[PR PATCH] bubblewrap: update to 0.5.0.

[PR PATCH] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



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

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

From 908e80b40cd508b8be7e99f02321bf5655f76c0f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 09:12:05 +0200
Subject: [PATCH] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  10 +-
 3 files changed, 4 insertions(+), 274 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..fe2e985141df 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,8 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818
 
 post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
+	vlicense COPYING
 }

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



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

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

From b42ee11eac19e8c3f91af825e66d48aeadfc93c3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 09:12:05 +0200
Subject: [PATCH] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

Re: bubblewrap: update to 0.5.0.

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-935948083

Comment:
are you sure the realpath patch can go

it fixes a problem that does not always happen (see git history) so you should confirm that there is a concrete fix before dropping any patches

Re: bubblewrap: update to 0.5.0.

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-937211717

Comment:
The problematic code path in bubblewrap is still there, so please keep the patch around even if flatpak doesn't trigger the bug right now.

Re: bubblewrap: update to 0.5.0.

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-937230647

Comment:
it's apparently fixed with musl 1.2.2, we could maybe backport the musl patch instead 

Re: bubblewrap: update to 0.5.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-937346973

Comment:
I might have a branch backporting that. You need the readlink patch + new realpath patch.

Re: bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

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

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-937552137

Comment:
My bad there, I didn't encounter the problem because of musl 1.2.2, totally forgot that I was on it. 

@ericonr I couldn't find that branch, is it just this commit? https://git.musl-libc.org/cgit/musl/commit/?id=29ff7599a448232f2527841c2362643d246cee36

Re: bubblewrap: update to 0.5.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-937702726

Comment:
The upstream musl fix is only in 1.2.2 (which we don't have yet).

Re: bubblewrap: update to 0.5.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-937702726

Comment:
The upstream musl fix is only in 1.2.2 (which we don't have yet).

Re: bubblewrap: update to 0.5.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-937752303

Comment:
No, you also need e2fa720be7024cce4fc489f3877476d35da48ee2

Re: bubblewrap: update to 0.5.0.

[NoEiBk3]

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

New comment by NoEiBk3 on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-972524157

Comment:
bump

Re: bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

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

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-984490631

Comment:
Sorry for the delay, I was away for a long time, I'll make PR with patches on the weekend.

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



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

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

From b42ee11eac19e8c3f91af825e66d48aeadfc93c3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 09:12:05 +0200
Subject: [PATCH 0001/4088] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

From 92a87c10e6bc74207c200aadbbb7451dffac7b82 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Oct 2021 13:45:38 +0200
Subject: [PATCH 0002/4088] netpbm: update to 10.96.01.

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

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 58c81e076f79..c2d2411fdac0 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.96.00
+version=10.96.01
 revision=1
-_githash=0ffd1eedea91fdb58cbef1075d8b251fe61a75fa
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=0919dabcdcf52c26d3330ba65b2a3b3a34852d0d
+_githash_guide=c7569ba2267a4971b19a78a8b44488b28e86b5ee
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="7f2f33bf6fcc4f72ad05523f9ee920c2b75a7bb52784a7f1af974930ea93e83f
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="98009a9bacdf8bc37c6b15f9070ccbb82a28ddafb9c8ef424c0f6cce99468863
+ dbcdfd4164e1ce5a888727beb92d09f67e8cc7dde2d46ad03a1b58e1427c70ce"
 
 post_extract() {
 	cd $build_wrksrc

From 89a5fa3fcd5521f54e16b0301ad4522898bd483b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Oct 2021 13:46:10 +0200
Subject: [PATCH 0003/4088] iana-etc: update to 20211004.

---
 srcpkgs/iana-etc/files/services | 1 +
 srcpkgs/iana-etc/template       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 1367be1aedee..64536320b0b3 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -11154,6 +11154,7 @@ nxlmd           28000/tcp
 nxlmd           28000/udp
 pqsp            28001/tcp
 gruber-cashreg  28010/tcp
+thor-engine     28080/tcp
 a27-ran-ran     28119/udp
 voxelstorm      28200/tcp
 voxelstorm      28200/udp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index 2db36f5ae774..98cdbe1ce6a9 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -1,7 +1,7 @@
 # Template file for 'iana-etc'
 pkgname=iana-etc
 reverts="202001016_1"
-version=20210818
+version=20211004
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From a566d4e943efe559293d9c19243d2938f01360e1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Oct 2021 13:52:52 +0200
Subject: [PATCH 0004/4088] open-iscsi: update to 2.1.5.

---
 srcpkgs/open-iscsi/template | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index 7cd8308b0498..f7f0cf32517c 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.1.3
-revision=2
+version=2.1.5
+revision=1
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,18 +11,17 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=5410474b23552016220d04aa181903cb50ae988f29e99cb03f3e2de86a109be4
+checksum=d8a06c1ea86d2a312d598f52c151b210a34d82445a6f522f7c2bd6581b3a99af
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
+	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
 post_extract() {
-	sed -i '1i#include <fcntl.h>' usr/idbm.c
-	sed -i 's/(__compar_fn_t)//' utils/fwparam_ibft/fwparam_ppc.c
-	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
-	sed -i 's/lib64/lib/g' libopeniscsiusr/Makefile
-	sed -i 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
-	sed -i '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
+	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
+	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
+	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
+	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
+	vsed -i -e 's:ISCSI_MAX_IFACE_LEN):ISCSI_MAX_IFACE_LEN-1):' libopeniscsiusr/idbm.c
 }
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
@@ -43,6 +42,4 @@ do_install() {
 	true >${DESTDIR}/etc/iscsi/initiatorname.iscsi
 	vsconf ${DESTDIR}/etc/iscsi/ifaces/iface.example
 	rm ${DESTDIR}/etc/iscsi/ifaces/iface.example
-
-	sed -i 's,/sbin/iscsid,/usr/bin/iscsid,' ${DESTDIR}/etc/iscsi/iscsid.conf
 }

From de7191072633e44f7f16f8e5da8409777202eeb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Oct 2021 14:00:26 +0200
Subject: [PATCH 0005/4088] schilytools: update to 2021.09.18.

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

diff --git a/srcpkgs/schilytools/template b/srcpkgs/schilytools/template
index a33b805adf12..b6d6757d3cb8 100644
--- a/srcpkgs/schilytools/template
+++ b/srcpkgs/schilytools/template
@@ -1,6 +1,6 @@
 # Template file for 'schilytools'
 pkgname=schilytools
-version=2021.08.14
+version=2021.09.18
 revision=1
 wrksrc="schily-${version//./-}"
 build_style=meta
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CDDL-1.0"
 homepage="https://sourceforge.net/projects/schilytools/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/schily-${version//./-}.tar.bz2"
-checksum=fb4e4c0ca534aa28127f7e7556c9017e059f4c7b93f6bfc33965f28091230f10
+checksum=7c93f43d22c6e3de0eafe018ceb26ddd5cc6c543dc301f307d1e6ca313248aa4
 nocross=yes  # configure + re-builds with itself
 
 do_build() {

From 193ded42d642d93e3490e250240fa4c893ff7f1e Mon Sep 17 00:00:00 2001
From: Yuyu <yuyu@yyzr.de>
Date: Wed, 6 Oct 2021 12:51:24 +0200
Subject: [PATCH 0006/4088] openvpn: update to 2.5.4.

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

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 143f1b22e700..e68895775fe0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.5.3
+version=2.5.4
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
 distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e
+checksum=56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436
 
 build_options="mbedtls pkcs11"
 build_options_default="pkcs11"

From 62257e563fbf407a5e2634e5875b0e7e258af072 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 6 Oct 2021 19:33:29 +0200
Subject: [PATCH 0007/4088] perl-Gtk3-ImageView: update to 10.

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

diff --git a/srcpkgs/perl-Gtk3-ImageView/template b/srcpkgs/perl-Gtk3-ImageView/template
index 636ba4240a5a..0af3d79b6b6a 100644
--- a/srcpkgs/perl-Gtk3-ImageView/template
+++ b/srcpkgs/perl-Gtk3-ImageView/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Gtk3-ImageView'
 pkgname=perl-Gtk3-ImageView
-version=9
+version=10
 revision=1
 wrksrc="gtk3-imageview-${version}"
 build_style=perl-module
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://github.com/carygravel/gtk3-imageview"
 distfiles="https://github.com/carygravel/gtk3-imageview/archive/v${version}.tar.gz"
-checksum=b429e1cafbee6c47b36f14579068b75337aff838ddcba1c6506fe1c4da296028
+checksum=1465075a9e0e8e623d4af2a521ad66e55b71074b00e8bf9e4448db13df407519

From 58e5b1f71244627cd5e8ec50d8536ec461fee20c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Oct 2021 15:34:50 -0400
Subject: [PATCH 0008/4088] cpp-utilities: update to 5.11.2.

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

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 3acb2c6b0e17..366f7a40f6f1 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.11.1
+version=5.11.2
 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=cd36c39b10f1884bcb7c49337891a4ade157e6bc12ee40526387a0f717c33bda
+checksum=4ff8d2a8844c754d1c64f151e91d8b13365a8f1e4a68b49e314d110881479f1a
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From dd24b30bd748d3a17821eef248b58ea0c3a76031 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Oct 2021 15:35:50 -0400
Subject: [PATCH 0009/4088] qtutilities: update to 6.5.1.

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

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..4ba04f48dfd3 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.5.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a0bb997e9ea8b53c4ba7ae40affd945d015c757f43d7a313b575a8a425bea180
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From 4b3edf7dd20923524779a734f03c4ae669b59879 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Oct 2021 15:36:16 -0400
Subject: [PATCH 0010/4088] tagparser: update to 10.3.0.

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

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1630bc5a5716..89ba6fde0086 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.2.0
+version=10.3.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=028143f63140b6312f170b32ea3beb70fc79a80d8ae6e2432d2495231ff5b8a0
+checksum=7ec68d39b7a3a7e3d4ca2e991e2eea5158c91d2afb6c5607b49a27a5c81930d1
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From 39e1ef8fe147b4ab06c4f93ec94e0042caa18af6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Oct 2021 15:40:16 -0400
Subject: [PATCH 0011/4088] tageditor: update to 3.5.1.

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

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index a5cc9e08e75e..ece38f3a1ed6 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.5.0
+version=3.5.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=87c04ff8d2f83a801bfb40de7e991008290d0f3808642f2f5c2e05489a353dee
+checksum=c6a787ef5b235b93f55a5f458cc1cb6376a53f60b2de1a76c70efdfa8390b928
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 273bf99ffe969c7c0949422a85fa6fe32362157f Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 6 Oct 2021 21:48:53 +0200
Subject: [PATCH 0012/4088] Minder: update to 1.13.1.

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

diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index 9ec640b42fd7..2022aca4548d 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,17 +1,17 @@
 # Template file for 'Minder'
 pkgname=Minder
-version=1.11.1
+version=1.13.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
- libarchive-devel discount-devel gtksourceview-devel"
+ libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel"
 short_desc="Mind-mapping application designed for Pantheon"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/phase1geo/Minder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=954b84be60233c6c46be58f6bc365b3b8c376ba312d15ec74edf82c5cf9eea27
+distfiles="https://github.com/phase1geo/Minder/archive/${version}.tar.gz"
+checksum=f319501e40e53e7721864d73e8c071960acc40a4f32dd84e85646a2031be215a
 
 post_install() {
 	vinstall data/com.github.phase1geo.minder.desktop 644 /usr/share/applications/

From 8acee46fd63d12f3dae196f1ed9aaf0f30a46209 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Wed, 6 Oct 2021 11:51:48 -0700
Subject: [PATCH 0013/4088] tintin: update to 2.02.12.

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

diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index e095e427bd9d..73d46cc4a120 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -1,6 +1,6 @@
 # Template file for 'tintin'
 pkgname=tintin
-version=2.02.11
+version=2.02.12
 revision=1
 wrksrc=tt
 build_wrksrc=src
@@ -11,7 +11,7 @@ maintainer="Michael Taboada <voidpkgs@forwardme.email>"
 license="GPL-2.0-or-later"
 homepage="http://tintin.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"
-checksum=b39289ef1e26d2f5b7f7e33f70bcd894060c95dd96c157bb976f063c59a8b1f5
+checksum=b6f9fd4f2c1e7cdc8cff4172d7a80014961b0394380ced9182209dc34d781a00
 
 post_install() {
 	for i in FAQ SCRIPTS README; do

From e63e691a80c522d4587745ef3345d99821362448 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 19:45:39 +0200
Subject: [PATCH 0014/4088] nano: update to 5.9.

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

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index f2a990d4727b..aeb8d0feda4a 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=5.8
+version=5.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.nano-editor.org/"
 changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
 distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar.xz"
-checksum=e43b63db2f78336e2aa123e8d015dbabc1720a15361714bfd4b1bb4e5e87768c
+checksum=757db8cda4bb2873599e47783af463e3b547a627b0cabb30ea7bf71fb4c24937
 
 post_install() {
 	vsconf syntax/nanorc.nanorc

From feee1308b088cd924b45d8aa5d870ee4cf4b7bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 6 Oct 2021 22:09:45 -0300
Subject: [PATCH 0015/4088] build-style/void-cross: check for
 kernel-libc-headers/patches

The directory isn't always present, so add the same check as used in
other stages of the build.
---
 common/build-style/void-cross.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index ee2c6aaf7c2e..92f03f8130f5 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -167,9 +167,11 @@ _void_cross_build_kernel_headers() {
 	msg_normal "Patching Linux headers for ${tgt}\n"
 
 	cd ${wrksrc}/linux-${ver}
-	for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do
-		_void_cross_apply_patch "$f"
-	done
+	if [ -d "${XBPS_SRCPKGDIR}/kernel-libc-headers/patches" ]; then
+		for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do
+			_void_cross_apply_patch "$f"
+		done
+	fi
 	cd ..
 
 	msg_normal "Building Linux headers for ${tgt}\n"

From e6f76d5187451edee6d9f31c50310f95783b8d1e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Wed, 6 Oct 2021 22:46:33 +0200
Subject: [PATCH 0016/4088] dbeaver: update to 21.2.2.

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 673bf669c90d..d35379bbcaff 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.2.1
+version=21.2.2
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=b78be3c0b0bf83c0921c5b7172d5d177c6b4421f2899cd81f4be7f1b217e0bc5
+checksum=955046eec4a77085b74ac40e40c1754fad8642dd8b8cb99896d10d3b81731e52
 nopie=true
 
 do_build() {

From a413b68181a1a38f6376fc9c09c2b8ff47d9de3f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 6 Oct 2021 21:52:44 +0400
Subject: [PATCH 0017/4088] calibre: update to 5.28.0.

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 24a3cc318095..a6721278a810 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.26.0
+version=5.28.0
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=86e6dd593187327f866c9ded2ce20a1f36b909d0b79d7a71197a90c7832ee386
+checksum=e8021131c8e4f77580560d70a0d49acb1acabfb40e3d91274214df925d5f3ada
 lib32disabled=yes
 nocross=yes
 

From 77e043626212833a6e636bb39fb6ff2dd54a2669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 6 Oct 2021 19:02:15 +0200
Subject: [PATCH 0018/4088] doctl: update to 1.65.0.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5dacf1f24446..e9de76f41666 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.64.0
+version=1.65.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=ad3ff9afac67e6065a602bca783da0d86747a66fde24e542e4947f73b794380b
+checksum=b2ab4f123813ee3fdcc750b7c8f7bd9764dfa1647c54514413940449ef78cab5

From 058d17a19d0a5c5a771a14fcebb71a62369b07fe Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Wed, 6 Oct 2021 18:48:10 +0600
Subject: [PATCH 0019/4088] fselect: update to 0.7.7.

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

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 9bc1fe21865b..bdb1a6071b02 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,6 +1,6 @@
 # Template file for 'fselect'
 pkgname=fselect
-version=0.7.4
+version=0.7.7
 revision=1
 build_style=cargo
 short_desc="Find files with SQL-like queries"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/jhspetersson/fselect"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c3bf4096419ae8ff5390b6f0d064cfd2917169d41841071c61e6f265ebf11d7a
+checksum=0dc6749a0c15a79639a183d44be630f59c7ce7c1af5a835fe0fd31c0eab4a653
 
 post_install() {
 	vlicense LICENSE-MIT

From 489230fb879f60281dc645debdd72218feb4b161 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 6 Oct 2021 20:53:06 +0400
Subject: [PATCH 0020/4088] benchmark: update to 1.6.0.

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

diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..b8ce38cd9d58 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.6.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=1f71c72ce08d2c1310011ea6436b31e39ccab8c2db94186d26657d41747c85d6
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 23564b7bb7b67c6060165bd55bef6b92fc717689 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 12:55:04 +0200
Subject: [PATCH 0021/4088] minitube: update to 3.9.1.

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

diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template
index ab5cc6591448..528e8fa1b0db 100644
--- a/srcpkgs/minitube/template
+++ b/srcpkgs/minitube/template
@@ -1,6 +1,6 @@
 # Template file for 'minitube'
 pkgname=minitube
-version=3.7
+version=3.9.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-tools qt5-host-tools qt5-qmake git"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://flavio.tordini.org/minitube"
 distfiles="https://github.com/flaviotordini/minitube/releases/download/${version}/minitube-${version}.tar.bz2"
-checksum=a8dd0db3f3f8172abc1ea940d3bf533e87c9a4f8a1df2ce38ff2e0cda728107e
+checksum=7063d3db599c0c9c3ddfea39a14cf708bd5bc9ff1dbb66acb4bd1eb1b7a86a47
 
 pre_configure() {
 	# Provided by Gottox

From 35923f29e9cb2fdba9cfc79b338639a46a77187c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 12:26:55 +0200
Subject: [PATCH 0022/4088] rover: update to 1.0.1.

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

diff --git a/srcpkgs/rover/template b/srcpkgs/rover/template
index e44bc4dcf068..dca5cc02178a 100644
--- a/srcpkgs/rover/template
+++ b/srcpkgs/rover/template
@@ -1,18 +1,15 @@
 # Template file for 'rover'
 pkgname=rover
-version=1.0.0
+version=1.0.1
 revision=1
+build_style=gnu-makefile
 makedepends="ncurses-devel"
 short_desc="Simple file browser for the terminal"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="Public Domain"
 homepage="https://github.com/lecram/rover"
 distfiles="https://github.com/lecram/rover/archive/v${version}.tar.gz"
-checksum=f2e6629107f80cc71e64cf1f2c79afe8c76d3aa0d53074bd221e5ddcda895a4e
-
-do_build() {
-	make ${makejobs} LDLIBS="-lncursesw"
-}
+checksum=d40c684e0504d4a5f2525dd72df89d6bf1a209f8c83a6fc9eaca9f8b9613effa
 
 do_install() {
 	vbin rover

From 8f8d3ffde75ca7458d61311280406d29b0ce4e35 Mon Sep 17 00:00:00 2001
From: Yuyu <yuyu@yyzr.de>
Date: Wed, 6 Oct 2021 14:06:30 +0200
Subject: [PATCH 0023/4088] libass: update to 0.15.2.

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

diff --git a/srcpkgs/libass/template b/srcpkgs/libass/template
index 83cc908f26af..5aa7953b7be2 100644
--- a/srcpkgs/libass/template
+++ b/srcpkgs/libass/template
@@ -1,6 +1,6 @@
 # Template file for 'libass'
 pkgname=libass
-version=0.15.1
+version=0.15.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool yasm pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/libass/libass/"
 distfiles="https://github.com/libass/libass/archive/${version}.tar.gz"
-checksum=61538871aa7779620caa01fb52e9344a1840848e8a55b8aaa33d16dd88f97417
+checksum=f96b7ce35f2b0bf430eb71c4c9dd5d8f0abf52499e08490d346608c837c98299
 
 pre_configure() {
 	autoreconf -fi

From 15fddb4e859ea9035dddb70e4556ce343386e0da Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 12:14:50 +0200
Subject: [PATCH 0024/4088] terminology: update to 1.10.0.

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

diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template
index af994753275d..0bcaea037048 100644
--- a/srcpkgs/terminology/template
+++ b/srcpkgs/terminology/template
@@ -1,6 +1,6 @@
 # Template file for 'terminology'
 pkgname=terminology
-version=1.9.0
+version=1.10.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config efl gettext"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.enlightenment.org"
 distfiles="https://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c
+checksum=5faf658a8656df753a93a3147c0d35f5c77549f1954b48dc1f5a4b36253bb346
 
 post_install() {
 	vlicense COPYING

From 34390589a4376da5a06e47c6ea0cf5ac876fd72c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 09:28:03 +0200
Subject: [PATCH 0025/4088] moserial: update to 3.0.20.

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

diff --git a/srcpkgs/moserial/template b/srcpkgs/moserial/template
index 41871996f817..07f594c506d3 100644
--- a/srcpkgs/moserial/template
+++ b/srcpkgs/moserial/template
@@ -1,6 +1,6 @@
 # Template file for 'moserial'
 pkgname=moserial
-version=3.0.16
+version=3.0.20
 revision=1
 _majver=3.0
 build_style=gnu-configure
@@ -11,4 +11,4 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Moserial"
 distfiles="${GNOME_SITE}/moserial/${_majver}/moserial-${version}.tar.xz"
-checksum=1e676d8e240ca9e37b3a2b413b7e59c751868a41c9f8a9248984e1dbe15e6d74
+checksum=dd180bc027c2858706780c806f7af99a256c83ecc298fb6a5eb0ce3979f1fa92

From 7ddad8c35cb199fb40bbd5c49e446581f91c685d Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 6 Oct 2021 08:33:46 +0200
Subject: [PATCH 0026/4088] pass-git-helper: update to 1.1.2.

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

diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index a9500f81b99a..d799acdc189f 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -1,6 +1,6 @@
 # Template file for 'pass-git-helper'
 pkgname=pass-git-helper
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/languitar/pass-git-helper"
 distfiles="https://github.com/languitar/${pkgname}/archive/v${version}.tar.gz"
-checksum=17a4c36d0fe67a7a4a709da3c0649d10efb02df266e62765661eac2ced4bc03d
+checksum=4acfb486d0873014376383167792ee2b46926386718eb2331a1b4564576a2076

From 6b00f153191787876fe2d9cb531390e951687ed3 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 6 Oct 2021 08:37:17 +0200
Subject: [PATCH 0027/4088] py3status: update to 3.39.

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

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..02d9a83f8c67 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.39
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=d18b81e86d5a44d2fa67453c3e9f04b9285005b2a7a9455890903d0e2dfe843c
 
 post_install() {
 	vlicense LICENSE

From 65c5e6798b6e471d6671dab83dbd94297f39fb72 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 6 Oct 2021 08:21:47 +0200
Subject: [PATCH 0028/4088] drone-cli: update to 1.4.0.

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

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..44885976b677 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -10,5 +10,6 @@ short_desc="CLI for Drone continuous delivery platform"
 maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
+changelog="https://raw.githubusercontent.com/drone/drone-cli/master/CHANGELOG.md"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=6b19378c923f71303dc753f2d39e7126285c23a504d20e3ce35fa8ee5605db03

From dd7c5c3fe4f1317b3a1c2a56399d341ae2ac95aa Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 08:46:23 +0200
Subject: [PATCH 0029/4088] brillo: update to 1.4.10.

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

diff --git a/srcpkgs/brillo/template b/srcpkgs/brillo/template
index 672aa15f3c4e..00d6976d20af 100644
--- a/srcpkgs/brillo/template
+++ b/srcpkgs/brillo/template
@@ -1,6 +1,6 @@
 # Template file for 'brillo'
 pkgname=brillo
-version=1.4.9
+version=1.4.10
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-makefile
@@ -11,4 +11,4 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/cameronnemo/brillo"
 distfiles="${homepage}/-/archive/v${version}/${wrksrc}.tar.gz"
-checksum=354f3a4e2c3b755d3683614afff0fb654944ba568aba87b90508d27609802658
+checksum=33eac5dde827fd1e293f6b9c8e0bdd3e5d90f9d7868cdc75f8be8ae4a43e4529

From cf40dd9ee953a3943e1d35723eab541c3719ebbe Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 6 Oct 2021 08:36:26 +0200
Subject: [PATCH 0030/4088] portage: update to 3.0.28.

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

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..2362d64648bf 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.28
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=bb5e9db681f437b68e9e9cab3f637b757d6c6a90cb30ac41f6567430beb4a67f
 
 conf_files="
 	/etc/dispatch-conf.conf

From 7a90a659e215859244658667455da04c540b9bd9 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Tue, 5 Oct 2021 15:17:55 -0600
Subject: [PATCH 0031/4088] mbuffer: update to 20211004

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

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index 2298efe7e4df..9c3946022199 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,6 +1,6 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
-version=20210829
+version=20211004
 revision=1
 build_style=gnu-configure
 hostmakedepends="which"
@@ -11,5 +11,5 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.maier-komor.de/mbuffer.html"
 distfiles="https://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"
-checksum=74e6f01c716147128d1c7ba0a8f01bf3df67415d67d90ac8c39892514cbc69ae
+checksum=2a8b6b3466d41e6c0dde32ce09eec672525ca9a5cf4150b9a0e9f5c65ee89942
 conf_files="/etc/mbuffer.rc"

From 4ff0edae9bd1d744a53ad13955f99f0027297a47 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 08:36:30 +0200
Subject: [PATCH 0032/4088] xlunch: update to 4.7.1.

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

diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index 8c8eafcb029b..36c568aafa8f 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -1,6 +1,6 @@
 # Template file for 'xlunch'
 pkgname=xlunch
-version=4.7.0
+version=4.7.1
 revision=1
 build_style=gnu-makefile
 make_build_target=xlunch
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://xlunch.org/"
 distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz"
-checksum=08728beba2a86b1e8f0cccf14903b7e6625e099425b6a254418c75636f2515e6
+checksum=9ee401638fde606539bb36e7754af83d5827e4764d4e8fcbe95f25d19338bf33
 
 do_install() {
 	vbin xlunch

From 0a5f9cdcefc63e5631b964be39b8d8ce14db176f Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 6 Oct 2021 08:35:08 +0200
Subject: [PATCH 0033/4088] podget: update to 0.8.10.

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

diff --git a/srcpkgs/podget/template b/srcpkgs/podget/template
index 960a3bbf4bd5..9307ae0cf15c 100644
--- a/srcpkgs/podget/template
+++ b/srcpkgs/podget/template
@@ -1,6 +1,6 @@
 # Template file for 'podget'
 pkgname=podget
-version=0.8.8
+version=0.8.10
 revision=1
 build_style=gnu-makefile
 depends="wget"
@@ -9,4 +9,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="http://podget.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/podget/podget/podget-${version}/podget-${version}.tar.gz"
-checksum=54bc846583d06d93aeaf170e0f9ed854bf9a030ce3a6537d68908bb8d3f284d4
+checksum=74b7f1e03d23e4ddfecb63fc34b8e279d4847701a2f218df23f7481adc3bde26

From 1dbb2fc48a4e37959023566bfbdf43fd576f2407 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Wed, 6 Oct 2021 15:55:05 -0500
Subject: [PATCH 0034/4088] cproto: update to 4.7s

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

diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template
index 7c1e844d2b85..91dea40d9d33 100644
--- a/srcpkgs/cproto/template
+++ b/srcpkgs/cproto/template
@@ -1,7 +1,7 @@
 # Template file for 'cproto'
 pkgname=cproto
-version=4.7o
-revision=2
+version=4.7s
+revision=1
 build_style=gnu-configure
 hostmakedepends="flex"
 short_desc="Generates function prototypes and variable declarations from C code"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/cproto/cproto.html"
 distfiles="ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
-checksum=c76b0b72064e59709459bb7d75d6ec929f77ce5ae7f2610d169ba0fa20ccb44f
+checksum=842f28a811f58aa196b77763e08811c2af00472c0ea363d397a545046d623545
 
 do_install() {
 	make bindir=${DESTDIR}/usr/bin mandir=${DESTDIR}/usr/share/man install

From 56e798b9c6c89d75a58556cc2ac6a46e09947642 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 08:31:58 +0200
Subject: [PATCH 0035/4088] font-unifont-bdf: update to 14.0.01.

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

diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index 48b901e1951a..ce94f9be9c3c 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-unifont-bdf'
 pkgname=font-unifont-bdf
-version=13.0.06
+version=14.0.01
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://unifoundry.com/unifont/index.html"
 distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz"
-checksum=b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5
+checksum=391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e
 font_dirs=/usr/share/fonts/misc
 
 do_install() {

From 2442bae43bc3182512ef8f471293e292d28c459b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 21:41:47 -0400
Subject: [PATCH 0036/4088] ufw: update to 0.36.1.

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

diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index 0892c6105834..baa38a4fe466 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -1,9 +1,9 @@
 # Template file for 'ufw'
 pkgname=ufw
-version=0.36
-revision=4
+version=0.36.1
+revision=1
+_major_minor="${version%.*}"
 build_style=python3-module
-pycompile_module="ufw"
 conf_files="
  /etc/ufw/*.conf
  /etc/ufw/*.rules
@@ -14,8 +14,8 @@ short_desc="Uncomplicated Firewall"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://launchpad.net/ufw"
-distfiles="https://launchpad.net/ufw/${version}/${version}/+download/ufw-${version}.tar.gz"
-checksum=754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833fff33cfc
+distfiles="https://launchpad.net/ufw/${_major_minor}/${version}/+download/ufw-${version}.tar.gz"
+checksum=1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c
 
 pre_configure() {
 	sed -i -e 's|/lib|/usr/lib|' setup.py

From fff1ac8a0864c8d5bc748bb030ee0f16c9f42b25 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 4 Oct 2021 15:06:33 -0500
Subject: [PATCH 0037/4088] libedit: update to 20210910.3.1

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

diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template
index 6e2b7f1abc01..84d1bf136a26 100644
--- a/srcpkgs/libedit/template
+++ b/srcpkgs/libedit/template
@@ -1,6 +1,6 @@
 # Template file for 'libedit'
 pkgname=libedit
-version=20210522.3.1
+version=20210910.3.1
 revision=1
 _distver="${version%%.*}-${version#*.}"
 wrksrc="${pkgname}-${_distver}"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.thrysoee.dk/editline/"
 distfiles="http://www.thrysoee.dk/editline/libedit-${_distver}.tar.gz"
-checksum=0220bc2047e927c0c1984ef5f7b4eb2a9469a5b7bf12ba573ca3b23ca02bbb6f
+checksum=6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5
 
 post_install() {
 	vlicense COPYING

From 53fc23e027f8a7199c388bb959887d0e688acefc Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 5 Oct 2021 15:25:21 +0200
Subject: [PATCH 0038/4088] instead: update to 3.4.1.

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

diff --git a/srcpkgs/instead/template b/srcpkgs/instead/template
index 66800783564b..906bbad48690 100644
--- a/srcpkgs/instead/template
+++ b/srcpkgs/instead/template
@@ -1,6 +1,6 @@
 # Template file for 'instead'
 pkgname=instead
-version=3.3.4
+version=3.4.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://instead-hub.github.io"
 changelog="https://raw.githubusercontent.com/instead-hub/instead/master/ChangeLog"
 distfiles="https://github.com/instead-hub/instead/releases/download/${version}/instead_${version}.tar.gz"
-checksum=ff705290646b764a189f08e852deee82baa56f467f5f3fe9e687df81c3c819d6
+checksum=17479bab7e8cd8fb6349a42758b23a91e81b798b297319c6d60c72895b37ab8b
 
 post_install() {
 	vlicense COPYING

From 732a5aa1dc41e8b22c73386ff7731e6e5f27d6fb Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 4 Oct 2021 21:15:30 -0500
Subject: [PATCH 0039/4088] salt: add contextvars dependency conditional

See https://github.com/saltstack/salt/issues/60483
---
 srcpkgs/salt/patches/requirements.patch | 6 ++++++
 srcpkgs/salt/template                   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/salt/patches/requirements.patch

diff --git a/srcpkgs/salt/patches/requirements.patch b/srcpkgs/salt/patches/requirements.patch
new file mode 100644
index 000000000000..8b1217a30c44
--- /dev/null
+++ b/srcpkgs/salt/patches/requirements.patch
@@ -0,0 +1,6 @@
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -6,2 +6,2 @@
+ distro>=1.0.1
+-contextvars
++contextvars; python_version < "3.7"
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 7e9f1f7a140e..8959d4f90018 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,7 +1,7 @@
 # Template file for 'salt'
 pkgname=salt
 version=3003.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq

From 3e85aa4d4be1d6ef8fa86f0a9b22d43cf917a57b Mon Sep 17 00:00:00 2001
From: Yuyu <yuyu@yyzr.de>
Date: Wed, 6 Oct 2021 13:20:35 +0200
Subject: [PATCH 0040/4088] polybar: update to 3.5.7.

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

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index afcae60e9e4c..803d9b1870f9 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,6 +1,6 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.5.6
+version=3.5.7
 revision=1
 build_style=cmake
 configure_args="
@@ -25,7 +25,7 @@ maintainer="Michael Carlberg <c@rlberg.se>"
 license="MIT"
 homepage="https://github.com/polybar/polybar"
 distfiles="${homepage}/releases/download/${version}/polybar-${version}.tar.gz"
-checksum=dfe602fc6ac96eac2ae0f5deb2f87e0dd1f81ea5d0f04ad3b3bfd71efd5cc038
+checksum=73210e6d74217acb953b253990b4302343b7b6a7870fe1da9a1855daa44123db
 
 build_options="alsa curl i3 mpd network pulseaudio"
 build_options_default="$build_options"

From 82f22eb921f06cc060e0aeb43549f2e5a0540e40 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 Oct 2021 13:05:46 +0200
Subject: [PATCH 0041/4088] gtk+3: update to 3.24.30. switch to meson

This commit also disables failing tests. This is an improvement over
having the buildsystem fail completely as we can actually start to track
regressions here.

Also remove obsolete revbump message
---
 srcpkgs/gtk+3/template | 63 +++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index be97801ad473..c6660b618f10 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,18 +1,21 @@
 # Template file for 'gtk+3'
-# Revbump gtk-layer-shell when updating, otherwise it presents a warning message
 pkgname=gtk+3
-version=3.24.29
+version=3.24.30
 revision=1
 wrksrc="gtk+-${version}"
-build_style=gnu-configure
+build_style=meson
 build_helper="gir"
-#XXX broken configure script: Can't use vopt_enable cloudproviders, configure
-#checks for libcloudproviders when we pass '--disable-cloudproviders' to it!
-configure_args="--disable-schemas-compile
- $(vopt_enable broadway broadway-backend) $(vopt_enable colord)
- $(vopt_enable cups) $(vopt_enable gir introspection)
- $(vopt_enable wayland wayland-backend) $(vopt_enable x11 x11-backend)
- $(vopt_if cloudproviders '--enable-cloudproviders')"
+configure_args="
+ $(vopt_bool x11 x11_backend)
+ $(vopt_bool wayland wayland_backend)
+ $(vopt_bool broadway broadway_backend)
+ -Dprint_backends=$(vopt_if cups 'cups,')file
+ $(vopt_bool cloudproviders)
+ -Dcolord=$(vopt_if colord yes no)
+ $(vopt_bool gtk_doc)
+ -Dman=true
+ $(vopt_bool gir introspection)
+ "
 conf_files="/etc/gtk-3.0/im-multipress.conf"
 hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
  pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
@@ -29,19 +32,46 @@ 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=f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa
+checksum=ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9
+_broken_tests="
+ a11y/scale-drawvalue
+ a11y/menu
+ a11y/menubutton
+ a11y/menubutton2
+ a11y/menubutton3
+ a11y/tooltips
+ reftests/button-wrapping.ui
+ reftests/cellrenderer-pixbuf-stock-rtl.ui
+ reftests/icon-effect-missing.ui
+ reftests/symbolic-icon-translucent-color.ui
+ reftests/window-height-for-width.ui"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) _broken_tests+=" gtk/cellarea" ;;
+esac
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="broadway colord cups gir cloudproviders wayland x11 gtk_doc"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 
 # Enable all options (other than cloudproviders) by default.
 build_options_default="colord cups gir broadway wayland x11"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
+pre_check() {
+	for t in $_broken_tests; do
+		test_dir="testsuite/${t%\/*}"
+		test_name="${t##*\/}"
+
+		vsed -e "/'${test_name}',/d" -i "$test_dir/meson.build"
+	done
+}
 
 do_check() {
-	# TODO: don't pass fully
-	xvfb-run dbus-run-session make ${makejobs} check
+	xvfb-run dbus-run-session ninja -C build ${makejobs} test
 }
 
 post_install() {
@@ -59,7 +89,9 @@ gtk+3-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		vmove usr/share/aclocal
 	}
 }
@@ -73,7 +105,6 @@ gtk+3-demo_package() {
 		vmove usr/share/man/man1/gtk3-widget-factory.1
 		vmove usr/share/gtk-3.0/gtkbuilder.rng
 		vmove usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
-		vmove usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
 		vmove usr/share/applications/gtk3-widget-factory.desktop
 		vmove usr/share/applications/gtk3-demo.desktop
 		vmove usr/share/icons

From c0a1bde241b09738072fff26a71ec7133e6d8240 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 7 Oct 2021 08:37:13 -0500
Subject: [PATCH 0042/4088] Amass: update to 3.14.1.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 179f471cb200..98d0b02afe0a 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.14.0
+version=3.14.1
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=0984d755468876ddd7585ce8209dc149ad2a63b16de9cbd9a9e06bcdaaf87822
+checksum=03ab09258f82a81f49c7ba99988f23151b56ab481236a46a95c12c8eef0952fa
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From 466d22c429b08a3efdfaa855ff8553851c94bf77 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 7 Oct 2021 08:58:46 -0500
Subject: [PATCH 0043/4088] mongo-c-driver: update to 1.19.1.

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

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..fcc28113fb96 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.19.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=1732251e3f65bc02ce05c04ce34ef2819b154479108df669f0c045486952521d
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From f83b68205d05fd7eba0ae994f427bd89e155031e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 7 Oct 2021 09:00:41 -0500
Subject: [PATCH 0044/4088] python3-rich: update to 10.12.0.

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 300099c11a59..e83be32122d1 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.11.0
+version=10.12.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=016fa105f34b69c434e7f908bb5bd7fefa9616efdb218a2917117683a6394ce5
+checksum=83fb3eff778beec3c55201455c17cccde1ccdf66d5b4dade8ef28f56b50c4bd4
 
 post_install() {
 	vlicense LICENSE

From b780f621514b65ed6f0fbc6ddce51e4a72a18dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 7 Oct 2021 16:22:13 -0300
Subject: [PATCH 0045/4088] apache: update to 2.4.51.

Also move to recommended CDN download. They officially ask not to
download directly from apache.org and archive.apache.org hadn't even
received the 2.4.51 tarball yet.
---
 srcpkgs/apache/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 7b16e194f51a..b4c53165812a 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,6 +1,6 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.50
+version=2.4.51
 revision=1
 wrksrc="httpd-${version}"
 build_style=gnu-configure
@@ -35,8 +35,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://httpd.apache.org/"
 changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
-distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
-checksum=6a2817c070c606682eb53ed963511407d3c3d7a379cdf855971467b00fb3890f
+distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
+checksum=20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4
 
 system_accounts="_apache"
 _apache_homedir="/srv/www/$pkgname"

From 9c036043504f3f5f77ec691648cfadf4dd02cec8 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 09:32:05 +0200
Subject: [PATCH 0046/4088] jgmenu: update to 4.4.0.

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

diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template
index 4f459c546894..1db91768b44d 100644
--- a/srcpkgs/jgmenu/template
+++ b/srcpkgs/jgmenu/template
@@ -1,6 +1,6 @@
 # Template file for 'jgmenu'
 pkgname=jgmenu
-version=4.3.0
+version=4.4.0
 revision=1
 build_style=gnu-configure
 make_use_env=yes
@@ -16,4 +16,4 @@ license="GPL-2.0-only"
 homepage="https://www.github.com/johanmalm/jgmenu"
 changelog="https://raw.githubusercontent.com/johanmalm/jgmenu/master/docs/relnotes/${version}.txt"
 distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz"
-checksum=84daae2c544a2755d76e9bcd8cd2503e9cfbf8c48b3e97c8ec32dbcf269c6275
+checksum=acdd298a96da96c18deaeadf68f669a3e10242bd55911641a049ad6c0415054f

From dcc01407ad1e07300ed4d55591cf9c82d87c5d4d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 7 Oct 2021 21:41:47 +0200
Subject: [PATCH 0047/4088] linux5.4: update to 5.4.151.

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

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 839e8c91f83d..679cb6a661ff 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.150
+version=5.4.151
 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=f424a9bbb05007f04c17f96a2e4f041a8001554a9060d2c291606e8a97c62aa2
+checksum=bbe73fb83c31a6a7269de85b6b2bbd54dd31e6613f4edab20bb7a6f37cf53313
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 349fcc7332ae66c625c06cec16fd2656f4deb810 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 7 Oct 2021 21:43:58 +0200
Subject: [PATCH 0048/4088] linux4.19: update to 4.19.209.

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

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index bc9a4e61ca2b..b780f4fdf046 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.208
+version=4.19.209
 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=e74da88429a7bcf8915a45502a936528304f8ac08dce9dbb68f29e6dc85ca694
+checksum=7327d5b92e60b0134488c9bec463ef3d252ea49ac718117b37e80a8e5f87e913
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From a0a7583853bb643ea7be51357002d036c9238694 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Tue, 5 Oct 2021 23:25:37 +0200
Subject: [PATCH 0049/4088] nextcloud-client: update to 3.3.5, webengine is
 optional again

upstream officially supports build without webengine.
webengine option is disabled for known non-matching architectures.
---
 ...ariadic-macro-warning-only-for-clang.patch | 36 -------------------
 srcpkgs/nextcloud-client/template             | 17 ++++++---
 2 files changed, 13 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch

diff --git a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch
deleted file mode 100644
index 5afd721f392c..000000000000
--- a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-source: https://github.com/nextcloud/desktop/pull/3132
-
-From 52951820b2c094bcff0ec1a36c3c89d1c08c9618 Mon Sep 17 00:00:00 2001
-From: yopito <pierre.bourgin@free.fr>
-Date: Wed, 14 Apr 2021 22:07:19 +0200
-Subject: [PATCH] clang's variadic macro warnings: only for clang
-
-following settings of cmake/modules/Warnings.cmake
----
- src/CMakeLists.txt | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git src/CMakeLists.txt src/CMakeLists.txt
-index f29349582..6f3145331 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -30,10 +30,12 @@ if(NOT MSVC)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
-   endif()
- 
--  # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
--  # extension (C++11 §16.3/4 forbids them). Silence clang's warnings.
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
-+  if (CMAKE_CXX_COMPILER MATCHES "Clang")
-+    # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
-+    # extension (C++11 §16.3/4 forbids them). Silence clang's warnings.
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
-+  endif()
- endif()
- 
- if(WIN32)
--- 
-2.31.1
-
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index ff2199b915d5..e7d356bfa31d 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,6 +1,6 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.2.3
+version=3.3.5
 revision=1
 wrksrc="desktop-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
  qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
  $(vopt_if dolphin 'extra-cmake-modules kio-devel')
- qt5-webengine-devel"
+ $(vopt_if webengine 'qt5-webengine-devel')"
 depends="qt5-graphicaleffects"
 checkdepends="cmocka-devel"
 conf_files="/etc/Nextcloud/sync-exclude.lst"
@@ -18,13 +18,22 @@ short_desc="NextCloud Desktop client"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
+changelog="https://github.com/nextcloud/desktop/releases"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=40dc6fe3aaa62851af3fa480f108cc7e3bfff64b6bea0602e9546359b3d2cba2
+checksum=5e952be36ab6806ffbab6d216b05bfbd9d7e72687e0d281f492e1059cd34b419
+make_check=ci-skip
 
-build_options="dolphin"
+build_options="dolphin webengine"
 desc_option_dolphin="Build KDE dolphin support"
+desc_option_webengine="Build Qt5 WebEngine support"
 build_options_default="dolphin"
 
+if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
+	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+		build_options_default+=" webengine"
+	fi
+fi
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools"
 	# provides desktoptojson

From f8f9c732227e9a7a06be0cc19182098fcd021806 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Fri, 8 Oct 2021 12:43:55 +0200
Subject: [PATCH 0050/4088] obs: update to 27.1.3.

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

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 224aee4ace14..9d1487743d07 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=27.1.0
+version=27.1.3
 revision=1
 archs="i686* x86_64* ppc64le* aarch64*"
 wrksrc="obs-studio-${version}"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://obsproject.com"
 changelog="https://github.com/obsproject/obs-studio/releases"
 distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=a2f0b143a55f425455de98c3694cdbf24da02eebee2a390a5379f41343810a25
+checksum=4dfdb018b33ec0a90eb3a7e5a174afd58d52d583990680264afedf678961db1d
 
 obs-devel_package() {
 	short_desc+=" - development files"

From e2df6cd042a895b7be9ee3fc93547a91c057ad6c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Tue, 5 Oct 2021 08:52:35 -0700
Subject: [PATCH 0051/4088] raft: update to 0.11.2

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

diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 2d27d54bc127..85f12e9dd445 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,17 +1,18 @@
 # Template file for 'raft'
 pkgname=raft
-version=0.9.25
+version=0.11.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-example=no"
 hostmakedepends="pkg-config autoconf automake libtool"
-makedepends="libuv-devel"
+makedepends="libuv-devel liblz4-devel"
 short_desc="C implementation of the Raft consensus protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="custom:LGPL-3.0-only-linking-exception"
 homepage="https://github.com/canonical/raft"
 distfiles="https://github.com/canonical/raft/archive/v${version}.tar.gz"
-checksum=fac55dc1cea66c7e2e6525d3be0aebedff8c31ec568efb6a911c6bb0ea99268d
+checksum=c89fd6a6fa3c9e6d670b74e389b2d028dfd39d1eec2b18661fae73a9bfd6b89d
+make_check=ci-skip
 
 pre_configure() {
 	autoreconf -i

From 4ed781bafb3842ade64af53bd1392e65bf5d564f Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Tue, 5 Oct 2021 08:47:11 -0700
Subject: [PATCH 0052/4088] dqlite: update to 1.9.0

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

diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index ed948d343560..41af8cde377d 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'dqlite'
 pkgname=dqlite
-version=1.6.0
+version=1.9.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="custom:LGPL-3.0-only-linking-exception"
 homepage="https://github.com/canonical/dqlite"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8671396a9510c7c125e706973a8ffb2e4540ac605f1f3e9720a63876448f5d93
+checksum=b3f23019bcdc030b8f1d97ef585a34b24128414d6c2e79fcf729e053578d80a7
 
 pre_configure() {
 	autoreconf -i

From a071397d4ac3fb5c7e3e12b926efa8db646fe1f3 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Tue, 5 Oct 2021 09:08:42 -0700
Subject: [PATCH 0053/4088] lxd: update to 4.19

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

diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template
index 9d5e6d8a713a..d216d7bb7f7c 100644
--- a/srcpkgs/lxd/template
+++ b/srcpkgs/lxd/template
@@ -1,6 +1,6 @@
 # Template file for 'lxd'
 pkgname=lxd
-version=4.15
+version=4.19
 revision=1
 build_style=go
 go_import_path=github.com/lxc/lxd
@@ -9,23 +9,18 @@ go_package="${go_import_path}/lxd ${go_import_path}/lxc
  ${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
 hostmakedepends="pkg-config git"
 makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
-depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
+depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
 short_desc="Next generation system container manager"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/lxd"
 changelog="https://github.com/lxc/lxd/releases"
 distfiles="https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
-checksum=5178a918d59c9412a0af4af4c1abfce469e1a76497913bc316bf602895a2b265
+checksum=6e4cf6cb1549e1b56802d64ad24d812914e0c0102bfcf146bb18a8dcd1fbab57
 system_groups="lxd"
 
-# whitelist libcap LDFLAGS (see: https://github.com/lxc/lxd/issues/6727)
-export CGO_LDFLAGS_ALLOW='-Wl,-wrap,pthread_create'
-
-do_configure() {
-	# the LXD tarball packages up the required dependencies
-	ln -s "$wrksrc/_dist" "$GOPATH"
-}
+# whitelist dqlite LDFLAGS
+export CGO_LDFLAGS_ALLOW='-Wl,-z,now'
 
 post_install() {
 	vinstall scripts/bash/lxd-client 644 /usr/share/bash-completion/completions lxd

From 91b2bf0b9842120d4f05d2a564c5fd0508ffb545 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 7 Oct 2021 22:12:01 -0700
Subject: [PATCH 0054/4088] skopeo: update to 1.5.0

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

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 72149bea5341..8bbef5b80c2a 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.1
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=a0fd7a509b901f0b41364985daf41268eec5cf50f7ee0bd5c6f4b9add4042589
+checksum=4605a60a12a8f58cfe136d49242059a70810e786ee5849c778be0b4c7a49c453
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From d3270040b3fa0ade016b15d662539fae8baf25aa Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 7 Oct 2021 23:20:08 +0200
Subject: [PATCH 0055/4088] bindfs: update to 1.15.1.

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

diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index 3c224b167456..71836f4985c6 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,14 +1,15 @@
 # Template file for 'bindfs'
 pkgname=bindfs
-version=1.14.8
+version=1.15.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="fuse-devel"
-checkdepends="valgrind"
+makedepends="fuse3-devel"
 short_desc="FUSE filesystem for mounting a directory to another location"
 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=04dd3584a6cdf9af4344d403c62185ca9fab31ce3ae5a25d0101bc10936c68ab
+#cannot mount
+make_check=no

From fa3b65b9e80b5175346f4ab6d0ac59876224debd Mon Sep 17 00:00:00 2001
From: Fakhruddin Ahmad Darwis <fakhri.satu@gmail.com>
Date: Fri, 8 Oct 2021 06:26:40 +0700
Subject: [PATCH 0056/4088] vivaldi: update to 4.3.2439.39

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 15a71847a9ce..7cb5236a6097 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=4.2.2406.54
+version=4.3.2439.39
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=02c3a2a28b0e53bed563a94f3e504ec72dd206cd83cbaa141319b427dcf23c79
+checksum=91353cc0e566dea6ff06043700bfbfc542958136091929bdc86d0d9a589c5445
 repository=nonfree
 restricted=yes
 nostrip=yes

From 97ff354427693c8befcc0c38feb65648e391a92f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 7 Oct 2021 20:58:53 +0200
Subject: [PATCH 0057/4088] google-chrome: update to 94.0.4606.81

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

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index f9752c2aff9d..8e543b6e248b 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=94.0.4606.71
+version=94.0.4606.81
 revision=1
 _channel=stable
 archs="x86_64"
@@ -19,7 +19,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=04e7e7fd2558eb8032cd3878cf600daa44c86900949ce217806cc5a3314ccab9
+checksum=bfe97cd8d9f941e4a1e73f53d9de6bb54e73a007ee4ce5d4e94a9a65ae2d7fb4
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 7924c7b58c4ef313cc58f4c2548331f269c49d66 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Oct 2021 12:06:50 -0400
Subject: [PATCH 0058/4088] libcpuid: update to 0.5.1.

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

diff --git a/srcpkgs/libcpuid/template b/srcpkgs/libcpuid/template
index fd68d5b1e730..3cfeb869ba2a 100644
--- a/srcpkgs/libcpuid/template
+++ b/srcpkgs/libcpuid/template
@@ -1,16 +1,18 @@
 # Template file for 'libcpuid'
 pkgname=libcpuid
-version=0.5.0
+version=0.5.1
 revision=1
 archs="i686* x86_64*"
 build_style=cmake
 hostmakedepends="doxygen"
+checkdepends="python3"
 short_desc="Small C library for x86 CPU detection and feature extraction"
 maintainer="cr6git <quark6@protonmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/anrieff/libcpuid"
+changelog="https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog"
 distfiles="https://github.com/anrieff/libcpuid/archive/v${version}.tar.gz"
-checksum=49893f31475510aa0ebe2ad3a29fad95e2a592cc5f48451c95271c536f89a157
+checksum=36d62842ef43c749c0ba82237b10ede05b298d79a0e39ef5fd1115ba1ff8e126
 
 post_install() {
 	vlicense COPYING

From 6af71b4fbcec7be82834ea7ca45d3cbf0a834ae8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Oct 2021 12:07:00 -0400
Subject: [PATCH 0059/4088] CPU-X: update to 4.2.0.

---
 .../patches/define_ACCESSPERMS_on_musl.patch    | 15 ---------------
 .../CPU-X/patches/fix_bitness_detection.patch   | 17 -----------------
 .../CPU-X/patches/musl-ctrl-not-defined.patch   | 15 +++++++++++++++
 srcpkgs/CPU-X/template                          | 11 ++++++++---
 4 files changed, 23 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch
 delete mode 100644 srcpkgs/CPU-X/patches/fix_bitness_detection.patch
 create mode 100644 srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch

diff --git a/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch b/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch
deleted file mode 100644
index 58d81eaf909b..000000000000
--- a/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/util.c
-+++ b/src/util.c
-@@ -35,6 +35,12 @@
- #include <libintl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+
-+/* glibc's stat.h has it but musl's does not. */
-+#ifndef ACCESSPERMS
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
-+#endif
-+
- #include <sys/wait.h>
- #include "cpu-x.h"
- #include "ipc.h"
diff --git a/srcpkgs/CPU-X/patches/fix_bitness_detection.patch b/srcpkgs/CPU-X/patches/fix_bitness_detection.patch
deleted file mode 100644
index b4ae465ed46b..000000000000
--- a/srcpkgs/CPU-X/patches/fix_bitness_detection.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,11 +25,11 @@
- set(APP_EXEC                       ${CMAKE_PROJECT_NAME})
- set(DAEMON_EXEC                    ${CMAKE_PROJECT_NAME}-daemon)
- set(DAEMON_PATH                    ${CMAKE_INSTALL_FULL_LIBEXECDIR}/${DAEMON_EXEC})
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
-+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-	set(BITNESS "32")
--else(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
-+else(CMAKE_SIZEOF_VOID_P EQUAL 4)
-	set(BITNESS "64")
--endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
-+endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -Wno-deprecated-declarations -Wno-unused-result")
- set(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -Wuninitialized -Wstrict-prototypes -Wformat -Wformat-security")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
diff --git a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch b/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
new file mode 100644
index 000000000000..77b7abec77bc
--- /dev/null
+++ b/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
@@ -0,0 +1,15 @@
+--- a/src/tui_ncurses.c	2021-10-07 14:38:03.886862860 -0400
++++ b/src/tui_ncurses.c	2021-10-07 14:49:43.258142532 -0400
+@@ -262,6 +262,12 @@
+ /* Convert keys when an alternative mapping is used */
+ #define ALT_CODE 27
+ #define ALT(x)   (x & ALT_CODE)
++
++/* glibc's term.h pulls in sys/ttydefaults.h which has it, but musl's does not. */
++#ifndef CTRL
++#define CTRL(x)	(x&037)
++#endif
++
+ static int convert_char(int ch)
+ {
+ 	int i = 0;
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 0947bcfef816..19a01be5978c 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,18 +1,23 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
-version=4.0.1
+version=4.2.0
 revision=1
 archs="x86_64* i686*"
 build_style=cmake
 hostmakedepends="nasm pkg-config gettext"
 makedepends="libcpuid-devel ncurses-devel pciutils-devel
- procps-ng-devel $(vopt_if gtk3 'gtk+3-devel')"
+ procps-ng-devel glfw-devel $(vopt_if gtk3 'gtk+3-devel')"
 short_desc="Free software that gathers information on CPU, motherboard and more"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://x0rg.github.io/CPU-X/"
+changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md"
 distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=c41fbb3000e3e6f79e5228aa0237fde4f98b11df8ccb4c9a46f7e63a4a7011bf
+checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f
+# tests depend on:
+# having mawk and nawk installed which breaks chroot-gawk
+# grep -P, which `chroot-grep` is compiled without
+make_check=no
 
 build_options="gtk3"
 build_options_default="gtk3"

From 74a4cb5bb5a59544fb33475afbf223c568e2c374 Mon Sep 17 00:00:00 2001
From: Savoy <root@savoyroad.io>
Date: Thu, 7 Oct 2021 10:14:25 -0500
Subject: [PATCH 0060/4088] go-ipfs: update to 0.10.0

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

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index 4a53dd948797..e67b59649a48 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,6 +1,6 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
-version=0.8.0
+version=0.10.0
 revision=1
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
@@ -13,7 +13,7 @@ license="MIT, Apache-2.0"
 homepage="https://ipfs.io"
 changelog="https://github.com/ipfs/go-ipfs/blob/master/CHANGELOG.md"
 distfiles="https://github.com/ipfs/go-ipfs/archive/v${version}.tar.gz"
-checksum=cc1170058ad5cd9ffcfb6b642a65c40bd8210b308c82bef1c47f0136ee370c23
+checksum=d145f13eb98b61eefc9b30ace35246215876ba1adf79bf74e9ddd43a54671803
 
 system_accounts="_ipfs"
 make_dirs="/var/lib/ipfs 0700 _ipfs _ipfs"
@@ -26,7 +26,6 @@ pre_build() {
 }
 
 post_install() {
-	vcompletion misc/completion/ipfs-completion.bash bash ipfs
 	vlicense LICENSE-MIT
 	vdoc README.md
 	vdoc CHANGELOG.md

From 3efcd4e6b350d4d4bca59b4ead341530dce0e0c8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 2 Oct 2021 11:41:21 +0200
Subject: [PATCH 0061/4088] rclone: update to 1.56.2.

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

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a00dc6e34dac..4f0d695053ae 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,6 +1,6 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.56.1
+version=1.56.2
 revision=1
 wrksrc="rclone-v${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://rclone.org/"
 changelog="https://rclone.org/changelog/"
 distfiles="https://downloads.rclone.org/v${version}/rclone-v${version}.tar.gz"
-checksum=090b4b082caa554812f341ae26ea6758b40338836122595d6283c60c39eb5a97
+checksum=a8813d25c4640e52495fee83e525e76283c63f01d1cce8fbb58d8486b0c20c8a
 
 pre_build() {
 	if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then

From 5ef4da8a73f2852967d0cc0c1d4290521231bcc6 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 3 Oct 2021 12:34:23 +0200
Subject: [PATCH 0062/4088] gocryptfs: update to 2.2.0.

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

diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index 0028a5ea5c13..8dc9d4079321 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,10 +1,10 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
-version=2.1
+version=2.2.0
 revision=1
 wrksrc="${pkgname}_v${version}_src-deps"
 build_style=go
-go_import_path="github.com/rfjakob/gocryptfs"
+go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"
 go_ldflags="-X main.GitVersion=v${version} -X main.GitVersionFuse="[vendored]" -X main.BuildDate=$(date +%Y-%m-%d)"
 depends="fuse"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://nuetzlich.net/gocryptfs"
 changelog="https://github.com/rfjakob/gocryptfs#changelog"
 distfiles="https://github.com/rfjakob/${pkgname}/releases/download/v${version}/${pkgname}_v${version}_src-deps.tar.gz"
-checksum=cf277ce6527cc0c04d19515e745fd598244a64b9b3afb3d30d5939da65242668
+checksum=555e8fba2bc5ed87ad52fc9b7a5525ed0fd01b0a34dfd23cb3ecfae6de75edcd
 
 post_install() {
 	vlicense LICENSE

From 2acbde83475a44b6f936aa3b7e0f2a6edb911012 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 7 Oct 2021 13:29:40 +0200
Subject: [PATCH 0063/4088] SIR: update to 3.2.1.

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

diff --git a/srcpkgs/SIR/template b/srcpkgs/SIR/template
index fb714aeb3cce..5a4825dd72b9 100644
--- a/srcpkgs/SIR/template
+++ b/srcpkgs/SIR/template
@@ -1,17 +1,17 @@
 # Template file for 'SIR'
 pkgname=SIR
-version=3.2
-revision=3
+version=3.2.1
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="exiv2-devel qt5-svg-devel qt5-tools-devel"
 depends="dcraw qt5-imageformats"
 short_desc="Simple Image Resizer using Qt5 and exiv2"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://marek629.github.io/SIR/"
 distfiles="https://github.com/marek629/SIR/archive/v${version}.tar.gz"
-checksum=a39090df1f4dfdf15583d6c591a9e55cfcee80142c275e631bd12fbc46a7ba97
+checksum=b6c6e07e0052271056eedcea102b59e3c2538c3a2e9663f31fbf8234a4a03c18
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From db58a895fa96ff54b8a9a451d02479e48fd849ae Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 7 Oct 2021 12:25:21 +0200
Subject: [PATCH 0064/4088] sacc: update to 1.03.

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

diff --git a/srcpkgs/sacc/template b/srcpkgs/sacc/template
index 992c804d2324..cf993b046c6d 100644
--- a/srcpkgs/sacc/template
+++ b/srcpkgs/sacc/template
@@ -1,6 +1,6 @@
 # Template file for 'sacc'
 pkgname=sacc
-version=1.02
+version=1.03
 revision=1
 build_style="gnu-makefile"
 makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Quentin Rameau <quinq@fifth.space>"
 license="ISC"
 homepage="gopher://gopher.fifth.space/1/scm/sacc"
 distfiles="ftp://ftp.bitreich.org/releases/$pkgname/$pkgname-$version.tgz"
-checksum=ded9726d51a97724616ebe010c69544cda74af651e6d4d86a7ba4c85b9458eb7
+checksum=10bc0416e5c429c7a634cd4dddece282fff0a2efa083d71d28cddc693eca33c9
 
 post_install() {
 	vlicense LICENSE

From ab4e1d39ae0ea1e39d44a5472a927ac7f05d8315 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 23:09:11 -0400
Subject: [PATCH 0065/4088] borgmatic: update to 1.5.18.

---
 srcpkgs/borgmatic/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 5785f227ee77..c6959be3a8d1 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,24 +1,21 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
-version=1.5.10
+version=1.5.18
 revision=1
 build_style=python3-module
+# runs not yet installed self
+make_check_args="--deselect=tests/integration/commands/test_borgmatic.py"
 hostmakedepends="python3-setuptools"
-depends="borg python3-setuptools python3-ruamel.yaml python3-pykwalify
+depends="borg python3-setuptools python3-ruamel.yaml python3-jsonschema
  python3-colorama python3-requests"
 checkdepends="${depends} python3-pytest-cov python3-flexmock"
 short_desc="Wrapper script for the Borg backup software"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-only"
+license="GPL-3.0-or-later"
 homepage="https://torsion.org/borgmatic/"
+changelog="https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/NEWS"
 distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz"
-checksum=31459e5573c34b7b9e53ad54012be6d367e2f23c0612fd5a315593ebf23074c5
-
-do_check() {
-	# runs not yet installed self
-	rm tests/integration/commands/test_borgmatic.py
-	python3 -m pytest
-}
+checksum=757d54d73cdaf333210e24cb13e0e0b4de912d17222e4b383433ae929287fe9a
 
 post_install() {
 	# remove tests directory polluting site-packages

From 41d09a83eca763365728f7b4600cbb22f877f8aa Mon Sep 17 00:00:00 2001
From: heitor <heitorleite.dev@gmail.com>
Date: Wed, 6 Oct 2021 20:04:38 -0300
Subject: [PATCH 0066/4088] net-snmp: add service

---
 srcpkgs/net-snmp/files/snmpd/log/run | 1 +
 srcpkgs/net-snmp/files/snmpd/run     | 4 ++++
 srcpkgs/net-snmp/template            | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/net-snmp/files/snmpd/log/run
 create mode 100755 srcpkgs/net-snmp/files/snmpd/run

diff --git a/srcpkgs/net-snmp/files/snmpd/log/run b/srcpkgs/net-snmp/files/snmpd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/net-snmp/files/snmpd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/net-snmp/files/snmpd/run b/srcpkgs/net-snmp/files/snmpd/run
new file mode 100755
index 000000000000..bcb7b2004baa
--- /dev/null
+++ b/srcpkgs/net-snmp/files/snmpd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec snmpd -f -Lo $OPTS
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index 0b91683e00a8..2a808130cd33 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,7 +1,7 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9.1
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
 makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"

From 7375346299f9c71e42ceb0dc6b52039c480075cc Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 7 Oct 2021 23:21:37 +0200
Subject: [PATCH 0067/4088] xkcdpass: update to 1.19.3.

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

diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template
index 53f85c213d1f..da25764f4551 100644
--- a/srcpkgs/xkcdpass/template
+++ b/srcpkgs/xkcdpass/template
@@ -1,10 +1,9 @@
 # Template file for 'xkcdpass'
 pkgname=xkcdpass
-version=1.17.3
-revision=3
+version=1.19.3
+revision=1
 wrksrc="XKCD-password-generator-xkcdpass-${version}"
 build_style=python3-module
-pycompile_module="xkcdpass"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
 checkdepends="python3-pytest"
@@ -13,7 +12,7 @@ maintainer="Lugubris <lugubris@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/redacted/XKCD-password-generator"
 distfiles="https://github.com/redacted/XKCD-password-generator/archive/xkcdpass-${version}.tar.gz"
-checksum=793aa1803360033cefa24b386abb0f11f815ffd95824026605fe398e98f9efd4
+checksum=8ac1e1778c6c9bb1725816244695c79c622414f6937406be1eb10606de166340
 
 do_check() {
 	pytest3
@@ -21,5 +20,6 @@ do_check() {
 
 post_install() {
 	vman xkcdpass.1
+	vcompletion contrib/xkcdpass.bash-completion bash
 	vlicense LICENSE.BSD
 }

From 527e255399d66b5172e0cd48f0b927b76dc4fbb8 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Sun, 3 Oct 2021 12:25:20 -0400
Subject: [PATCH 0068/4088] chezmoi: update to 2.6.1, enable cgo.

Note: if this package breaks on musl, disable cgo for musl
(see void-linux/void-packages#33298)
---
 srcpkgs/chezmoi/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 071c5a5a74af..ed94487b6f46 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,18 +1,21 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.5.1
+version=2.6.1
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"
-go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps
+go_ldflags="-X main.version=${version} -X main.commit=v${version}
+ -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps
  -X github.com/twpayne/chezmoi/cmd.DocsDir=/usr/share/doc/chezmoi"
 short_desc="Manage your dotfiles across multiple machines, securely"
 maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=94ad37776ec47fd2865f3bcf56a090592e92d56558811d10fb0a331e146b899f
+checksum=9703edbe369a498feb82173bda6400f23b7d1624154f84aa0beccf19462f082f
+
+export CGO_ENABLED=1
 
 post_install() {
 	vlicense LICENSE

From 29ff0c6ae2bba047c45679b4ceb8b04f011b458d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 3 Oct 2021 20:33:49 -0300
Subject: [PATCH 0069/4088] giac: update to 1.7.0.37.

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

diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3fc5eb17c661..b21a303f8e43 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.7.0.25
+version=1.7.0.37
 revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=948dfc369f22ca068ff29be7222eb8e7aea3f004b0541f87b8a5591735d42134
+checksum=ff06d32808295061f3a7139edb8d6397036fce94da68e27afcf55e40f271f8d7
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

From f18e83d2968b8892c46757c6911b1b4cdc9bdd56 Mon Sep 17 00:00:00 2001
From: Gavin Howard <gavin@yzena.com>
Date: Mon, 4 Oct 2021 12:37:37 -0600
Subject: [PATCH 0070/4088] bc-gh: update to 5.1.1

Signed-off-by: Gavin Howard <gavin@yzena.com>
---
 srcpkgs/bc-gh/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index 76829c3c8fa1..33e0b0292762 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,6 +1,6 @@
 # Template file for 'bc-gh'
 pkgname=bc-gh
-version=4.0.2
+version=5.1.1
 revision=1
 wrksrc="bc-${version}"
 short_desc="Implementation of POSIX bc with GNU extensions"
@@ -9,7 +9,7 @@ license="BSD-2-Clause"
 homepage="https://git.yzena.com/gavin/bc"
 changelog="https://git.yzena.com/gavin/bc/raw/branch/master/NEWS.md"
 distfiles="https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz"
-checksum=b4a7046325557a44d02165874f957c3abf49e2ba4491c8275326cb7c55ef2290
+checksum=cfec5571216693537f9565073334be691717bfb762610cf1a06050e0f25aa94d
 alternatives="
  bc:bc:/usr/bin/bc-gh
  bc:bc.1:/usr/share/man/man1/bc-gh.1
@@ -18,7 +18,8 @@ alternatives="
 
 do_configure() {
 	PREFIX=/usr DESTDIR="${DESTDIR}" EXECSUFFIX=-gh CC="${CC}" CFLAGS="${CFLAGS}" \
-	HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="${CFLAGS_FOR_BUILD}" ./configure.sh -GM
+	HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="${CFLAGS_FOR_BUILD}" ./configure.sh -GM \
+	-sbc.banner -sdc.tty_mode
 }
 do_build() {
 	make ${makejobs}

From 7a76695a023cfa6811b1a4f5a6dcb0344e93cec0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Oct 2021 17:37:32 +0200
Subject: [PATCH 0071/4088] mupdf: update to 1.19.0.

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

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index de89007c8f06..c6331d120357 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
-version=1.18.0
-revision=3
+version=1.19.0
+revision=1
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://mupdf.com"
 distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz"
-checksum=8860ea6d01fc3c360ba5e0fa9fede241c6fbb2a73f5215b17a105de409a19266
+checksum=21affcd4fcabf1cc7a896db95ba971552ba9df229ebec7720313a8803185deed
 
 pre_build() {
 	# libmupdf-{threads,pkcs7}.a are required by fbpdf
@@ -42,6 +42,9 @@ do_build() {
 
 do_install() {
 	make USE_SYSTEM_LIBS=yes build=release prefix=${DESTDIR}/usr install
+	for f in build/release/libmupdf-*.a; do
+		vinstall $f 644 usr/lib
+	done
 
 	ln -rs ${DESTDIR}/usr/bin/mupdf-x11 ${DESTDIR}/usr/bin/mupdf
 

From fd6ccf9284f301746eb71f5cbe8cbc2c2acc86ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Oct 2021 12:43:39 +0200
Subject: [PATCH 0072/4088] fbpdf: rebuild for mupdf-1.19.0_1.

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

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index ec6965ef45a8..4d0904c2692b 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -1,7 +1,7 @@
 # Template file for 'fbpdf'
 pkgname=fbpdf
 version=0.0.20200616
-revision=2
+revision=3
 _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"

From 2dbf756ce7ef5681eb74f2aa3753541bd865e865 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Oct 2021 12:43:52 +0200
Subject: [PATCH 0073/4088] zathura-pdf-mupdf: rebuild for mupdf-1.19.0_1.

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..1c7e4d1a6e98 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
 version=0.3.7
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"

From d393c7add5a81168d4c58d66aea5652413b927d2 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 16 Sep 2021 19:18:04 +0200
Subject: [PATCH 0074/4088] gnupg: update to 2.2.32.

---
 .../patches/sys-siglist-and-no-systemd.patch     | 16 ----------------
 srcpkgs/gnupg/template                           |  7 +++----
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch

diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
deleted file mode 100644
index b5f2360685f3..000000000000
--- a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-No brainer patch converted from 
-	vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
-
-Index: gnupg-2.2.28/common/signal.c
-===================================================================
---- gnupg-2.2.28.orig/common/signal.c
-+++ gnupg-2.2.28/common/signal.c
-@@ -87,7 +87,7 @@ get_signal_name( int signum )
- {
-   /* Note that we can't use strsignal(), because it is not
-      reentrant. */
--#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
-+#if 0 && defined(NSIG)
-   return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
- #else
-   return NULL;
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index c608f991c4a1..9f1bb8a27bb0 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,8 +1,7 @@
 # Template file for 'gnupg'
 pkgname=gnupg
-reverts="2.2.30_1"
-version=2.2.29
-revision=2
+version=2.2.32
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
  --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
@@ -19,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
-checksum=39d07cdb4524818f9ebce49294931974af504519e6a7476c52e9d38fc0bd0cc9
+checksum=b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614
 build_options="ldap"
 build_options_default="ldap"
 

From 53e5c36c21bf18441ae885809660d1cb3b789b55 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 4 Oct 2021 23:27:03 +0300
Subject: [PATCH 0075/4088] libatomic_ops: update to 7.6.12

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

diff --git a/srcpkgs/libatomic_ops/template b/srcpkgs/libatomic_ops/template
index 8adc30044ba0..9fce059f86f3 100644
--- a/srcpkgs/libatomic_ops/template
+++ b/srcpkgs/libatomic_ops/template
@@ -1,6 +1,6 @@
 # Template file for 'libatomic_ops'
 pkgname=libatomic_ops
-version=7.6.10
+version=7.6.12
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --enable-static"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/ivmai/libatomic_ops"
 distfiles="${homepage}/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
-checksum=587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af
+checksum=f0ab566e25fce08b560e1feab6a3db01db4a38e5bc687804334ef3920c549f3e
 
 post_install() {
 	vlicense doc/LICENSING.txt

From 4e57ea78b6844bcfa4762f618f21c2f2708a5d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 8 Oct 2021 11:03:09 -0300
Subject: [PATCH 0076/4088] aisleriot: clean up makedepends.

guile-devel depends on libatomic_ops-devel itself since
b67aa1de9ee4a032f2f9c0e5b7f7112ae59b7ddd.
---
 srcpkgs/aisleriot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 16bd57605f89..0c5c81200a9d 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -8,7 +8,7 @@ configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=tru
  -Dtheme_kde=false -Db_ndebug=false"
 hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
  pysolfc-cardsets"
-makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+makedepends="guile-devel libcanberra-devel librsvg-devel"
 depends="guile yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From 671f80a4efdb3f0f32903c6d3c2b34ef4dde3d72 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 7 Oct 2021 18:12:57 +0700
Subject: [PATCH 0077/4088] vifm: update to 0.12

Disable failed testsuites:
- fileopts: disable tests for `chown` process with GID
- commands, lua: segmentation fault
- misc: fails because `TERM` is not set. But setting it to a random
  value, eg. `xterm-256color` makes it segmentation fault
---
 .../vifm/patches/disable-failed-tests.patch   | 38 +++++++++++++++++++
 srcpkgs/vifm/template                         |  4 +-
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
new file mode 100644
index 000000000000..f674a4be66d8
--- /dev/null
+++ b/srcpkgs/vifm/patches/disable-failed-tests.patch
@@ -0,0 +1,38 @@
+diff --git tests/Makefile tests/Makefile
+index 1419a4edd..a213d70ef 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -67,14 +67,14 @@ B ?=
+ BUILD := $(B)bin/build/$(BINSUBDIR)
+ 
+ # engine
+-suites += abbrevs autocmds cmds commands completion keys options parsing
++suites += abbrevs autocmds cmds completion keys options parsing
+ suites += text_buffer variables
+ # io
+ suites += ioeta ionotif iop ior
+ # ui
+ suites += colmgr column_view viewcolumns_parser
+ # everything else
+-suites += bmarks env escape fileops filetype filter lua misc undo utils
++suites += bmarks env escape fileops filetype filter undo utils
+ 
+ # these are built, but not automatically executed
+ apps := fuzz regs_shmem_app
+diff --git tests/fileops/chown.c tests/fileops/chown.c
+index ef7b1a405..cd2c33388 100644
+--- a/tests/fileops/chown.c
++++ b/tests/fileops/chown.c
+@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
+ 	mark_selection_or_current(curr_view);
+ 	fops_chown(0, 1, 0, gid1);
+ 	assert_success(os_stat("dir/chown-me", &s));
+-	assert_true(s.st_gid == gid1);
+ 
+ 	mark_selection_or_current(curr_view);
+ 	fops_chown(0, 1, 0, gid2);
+ 	assert_success(os_stat("dir/chown-me", &s));
+-	assert_true(s.st_gid == gid2);
+ 
+ 	assert_success(unlink("dir/chown-me"));
+ 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index a6d632d27e33..252d56ea96ef 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,6 +1,6 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.11
+version=0.12
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
 distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=d06f7e25f1ba0936f27f3d34401cc9eaa50ccc5a5e70ad5659e5014f04691e67
+checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
 
 CFLAGS="-fcommon"
 

From f3a5e1e9f42dbbbb420fb9df0ea555d274a5a2f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Oct 2021 00:13:23 -0300
Subject: [PATCH 0078/4088] maxima: update to 5.45.1. Also:

- add rlwrap to depends so rmaxima (readline cli) works.
- add gnuplot to checkdepends, fixes 2 failing tests.
- add patch to allow more rounding, fixes 2 failing tests on musl.
- add rmaxima.1 and xmaxima.1 man pages as symlinks to maxima.1.
- do not compress info files, since they are used for in-program help
  and it doesn't work when they are compressed.
- add patch to copy test output to stdout, since it's too silent
  otherwise.
---
 srcpkgs/maxima/patches/check-output.patch | 13 +++++++++++++
 srcpkgs/maxima/patches/musl-round.patch   | 23 +++++++++++++++++++++++
 srcpkgs/maxima/template                   | 18 ++++++++++++++----
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/maxima/patches/check-output.patch
 create mode 100644 srcpkgs/maxima/patches/musl-round.patch

diff --git a/srcpkgs/maxima/patches/check-output.patch b/srcpkgs/maxima/patches/check-output.patch
new file mode 100644
index 000000000000..c20368f64300
--- /dev/null
+++ b/srcpkgs/maxima/patches/check-output.patch
@@ -0,0 +1,13 @@
+Copy test output to stdout in addition to $log_file
+
+--- a/test-driver	2021-10-04 00:20:29.356330263 -0300
++++ b/test-driver	2021-10-04 00:19:56.144741073 -0300
+@@ -92,7 +92,7 @@
+ trap "st=143; $do_exit" 15
+ 
+ # Test script is run here.
+-"$@" >$log_file 2>&1
++"$@" 2>&1 | tee $log_file
+ estatus=$?
+ if test $enable_hard_errors = no && test $estatus -eq 99; then
+   estatus=1
diff --git a/srcpkgs/maxima/patches/musl-round.patch b/srcpkgs/maxima/patches/musl-round.patch
new file mode 100644
index 000000000000..a532415ee60b
--- /dev/null
+++ b/srcpkgs/maxima/patches/musl-round.patch
@@ -0,0 +1,23 @@
+Add a bit more room for rounding errors which cause two tests to fail
+on x86_64-musl
+
+--- a/tests/rtest16.mac	2021-10-03 21:31:01.654932345 -0300
++++ b/tests/rtest16.mac	2021-10-03 21:31:51.633283404 -0300
+@@ -2229,7 +2229,7 @@
+ true;
+ 
+ closeto(li[4](10.0) - (9.6140263862742968515251940747859 - 6.3921313179656069159740055708257*%i),
+-  5.618e-15);
++  7.945e-15);
+ true;
+ 
+ closeto(li[4](10.0b0) - (9.6140263862742968515251940747859b0 - 6.3921313179656069159740055708257b0*%i),
+@@ -2277,7 +2277,7 @@
+ true;
+ 
+ closeto(li[5](10.0) - (11.2390407376112991620107110964539 - 3.6796065713019972004384472107791*%i),
+-  9.93014e-15);
++  1.25608e-14);
+ true;
+ 
+ closeto(li[5](10.0b0) - (11.2390407376112991620107110964539b0 - 3.6796065713019972004384472107791b0*%i),
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index 69b4fc3d990a..3a95e3706447 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,18 +1,19 @@
 # Template file for 'maxima'
 pkgname=maxima
-version=5.44.0
-revision=4
+version=5.45.1
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec)"
 hostmakedepends="python3 perl emacs texinfo"
 makedepends="$(vopt_if clisp clisp) $(vopt_if sbcl sbcl)"
-depends="$(vopt_if clisp clisp)"
+depends="$(vopt_if clisp clisp) rlwrap"
+checkdepends="gnuplot"
 short_desc="Computer Algebra System"
 maintainer="Bosco Garcia <jboscogg@gmail.org>"
 license="GPL-2.0-only"
 homepage="http://maxima.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
-checksum=d93f5e48c4daf8f085d609cb3c7b0bdf342c667fd04cf750c846426874c9d2ec
+checksum=fe9016276970bef214a1a244348558644514d7fdfaa4fc8b9d0e87afcbb4e7dc
 
 nostrip=yes
 nopie=yes
@@ -25,6 +26,14 @@ vopt_conflict clisp sbcl
 post_install() {
 	vmkdir usr/share/doc
 	ln -sf ../maxima/${version}/doc ${DESTDIR}/usr/share/doc/maxima
+
+	# symlink man pages for rmaxima and xmaxima
+	ln -s maxima.1 ${DESTDIR}/usr/share/man/man1/rmaxima.1
+	ln -s maxima.1 ${DESTDIR}/usr/share/man/man1/xmaxima.1
+
+	# info files are used for maxima help, and need to be uncompressed
+	# removing this file prevents compression of info files
+	rm ${DESTDIR}/usr/share/info/dir
 }
 
 maxima-src_package() {
@@ -48,6 +57,7 @@ xmaxima_package() {
 	depends="${sourcepkg}-${version}_${revision} tk"
 	pkg_install() {
 		vmove usr/bin/xmaxima
+		vmove usr/share/man/man1/xmaxima.1
 		vmove usr/share/maxima/${version}/xmaxima
 		vmove usr/share/info/xmaxima.info
 		vinstall ${FILESDIR}/maxima.desktop 644 usr/share/applications

From 92e9a0e4636150959cfa796195a07bce32093c6a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 8 Oct 2021 17:23:44 +0300
Subject: [PATCH 0079/4088] notcurses: update to 2.4.5.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0600052acb93..0f401a0f8770 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,12 +1,12 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.4.3
+version=2.4.5
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man pandoc)"
 makedepends="libunistring-devel ffmpeg-devel ncurses-libtinfo-devel qrcodegen-devel doctest-devel
- readline-devel zlib-devel"
+ zlib-devel"
 depends="ncurses-base"
 short_desc="Blingful character graphics/TUI library"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=3405b0af37820570c808478c7cf0965a5b1117a0394bf95e123a4f05ad3fe15a
+checksum=e006c8d0a19d148d1fa779803e19145a7d8c5f1bf1f8e9e5d2c14a5e0d860343
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 1318dd2c3e22922a5e5c1f2822d39379ffcd2554 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 8 Oct 2021 17:23:50 +0300
Subject: [PATCH 0080/4088] growlight: update to 1.2.36.

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

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 41a219905290..942222435ec4 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.35
+version=1.2.36
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=7f49a9bc0d304c3a09eea934db093c853deae0d1877c5230334e634ca314b211
+checksum=d4f5c28230d714e9941f50b38ccf9b72f76bfed719c89058d391de8cca55f43c
 
 build_options="man zfs"
 

From 828e202e1b4dd150318c6f9c89966bf65764adc6 Mon Sep 17 00:00:00 2001
From: Remi Pommarel <repk@triplefau.lt>
Date: Fri, 10 Sep 2021 00:30:34 +0200
Subject: [PATCH 0081/4088] php: Support opcache cross compilation

Opcache extension configuration tries to detect some shared memory
function by compiling and executing test programs at compile time.
This cannot work when cross compiling.

To workaround that add proper defines to use those functions anyway if
we are cross compiling.

That fixes the following error when using opcache extension on arm:
Fatal Error Unable to allocate shared memory segment of 134217728 bytes
---
 srcpkgs/php/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..c98c59815ac6 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -23,7 +23,14 @@ replaces="php-mcrypt<7.2.0"
 if [ -n "$CROSS_BUILD" ]; then
 	# php-pear needs php to build
 	hostmakedepends+=" php"
-	CFLAGS+=" -DHAVE_LIBDL -DHAVE_DLOPEN -DHAVE_DLSYM"
+	CFLAGS+=" -DHAVE_LIBDL
+		 -DHAVE_DLOPEN
+		 -DHAVE_DLSYM
+		 -DHAVE_SHM_IPC
+		 -DHAVE_SHM_MMAP_ANON
+		 -DHAVE_SHM_MMAP_ZERO
+		 -DHAVE_SHM_MMAP_POSIX
+		 -DHAVE_SHM_MMAP_FILE"
 fi
 
 do_build() {

From ec22d51a51da079877ea470328d143efd5843ac5 Mon Sep 17 00:00:00 2001
From: Remi Pommarel <repk@triplefau.lt>
Date: Thu, 9 Sep 2021 16:36:50 +0200
Subject: [PATCH 0082/4088] php: phpize: Modify ltmain.sh to support sysroot
 path in .la files

PHP's phpize is based on a very old libtool to generate build files for
its extensions. This libtool does not support .la files with '=' to
support sysroot.

In order to support more PHP extension cross compilation this modifies
ltmain.sh to support such path. This is a bit hackish has it only get
sysroot from the used toolchain; the proper way to fix that is to have
PHP developpers to update the autotools file used to build there
extensions.
---
 .../patches/php-ltmain-sysroot-support.patch  | 39 +++++++++++++++++++
 srcpkgs/php/template                          |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/php/patches/php-ltmain-sysroot-support.patch

diff --git a/srcpkgs/php/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php/patches/php-ltmain-sysroot-support.patch
new file mode 100644
index 000000000000..bbe0a514a9e8
--- /dev/null
+++ b/srcpkgs/php/patches/php-ltmain-sysroot-support.patch
@@ -0,0 +1,39 @@
+--- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
++++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
+@@ -2375,6 +2375,13 @@ EOF
+ 	*) . ./$lib ;;
+ 	esac
+ 
++        newdependency_libs=
++        for deplib in $dependency_libs; do
++            deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
++            newdependency_libs="$newdependency_libs $deplib"
++        done
++        dependency_libs=${newdependency_libs}
++
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5750,6 +5757,13 @@ fi\
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
++
++          newdependency_libs=
++          for deplib in $dependency_libs; do
++              deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
++              newdependency_libs="$newdependency_libs $deplib"
++          done
++
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5767,7 +5781,7 @@ library_names='$library_names'
+ old_library='$old_library'
+ 
+ # Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++dependency_libs='$newdependency_libs'
+ 
+ # Version information for $libname.
+ current=$current
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index c98c59815ac6..927bbf8504f8 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=6
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 01c91f661bbb57a1dec591ee8d8d8a11a38fdba2 Mon Sep 17 00:00:00 2001
From: Remi Pommarel <repk@triplefau.lt>
Date: Thu, 9 Sep 2021 16:47:40 +0200
Subject: [PATCH 0083/4088] php-imagick: Cross compilation support

---
 ...pile-libmagick-header-file-search-path.patch | 17 +++++++++++++++++
 srcpkgs/php-imagick/template                    |  7 ++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/php-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch

diff --git a/srcpkgs/php-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
new file mode 100644
index 000000000000..16b8aaa57371
--- /dev/null
+++ b/srcpkgs/php-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
@@ -0,0 +1,17 @@
+--- a/imagemagick.m4	2021-09-09 10:53:42.287881616 +0200
++++ b/imagemagick.m4	2021-09-09 11:14:47.662312430 +0200
+@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
+   
+     AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+ 
++  elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
++
++    IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
++    IM_HEADER_STYLE="SEVEN"
++    AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
++
++    AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
++
+   elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+ 
+     IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php-imagick/template b/srcpkgs/php-imagick/template
index dba22bb860cd..271bbe6959a9 100644
--- a/srcpkgs/php-imagick/template
+++ b/srcpkgs/php-imagick/template
@@ -1,9 +1,10 @@
 # Template file for 'php-imagick'
 pkgname=php-imagick
 version=3.4.4
-revision=3
+revision=4
 wrksrc="imagick-$version"
 build_style=gnu-configure
+configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="php-devel autoconf pkg-config"
 makedepends="php-devel pcre2-devel libmagick-devel"
 depends="php>=7.4.3"
@@ -14,10 +15,6 @@ homepage="https://pecl.php.net/package/imagick"
 distfiles="https://pecl.php.net/get/imagick-$version.tgz"
 checksum=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077
 
-if [ -n "$CROSS_BUILD" ]; then
-	broken="checking for MagickWand.h or magick-wand.h header... configure: error: Unable to find MagickWand.h or magick-wand.h header"
-fi
-
 pre_configure() {
 	phpize
 }

From 7d768e3c6909fe73cc5c73a989881f67b1f61e2a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 7 Oct 2021 20:53:02 +0400
Subject: [PATCH 0084/4088] xkeyboard-config: update to 2.34.

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

diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 1c0a4848714f..15d9c1fb08f2 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,7 +1,7 @@
 # Template file for 'xkeyboard-config'
 pkgname=xkeyboard-config
-version=2.33
-revision=2
+version=2.34
+revision=1
 build_style=gnu-configure
 configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules"
 hostmakedepends="pkg-config libxslt intltool python3"
@@ -11,8 +11,9 @@ short_desc="X Keyboard Configuration Database"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+changelog="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/raw/master/NEWS"
 distfiles="${XORG_SITE}/data/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=657fd790d6dcf781cd395de4cf726120a5b0f93ba91dfb2628bcc70ae8b1d3bc
+checksum=b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce
 
 post_install() {
 	vlicense COPYING

From 4a88d2494ac1155354bf9081298f079884df7b76 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Oct 2021 12:48:11 +0200
Subject: [PATCH 0085/4088] linux5.10: update to 5.10.71.

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

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 0feb8636ea0d..3b6578f4c923 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.69
+version=5.10.71
 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=232f9ec53bccca768868831b7cc286f7d8bbbac9f481bbac1495700231a20cca
+checksum=02e688d27d963f0325f5cd30e383329cf00ab23db46d1586d6e848e3f992a497
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From f8e69ae388cb94d645982551b8152cb10d6c92f8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Oct 2021 18:14:07 +0200
Subject: [PATCH 0086/4088] isl: upsteam moved to sourceforge.

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

diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index 397221fbaa41..6d4e18b18874 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -1,15 +1,15 @@
 # Template file for 'isl'
 pkgname=isl
 version=0.24
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 makedepends="gmp-devel"
 short_desc="Integer Set Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://isl.gforge.inria.fr"
-distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2"
+homepage="https://libisl.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/libisl/isl-${version}.tar.bz2"
 checksum=fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0
 
 if [ -z "$CHROOT_READY" ]; then

From 0854712e3586730af9ff8316e14c205a9911c74e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Oct 2021 18:15:27 +0200
Subject: [PATCH 0087/4088] isl15: upsteam moved to sourceforge.

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

diff --git a/srcpkgs/isl15/template b/srcpkgs/isl15/template
index 9d327a3a53dd..e8225eb6d491 100644
--- a/srcpkgs/isl15/template
+++ b/srcpkgs/isl15/template
@@ -1,7 +1,7 @@
 # Template file for 'isl15'
 pkgname=isl15
 version=0.19
-revision=2
+revision=3
 wrksrc="isl-${version}"
 bootstrap=yes
 build_style=gnu-configure
@@ -9,8 +9,8 @@ makedepends="gmp-devel"
 short_desc="Integer Set Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://freecode.com/projects/isl"
-distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2"
+homepage="https://libisl.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/libisl/isl-${version}.tar.bz2"
 checksum=d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8
 
 post_install() {

From 142f5d596f46a03d861d9764df42d25d78a5a68a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Oct 2021 18:18:52 +0200
Subject: [PATCH 0088/4088] gcc: isl moved to sourceforge.

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

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 9cd9989b973d..09727ef34fb2 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -26,7 +26,7 @@ distfiles="
  https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
  ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
  ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
- http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2"
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2"
 checksum="772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
  258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
  0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f

From 75197d20e3b97c1145fa34e634e281f2eb770938 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Oct 2021 18:20:22 +0200
Subject: [PATCH 0089/4088] gcc6: isl moved to sourceforge.

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

diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 5776c9053aba..467af2f41945 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -16,7 +16,7 @@ license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, EPL"
 homepage="http://gcc.gnu.org"
 distfiles="
  ${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz
- http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2
  https://sourceware.org/pub/java/ecj-4.9.jar"
 checksum="
  7ef1796ce497e89479183702635b14bb7a46b53249209a5e0f999bebf4740945

From a23231642001ca70e9fab075dcf1cdcd8cf9eb0b Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+void@gmail.com>
Date: Thu, 30 Sep 2021 22:01:22 -0500
Subject: [PATCH 0090/4088] python3-zope.hookable: update to 5.1.0

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

diff --git a/srcpkgs/python3-zope.hookable/template b/srcpkgs/python3-zope.hookable/template
index 62ecbac6425d..ac11541b1e98 100644
--- a/srcpkgs/python3-zope.hookable/template
+++ b/srcpkgs/python3-zope.hookable/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.hookable'
 pkgname=python3-zope.hookable
-version=5.0.1
-revision=2
+version=5.1.0
+revision=1
 wrksrc="zope.hookable-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,5 +10,6 @@ short_desc="Zope hookable architecture for Python3"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="ZPL-2.1"
 homepage="https://github.com/zopefoundation/zope.hookable"
+changelog="https://raw.githubusercontent.com/zopefoundation/zope.hookable/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/z/zope.hookable/zope.hookable-${version}.tar.gz"
-checksum=29d07681a78042cdd15b268ae9decffed9ace68a53eebeb61d65ae931d158841
+checksum=8fc3e6cd0486c6af48e3317c299def719b57538332a194e0b3bc6a772f4faa0e

From 0dbae54c6da9f6c54f0b70eab136348d20a6c7b8 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Mon, 4 Oct 2021 19:30:03 -0400
Subject: [PATCH 0091/4088] lighttpd: update to 1.4.60

remove dependency on libev;
  lighttpd has used epoll on Linux for a long time
---
 srcpkgs/lighttpd/patches/020-decls.patch      | 34 +++++++++++++++++++
 srcpkgs/lighttpd/patches/020-meson-zstd.patch | 29 ----------------
 srcpkgs/lighttpd/template                     | 12 +++----
 3 files changed, 40 insertions(+), 35 deletions(-)
 create mode 100644 srcpkgs/lighttpd/patches/020-decls.patch
 delete mode 100644 srcpkgs/lighttpd/patches/020-meson-zstd.patch

diff --git a/srcpkgs/lighttpd/patches/020-decls.patch b/srcpkgs/lighttpd/patches/020-decls.patch
new file mode 100644
index 000000000000..c1d15cfb8737
--- /dev/null
+++ b/srcpkgs/lighttpd/patches/020-decls.patch
@@ -0,0 +1,34 @@
+From cf4dfbe15ef8ead3a7eda974af7d804d447f00db Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Mon, 4 Oct 2021 09:51:22 -0400
+Subject: [PATCH] [core] define __BEGIN_DECLS, __END_DECLS if needed
+
+---
+ src/first.h | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/src/first.h
++++ b/src/first.h
+@@ -39,6 +39,22 @@
+ #include <sys/types.h>
+ #include <stddef.h>
+ 
++#ifndef __BEGIN_DECLS
++#ifdef __cplusplus
++#define __BEGIN_DECLS extern "C" {
++#else
++#define __BEGIN_DECLS
++#endif
++#endif
++
++#ifndef __END_DECLS
++#ifdef __cplusplus
++#define __END_DECLS }
++#else
++#define __END_DECLS
++#endif
++#endif
++
+ #if defined HAVE_STDINT_H
+ # include <stdint.h>
+ #elif defined HAVE_INTTYPES_H
diff --git a/srcpkgs/lighttpd/patches/020-meson-zstd.patch b/srcpkgs/lighttpd/patches/020-meson-zstd.patch
deleted file mode 100644
index 647bf7f98b56..000000000000
--- a/srcpkgs/lighttpd/patches/020-meson-zstd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a737572aa4b7a50fd9ac3f54245e40fd5cd2609d Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Wed, 3 Feb 2021 00:35:34 -0500
-Subject: [PATCH] [meson] add with_zstd to meson_options.txt
-
-Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
----
- meson_options.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git meson_options.txt meson_options.txt
-index 51bea44d..f6687159 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -148,6 +148,11 @@ option('with_zlib',
- 	value: true,
- 	description: 'with deflate-support for mod_deflate [default: on]',
- )
-+option('with_zstd',
-+	type: 'boolean',
-+	value: false,
-+	description: 'with zstd-support for mod_deflate [default: off]',
-+)
- 
- option('build_extra_warnings',
- 	type: 'boolean',
--- 
-2.29.2
-
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 4891e13d3d63..18e5fced85a3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,18 +1,18 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.59
-revision=2
+version=1.4.60
+revision=1
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true
- -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true
+ -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=false
  -Dwith_libunwind=false -Dwith_lua=true -Dwith_memcached=true
  -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre=true -Dwith_pgsql=false
  -Dwith_sasl=false -Dwith_webdav_props=true -Dwith_webdav_locks=true
- -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false
+ -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false -Dwith_dbi=false
  -Dmoduledir=lib/lighttpd/modules"
 hostmakedepends="pkg-config"
-makedepends="gdbm-devel libev-devel libmemcached-devel
+makedepends="gdbm-devel libmemcached-devel
  libxml2-devel lua53-devel mit-krb5-devel pcre-devel sqlite-devel"
 checkdepends="perl"
 short_desc="Secure, fast, compliant and very flexible web-server"
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5
+checksum=4bb1dd859e541a3131e5be101557d2e1195b4129d3a849a3a6fbd21fe1c946f0
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

From 84f3cea678ae26159085b61a74900d734d03bf21 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 7 Oct 2021 10:52:40 +0200
Subject: [PATCH 0092/4088] iio-sensor-proxy: move daemon back to /usr/bin; fix
 tests

---
 srcpkgs/iio-sensor-proxy/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..ebd13471e6f8 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,11 +1,12 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
 version=3.1
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsystemdsystemunitdir=false"
 hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
+checkdepends="dbus python3-dbus python3-psutil"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
@@ -13,6 +14,10 @@ homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
 checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
+do_check() {
+	dbus-run-session ninja -C build test
+}
 post_install() {
 	vsv iio-sensor-proxy
+	mv $DESTDIR/usr/libexec/* $DESTDIR/usr/bin
 }

From 4fee4e1e9ebf6639272930ff64068134985da215 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 8 Oct 2021 22:41:08 +0200
Subject: [PATCH 0093/4088] flatpak: update to 1.12.1.

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

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 658989fff399..837b31416b34 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.10.3
+version=1.12.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -23,7 +23,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/raw/master/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=12723ad250997b5a28bef92ae632b097f50b0819feeb25ef8887fe8ec9b63b46
+checksum=23893bca7fee82692c43cb692dbec36ea9d5339508c19d3925eac6f06414c857
 
 build_options="gir"
 build_options_default="gir"

From 0ebe7ba27634a3c4652ddf3b5c8ce812dc92d784 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 8 Oct 2021 23:23:02 +0300
Subject: [PATCH 0094/4088] skype: update to 8.77.0.90.

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

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..5ec5b68d6ea5 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.77.0.90
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=045d13578149815a4f45566f9d7c2da988ae471276d6a5486aef8a4850ee004e
 repository="nonfree"
 nostrip="yes"
 

From a6a47f8e88b9a25b53e5e915cdf8363719e03bde Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Oct 2021 01:39:19 +0200
Subject: [PATCH 0095/4088] linux5.10: fix ppc*-dotconfig

---
 srcpkgs/linux5.10/files/ppc-dotconfig     | 10 +++-------
 srcpkgs/linux5.10/files/ppc64-dotconfig   | 14 +++-----------
 srcpkgs/linux5.10/files/ppc64le-dotconfig | 14 +++-----------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index 7fbdd540c4fc..d73cec3eaab5 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.33 Kernel Configuration
+# Linux/powerpc 5.10.71 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -3874,6 +3874,7 @@ CONFIG_CHARGER_BQ2515X=m
 # CONFIG_CHARGER_BQ25980 is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -6372,6 +6373,7 @@ CONFIG_88EU_AP_MODE=y
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
 # CONFIG_PI433 is not set
@@ -6594,7 +6596,6 @@ CONFIG_AD7768_1=m
 # CONFIG_AD7923 is not set
 CONFIG_AD7949=m
 # CONFIG_AD799X is not set
-# CONFIG_AD9467 is not set
 # CONFIG_ADI_AXI_ADC is not set
 CONFIG_CC10001_ADC=m
 # CONFIG_ENVELOPE_DETECTOR is not set
@@ -7276,11 +7277,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index ed408edbab54..fa41aedb6834 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.11 Kernel Configuration
+# Linux/powerpc 5.10.71 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -222,6 +222,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -1892,7 +1893,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -2095,7 +2095,6 @@ CONFIG_MTD_BLOCK_RO=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -7985,6 +7984,7 @@ CONFIG_FWTTY_MAX_TOTAL_PORTS=64
 CONFIG_FWTTY_MAX_CARD_PORTS=32
 CONFIG_GS_FPGABOOT=m
 # CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_FB_TFT=m
 CONFIG_FB_TFT_AGM1264K_FL=m
 CONFIG_FB_TFT_BD663474=m
@@ -8783,8 +8783,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
-# CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -8792,7 +8790,6 @@ CONFIG_RESET_CONTROLLER=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_USB_LGM_PHY=m
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_PHY_CADENCE_TORRENT=m
 CONFIG_PHY_CADENCE_DPHY=m
@@ -9159,11 +9156,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index 21a2401e1de4..de94b193290b 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.11 Kernel Configuration
+# Linux/powerpc 5.10.71 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -220,6 +220,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -1815,7 +1816,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -2000,7 +2000,6 @@ CONFIG_MTD_BLOCK_RO=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -7717,6 +7716,7 @@ CONFIG_FWTTY_MAX_TOTAL_PORTS=64
 CONFIG_FWTTY_MAX_CARD_PORTS=32
 CONFIG_GS_FPGABOOT=m
 # CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_FB_TFT=m
 CONFIG_FB_TFT_AGM1264K_FL=m
 CONFIG_FB_TFT_BD663474=m
@@ -8512,8 +8512,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
-# CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -8521,7 +8519,6 @@ CONFIG_RESET_CONTROLLER=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_USB_LGM_PHY=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 CONFIG_PHY_CADENCE_TORRENT=m
 CONFIG_PHY_CADENCE_DPHY=m
@@ -8889,11 +8886,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set

From d6fc90ed7ee14c06254e6452ebbf16ff4e3a8766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 8 Oct 2021 22:16:52 -0300
Subject: [PATCH 0096/4088] linux5.14: update to 5.14.10.

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

diff --git a/srcpkgs/linux5.14/template b/srcpkgs/linux5.14/template
index 8652b9881433..3e2b044077bf 100644
--- a/srcpkgs/linux5.14/template
+++ b/srcpkgs/linux5.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.14'
 pkgname=linux5.14
-version=5.14.9
+version=5.14.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2
- ce444a50abc335294f6104e075ac2448ee1c677c076031f517dd98c877b4e076"
+ 228de63ff070274902ef29c7d5229c6ea55860e95fbb36590f7b6930def14b17"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From c2e59b27264c091b5876664f5aff8616d1780e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 8 Oct 2021 23:33:44 -0300
Subject: [PATCH 0097/4088] linux5.14: update i686 config.

It's unclear to me why this only popped up now. The update to 5.14.10
didn't touch config files related to this.
---
 srcpkgs/linux5.14/files/i386-dotconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.14/files/i386-dotconfig b/srcpkgs/linux5.14/files/i386-dotconfig
index 4453a873085d..3721da32f6ef 100644
--- a/srcpkgs/linux5.14/files/i386-dotconfig
+++ b/srcpkgs/linux5.14/files/i386-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.14.7 Kernel Configuration
+# Linux/i386 5.14.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="i686-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -307,6 +307,7 @@ CONFIG_X86_32_SMP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=3
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 
 #
 # Processor type and features
@@ -786,6 +787,9 @@ CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
 # CONFIG_SECCOMP_CACHE_DEBUG is not set
 CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y

From c319ffa7397ab0096b99133c3d89fd1874f2b791 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 21:58:45 -0400
Subject: [PATCH 0098/4088] python3: update to 3.10.0.

---
 common/environment/setup/python.sh            |  2 +-
 .../04-create-xbps-metadata-scripts.sh        |  2 +-
 .../hooks/pre-configure/02-script-wrapper.sh  |  2 +-
 .../pre-pkg/03-rewrite-python-shebang.sh      |  2 +-
 common/shlibs                                 |  2 +-
 srcpkgs/python3/template                      | 42 +++++++++----------
 6 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index 993cf3587a1a..43ee4d08a54d 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}"
 py2_sitelib="${py2_lib}/site-packages"
 py2_inc="usr/include/python${py2_ver}"
 
-py3_ver="3.9"
+py3_ver="3.10"
 py3_abiver=""
 py3_lib="usr/lib/python${py3_ver}"
 py3_sitelib="${py3_lib}/site-packages"
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index 8bb86c4487a5..69e318a56081 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -266,7 +266,7 @@ _EOF
 	#
 	local pycompile_version
 	if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
-		pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
+		pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]\+$')"
 		if [ -z "${pycompile_module}" ]; then
 			pycompile_module="$(find ${PKGDESTDIR}/usr/lib/python*/site-packages -mindepth 1 -maxdepth 1 '!' -name '*.egg-info' '!' -name '*.dist-info' '!' -name '*.so' '!' -name '*.pth' -printf '%f ')"
 		fi
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 1cbd9df63639..09c796001ea3 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -236,7 +236,7 @@ hook() {
 	generic_wrapper3 libetpan-config
 	generic_wrapper3 giblib-config
 	python_wrapper python-config 2.7
-	python_wrapper python3-config 3.9
+	python_wrapper python3-config 3.10
 	apr_apu_wrapper apr-1-config
 	apr_apu_wrapper apu-1-config
 }
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 60e7f61975b5..07162ad2c69b 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -5,7 +5,7 @@ hook() {
 	local pyver= shebang= off=
 
 	if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
-		pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
+		pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]\+$')"
 	fi
 
 	if [ -n "$python_version" ]; then
diff --git a/common/shlibs b/common/shlibs
index 7e5289f58f66..4e7b70f6b161 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1718,7 +1718,7 @@ libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
 libpython3.so python3-3.9.2_2
-libpython3.9.so.1.0 python3-3.9.2_2
+libpython3.10.so.1.0 python3-3.10.0_1
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 93a0fc825276..cdaf9bd2e3d9 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,9 +3,14 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.9.7
+version=3.10.0
 revision=1
 wrksrc="Python-${version}"
+build_style="gnu-configure"
+configure_args="--enable-shared --enable-ipv6
+ --enable-loadable-sqlite-extensions --with-computed-gotos
+ --with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi
+ --without-ensurepip ac_cv_working_tzset=yes"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
@@ -17,7 +22,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57
+checksum=5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}
@@ -26,36 +31,28 @@ alternatives="
  python:python:/usr/bin/python${version%.*}
  python:python.1:/usr/share/man/man1/python${version%.*}.1"
 
-pre_configure() {
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" python3"
+fi
+
+post_extract() {
 	# Ensure that internal copies of expat and libffi are not used
 	rm -rf Modules/expat
 	rm -rf Modules/_ctypes/{darwin,libffi}*
 }
 
-do_configure() {
-	local _args
-	unset GCC CC CXX CPP LD AR AS RANLIB
+post_patch() {
 	if [ "$CROSS_BUILD" ]; then
-		mkdir -p host-build
-		cd host-build
-		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH CFLAGS=-Os ../configure
-		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
-		mkdir -p ../hostpython
-		mv python ../hostpython
-		cd ..
 		patch -Np0 -i ${FILESDIR}/cross.patch
-		_args="--build=${XBPS_MACHINE%%-musl}"
 	fi
-	./configure ${configure_args} ${_args} \
-		--enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions \
-		--with-computed-gotos --with-dbmliborder=gdbm:ndbm \
-		--with-system-expat --with-system-ffi --without-ensurepip \
-		ac_cv_working_tzset=yes
 }
 
-do_build() {
-	export PATH="$PATH:$wrksrc/hostpython"
-	make ${makejobs}
+do_configure() {
+	# If these are set, distutils will default to cc and attempt to pass
+	# `-R<path>` to the compiler for every compiled extension that sets an
+	# rpath rather than the '-Wl,-R<path>' argument that GCC requires
+	unset GCC CC CXX CPP LD AR AS RANLIB
+	./configure ${configure_args}
 }
 
 do_check() {
@@ -77,7 +74,6 @@ do_check() {
 }
 
 do_install() {
-	export PATH="$PATH:$wrksrc/hostpython"
 	make DESTDIR=${DESTDIR} install maninstall
 	vlicense LICENSE
 

From 2144988b23f94a528289c1c8a8dae526f8a4cddd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 22:05:41 -0400
Subject: [PATCH 0099/4088] python3-tkinter: update to 3.10.0.

---
 srcpkgs/python3-tkinter/template | 39 +++++++++++++-------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index b631f5b6b7dc..2aa3be1efb96 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,9 +8,14 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.9.7
+version=3.10.0
 revision=1
 wrksrc="Python-${version}"
+build_style="gnu-configure"
+configure_args="--enable-shared --enable-ipv6
+ --enable-loadable-sqlite-extensions --with-computed-gotos
+ --with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi
+ --without-ensurepip"
 pycompile_dirs="
  usr/lib/python${version%.*}/tkinter
  usr/lib/python${version%.*}/turtledemo
@@ -23,37 +28,27 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57
+checksum=5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
 
-pre_configure() {
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" python3"
+fi
+
+post_extract() {
 	# Ensure that internal copies of expat and libffi are not used.
 	rm -r Modules/expat
 	rm -r Modules/_ctypes/{darwin,libffi}*
 }
 
-do_configure() {
-	local _args
-	unset GCC CC CXX CPP LD AR AS RANLIB
+post_patch() {
 	if [ "$CROSS_BUILD" ]; then
-		mkdir -p host-build
-		cd host-build
-		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH CFLAGS=-Os ../configure
-		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
-		mkdir -p ../hostpython
-		mv python ../hostpython
-		cd ..
 		patch -Np0 -i ${FILESDIR}/cross.patch
-		_args="--build=${XBPS_MACHINE%%-musl}"
 	fi
-	./configure ${configure_args} ${_args} \
-		--enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions \
-		--with-computed-gotos --with-dbmliborder=gdbm:ndbm \
-		--with-system-expat --with-system-ffi --without-ensurepip
 }
 
-do_build() {
-	export PATH="$PATH:$wrksrc/hostpython"
-	make ${makejobs}
+do_configure() {
+	unset GCC CC CXX CPP LD AR AS RANLIB
+	./configure ${configure_args}
 }
 
 do_check() {
@@ -62,8 +57,6 @@ do_check() {
 }
 
 do_install() {
-	export PATH="$PATH:$wrksrc/hostpython"
-
 	mkdir -p ${wrksrc}/tmp-destdir/usr/lib
 	ln -s lib ${wrksrc}/tmp-destdir/usr/lib${XBPS_TARGET_WORDSIZE}
 

From 86b521d784e2673f01819e87cf99d4d93126e453 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:48 -0400
Subject: [PATCH 0100/4088] python3-setuptools: rebuild for Python 3.10, update
 to 58.1.0.

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

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index d1313ea87c1d..41d9793206a2 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=57.0.0
+version=58.1.0
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=401cbf33a7bf817d08014d51560fc003b895c4cdc1a5b521ad2969e928a07535
+checksum=5de67252090e08d25f240f07d80310f778a5a46cdcf9ea9855662630ac8547b2
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From 88461eb1e90a332d9e36d785276fa630113b4f54 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:28 -0400
Subject: [PATCH 0101/4088] python3-pip: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..fa95a4ecf18a 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
 version=21.2.4
-revision=1
+revision=2
 wrksrc="pip-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bb98e1d7a393fb29c919287b1b6749c41ef7580f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:55 -0400
Subject: [PATCH 0102/4088] python3-toml: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-toml/template b/srcpkgs/python3-toml/template
index 8deaca8da064..c185660873c6 100644
--- a/srcpkgs/python3-toml/template
+++ b/srcpkgs/python3-toml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-toml'
 pkgname=python3-toml
 version=0.10.2
-revision=1
+revision=2
 wrksrc="toml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d557d24a3690c417b3a303f2595b5dbb5ec97d71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:23 -0400
Subject: [PATCH 0103/4088] python-parsing: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python-parsing/template
index ea228188b460..524a4a2d99ee 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python-parsing/template
@@ -1,7 +1,7 @@
 # Template file for 'python-parsing'
 pkgname=python-parsing
 version=2.4.7
-revision=1
+revision=2
 wrksrc="pyparsing-pyparsing_${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 5654e7d23168bc768d98eac213a4eb2afe67fcd0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:57 -0400
Subject: [PATCH 0104/4088] python3-flit_core: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..556363426c16 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
 version=3.3.0
-revision=1
+revision=2
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
 build_style=python3-pep517

From c7c09275a2e2cf8ae25ae6fd00cfbfc036b57eda Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:24 -0400
Subject: [PATCH 0105/4088] python3-packaging: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-packaging/template b/srcpkgs/python3-packaging/template
index 3975d5175289..204674f670f4 100644
--- a/srcpkgs/python3-packaging/template
+++ b/srcpkgs/python3-packaging/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-packaging'
 pkgname=python3-packaging
 version=21.0
-revision=1
+revision=2
 wrksrc="packaging-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 31d4dfafcf209a8126287bc3ad3faa4db1dfd50f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:55 -0400
Subject: [PATCH 0106/4088] python3-tomli: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tomli/template b/srcpkgs/python3-tomli/template
index 88bdf7dd3785..b4cb466abad3 100644
--- a/srcpkgs/python3-tomli/template
+++ b/srcpkgs/python3-tomli/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tomli'
 pkgname=python3-tomli
 version=1.2.1
-revision=1
+revision=2
 wrksrc="tomli-${version}"
 build_style=python3-pep517
 hostmakedepends="python3-flit_core"

From a2d2645d55b1c18267043be8d27135977ffbec10 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:25 -0400
Subject: [PATCH 0107/4088] python-six: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index efaccb2e4a29..b50e793b2c9b 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -1,7 +1,7 @@
 # Template file for 'python-six'
 pkgname=python-six
 version=1.16.0
-revision=1
+revision=2
 wrksrc="six-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 827db6252d71c03c6ddeb58ff4a609236f0db082 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:51 -0400
Subject: [PATCH 0108/4088] python3-decorator: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-decorator/template b/srcpkgs/python3-decorator/template
index 02e3b5c55a44..d4a5709cffff 100644
--- a/srcpkgs/python3-decorator/template
+++ b/srcpkgs/python3-decorator/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-decorator'
 pkgname=python3-decorator
 version=5.1.0
-revision=1
+revision=2
 wrksrc="decorator-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From afad87bd83a92daee388a09eb38742255ec67455 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:06 -0400
Subject: [PATCH 0109/4088] python3-ipython_genutils: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ipython_genutils/template b/srcpkgs/python3-ipython_genutils/template
index 5686c3f58113..8198027868a4 100644
--- a/srcpkgs/python3-ipython_genutils/template
+++ b/srcpkgs/python3-ipython_genutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ipython_genutils'
 pkgname=python3-ipython_genutils
 version=0.2.0
-revision=5
+revision=6
 wrksrc="ipython_genutils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 33ab92eb1d42e2ad06e2316fedbb36dd128a73db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:05 -0400
Subject: [PATCH 0110/4088] libxml2-python: rebuild for Python 3.10

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

diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template
index 4208519dac3e..1d75b7ac56b3 100644
--- a/srcpkgs/libxml2-python/template
+++ b/srcpkgs/libxml2-python/template
@@ -1,7 +1,7 @@
 # Template file for 'libxml2-python'
 pkgname=libxml2-python
 version=2.9.10
-revision=3
+revision=4
 wrksrc="${pkgname%-python}-${version}"
 build_wrksrc=python
 build_style=python-module

From 81e1ff5de84a86e8042cca3de870eb14111df3ea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:18 -0400
Subject: [PATCH 0111/4088] python-Cython: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 63b71e6b9458..63cb8b7fad69 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
 version=0.29.24
-revision=1
+revision=2
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From b05869762e891a8fcb95a1f9f1f053fd2380fa50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:48 -0400
Subject: [PATCH 0112/4088] python3-setuptools_scm: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-setuptools_scm/template b/srcpkgs/python3-setuptools_scm/template
index b315b2432131..1c0bb52e7736 100644
--- a/srcpkgs/python3-setuptools_scm/template
+++ b/srcpkgs/python3-setuptools_scm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-setuptools_scm'
 pkgname=python3-setuptools_scm
 version=6.3.2
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-tomli"

From e90ad91238fb813e1beb387db10dd62bbf3cda96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:23 -0400
Subject: [PATCH 0113/4088] python-ply: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
index 55a017a9b66c..f91150588c84 100644
--- a/srcpkgs/python-ply/template
+++ b/srcpkgs/python-ply/template
@@ -1,7 +1,7 @@
 # Template file for 'python-ply'
 pkgname=python-ply
 version=3.11
-revision=5
+revision=6
 wrksrc="ply-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From a8ffeb3b58b27e0cfeb07d53c1d7e1a3a1914d26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0114/4088] python3-traitlets: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
index 5afb04ef8050..f9b5819f9177 100644
--- a/srcpkgs/python3-traitlets/template
+++ b/srcpkgs/python3-traitlets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-traitlets'
 pkgname=python3-traitlets
 version=5.0.5
-revision=1
+revision=2
 wrksrc="traitlets-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f458cb76350d45c1fdc59bd8a844e40d429a1ca6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:20 -0400
Subject: [PATCH 0115/4088] python-attrs: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 52cc82e06beb..88779a213b05 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -1,7 +1,7 @@
 # Template file for 'python-attrs'
 pkgname=python-attrs
 version=21.2.0
-revision=1
+revision=2
 wrksrc="attrs-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 539c59a59c3d475de71d09adb057fab4b388399e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:38 -0400
Subject: [PATCH 0116/4088] python3-pyrsistent: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..2378ede51c65 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
 version=0.18.0
-revision=1
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"

From 279f65b74152b7301d833d013194708894a24157 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 27 Sep 2021 08:15:49 -0400
Subject: [PATCH 0117/4088] itstool: rebuild for Python 3.10, update to 2.0.7.

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

diff --git a/srcpkgs/itstool/template b/srcpkgs/itstool/template
index 5618fa120fff..ed7e30e743d9 100644
--- a/srcpkgs/itstool/template
+++ b/srcpkgs/itstool/template
@@ -1,7 +1,7 @@
 # Template file for 'itstool'
 pkgname=itstool
-version=2.0.6
-revision=4
+version=2.0.7
+revision=1
 build_style=gnu-configure
 configure_args="PYTHON=/usr/bin/python3"
 hostmakedepends="python3 libxml2-python3"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://itstool.org/"
 distfiles="http://files.itstool.org/itstool/${pkgname}-${version}.tar.bz2"
-checksum=6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9
+checksum=6b9a7cd29a12bb95598f5750e8763cee78836a1a207f85b74d8b3275b27e87ca

From 369afc261ea5ced9323c42dfcac8ef6a3f0aaef4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:08 -0400
Subject: [PATCH 0118/4088] meson: rebuild for Python 3.10

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..93464f832ee4 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.58.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

From 75f0913d6efb771aa03e79c8e19334f91b89e839 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:22 -0400
Subject: [PATCH 0119/4088] python-lxml: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
index 8095f7c7e40f..aacddf9cdcb0 100644
--- a/srcpkgs/python-lxml/template
+++ b/srcpkgs/python-lxml/template
@@ -1,7 +1,7 @@
 # Template file for 'python-lxml'
 pkgname=python-lxml
 version=4.6.3
-revision=1
+revision=2
 wrksrc="lxml-lxml-${version}"
 build_style=python-module
 make_build_args="--with-cython"

From 54d244e9b29e6e0248257d84b82a0d1ae17fde91 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:33 -0400
Subject: [PATCH 0120/4088] python3-Pygments: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..da50862f2633 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
 version=2.10.0
-revision=1
+revision=2
 wrksrc="Pygments-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a96ba0a18ba4e3c5d1ab359454acc2e9d88081c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:39 -0400
Subject: [PATCH 0121/4088] python3-anytree: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-anytree/template b/srcpkgs/python3-anytree/template
index 8f1f4a2d8f30..1ba39855a993 100644
--- a/srcpkgs/python3-anytree/template
+++ b/srcpkgs/python3-anytree/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-anytree'
 pkgname=python3-anytree
 version=2.8.0
-revision=3
+revision=4
 wrksrc="anytree-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From f123b630ede3b3482df767dd658cfe0cd8d6cd7a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:24 -0400
Subject: [PATCH 0122/4088] python-pytz: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template
index de169d39baa7..cc303c567518 100644
--- a/srcpkgs/python-pytz/template
+++ b/srcpkgs/python-pytz/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pytz'
 pkgname=python-pytz
 version=2021.3
-revision=1
+revision=2
 wrksrc="pytz-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 39c0fae2ad93f705ce3c086c376a248806ece0d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:20 -0400
Subject: [PATCH 0123/4088] python-chardet: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-chardet/template b/srcpkgs/python-chardet/template
index 4af1148333f5..14678b06509f 100644
--- a/srcpkgs/python-chardet/template
+++ b/srcpkgs/python-chardet/template
@@ -1,7 +1,7 @@
 # Template file for 'python-chardet'
 pkgname=python-chardet
 version=4.0.0
-revision=2
+revision=3
 wrksrc="chardet-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 9b771dd74902d6f89a3187849009b3387415c71f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:26 -0400
Subject: [PATCH 0124/4088] python-urllib3: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 049d30a40891..bf98d448e445 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,7 +1,7 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
 version=1.26.6
-revision=1
+revision=2
 wrksrc="urllib3-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 2bca9d1417b29ccb54da0bd0a849f67b560e5932 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:45 -0400
Subject: [PATCH 0125/4088] python3-charset-normalizer: rebuild for Python 3.10

---
 srcpkgs/python3-charset-normalizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index c7d212d8cf1d..a319e2daa13c 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-charset-normalizer'
 pkgname=python3-charset-normalizer
 version=2.0.4
-revision=1
+revision=2
 wrksrc="charset_normalizer-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fcb96567fcb037152a83858ff7bd71d46778f773 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:04 -0400
Subject: [PATCH 0126/4088] python3-idna: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-idna/template b/srcpkgs/python3-idna/template
index 29f49107e2f3..215f38f3f9d4 100644
--- a/srcpkgs/python3-idna/template
+++ b/srcpkgs/python3-idna/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-idna'
 pkgname=python3-idna
 version=3.2
-revision=1
+revision=2
 wrksrc="idna-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 849358396c230cd09e398013b14503642846fd74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:19 -0400
Subject: [PATCH 0127/4088] python-MarkupSafe: rebuild for Python 3.10, split
 package

python3-MarkupSafe: update to 2.0.1.
---
 srcpkgs/python-MarkupSafe/template  | 19 ++++---------------
 srcpkgs/python3-MarkupSafe          |  1 -
 srcpkgs/python3-MarkupSafe/template | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-MarkupSafe
 create mode 100644 srcpkgs/python3-MarkupSafe/template

diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template
index 780a65f9242d..95fb3208e832 100644
--- a/srcpkgs/python-MarkupSafe/template
+++ b/srcpkgs/python-MarkupSafe/template
@@ -1,13 +1,11 @@
 # Template file for 'python-MarkupSafe'
 pkgname=python-MarkupSafe
 version=1.1.1
-revision=6
+revision=7
 wrksrc="MarkupSafe-${version}"
-build_style=python-module
-pycompile_module="markupsafe"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-checkdepends="python3-pytest"
+build_style=python2-module
+hostmakedepends="python-setuptools"
+makedepends="python-devel"
 short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
@@ -18,12 +16,3 @@ checksum=29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b
 post_install() {
 	vlicense LICENSE.rst
 }
-
-python3-MarkupSafe_package() {
-	pycompile_module="markupsafe"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-MarkupSafe b/srcpkgs/python3-MarkupSafe
deleted file mode 120000
index 56b2cb8a731e..000000000000
--- a/srcpkgs/python3-MarkupSafe
+++ /dev/null
@@ -1 +0,0 @@
-python-MarkupSafe
\ No newline at end of file
diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template
new file mode 100644
index 000000000000..01ce46545387
--- /dev/null
+++ b/srcpkgs/python3-MarkupSafe/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-MarkupSafe'
+pkgname=python3-MarkupSafe
+version=2.0.1
+revision=1
+wrksrc="MarkupSafe-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+checkdepends="python3-pytest"
+short_desc="Implements a XML/HTML/XHTML Markup safe string for Python3"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://palletsprojects.com/p/markupsafe/"
+distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
+checksum=594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a
+
+post_install() {
+	vlicense LICENSE.rst
+}

From 42738d2fde167cac3d7540bcb228f4678e6a8949 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:24 -0400
Subject: [PATCH 0128/4088] python-pycparser: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
index c57366574d58..68ea482d2075 100644
--- a/srcpkgs/python-pycparser/template
+++ b/srcpkgs/python-pycparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pycparser'
 pkgname=python-pycparser
 version=2.20
-revision=1
+revision=2
 wrksrc="pycparser-${version}"
 build_style=python-module
 pycompile_module="pycparser"

From c545a50e5cf47e0f9d84a87842b43b1864aa368b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:47 -0400
Subject: [PATCH 0129/4088] python3-semanticversion: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-semanticversion/template b/srcpkgs/python3-semanticversion/template
index 19db48a5a74b..f4c94f2e52df 100644
--- a/srcpkgs/python3-semanticversion/template
+++ b/srcpkgs/python3-semanticversion/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-semanticversion'
 pkgname=python3-semanticversion
 version=2.8.5
-revision=2
+revision=3
 wrksrc="semantic_version-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From de167899fcc8ebea4f48c164affea6917271884a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:57 -0400
Subject: [PATCH 0130/4088] python3-typing_extensions: rebuild for Python 3.10,
 update to 3.10.0.2.

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

diff --git a/srcpkgs/python3-typing_extensions/template b/srcpkgs/python3-typing_extensions/template
index 48218a100428..a9917a177428 100644
--- a/srcpkgs/python3-typing_extensions/template
+++ b/srcpkgs/python3-typing_extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-typing_extensions'
 pkgname=python3-typing_extensions
-version=3.10.0.0
+version=3.10.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="Python-2.0"
 homepage="https://github.com/python/typing"
 distfiles="${PYPI_SITE}/t/typing_extensions/typing_extensions-${version}.tar.gz"
-checksum=50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342
+checksum=49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e

From 0b8d895fbe32b6a9a40c9634acbdb8f0bbb747e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:25 -0400
Subject: [PATCH 0131/4088] python3-parso: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template
index c4406bc39bed..5fb79d8baaad 100644
--- a/srcpkgs/python3-parso/template
+++ b/srcpkgs/python3-parso/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-parso'
 pkgname=python3-parso
 version=0.8.2
-revision=1
+revision=2
 wrksrc="parso-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fca304a4e196668a95cf4ada8cfad4ae774cbceb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:32 -0400
Subject: [PATCH 0132/4088] python3-ptyprocess: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ptyprocess/template b/srcpkgs/python3-ptyprocess/template
index f3d1be1400f2..ac79b761be77 100644
--- a/srcpkgs/python3-ptyprocess/template
+++ b/srcpkgs/python3-ptyprocess/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ptyprocess'
 pkgname=python3-ptyprocess
 version=0.7.0
-revision=1
+revision=2
 wrksrc="ptyprocess-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f775fa2fb716d2487ad93a8dd3c725ecb6a154a7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:26 -0400
Subject: [PATCH 0133/4088] python-wcwidth: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python-wcwidth/template
index 254d0798c67b..a21b21883e10 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python-wcwidth/template
@@ -1,7 +1,7 @@
 # Template file for 'python-wcwidth'
 pkgname=python-wcwidth
 version=0.2.5
-revision=3
+revision=4
 wrksrc="wcwidth-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From d9ac5af30b5ef6dd600938b1c001db50b2fd5510 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:21 -0400
Subject: [PATCH 0134/4088] python-dateutil: rebuild for Python 3.10, update to
 2.8.2.

---
 .../patches/setuptools_scm.patch              | 28 +++++++++++++++++++
 srcpkgs/python-dateutil/template              | 14 +++++-----
 2 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch

diff --git a/srcpkgs/python-dateutil/patches/setuptools_scm.patch b/srcpkgs/python-dateutil/patches/setuptools_scm.patch
new file mode 100644
index 000000000000..9e5103ce4d46
--- /dev/null
+++ b/srcpkgs/python-dateutil/patches/setuptools_scm.patch
@@ -0,0 +1,28 @@
+Void doesn't package setuptools_scm for Python 2, so remove the dependency.
+Leave a placeholder for version number that can be substituted at build.
+
+diff -ur a/setup.cfg b/setup.cfg
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -35,7 +35,6 @@
+ 
+ [options]
+ zip_safe = True
+-setup_requires = setuptools_scm
+ install_requires = six >= 1.5
+ python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*
+ packages = find:
+diff -ur a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -47,9 +47,7 @@
+ 
+ 
+ setup(
+-      use_scm_version={
+-          'write_to': 'dateutil/_version.py',
+-      },
++      version=%PKGVERSION%,
+       ## Needed since doctest not supported by PyPA.
+       long_description = README,
+       cmdclass={
diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
index a2dd2430d4de..51c0a4521f6b 100644
--- a/srcpkgs/python-dateutil/template
+++ b/srcpkgs/python-dateutil/template
@@ -1,21 +1,21 @@
 # Template file for 'python-dateutil'
 pkgname=python-dateutil
-version=2.8.1
-revision=2
+version=2.8.2
+revision=1
 build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools_scm"
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python-six tzdata"
 short_desc="Extensions to the standard Python2 datetime module"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/dateutil/dateutil"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c
+checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
 
-pre_build() {
-	# don't install zoneinfo tarball
-	sed -i '/package_data=/d' setup.py
+post_patch() {
+	vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
 }
+
 post_install() {
 	vlicense LICENSE
 }

From 5b086d488e0149a5b34d1dcbdacdffa3a8bcc1a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:10 -0400
Subject: [PATCH 0135/4088] python3-jupyter_core: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template
index ceb91e029f5b..d0fa364a6751 100644
--- a/srcpkgs/python3-jupyter_core/template
+++ b/srcpkgs/python3-jupyter_core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_core'
 pkgname=python3-jupyter_core
 version=4.7.1
-revision=1
+revision=2
 wrksrc="jupyter_core-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 81bccb31e2507023b73b10bad8d94a093751f18a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:20 -0400
Subject: [PATCH 0136/4088] python3-nest_asyncio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
index 19b143bb2c7e..64f4574dc8f0 100644
--- a/srcpkgs/python3-nest_asyncio/template
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nest_asyncio'
 pkgname=python3-nest_asyncio
 version=1.5.1
-revision=2
+revision=3
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 4092a84f8fc9e38bb81ace7d0f23daff1a6977fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:42 -0400
Subject: [PATCH 0137/4088] python3-pyzmq: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index cb7d410229e2..c12b58790432 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
 version=22.3.0
-revision=1
+revision=2
 wrksrc="pyzmq-${version}"
 build_style=python3-module
 make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"

From ee9980cd678996b9e6b1eca9760e8d9961e2a769 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:55 -0400
Subject: [PATCH 0138/4088] python3-tornado: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template
index a4bd8950cf19..dadfa37ddb02 100644
--- a/srcpkgs/python3-tornado/template
+++ b/srcpkgs/python3-tornado/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tornado'
 pkgname=python3-tornado
 version=6.1
-revision=1
+revision=2
 wrksrc="tornado-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7e73dc80d8ef024e28319adc50f19d1480b67a41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:09 -0400
Subject: [PATCH 0139/4088] python3-jsonschema: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index 916a2d3164e3..3b365347c22e 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 version=3.2.0
-revision=1
+revision=2
 wrksrc="jsonschema-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 6d1ad18811070a423121dbfc93553745b092a85a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:57 -0400
Subject: [PATCH 0140/4088] gtk-doc: rebuild for Python 3.10

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

diff --git a/srcpkgs/gtk-doc/template b/srcpkgs/gtk-doc/template
index ab149d7f33d5..06dfc97f9000 100644
--- a/srcpkgs/gtk-doc/template
+++ b/srcpkgs/gtk-doc/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk-doc'
 pkgname=gtk-doc
 version=1.33.0
-revision=2
+revision=3
 build_style=meson
 # disable tests to avoid cyclic dependency on glib
 configure_args="-Dtests=false"

From e6a7f6129d8216309156de89cc48af62c3dc2c6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:18 -0400
Subject: [PATCH 0141/4088] python-Babel: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-Babel/template b/srcpkgs/python-Babel/template
index 615b125364aa..4d110e70d474 100644
--- a/srcpkgs/python-Babel/template
+++ b/srcpkgs/python-Babel/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Babel'
 pkgname=python-Babel
 version=2.8.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From ec2997241a2868e7971ec30a55914b25098c6445 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:25 -0400
Subject: [PATCH 0142/4088] python-requests: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template
index ab2e1eb27067..6ad6fd32dd51 100644
--- a/srcpkgs/python-requests/template
+++ b/srcpkgs/python-requests/template
@@ -1,7 +1,7 @@
 # Template file for 'python-requests'
 pkgname=python-requests
 version=2.26.0
-revision=1
+revision=2
 wrksrc="requests-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From b570dd8703b4654f1d26ca6a6d15fe97721b7f63 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:19 -0400
Subject: [PATCH 0143/4088] python-Jinja2: rebuild for Python 3.10, split
 package

python3-Jinja2: update to 3.0.2
---
 srcpkgs/python-Jinja2/template  | 18 ++++--------------
 srcpkgs/python3-Jinja2          |  1 -
 srcpkgs/python3-Jinja2/template | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 15 deletions(-)
 delete mode 120000 srcpkgs/python3-Jinja2
 create mode 100644 srcpkgs/python3-Jinja2/template

diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index d447aebca8c9..3e8ab4268b5d 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -1,12 +1,12 @@
 # Template file for 'python-Jinja2'
 pkgname=python-Jinja2
 version=2.11.3
-revision=1
+revision=2
 wrksrc="Jinja2-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-MarkupSafe"
-checkdepends="python-MarkupSafe python3-MarkupSafe python-pytest python3-pytest"
+checkdepends="python-pytest $depends"
 short_desc="Full featured template engine (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
@@ -17,7 +17,6 @@ checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
 
 do_check() {
 	PYTHONPATH=src python2 -m pytest
-	PYTHONPATH=src python3 -m pytest
 }
 
 post_install() {
@@ -26,12 +25,3 @@ post_install() {
 	rm -f ${DESTDIR}/${py2_sitelib}/jinja2/asyncsupport.py
 	rm -f ${DESTDIR}/${py2_sitelib}/jinja2/asyncfilters.py
 }
-
-python3-Jinja2_package() {
-	depends="python3-MarkupSafe"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-Jinja2 b/srcpkgs/python3-Jinja2
deleted file mode 120000
index a87362a4b0a2..000000000000
--- a/srcpkgs/python3-Jinja2
+++ /dev/null
@@ -1 +0,0 @@
-python-Jinja2
\ No newline at end of file
diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
new file mode 100644
index 000000000000..fd90860d5637
--- /dev/null
+++ b/srcpkgs/python3-Jinja2/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-Jinja2'
+pkgname=python3-Jinja2
+version=3.0.2
+revision=1
+wrksrc="Jinja2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-MarkupSafe"
+checkdepends="python3-pytest $depends"
+short_desc="Full featured template engine (Python3)"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="http://jinja.pocoo.org/"
+changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
+checksum=827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45
+
+post_install() {
+	vlicense LICENSE.rst
+}

From 6ce2f00a3bfc06f77f09d1f692e77d16e19314fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:37 -0400
Subject: [PATCH 0144/4088] python3-alabaster: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-alabaster/template b/srcpkgs/python3-alabaster/template
index 830957dcb2bb..815e5300476a 100644
--- a/srcpkgs/python3-alabaster/template
+++ b/srcpkgs/python3-alabaster/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-alabaster'
 pkgname=python3-alabaster
 version=0.7.12
-revision=4
+revision=5
 wrksrc="alabaster-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 63e594283d4ab62954d93a8ab7e88654aafe75ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:53 -0400
Subject: [PATCH 0145/4088] python3-docutils: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
index 6ffd111a0a12..0600a65a729b 100644
--- a/srcpkgs/python3-docutils/template
+++ b/srcpkgs/python3-docutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docutils'
 pkgname=python3-docutils
 version=0.17.1
-revision=1
+revision=2
 wrksrc="docutils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 50010aa10339ce3ea887d337f6d67e67190543bb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:05 -0400
Subject: [PATCH 0146/4088] python3-imagesize: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-imagesize/template b/srcpkgs/python3-imagesize/template
index 5d36f954e454..566f33fb2710 100644
--- a/srcpkgs/python3-imagesize/template
+++ b/srcpkgs/python3-imagesize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-imagesize'
 pkgname=python3-imagesize
 version=1.2.0
-revision=1
+revision=2
 wrksrc="imagesize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cf1c2feb2f374e81650417e7bf720d37d609e2c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:50 -0400
Subject: [PATCH 0147/4088] python3-snowballstemmer: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-snowballstemmer/template b/srcpkgs/python3-snowballstemmer/template
index 37733fa36607..4801fa042325 100644
--- a/srcpkgs/python3-snowballstemmer/template
+++ b/srcpkgs/python3-snowballstemmer/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-snowballstemmer'
 pkgname=python3-snowballstemmer
 version=1.2.1
-revision=6
+revision=7
 wrksrc="snowballstemmer-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6fc36dcfdd5fc8e0e792ebd7ca57927210ba33ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:52 -0400
Subject: [PATCH 0148/4088] python3-sphinxcontrib-applehelp: rebuild for Python
 3.10

---
 srcpkgs/python3-sphinxcontrib-applehelp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sphinxcontrib-applehelp/template b/srcpkgs/python3-sphinxcontrib-applehelp/template
index 0762615c0e5f..b2896f85f8ad 100644
--- a/srcpkgs/python3-sphinxcontrib-applehelp/template
+++ b/srcpkgs/python3-sphinxcontrib-applehelp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib-applehelp'
 pkgname=python3-sphinxcontrib-applehelp
 version=1.0.2
-revision=2
+revision=3
 wrksrc=sphinxcontrib-applehelp-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From aea801164581ce582c0355861381e7571f194c17 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:52 -0400
Subject: [PATCH 0149/4088] python3-sphinxcontrib-devhelp: rebuild for Python
 3.10

---
 srcpkgs/python3-sphinxcontrib-devhelp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sphinxcontrib-devhelp/template b/srcpkgs/python3-sphinxcontrib-devhelp/template
index 0504c7625888..53e6d06092cd 100644
--- a/srcpkgs/python3-sphinxcontrib-devhelp/template
+++ b/srcpkgs/python3-sphinxcontrib-devhelp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib-devhelp'
 pkgname=python3-sphinxcontrib-devhelp
 version=1.0.2
-revision=2
+revision=3
 wrksrc=sphinxcontrib-devhelp-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d895c57f63958623924ee93501588189d3c61e98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:52 -0400
Subject: [PATCH 0150/4088] python3-sphinxcontrib-htmlhelp: rebuild for Python
 3.10

---
 srcpkgs/python3-sphinxcontrib-htmlhelp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sphinxcontrib-htmlhelp/template b/srcpkgs/python3-sphinxcontrib-htmlhelp/template
index 2b1fa2c8ea3c..966981fee4ba 100644
--- a/srcpkgs/python3-sphinxcontrib-htmlhelp/template
+++ b/srcpkgs/python3-sphinxcontrib-htmlhelp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib-htmlhelp'
 pkgname=python3-sphinxcontrib-htmlhelp
 version=2.0.0
-revision=1
+revision=2
 wrksrc=sphinxcontrib-htmlhelp-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 18d36fa7ae12e84c6f82f1cb0920135eb2db0c1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:52 -0400
Subject: [PATCH 0151/4088] python3-sphinxcontrib-jsmath: rebuild for Python
 3.10

---
 srcpkgs/python3-sphinxcontrib-jsmath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sphinxcontrib-jsmath/template b/srcpkgs/python3-sphinxcontrib-jsmath/template
index 9234fc58cd72..84c2f2951981 100644
--- a/srcpkgs/python3-sphinxcontrib-jsmath/template
+++ b/srcpkgs/python3-sphinxcontrib-jsmath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib-jsmath'
 pkgname=python3-sphinxcontrib-jsmath
 version=1.0.1
-revision=2
+revision=3
 wrksrc=sphinxcontrib-jsmath-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 28f00e163b72342d79c25f482c0f50587f5a46ee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:52 -0400
Subject: [PATCH 0152/4088] python3-sphinxcontrib-qthelp: rebuild for Python
 3.10

---
 srcpkgs/python3-sphinxcontrib-qthelp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sphinxcontrib-qthelp/template b/srcpkgs/python3-sphinxcontrib-qthelp/template
index 2f6e47965db4..c5635c26237f 100644
--- a/srcpkgs/python3-sphinxcontrib-qthelp/template
+++ b/srcpkgs/python3-sphinxcontrib-qthelp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib-qthelp'
 pkgname=python3-sphinxcontrib-qthelp
 version=1.0.3
-revision=2
+revision=3
 wrksrc=sphinxcontrib-qthelp-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f2bd3ef40b24f555d5256556f1b21a45d2eb173d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:52 -0400
Subject: [PATCH 0153/4088] python3-sphinxcontrib-serializinghtml: rebuild for
 Python 3.10

---
 srcpkgs/python3-sphinxcontrib-serializinghtml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sphinxcontrib-serializinghtml/template b/srcpkgs/python3-sphinxcontrib-serializinghtml/template
index ae3747aa3cf8..d14c6b29107c 100644
--- a/srcpkgs/python3-sphinxcontrib-serializinghtml/template
+++ b/srcpkgs/python3-sphinxcontrib-serializinghtml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib-serializinghtml'
 pkgname=python3-sphinxcontrib-serializinghtml
 version=1.1.5
-revision=1
+revision=2
 wrksrc=sphinxcontrib-serializinghtml-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e7e2303d977280c63cfc1c231e70b1fe7fc31a24 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:20 -0400
Subject: [PATCH 0154/4088] python-cffi: rebuild for Python 3.10

---
 srcpkgs/python-cffi/template | 2 +-
 srcpkgs/python-cffi/update   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 999fec883156..9a256a738359 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -1,7 +1,7 @@
 # Template file for 'python-cffi'
 pkgname=python-cffi
 version=1.14.6
-revision=1
+revision=2
 wrksrc="cffi-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools libffi-devel"
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python-cffi/update
index d40d474e5da5..32c6fdfdd407 100644
--- a/srcpkgs/python-cffi/update
+++ b/srcpkgs/python-cffi/update
@@ -1 +1 @@
-ignore="*b* *dev*"
+ignore="*b* *dev* *rc*"

From ef3627c26a65d6a3e3fee24a7b86cb1595ad0105 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:48 -0400
Subject: [PATCH 0155/4088] python3-setuptools-rust: rebuild for Python 3.10

---
 srcpkgs/python3-setuptools-rust/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index bce6df90c87a..2b998f2145f2 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
 version=0.12.1
-revision=2
+revision=3
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 376f6a1a0cee7b69e91adce9c8671da3186677b5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:23 -0400
Subject: [PATCH 0156/4088] python-pyasn1: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
index 85eec768dbfa..733149d58448 100644
--- a/srcpkgs/python-pyasn1/template
+++ b/srcpkgs/python-pyasn1/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyasn1'
 pkgname=python-pyasn1
 version=0.4.8
-revision=3
+revision=4
 wrksrc="pyasn1-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 82c09a4270e3a022b75b9cd4f520313b0fea414b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:42 -0400
Subject: [PATCH 0157/4088] python3-backcall: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-backcall/template b/srcpkgs/python3-backcall/template
index f62eb7cf259c..b2303da50f2d 100644
--- a/srcpkgs/python3-backcall/template
+++ b/srcpkgs/python3-backcall/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-backcall'
 pkgname=python3-backcall
 version=0.2.0
-revision=4
+revision=5
 wrksrc="backcall-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3aa1456c9f40e877793cc9d45a4b58ae87dbad1c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:08 -0400
Subject: [PATCH 0158/4088] python3-jedi: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jedi/template b/srcpkgs/python3-jedi/template
index 728ff3a36694..1a7c5a261e5d 100644
--- a/srcpkgs/python3-jedi/template
+++ b/srcpkgs/python3-jedi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jedi'
 pkgname=python3-jedi
 version=0.18.0
-revision=1
+revision=2
 wrksrc="jedi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a8b1ada579bdc586161b6ef2559b63b460537318 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:15 -0400
Subject: [PATCH 0159/4088] python3-matplotlib-inline: rebuild for Python 3.10

---
 srcpkgs/python3-matplotlib-inline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-matplotlib-inline/template b/srcpkgs/python3-matplotlib-inline/template
index 1ee107e4e750..f991be2b5dde 100644
--- a/srcpkgs/python3-matplotlib-inline/template
+++ b/srcpkgs/python3-matplotlib-inline/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matplotlib-inline'
 pkgname=python3-matplotlib-inline
 version=0.1.3
-revision=1
+revision=2
 _pypkg="${pkgname#python3-}"
 wrksrc="${_pypkg}-${version}"
 build_style=python3-module

From ed3ab7a0973c804a7fb92ed2762127e276904d9e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:27 -0400
Subject: [PATCH 0160/4088] python3-pexpect: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pexpect/template b/srcpkgs/python3-pexpect/template
index a963738effc8..d51c4a37451a 100644
--- a/srcpkgs/python3-pexpect/template
+++ b/srcpkgs/python3-pexpect/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pexpect'
 pkgname=python3-pexpect
 version=4.8.0
-revision=1
+revision=2
 wrksrc="pexpect-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b7d7348d09f1c7f4af8d598bef14ab2b03ddc6cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:28 -0400
Subject: [PATCH 0161/4088] python3-pickleshare: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pickleshare/template b/srcpkgs/python3-pickleshare/template
index 3f569f5bf4cf..beac8eb9e445 100644
--- a/srcpkgs/python3-pickleshare/template
+++ b/srcpkgs/python3-pickleshare/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pickleshare'
 pkgname=python3-pickleshare
 version=0.7.5
-revision=4
+revision=5
 wrksrc="pickleshare-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 60710d5b6cefc7574e24683d63e010ceba7d9c9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:31 -0400
Subject: [PATCH 0162/4088] python3-prompt_toolkit: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index f9da6bb0b05b..0cf01a50c762 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
 version=3.0.20
-revision=1
+revision=2
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1ad0125539f8fdcfe8ea3d46b1aac1c4be37b2b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:00 -0400
Subject: [PATCH 0163/4088] python3-webencodings: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template
index fa4d415ac43e..13c9b4210d20 100644
--- a/srcpkgs/python3-webencodings/template
+++ b/srcpkgs/python3-webencodings/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-webencodings'
 pkgname=python3-webencodings
 version=0.5.1
-revision=6
+revision=7
 wrksrc="webencodings-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 77a44b840ecd59f9a6201e0b166b7f592784e454 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:40 -0400
Subject: [PATCH 0164/4088] python3-async_generator: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-async_generator/template b/srcpkgs/python3-async_generator/template
index 0c2b4d0722ad..9ccab1df8b63 100644
--- a/srcpkgs/python3-async_generator/template
+++ b/srcpkgs/python3-async_generator/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-async_generator'
 pkgname=python3-async_generator
 version=1.10
-revision=3
+revision=4
 wrksrc="async_generator-${version}"
 build_style=python3-module
 pycompile_module="async_generator"

From cbfc43335c286f98521631aa0ba7f56cf9fe28e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:10 -0400
Subject: [PATCH 0165/4088] python3-jupyter_client: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template
index 6c27403e678f..be6aa5594095 100644
--- a/srcpkgs/python3-jupyter_client/template
+++ b/srcpkgs/python3-jupyter_client/template
@@ -2,7 +2,7 @@
 pkgname=python3-jupyter_client
 # delay 6.2 until jupyter/jupyter_console#241 is fixed
 version=6.1.12
-revision=1
+revision=2
 wrksrc="jupyter_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 67410c679eb084ae5039357675160e64d9a9ff9e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:10 -0400
Subject: [PATCH 0166/4088] python3-jupyter_nbformat: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index f8d21d621bd8..4bea7989e2a2 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_nbformat'
 pkgname=python3-jupyter_nbformat
 version=5.1.3
-revision=1
+revision=2
 wrksrc="nbformat-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4942c0cda11e44c75d493a478aed4a6ca8622a6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:54 -0400
Subject: [PATCH 0167/4088] glib: rebuild for Python 3.10

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

diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index ea4b41be9493..34f6bc335ff3 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
 version=2.70.0
-revision=1
+revision=2
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu

From 3e59e29909db24ef7164b321f97df9b98168a36e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:30 -0400
Subject: [PATCH 0168/4088] python3-Mako: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Mako/template b/srcpkgs/python3-Mako/template
index 3471982eec50..b1c004241344 100644
--- a/srcpkgs/python3-Mako/template
+++ b/srcpkgs/python3-Mako/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Mako'
 pkgname=python3-Mako
 version=1.1.3
-revision=3
+revision=4
 wrksrc="Mako-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From de6ef49a90a51d20ab3451add737060dd1f13964 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:30 -0400
Subject: [PATCH 0169/4088] python3-Markdown: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template
index 81c5774ad03c..3d770e28c651 100644
--- a/srcpkgs/python3-Markdown/template
+++ b/srcpkgs/python3-Markdown/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Markdown'
 pkgname=python3-Markdown
 version=3.3.4
-revision=1
+revision=2
 wrksrc="Markdown-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 73ce6a961075961a55f8f8cd9b48353402ebe70f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:01 -0400
Subject: [PATCH 0170/4088] python3-wheel: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-wheel/template b/srcpkgs/python3-wheel/template
index 6bca1423ba95..fcfb2a4ad57a 100644
--- a/srcpkgs/python3-wheel/template
+++ b/srcpkgs/python3-wheel/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-wheel'
 pkgname=python3-wheel
 version=0.37.0
-revision=1
+revision=2
 wrksrc="wheel-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1c11714ec5afbf807b4fd9a52f7209969fbf63ee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:13 -0400
Subject: [PATCH 0171/4088] talloc: rebuild for Python 3.10

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

diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template
index 8ad2baf8937a..dc22f69cee13 100644
--- a/srcpkgs/talloc/template
+++ b/srcpkgs/talloc/template
@@ -1,7 +1,7 @@
 # Template file for 'talloc'
 pkgname=talloc
 version=2.3.2
-revision=1
+revision=2
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"

From 39ff64c6385c865d4ad6cee684615f63033c4daf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:34 -0400
Subject: [PATCH 0172/4088] python3-Sphinx: rebuild for Python 3.10, update to
 4.2.0.

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

diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index 66798b38a2cc..8b0493c1f92c 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Sphinx'
 pkgname=python3-Sphinx
-version=4.1.1
+version=4.2.0
 revision=1
 wrksrc=Sphinx-${version}
 build_style=python3-module
@@ -18,7 +18,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://sphinx-doc.org"
 distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=23c846a1841af998cb736218539bb86d16f5eb95f5760b1966abcd2d584e62b8
+checksum=94078db9184491e15bce0a56d9186e0aec95f16ac20b12d00e06d4e36f1058a6
 conflicts="python-Sphinx>=0"
 
 post_install() {

From b7b7c52a8c9e44d196a45f4ad357f5ad68d75515 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:48 -0400
Subject: [PATCH 0173/4088] python3-commonmark: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-commonmark/template b/srcpkgs/python3-commonmark/template
index e09637ce8bb1..4c3f17d8ad71 100644
--- a/srcpkgs/python3-commonmark/template
+++ b/srcpkgs/python3-commonmark/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-commonmark'
 pkgname=python3-commonmark
 version=0.9.1
-revision=1
+revision=2
 wrksrc="commonmark-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b83f2e3e8e7c40a25fc80973423d99869e868e17 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:49 -0400
Subject: [PATCH 0174/4088] python3-cryptography: rebuild for Python 3.10,
 disable rust

The rust extension is a no-op and currently fails to cross build with
Python 3.10. For now, skip building the extension and hope upstream
makes this easy to fix by the time the rust extension becomes mandatory.
---
 srcpkgs/python3-cryptography/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index dafe1e84c0ef..495f4a69c954 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,11 +1,10 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.8
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
-build_helper="rust"
-hostmakedepends="python3-setuptools-rust python3-cffi cargo"
+hostmakedepends="python3-setuptools-rust python3-cffi"
 makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
@@ -18,11 +17,14 @@ changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
 checksum=94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c
 
-if [ "$CROSS_BUILD" ]; then
-	makedepends+=" rust-std"
-	export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
-	export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
-fi
+# The rust extension is a no-op designed to test build systems and,
+# for the moment, does not work properly with Python 3.10 on cross.
+# Hoepfully upstream tooling will make accommodating Python 3.10 trivial by the
+# time the rust extension actually does something.
+#
+# See, e.g., commit 58bc3876d33bfa5e37a21b5a4b27f016af387a76 to see how the
+# rust extension was built with Python 3.9.
+export CRYPTOGRAPHY_DONT_BUILD_RUST=1
 
 post_install() {
 	vlicense LICENSE

From ed1851627c22ad18c2806371e75847a4d74d637f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:24 -0400
Subject: [PATCH 0175/4088] python-pyasn1-modules: rebuild for Python 3.10

---
 srcpkgs/python-pyasn1-modules/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
index 918fad29aa5b..2f8fb331c8fc 100644
--- a/srcpkgs/python-pyasn1-modules/template
+++ b/srcpkgs/python-pyasn1-modules/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyasn1-modules'
 pkgname=python-pyasn1-modules
 version=0.2.8
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 pycompile_module="pyasn1_modules"

From b2b1438059f571f5b6d33ada22c47de1eec89463 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:07 -0400
Subject: [PATCH 0176/4088] python3-jaraco: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jaraco/template b/srcpkgs/python3-jaraco/template
index 8b6e8a695eaf..434e4257d2f9 100644
--- a/srcpkgs/python3-jaraco/template
+++ b/srcpkgs/python3-jaraco/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jaraco'
 pkgname=python3-jaraco
 version=1.0
-revision=2
+revision=3
 create_wrksrc=yes
 short_desc="Namespace package declaration for jaraco (Python3)"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"

From b607d2c9e528e15dc2b1b50dc37de8898d0314da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:17 -0400
Subject: [PATCH 0177/4088] python3-more-itertools: rebuild for Python 3.10

---
 srcpkgs/python3-more-itertools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 06c951436f06..7fd4b0d57728 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
 version=8.10.0
-revision=1
+revision=2
 wrksrc="more-itertools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7c46b6b058a2a6ac4bd788e46fbe040f6baad49c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:26 -0400
Subject: [PATCH 0178/4088] python-zope.interface: rebuild for Python 3.10

---
 srcpkgs/python-zope.interface/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 80db3610d040..94a22e87902e 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -1,7 +1,7 @@
 # Template file for 'python-zope.interface'
 pkgname=python-zope.interface
 version=5.4.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From a1eccbd310425588e73df2a1017d9bb4b55bb301 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:06 -0400
Subject: [PATCH 0179/4088] python3-ipython: rebuild for Python 3.10, update to
 7.28.0.

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

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index fd87ff30549b..23bfbeee1caf 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.27.0
+version=7.28.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13
+checksum=2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From 864a16e1ee438f8529afd872859b894aa39f3e56 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:42 -0400
Subject: [PATCH 0180/4088] python3-bleach: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index a9ddfd5e5bed..21fec4f4b37c 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bleach'
 pkgname=python3-bleach
 version=3.3.0
-revision=1
+revision=2
 wrksrc="bleach-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e3c7499fcb1a61c44d43c47cdb66e446b261f377 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:51 -0400
Subject: [PATCH 0181/4088] python3-defusedxml: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-defusedxml/template b/srcpkgs/python3-defusedxml/template
index 19e06abfac4e..06bdd57a3526 100644
--- a/srcpkgs/python3-defusedxml/template
+++ b/srcpkgs/python3-defusedxml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-defusedxml'
 pkgname=python3-defusedxml
 version=0.6.0
-revision=4
+revision=5
 wrksrc="defusedxml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From be247a1dd0f69e8a8d9a880996ea254ebd14a1cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:55 -0400
Subject: [PATCH 0182/4088] python3-entrypoints: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-entrypoints/template b/srcpkgs/python3-entrypoints/template
index eb3318811dc6..5448c4696239 100644
--- a/srcpkgs/python3-entrypoints/template
+++ b/srcpkgs/python3-entrypoints/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-entrypoints'
 pkgname=python3-entrypoints
 version=0.3
-revision=4
+revision=5
 wrksrc="entrypoints-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b7121fee9a7baf413f2c4a42295505fc5084341f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:11 -0400
Subject: [PATCH 0183/4088] python3-jupyterlab_pygments: rebuild for Python
 3.10

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

diff --git a/srcpkgs/python3-jupyterlab_pygments/template b/srcpkgs/python3-jupyterlab_pygments/template
index e0d031841387..ec17dd3105ac 100644
--- a/srcpkgs/python3-jupyterlab_pygments/template
+++ b/srcpkgs/python3-jupyterlab_pygments/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyterlab_pygments'
 pkgname=python3-jupyterlab_pygments
 version=0.1.2
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 86fe0483beb788352f15e9f236f9b7f820a260a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:16 -0400
Subject: [PATCH 0184/4088] python3-mistune: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
index d090f265beb7..4b77251e0de5 100644
--- a/srcpkgs/python3-mistune/template
+++ b/srcpkgs/python3-mistune/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mistune'
 pkgname=python3-mistune
 version=0.8.4
-revision=4
+revision=5
 wrksrc="mistune-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From affd1e587ec773f03fec93dcfa05451a724b05b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:20 -0400
Subject: [PATCH 0185/4088] python3-nbclient: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
index 2eb17dd17113..300561020279 100644
--- a/srcpkgs/python3-nbclient/template
+++ b/srcpkgs/python3-nbclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbclient'
 pkgname=python3-nbclient
 version=0.5.4
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From aa5ab10ee360a8d944741db5006f9972859d8afa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:24 -0400
Subject: [PATCH 0186/4088] python3-pandocfilters: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pandocfilters/template b/srcpkgs/python3-pandocfilters/template
index c65bae4be72d..7582d8704078 100644
--- a/srcpkgs/python3-pandocfilters/template
+++ b/srcpkgs/python3-pandocfilters/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandocfilters'
 pkgname=python3-pandocfilters
 version=1.4.3
-revision=1
+revision=2
 wrksrc="pandocfilters-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9f6774046ac8029f1f6d3c913a9ebcc990732b04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:54 -0400
Subject: [PATCH 0187/4088] python3-testpath: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-testpath/template b/srcpkgs/python3-testpath/template
index 55437453a717..8876a9f59d8e 100644
--- a/srcpkgs/python3-testpath/template
+++ b/srcpkgs/python3-testpath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-testpath'
 pkgname=python3-testpath
 version=0.4.4
-revision=1
+revision=2
 wrksrc="testpath-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 165427d1dd65a5e9e701d24b72fb6a05413702d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:56 -0400
Subject: [PATCH 0188/4088] gobject-introspection: rebuild for Python 3.10

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

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index e3561a3b6220..503c68e75c87 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,7 +1,7 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
 version=1.68.0
-revision=2
+revision=3
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
 hostmakedepends="flex pkg-config"

From ebb82b74baaf7044a0e92bee220dccff4d3e2feb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:44 -0400
Subject: [PATCH 0189/4088] python3-cairo: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cairo/template b/srcpkgs/python3-cairo/template
index 4d33cd8af84f..66542cb89449 100644
--- a/srcpkgs/python3-cairo/template
+++ b/srcpkgs/python3-cairo/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cairo'
 pkgname=python3-cairo
 version=1.20.1
-revision=2
+revision=3
 wrksrc="pycairo-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3"

From 0a86c4f95d829e60a634a9a7236fa619d3718ace Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:44 -0400
Subject: [PATCH 0190/4088] python3-cachetools: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cachetools/template b/srcpkgs/python3-cachetools/template
index 1d5bc5fc7e9a..8d499d2a7de8 100644
--- a/srcpkgs/python3-cachetools/template
+++ b/srcpkgs/python3-cachetools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cachetools'
 pkgname=python3-cachetools
 version=4.2.4
-revision=1
+revision=2
 wrksrc="cachetools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6f4d73d6311abc1cb6d2cc5be8b36d5cd56bbc37 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:45 -0400
Subject: [PATCH 0191/4088] python3-rsa: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-rsa/template b/srcpkgs/python3-rsa/template
index c6874c00e644..18c8328111f4 100644
--- a/srcpkgs/python3-rsa/template
+++ b/srcpkgs/python3-rsa/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rsa'
 pkgname=python3-rsa
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 025178ac36481336eb7f8180430354898e1be958 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:31 -0400
Subject: [PATCH 0192/4088] python3-protobuf: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index b9753ed5ed78..37af66f20ea2 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
 version=3.17.3
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-wheel"

From 9c44cf92d4d02c526b85fc021efad6aa884b9aec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:19 -0400
Subject: [PATCH 0193/4088] python-atomicwrites: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
index 869c5f61df16..ac7d786c6e5b 100644
--- a/srcpkgs/python-atomicwrites/template
+++ b/srcpkgs/python-atomicwrites/template
@@ -1,7 +1,7 @@
 # Template file for 'python-atomicwrites'
 pkgname=python-atomicwrites
 version=1.4.0
-revision=1
+revision=2
 wrksrc="atomicwrites-${version}"
 build_style=python-module
 pycompile_module="atomicwrites"

From aa952445ead2aad6a613423d777d2b017e633a97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:05 -0400
Subject: [PATCH 0194/4088] python3-iniconfig: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-iniconfig/template b/srcpkgs/python3-iniconfig/template
index 8f35b984210d..36b2fa5ea0ee 100644
--- a/srcpkgs/python3-iniconfig/template
+++ b/srcpkgs/python3-iniconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-iniconfig'
 pkgname=python3-iniconfig
 version=1.1.1
-revision=1
+revision=2
 wrksrc="iniconfig-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 446816cc21b03d532bba388e1cd97824490e1c60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:29 -0400
Subject: [PATCH 0195/4088] python3-pluggy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index 1f615db52172..efaa7e25d2a7 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pluggy'
 pkgname=python3-pluggy
 version=0.13.1
-revision=6
+revision=7
 wrksrc="pluggy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 3adadd91ed06344d92a311457466f1c232a82f04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:32 -0400
Subject: [PATCH 0196/4088] python3-py: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-py/template b/srcpkgs/python3-py/template
index 2a4b54a501bf..ee7565758955 100644
--- a/srcpkgs/python3-py/template
+++ b/srcpkgs/python3-py/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-py'
 pkgname=python3-py
 version=1.10.0
-revision=1
+revision=2
 wrksrc="py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 4b32a54c0182232becbedce6213ddfb50f22c837 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:21 -0400
Subject: [PATCH 0197/4088] python-dbus: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index b190d8499bf7..884d001dcef8 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
 version=1.2.16
-revision=3
+revision=4
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config python-devel python3-devel"
@@ -69,7 +69,7 @@ python-dbus-devel_package() {
 }
 python3-dbus-devel_package() {
 	depends="python3-devel python3-dbus>=${version}_${revision}"
-	short_desc+=" - development files"
+	short_desc="${short_desc/Python2/Python3} - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From 97dbeb0ab056f565aeb72032b05385604503b031 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Sep 2021 20:17:15 -0400
Subject: [PATCH 0198/4088] automake: update to 1.16.4.

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

diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template
index 90dfe1f403e4..8cfdccb2b91a 100644
--- a/srcpkgs/automake/template
+++ b/srcpkgs/automake/template
@@ -1,8 +1,8 @@
 # Template file for 'automake'
 # NOTE: also update common/environment/configure/automake when updating!
 pkgname=automake
-version=1.16.2
-revision=2
+version=1.16.4
+revision=1
 build_style=gnu-configure
 make_check_args="${makejobs}"
 hostmakedepends="perl autoconf"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnu.org/software/automake"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0
+checksum=80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d
 
 pre_check() {
 	# taken from http://www.linuxfromscratch.org/lfs/view/development/chapter06/automake.html

From 53e4897f52025194ae69c8c8f23e4e9e6490162c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:13 -0400
Subject: [PATCH 0199/4088] tdb: rebuild for Python 3.10

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

diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template
index 87f0b211a05b..a542437b9699 100644
--- a/srcpkgs/tdb/template
+++ b/srcpkgs/tdb/template
@@ -1,7 +1,7 @@
 # Template file for 'tdb'
 pkgname=tdb
 version=1.4.3
-revision=1
+revision=2
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"

From 15e1d9b78cfc86ac9f5f55b1a161edf794433775 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:14 -0400
Subject: [PATCH 0200/4088] tevent: rebuild for Python 3.10

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

diff --git a/srcpkgs/tevent/template b/srcpkgs/tevent/template
index 731d707efaaa..1d05c275ebd2 100644
--- a/srcpkgs/tevent/template
+++ b/srcpkgs/tevent/template
@@ -1,7 +1,7 @@
 # Template file for 'tevent'
 pkgname=tevent
 version=0.10.2
-revision=2
+revision=3
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"

From 4677139030d0d3f6f9b4841e95021f682d19450f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:43 -0400
Subject: [PATCH 0201/4088] python3-recommonmark: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-recommonmark/template b/srcpkgs/python3-recommonmark/template
index f7dca68d6cf4..1240bcfe2639 100644
--- a/srcpkgs/python3-recommonmark/template
+++ b/srcpkgs/python3-recommonmark/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-recommonmark'
 pkgname=python3-recommonmark
 version=0.7.1
-revision=1
+revision=2
 wrksrc="recommonmark-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-commonmark python3-docutils

From 90051c34fbd4c9af1a008b8739d8e5a6884ea91d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:51 -0400
Subject: [PATCH 0202/4088] python3-sphinx-automodapi: rebuild for Python 3.10

---
 srcpkgs/python3-sphinx-automodapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sphinx-automodapi/template b/srcpkgs/python3-sphinx-automodapi/template
index 4e9469318a9e..0544d59d435f 100644
--- a/srcpkgs/python3-sphinx-automodapi/template
+++ b/srcpkgs/python3-sphinx-automodapi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinx-automodapi'
 pkgname=python3-sphinx-automodapi
 version=0.13
-revision=1
+revision=2
 wrksrc="sphinx-automodapi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 24f93df0f2bdc0a633fcd2cecd3b9034371171e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:19 -0400
Subject: [PATCH 0203/4088] python-PyHamcrest: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
index ddb560675b3a..34b26e0dfd48 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python-PyHamcrest/template
@@ -1,7 +1,7 @@
 # Template file for 'python-PyHamcrest'
 pkgname=python-PyHamcrest
 version=1.9.0
-revision=4
+revision=5
 wrksrc="PyHamcrest-${version}"
 build_style=python-module
 pycompile_module="hamcrest"

From 873d52b2032047ee2b22897d2b2a25635370b1af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:20 -0400
Subject: [PATCH 0204/4088] python-automat: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index 74c3ef1cafeb..3487b14abce8 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -1,7 +1,7 @@
 # Template file for 'python-automat'
 pkgname=python-automat
 version=20.2.0
-revision=3
+revision=4
 wrksrc="Automat-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 4666a80d72349e91fe96f9bd5ce1d3c5713dfd73 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:21 -0400
Subject: [PATCH 0205/4088] python-constantly: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
index 1686c863022a..51d9a9f25fef 100644
--- a/srcpkgs/python-constantly/template
+++ b/srcpkgs/python-constantly/template
@@ -1,7 +1,7 @@
 # Template file for 'python-constantly'
 pkgname=python-constantly
 version=15.1.0
-revision=5
+revision=6
 wrksrc="constantly-${version}"
 build_style=python-module
 pycompile_module="constantly"

From 124eac251c9088910c772e76737767cc6dfd3a7d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:22 -0400
Subject: [PATCH 0206/4088] python-hyperlink: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 412cc5c0fb46..710b8eb13db8 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -1,7 +1,7 @@
 # Template file for 'python-hyperlink'
 pkgname=python-hyperlink
 version=21.0.0
-revision=1
+revision=2
 wrksrc="hyperlink-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 3a6679e47cca51c34ab43aad86e6106f01aca0c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:22 -0400
Subject: [PATCH 0207/4088] python-incremental: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
index b5248b29eb39..693613085c17 100644
--- a/srcpkgs/python-incremental/template
+++ b/srcpkgs/python-incremental/template
@@ -1,7 +1,7 @@
 # Template file for 'python-incremental'
 pkgname=python-incremental
 version=17.5.0
-revision=5
+revision=6
 wrksrc="incremental-${version}"
 build_style=python-module
 pycompile_module="incremental"

From dd5a7c0a02acb9920e734a48a824883f7e292097 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:23 -0400
Subject: [PATCH 0208/4088] python-openssl: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
index 266e3326b8c8..60f32336e39d 100644
--- a/srcpkgs/python-openssl/template
+++ b/srcpkgs/python-openssl/template
@@ -1,7 +1,7 @@
 # Template file for 'python-openssl'
 pkgname=python-openssl
 version=20.0.1
-revision=1
+revision=2
 wrksrc="pyOpenSSL-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 136ff240329dcd4e62a23c20323d3beeda94b8db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:25 -0400
Subject: [PATCH 0209/4088] python-service_identity: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
index 18055c2d455f..b0cb27dfbea1 100644
--- a/srcpkgs/python-service_identity/template
+++ b/srcpkgs/python-service_identity/template
@@ -1,7 +1,7 @@
 # Template file for 'python-service_identity'
 pkgname=python-service_identity
 version=18.1.0
-revision=4
+revision=5
 wrksrc="service_identity-${version}"
 build_style=python-module
 pycompile_module="service_identity"

From fb3c81b103cbe2768d6134a0ca92eba3b7f3d1cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:18 -0400
Subject: [PATCH 0210/4088] python3-multidict: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template
index cf8c58a161f4..ab9ae4f46f0a 100644
--- a/srcpkgs/python3-multidict/template
+++ b/srcpkgs/python3-multidict/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-multidict'
 pkgname=python3-multidict
 version=5.1.0
-revision=1
+revision=2
 wrksrc="multidict-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3504cc321117b91a00599a4572ecab2b76a86528 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:10 -0400
Subject: [PATCH 0211/4088] sip: rebuild for Python 3.10

---
 srcpkgs/sip/patches/python310.patch | 8 ++++++++
 srcpkgs/sip/template                | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sip/patches/python310.patch

diff --git a/srcpkgs/sip/patches/python310.patch b/srcpkgs/sip/patches/python310.patch
new file mode 100644
index 000000000000..066b665a7eb1
--- /dev/null
+++ b/srcpkgs/sip/patches/python310.patch
@@ -0,0 +1,8 @@
+--- ./sipbuild/py_versions.py.orig	2021-09-25 21:37:44.381213255 -0400
++++ ./sipbuild/py_versions.py	2021-09-25 21:38:00.904208911 -0400
+@@ -23,4 +23,4 @@
+ 
+ # The first and last supported minor versions of Python v3.
+ FIRST_SUPPORTED_MINOR = 6
+-LAST_SUPPORTED_MINOR = 9
++LAST_SUPPORTED_MINOR = 10
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..ea60d37cab72 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,7 +1,7 @@
 # Template file for 'sip'
 pkgname=sip
 version=6.1.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
 makedepends="python3-devel"

From c24040de9567a3944aff538f631570c55fd03de8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:08 -0400
Subject: [PATCH 0212/4088] python3-jaraco.functools: rebuild for Python 3.10

---
 srcpkgs/python3-jaraco.functools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jaraco.functools/template b/srcpkgs/python3-jaraco.functools/template
index 1624a6ad6893..543cd11ec3b8 100644
--- a/srcpkgs/python3-jaraco.functools/template
+++ b/srcpkgs/python3-jaraco.functools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jaraco.functools'
 pkgname=python3-jaraco.functools
 version=3.3.0
-revision=1
+revision=2
 wrksrc="jaraco.functools-${version}"
 build_style=python3-module
 make_check_args="--override-ini='addopts=--doctest-modules'"

From 88ed3e038dc6c410db69a84a1ed62472d53ef24e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:05 -0400
Subject: [PATCH 0213/4088] python3-zope.proxy: rebuild for Python 3.10

---
 srcpkgs/python3-zope.proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.proxy/template b/srcpkgs/python3-zope.proxy/template
index a0e39907399e..6bbfc210da6c 100644
--- a/srcpkgs/python3-zope.proxy/template
+++ b/srcpkgs/python3-zope.proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.proxy'
 pkgname=python3-zope.proxy
 version=4.4.0
-revision=1
+revision=2
 wrksrc="zope.proxy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From 135f1fde766b417e4d6ffa62dbc3759ce2223942 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:05 -0400
Subject: [PATCH 0214/4088] python3-zope.event: rebuild for Python 3.10

---
 srcpkgs/python3-zope.event/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.event/template b/srcpkgs/python3-zope.event/template
index 7b26600c0db7..7ab88b3cae60 100644
--- a/srcpkgs/python3-zope.event/template
+++ b/srcpkgs/python3-zope.event/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.event'
 pkgname=python3-zope.event
 version=4.5.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 pycompile_module="zope/event"

From 2f38300f1b745468fef99d45471052b99903a41c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:39 -0400
Subject: [PATCH 0215/4088] python3-argon2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-argon2/template b/srcpkgs/python3-argon2/template
index c81d31cced10..69f47924ad19 100644
--- a/srcpkgs/python3-argon2/template
+++ b/srcpkgs/python3-argon2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-argon2'
 pkgname=python3-argon2
 version=19.2.0
-revision=2
+revision=3
 wrksrc="argon2-cffi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"

From d9c852b107cc0f3144299cf7cff4a11e15bdd2aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:06 -0400
Subject: [PATCH 0216/4088] python3-ipython_ipykernel: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 4cf95a85c8d6..f00e0a3f1a0c 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ipython_ipykernel'
 pkgname=python3-ipython_ipykernel
 version=5.5.4
-revision=1
+revision=2
 wrksrc="ipykernel-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-ipython

From e9eaf40cec37236a48bba33f5de0dd6061d65322 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:10 -0400
Subject: [PATCH 0217/4088] python3-jupyter_nbconvert: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index 59d7d2c5014a..ee8f7f8ba368 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_nbconvert'
 pkgname=python3-jupyter_nbconvert
 version=6.0.7
-revision=1
+revision=2
 wrksrc="nbconvert-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7c330fcc802a5e48ef6d8cd480dd40fd2f759458 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:31 -0400
Subject: [PATCH 0218/4088] python3-prometheus_client: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-prometheus_client/template b/srcpkgs/python3-prometheus_client/template
index 5a182223be45..82e4da1f3edd 100644
--- a/srcpkgs/python3-prometheus_client/template
+++ b/srcpkgs/python3-prometheus_client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prometheus_client'
 pkgname=python3-prometheus_client
 version=0.9.0
-revision=1
+revision=2
 wrksrc="prometheus_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 989dac9eda832bd12a201e932e79c2afe00eb617 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:47 -0400
Subject: [PATCH 0219/4088] python3-send2trash: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-send2trash/template b/srcpkgs/python3-send2trash/template
index 8ef320362a7e..8768c2c98264 100644
--- a/srcpkgs/python3-send2trash/template
+++ b/srcpkgs/python3-send2trash/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-send2trash'
 pkgname=python3-send2trash
 version=1.5.0
-revision=4
+revision=5
 wrksrc="send2trash-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 162fad255bc61581b19364d5c875f2fada854ba8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:54 -0400
Subject: [PATCH 0220/4088] python3-terminado: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-terminado/template b/srcpkgs/python3-terminado/template
index 4dbe5964dd38..28c65c82ba99 100644
--- a/srcpkgs/python3-terminado/template
+++ b/srcpkgs/python3-terminado/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-terminado'
 pkgname=python3-terminado
 version=0.9.4
-revision=1
+revision=2
 wrksrc="terminado-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c236c662e5a23b122c388afb06ce5b33d679f397 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:20 -0400
Subject: [PATCH 0221/4088] python-bcrypt: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-bcrypt/template b/srcpkgs/python-bcrypt/template
index 7a92d94e8f11..fdb27f491892 100644
--- a/srcpkgs/python-bcrypt/template
+++ b/srcpkgs/python-bcrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'python-bcrypt'
 pkgname=python-bcrypt
 version=3.2.0
-revision=1
+revision=2
 wrksrc="bcrypt-${version}"
 build_style=python-module
 pycompile_module="bcrypt"

From 991785316df75ac253f3ad6cbc6622f20b990a22 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:36 -0400
Subject: [PATCH 0222/4088] python3-pynacl: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pynacl/template b/srcpkgs/python3-pynacl/template
index 387a34e121a5..1ad1ea06883f 100644
--- a/srcpkgs/python3-pynacl/template
+++ b/srcpkgs/python3-pynacl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynacl'
 pkgname=python3-pynacl
 version=1.4.0
-revision=1
+revision=2
 wrksrc="PyNaCl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi python3-wheel"

From 33a37baadc2b41ded5a6833701e08d6af9d135e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:50 -0400
Subject: [PATCH 0223/4088] python3-sniffio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-sniffio/template b/srcpkgs/python3-sniffio/template
index 6481ea76e58c..0f0eeca23b65 100644
--- a/srcpkgs/python3-sniffio/template
+++ b/srcpkgs/python3-sniffio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sniffio'
 pkgname=python3-sniffio
 version=1.2.0
-revision=1
+revision=2
 wrksrc="sniffio-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 88636f7d8eaa5e8835759924eae312dcbf53016e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:42 -0400
Subject: [PATCH 0224/4088] boost: rebuild for Python 3.10

---
 common/shlibs                         |  2 +-
 srcpkgs/boost/patches/exec_file.patch | 45 +++++++++++++++++++++++++++
 srcpkgs/boost/template                |  2 +-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/boost/patches/exec_file.patch

diff --git a/common/shlibs b/common/shlibs
index 4e7b70f6b161..458f7dfcd128 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -644,7 +644,7 @@ libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
 libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
 libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
 libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python39.so.1.72.0 boost-python3-1.72-1.72.0_4
+libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
 libexempi.so.8 exempi-2.5.0_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
new file mode 100644
index 000000000000..b1b0ef969c4d
--- /dev/null
+++ b/srcpkgs/boost/patches/exec_file.patch
@@ -0,0 +1,45 @@
+From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
+From: Pat Riehecky <riehecky@fnal.gov>
+Date: Mon, 29 Jun 2020 10:51:58 -0500
+Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
+
+ [
+  Ed.: Paths were adapted from upstream commit
+  https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
+ ]
+
+---
+ src/exec.cpp | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
+index 171c6f4189..b2eabe59f6 100644
+--- a/libs/python/src/exec.cpp
++++ b/libs/python/src/exec.cpp
+@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
+   if (local.is_none()) local = global;
+   // should be 'char const *' but older python versions don't use 'const' yet.
+   char *f = const_cast<char *>(filename);
+-  // Let python open the file to avoid potential binary incompatibilities.
+-#if PY_VERSION_HEX >= 0x03040000
+-  FILE *fs = _Py_fopen(f, "r");
++#if PY_VERSION_HEX >= 0x03010000
++  // Let python manage any UTF bits to avoid potential incompatibilities.
++  PyObject *fo = Py_BuildValue("s", f);
++  PyObject *fb = Py_None;
++  PyUnicode_FSConverter(fo, &fb);
++  f = PyBytes_AsString(fb);
++  FILE *fs = fopen(f, "r");
++  Py_DECREF(fo);
++  Py_DECREF(fb);
+ #elif PY_VERSION_HEX >= 0x03000000
++  // Let python open the file to avoid potential binary incompatibilities.
+   PyObject *fo = Py_BuildValue("s", f);
+-  FILE *fs = _Py_fopen(fo, "r");
++  FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
+   Py_DECREF(fo);
+ #else
++  // Let python open the file to avoid potential binary incompatibilities.
+   PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
+   if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
+   python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..f5881e536bdd 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=6
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"

From d4493899b69810a681adeb1f069b0bcda07f1a80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:45 -0400
Subject: [PATCH 0225/4088] python3-cheetah3: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cheetah3/template b/srcpkgs/python3-cheetah3/template
index 060110a29e1e..1c07bcc8bcbb 100644
--- a/srcpkgs/python3-cheetah3/template
+++ b/srcpkgs/python3-cheetah3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cheetah3'
 pkgname=python3-cheetah3
 version=3.2.6.post2
-revision=1
+revision=2
 wrksrc="Cheetah3-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9e2adfd72948c2d7c6f2dcafff52756e0857e749 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:59 -0400
Subject: [PATCH 0226/4088] python3-gobject: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 851af74f1da4..22ae460c9125 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
 version=3.40.1
-revision=1
+revision=2
 wrksrc="pygobject-${version}"
 build_style=meson
 build_helper="gir"

From 63e01594b6ea40dadbda51958d45f9c7bbdcc9e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:08 -0400
Subject: [PATCH 0227/4088] python3-jeepney: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jeepney/template b/srcpkgs/python3-jeepney/template
index 05b7e257510e..c298448e8113 100644
--- a/srcpkgs/python3-jeepney/template
+++ b/srcpkgs/python3-jeepney/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jeepney'
 pkgname=python3-jeepney
 version=0.7.1
-revision=1
+revision=2
 wrksrc="jeepney-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7b8eeacbf581aca50061bdeec2bc1982e3f5f5c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:04 -0400
Subject: [PATCH 0228/4088] python3-zipp: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python3-zipp/template
index 13184b489e2f..533846c48784 100644
--- a/srcpkgs/python3-zipp/template
+++ b/srcpkgs/python3-zipp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zipp'
 pkgname=python3-zipp
 version=3.5.0
-revision=1
+revision=2
 wrksrc="zipp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From fa7b719895c21a273cd06595693fe16ef938ef22 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:00 -0400
Subject: [PATCH 0229/4088] python3-google-auth: rebuild for Python 3.10

---
 srcpkgs/python3-google-auth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-auth/template b/srcpkgs/python3-google-auth/template
index 880bb0441a1e..575d15989017 100644
--- a/srcpkgs/python3-google-auth/template
+++ b/srcpkgs/python3-google-auth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-auth'
 pkgname=python3-google-auth
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d88202e9abc4f1e7df79239c543a75f22b6fe597 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:00 -0400
Subject: [PATCH 0230/4088] python3-googleapis-common-protos: rebuild for
 Python 3.10

---
 srcpkgs/python3-googleapis-common-protos/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-googleapis-common-protos/template b/srcpkgs/python3-googleapis-common-protos/template
index 8b3c309b55d4..3a2dad8720bb 100644
--- a/srcpkgs/python3-googleapis-common-protos/template
+++ b/srcpkgs/python3-googleapis-common-protos/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-googleapis-common-protos'
 pkgname=python3-googleapis-common-protos
 version=1.53.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d7c531c23872ff51fc6ff70523bfa3c2314ded27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:03 -0400
Subject: [PATCH 0231/4088] python3-httplib2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-httplib2/template b/srcpkgs/python3-httplib2/template
index f3f1fe63a159..d0c39a478622 100644
--- a/srcpkgs/python3-httplib2/template
+++ b/srcpkgs/python3-httplib2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-httplib2'
 pkgname=python3-httplib2
 version=0.18.1
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="httplib2-${version}"
 build_style=python3-module

From 0e9dd9fc589ae9f0015369bc4b2f66aa5d6ddbb1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:44 -0400
Subject: [PATCH 0232/4088] python3-breathe: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index 0addde334a7d..ac3f3bdf6fd7 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
 version=4.31.0
-revision=1
+revision=2
 wrksrc="breathe-${version}"
 build_style=python3-module
 _pyreqs="python3-Sphinx python3-docutils python3-six"

From 2ff0fc9d259cf0a1d42083a26d2b592f8008ad50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0233/4088] python3-pytest: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index c381df973ba8..9db1ca76408e 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest'
 pkgname=python3-pytest
 version=6.2.5
-revision=1
+revision=2
 wrksrc="pytest-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-Sphinx"

From a4ca3ff8a9f81a0c41a07cc8185444ca35732653 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:51 -0400
Subject: [PATCH 0234/4088] python3-sphinx_rtd_theme: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-sphinx_rtd_theme/template b/srcpkgs/python3-sphinx_rtd_theme/template
index 3884255d0197..ed49f8a00c51 100644
--- a/srcpkgs/python3-sphinx_rtd_theme/template
+++ b/srcpkgs/python3-sphinx_rtd_theme/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinx_rtd_theme'
 pkgname=python3-sphinx_rtd_theme
 version=0.5.0
-revision=2
+revision=3
 wrksrc="sphinx_rtd_theme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 83f0b3dd8013afb01f73d07a9d3758adf21d65df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:47 -0400
Subject: [PATCH 0235/4088] python3-click: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template
index 71c8e0fc0b84..2583a95cc4ad 100644
--- a/srcpkgs/python3-click/template
+++ b/srcpkgs/python3-click/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-click'
 pkgname=python3-click
 version=7.1.2
-revision=4
+revision=5
 wrksrc="click-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 6abd1c58b8241f0e79b735502ae7676a4332a841 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:35 -0400
Subject: [PATCH 0236/4088] python3-Werkzeug: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
index acf4629d74aa..54ed4fbed49b 100644
--- a/srcpkgs/python3-Werkzeug/template
+++ b/srcpkgs/python3-Werkzeug/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Werkzeug'
 pkgname=python3-Werkzeug
 version=2.0.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fffd94473607463c5cf14dbae049eded689c033d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:07 -0400
Subject: [PATCH 0237/4088] python3-itsdangerous: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-itsdangerous/template b/srcpkgs/python3-itsdangerous/template
index b86d8c5a515a..6fa31a0342fd 100644
--- a/srcpkgs/python3-itsdangerous/template
+++ b/srcpkgs/python3-itsdangerous/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-itsdangerous'
 pkgname=python3-itsdangerous
 version=2.0.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5966eef1081758eb37da2108377113b971383158 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:21 -0400
Subject: [PATCH 0238/4088] python3-notify2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-notify2/template b/srcpkgs/python3-notify2/template
index aa119e4ffb25..ca5b755fc203 100644
--- a/srcpkgs/python3-notify2/template
+++ b/srcpkgs/python3-notify2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-notify2'
 pkgname=python3-notify2
 version=0.3.1
-revision=3
+revision=4
 wrksrc="notify2-${version}"
 build_style=python3-module
 hostmakedepends="python3"

From 2dda549651d81bbdb9a7927ee9f7e4e44e724bf6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:31 -0400
Subject: [PATCH 0239/4088] python3-psutil: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template
index e8f18070ff1a..6300f47b363d 100644
--- a/srcpkgs/python3-psutil/template
+++ b/srcpkgs/python3-psutil/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-psutil'
 pkgname=python3-psutil
 version=5.8.0
-revision=1
+revision=2
 wrksrc="psutil-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5d116569f43b9cca077f32278097090bac6b0d69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:54 -0400
Subject: [PATCH 0240/4088] glusterfs: rebuild for Python 3.10

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

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 93fd87eeda76..da372c56c5fb 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=9.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no

From 50aac3ff9ed2639b518ee5258704e7da587370ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:02 -0400
Subject: [PATCH 0241/4088] ldb: rebuild for Python 3.10

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

diff --git a/srcpkgs/ldb/template b/srcpkgs/ldb/template
index 8843e391d86c..6bcb57c6ba24 100644
--- a/srcpkgs/ldb/template
+++ b/srcpkgs/ldb/template
@@ -1,7 +1,7 @@
 # Template file for 'ldb'
 pkgname=ldb
 version=2.3.0
-revision=1
+revision=2
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"

From 34b75d6adb1ae00d50d73fd05e65ca493812ea4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:06 -0400
Subject: [PATCH 0242/4088] llvm12: rebuild for Python 3.10

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

diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template
index b4aa30e6d39d..7ce18028e4a3 100644
--- a/srcpkgs/llvm12/template
+++ b/srcpkgs/llvm12/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm12'
 pkgname=llvm12
 version=12.0.1
-revision=1
+revision=2
 wrksrc="llvm-project-${version}.src"
 build_wrksrc=llvm
 build_style=cmake

From 0471a2898fe6a986c71cae97e38eeb801aaad49f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:22 -0400
Subject: [PATCH 0243/4088] python3-numpy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4376f301edad 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
 version=1.21.2
-revision=1
+revision=2
 wrksrc="numpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"

From df5995e5993fd8ce9546901ad0bd7623f456647c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:54 -0400
Subject: [PATCH 0244/4088] python3-elementpath: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..0a7bbe9ad3c9 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
 version=2.2.3
-revision=1
+revision=2
 wrksrc=elementpath-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5b8d36d05ca9344c3156578067134ee1cc056fce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:57 -0400
Subject: [PATCH 0245/4088] python3-frozendict: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 3f43b3945b4b..274f14db49f9 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
 version=1.2
-revision=3
+revision=4
 wrksrc="frozendict-${version}"
 build_style=python3-module
 pycompile_module="frozendict"

From 8459b9af17d20f50f2838c570d9fbb1bd3394f3f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:49 -0400
Subject: [PATCH 0246/4088] python3-simplejson: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-simplejson/template b/srcpkgs/python3-simplejson/template
index 5c6818d8b486..f59717c0672b 100644
--- a/srcpkgs/python3-simplejson/template
+++ b/srcpkgs/python3-simplejson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simplejson'
 pkgname=python3-simplejson
 version=3.17.2
-revision=1
+revision=2
 wrksrc="simplejson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From adf7884a0bb394dbc100a54a479c95b27075b171 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:19 -0400
Subject: [PATCH 0247/4088] python-Twisted: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-Twisted/template b/srcpkgs/python-Twisted/template
index 5371c036a049..93560162f8fc 100644
--- a/srcpkgs/python-Twisted/template
+++ b/srcpkgs/python-Twisted/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Twisted'
 pkgname=python-Twisted
 version=20.3.0
-revision=2
+revision=3
 wrksrc="Twisted-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools

From 2c3ea6854416244014a915e4fe6f37f80122c151 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:09 -0400
Subject: [PATCH 0248/4088] python3-josepy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index 048606e2d7c7..2e08d8f0dbf3 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
 version=1.8.0
-revision=1
+revision=2
 wrksrc="josepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 39295dfbdc1b925cb3fbc3ad7cccc87c7f922283 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:38 -0400
Subject: [PATCH 0249/4088] python3-pyrfc3339: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyrfc3339/template b/srcpkgs/python3-pyrfc3339/template
index 1ec462102e42..f32a7f66df96 100644
--- a/srcpkgs/python3-pyrfc3339/template
+++ b/srcpkgs/python3-pyrfc3339/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrfc3339'
 pkgname=python3-pyrfc3339
 version=1.1
-revision=4
+revision=5
 wrksrc="pyRFC3339-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c895cdd23656984aeb898af5e92b5c3c70d8ad1d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:44 -0400
Subject: [PATCH 0250/4088] python3-requests-toolbelt: rebuild for Python 3.10

---
 srcpkgs/python3-requests-toolbelt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-requests-toolbelt/template b/srcpkgs/python3-requests-toolbelt/template
index 436cb5e69979..4e7af0c8492d 100644
--- a/srcpkgs/python3-requests-toolbelt/template
+++ b/srcpkgs/python3-requests-toolbelt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-toolbelt'
 pkgname=python3-requests-toolbelt
 version=0.9.1
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 781870529ee09c822b54c339c1d9a320cd0bf5bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:43 -0400
Subject: [PATCH 0251/4088] python3-boltons: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-boltons/template b/srcpkgs/python3-boltons/template
index a4c71fb7713d..4637d296b390 100644
--- a/srcpkgs/python3-boltons/template
+++ b/srcpkgs/python3-boltons/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-boltons'
 pkgname=python3-boltons
 version=20.2.1
-revision=1
+revision=2
 wrksrc="boltons-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c9e09647dfc4321f5e3412db1ef76c0bcd05e687 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:40 -0400
Subject: [PATCH 0252/4088] python3-async-timeout: rebuild for Python 3.10

---
 srcpkgs/python3-async-timeout/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template
index bcc7fc170487..1c4a46d1a0de 100644
--- a/srcpkgs/python3-async-timeout/template
+++ b/srcpkgs/python3-async-timeout/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-async-timeout'
 pkgname=python3-async-timeout
 version=3.0.1
-revision=3
+revision=4
 wrksrc="async-timeout-${version}"
 build_style=python3-module
 pycompile_module="async_timeout"

From ec2a2fd8d728c5218a4e0ff92c41aa07e900dfa4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:03 -0400
Subject: [PATCH 0253/4088] python3-yarl: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template
index 5f8235a90166..a98eebdcbbd1 100644
--- a/srcpkgs/python3-yarl/template
+++ b/srcpkgs/python3-yarl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yarl'
 pkgname=python3-yarl
 version=1.6.3
-revision=1
+revision=2
 wrksrc="yarl-${version}"
 build_style=python3-module
 pycompile_module="yarl"

From ecb53c45cc45cde2a64e8be7ce22626bd314f2d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:32 -0400
Subject: [PATCH 0254/4088] python3-PyQt-builder: rebuild for Python 3.10

---
 srcpkgs/python3-PyQt-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 58d5ad28db8b..5e9833dbc98d 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
 version=1.10.0
-revision=1
+revision=2
 wrksrc=PyQt-builder-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools sip"

From aaf8837a809d5483a51975e9c05c778f6eef16b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:49 -0400
Subject: [PATCH 0255/4088] python3-sip-PyQt5: rebuild for Python 3.10

---
 srcpkgs/python3-sip-PyQt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index efc715a7f910..4269510b5425 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sip-PyQt5'
 pkgname=python3-sip-PyQt5
 version=12.9.0
-revision=1
+revision=2
 wrksrc="PyQt5_sip-$version"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools sip"

From bc5c8807a94fbf282c7c8720785bbc74bcdfaf89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:07 -0400
Subject: [PATCH 0256/4088] python3-jaraco.classes: rebuild for Python 3.10

---
 srcpkgs/python3-jaraco.classes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jaraco.classes/template b/srcpkgs/python3-jaraco.classes/template
index 162a4a994134..1c0f76247a63 100644
--- a/srcpkgs/python3-jaraco.classes/template
+++ b/srcpkgs/python3-jaraco.classes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jaraco.classes'
 pkgname=python3-jaraco.classes
 version=3.1.0
-revision=3
+revision=4
 wrksrc="jaraco.classes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 500f85b2ebd918c53f45880340944cd5d3923edf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:08 -0400
Subject: [PATCH 0257/4088] python3-jaraco.text: rebuild for Python 3.10

---
 srcpkgs/python3-jaraco.text/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jaraco.text/template b/srcpkgs/python3-jaraco.text/template
index c8e03b56e644..bc551cdabe7f 100644
--- a/srcpkgs/python3-jaraco.text/template
+++ b/srcpkgs/python3-jaraco.text/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jaraco.text'
 pkgname=python3-jaraco.text
 version=3.2.0
-revision=3
+revision=4
 wrksrc="jaraco.text-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 3cab2cb873732a6dbcaffe6defe402c6f152396d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:53 -0400
Subject: [PATCH 0258/4088] python3-tempora: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tempora/template b/srcpkgs/python3-tempora/template
index 18d11536ffa8..2b9efced6fd2 100644
--- a/srcpkgs/python3-tempora/template
+++ b/srcpkgs/python3-tempora/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tempora'
 pkgname=python3-tempora
 version=4.1.1
-revision=1
+revision=2
 wrksrc="tempora-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From f45872c83995afafd22b9304173338a0d6d4fc3a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:01 -0400
Subject: [PATCH 0259/4088] python3-websocket-client: rebuild for Python 3.10

---
 srcpkgs/python3-websocket-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-websocket-client/template b/srcpkgs/python3-websocket-client/template
index ecc47dca1e55..d17a8ceea810 100644
--- a/srcpkgs/python3-websocket-client/template
+++ b/srcpkgs/python3-websocket-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-websocket-client'
 pkgname=python3-websocket-client
 version=1.2.1
-revision=1
+revision=2
 wrksrc="websocket-client-${version}"
 build_style=python3-module
 make_check_target="websocket/tests"

From 79efff88f6d0a2a9373fe9a40f877e6aad5b0c14 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:04 -0400
Subject: [PATCH 0260/4088] python3-zope.deferredimport: rebuild for Python
 3.10

---
 srcpkgs/python3-zope.deferredimport/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.deferredimport/template b/srcpkgs/python3-zope.deferredimport/template
index 81f6fbb9de78..90a24728c62c 100644
--- a/srcpkgs/python3-zope.deferredimport/template
+++ b/srcpkgs/python3-zope.deferredimport/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.deferredimport'
 pkgname=python3-zope.deferredimport
 version=4.3.1
-revision=3
+revision=4
 wrksrc="zope.deferredimport-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a9e44e643e2a83491ef09932624d7285f4e97d61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:04 -0400
Subject: [PATCH 0261/4088] python3-zope.deprecation: rebuild for Python 3.10

---
 srcpkgs/python3-zope.deprecation/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.deprecation/template b/srcpkgs/python3-zope.deprecation/template
index 44a2ce865608..b3b526cfa6cc 100644
--- a/srcpkgs/python3-zope.deprecation/template
+++ b/srcpkgs/python3-zope.deprecation/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.deprecation'
 pkgname=python3-zope.deprecation
 version=4.4.0
-revision=4
+revision=5
 wrksrc="zope.deprecation-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ae8d0b4e2740cb603db9d7d79731da09cff129be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:05 -0400
Subject: [PATCH 0262/4088] python3-zope.hookable: rebuild for Python 3.10

---
 srcpkgs/python3-zope.hookable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.hookable/template b/srcpkgs/python3-zope.hookable/template
index ac11541b1e98..f98688bafe0c 100644
--- a/srcpkgs/python3-zope.hookable/template
+++ b/srcpkgs/python3-zope.hookable/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.hookable'
 pkgname=python3-zope.hookable
 version=5.1.0
-revision=1
+revision=2
 wrksrc="zope.hookable-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 69b64939db5fd2d13f7b80e2f62f26d46700ebb3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:05 -0400
Subject: [PATCH 0263/4088] python3-zope.i18nmessageid: rebuild for Python 3.10

---
 srcpkgs/python3-zope.i18nmessageid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.i18nmessageid/template b/srcpkgs/python3-zope.i18nmessageid/template
index 53e4600ded4a..80ea1d4d9b77 100644
--- a/srcpkgs/python3-zope.i18nmessageid/template
+++ b/srcpkgs/python3-zope.i18nmessageid/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.i18nmessageid'
 pkgname=python3-zope.i18nmessageid
 version=5.0.1
-revision=2
+revision=3
 wrksrc="zope.i18nmessageid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From 5a1d746fd5b7b26d965cc2a6283294d0a8e85ec7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:05 -0400
Subject: [PATCH 0264/4088] python3-zope.schema: rebuild for Python 3.10

---
 srcpkgs/python3-zope.schema/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.schema/template b/srcpkgs/python3-zope.schema/template
index 03ffba962e2c..3dc9607fe80b 100644
--- a/srcpkgs/python3-zope.schema/template
+++ b/srcpkgs/python3-zope.schema/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.schema'
 pkgname=python3-zope.schema
 version=6.0.0
-revision=2
+revision=3
 wrksrc=zope.schema-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f56812cac83c72c45499cc08fbf138ef906d438b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:43 -0400
Subject: [PATCH 0265/4088] python3-repoze.sphinx.autointerface: rebuild for
 Python 3.10

---
 srcpkgs/python3-repoze.sphinx.autointerface/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-repoze.sphinx.autointerface/template b/srcpkgs/python3-repoze.sphinx.autointerface/template
index 18141a5bd46a..7372f8e39ca7 100644
--- a/srcpkgs/python3-repoze.sphinx.autointerface/template
+++ b/srcpkgs/python3-repoze.sphinx.autointerface/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-repoze.sphinx.autointerface'
 pkgname=python3-repoze.sphinx.autointerface
 version=0.8
-revision=4
+revision=5
 wrksrc="repoze.sphinx.autointerface-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5e81e29fa749e7215bc8c245ffb9d06b491bfb17 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:48 -0400
Subject: [PATCH 0266/4088] python3-cppy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template
index 1eef7e6e75d6..de7943af84f5 100644
--- a/srcpkgs/python3-cppy/template
+++ b/srcpkgs/python3-cppy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cppy'
 pkgname=python3-cppy
 version=1.1.0
-revision=1
+revision=2
 wrksrc="cppy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cf897fc148af805c1a3598b1bb982836494c306e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:29 -0400
Subject: [PATCH 0267/4088] python3-pkgconfig: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pkgconfig/template b/srcpkgs/python3-pkgconfig/template
index 2f3b7a9cae77..8b015d19b57f 100644
--- a/srcpkgs/python3-pkgconfig/template
+++ b/srcpkgs/python3-pkgconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pkgconfig'
 pkgname=python3-pkgconfig
 version=1.5.1
-revision=4
+revision=5
 wrksrc="pkgconfig-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 02c09051fabee6014df2e26c049b765de5cb09d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:02 -0400
Subject: [PATCH 0268/4088] python3-hpack: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-hpack/template b/srcpkgs/python3-hpack/template
index 4416ef1ca2fb..06e22a633349 100644
--- a/srcpkgs/python3-hpack/template
+++ b/srcpkgs/python3-hpack/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hpack'
 pkgname=python3-hpack
 version=4.0.0
-revision=1
+revision=2
 wrksrc=hpack-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7b6dce67f2666a4e4cd13be3535b76373b98acfc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:04 -0400
Subject: [PATCH 0269/4088] python3-hyperframe: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-hyperframe/template b/srcpkgs/python3-hyperframe/template
index 44711dab7424..ed2152ba0243 100644
--- a/srcpkgs/python3-hyperframe/template
+++ b/srcpkgs/python3-hyperframe/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hyperframe'
 pkgname=python3-hyperframe
 version=6.0.1
-revision=1
+revision=2
 wrksrc=hyperframe-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8e56605d5d9c72983ef0fffea2bcf373cdd96e9e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:01 -0400
Subject: [PATCH 0270/4088] python3-h11: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-h11/template b/srcpkgs/python3-h11/template
index afb9e2f4a68f..46f5603c4602 100644
--- a/srcpkgs/python3-h11/template
+++ b/srcpkgs/python3-h11/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-h11'
 pkgname=python3-h11
 version=0.12.0
-revision=1
+revision=2
 wrksrc=h11-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5e2aefdd7830c80d1682673648f79ab88ca365ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:21 -0400
Subject: [PATCH 0271/4088] python3-ntlm-auth: rebuild for Python 3.10

---
 srcpkgs/python3-ntlm-auth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ntlm-auth/template b/srcpkgs/python3-ntlm-auth/template
index fbbd886187f2..eff908fe61f0 100644
--- a/srcpkgs/python3-ntlm-auth/template
+++ b/srcpkgs/python3-ntlm-auth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ntlm-auth'
 pkgname=python3-ntlm-auth
 version=1.5.0
-revision=2
+revision=3
 wrksrc="ntlm-auth-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d6d715cc80c064dfbdf5599d96a240816a015494 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:11 -0400
Subject: [PATCH 0272/4088] python3-jupyter_notebook: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index 441ac0f9a4a6..ca9e1d43df21 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_notebook'
 pkgname=python3-jupyter_notebook
 version=6.3.0
-revision=1
+revision=2
 wrksrc="notebook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d3965963c66cd60f34899ce7899a3176ed1f7169 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:25 -0400
Subject: [PATCH 0273/4088] python3-paramiko: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-paramiko/template b/srcpkgs/python3-paramiko/template
index 723898fad08a..cff1b3a2fb59 100644
--- a/srcpkgs/python3-paramiko/template
+++ b/srcpkgs/python3-paramiko/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-paramiko'
 pkgname=python3-paramiko
 version=2.7.2
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fa7f465f08fab066860d728d4a997191a72623dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:44 -0400
Subject: [PATCH 0274/4088] python3-resolvelib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-resolvelib/template b/srcpkgs/python3-resolvelib/template
index 204cc0186510..b77554c03270 100644
--- a/srcpkgs/python3-resolvelib/template
+++ b/srcpkgs/python3-resolvelib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-resolvelib'
 pkgname=python3-resolvelib
 version=0.7.1
-revision=1
+revision=2
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bfe5dec41cddabf88aa04e96f02d22168d161653 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:02 -0400
Subject: [PATCH 0275/4088] python3-yaml: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template
index be593a82a91f..f9b5ba6e5268 100644
--- a/srcpkgs/python3-yaml/template
+++ b/srcpkgs/python3-yaml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yaml'
 pkgname=python3-yaml
 version=5.4.1
-revision=1
+revision=2
 wrksrc="PyYAML-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 133943bda94a94276b14a5fc36739977e4857a0a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:33 -0400
Subject: [PATCH 0276/4088] python3-pycares: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pycares/template b/srcpkgs/python3-pycares/template
index 036ab32b1dc6..54a92acad1a3 100644
--- a/srcpkgs/python3-pycares/template
+++ b/srcpkgs/python3-pycares/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycares'
 pkgname=python3-pycares
 version=3.1.1
-revision=3
+revision=4
 wrksrc="pycares-${version}"
 build_style=python3-module
 # using bundled c-ares which is patched for TTL support

From d96e7f54dac0f8adfc7202cdbef082c806fcdf9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:17 -0400
Subject: [PATCH 0277/4088] postgresql13: rebuild for Python 3.10

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

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..5c4d35639140 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.4
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world

From c398a045eeee4d08c40d949aae7f07a383eb506c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:23 -0400
Subject: [PATCH 0278/4088] python3-olefile: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-olefile/template b/srcpkgs/python3-olefile/template
index 4213ca32532f..2a1b2c597be5 100644
--- a/srcpkgs/python3-olefile/template
+++ b/srcpkgs/python3-olefile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-olefile'
 pkgname=python3-olefile
 version=0.46
-revision=5
+revision=6
 wrksrc="olefile-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools"

From 4e76689cbaefc69ac043a3f39afb039a36232bb3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:30 -0400
Subject: [PATCH 0279/4088] python3-poetry-core: rebuild for Python 3.10

---
 srcpkgs/python3-poetry-core/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-poetry-core/template b/srcpkgs/python3-poetry-core/template
index 6d4a7c507c90..9de34cbab254 100644
--- a/srcpkgs/python3-poetry-core/template
+++ b/srcpkgs/python3-poetry-core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-poetry-core'
 pkgname=python3-poetry-core
 version=1.0.3
-revision=1
+revision=2
 wrksrc="poetry-core-${version}"
 build_style="python3-module"
 make_install_target="poetry_core-${version}-*-*-*.whl"

From b1fa252ecc1a798d338bfbf8f16691e7ab2083a7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:58 -0400
Subject: [PATCH 0280/4088] python3-future: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-future/template b/srcpkgs/python3-future/template
index 6782bef15f00..01d76b17c93d 100644
--- a/srcpkgs/python3-future/template
+++ b/srcpkgs/python3-future/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-future'
 pkgname=python3-future
 version=0.18.2
-revision=4
+revision=5
 wrksrc="future-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d5c2a118786c92429cd5a8faaa2043841643b063 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:25 -0400
Subject: [PATCH 0281/4088] python-scandir: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
index b60c5835b5c5..fb7c016c411c 100644
--- a/srcpkgs/python-scandir/template
+++ b/srcpkgs/python-scandir/template
@@ -1,7 +1,7 @@
 # Template file for 'python-scandir'
 pkgname=python-scandir
 version=1.10.0
-revision=4
+revision=5
 wrksrc="scandir-${version}"
 build_style=python-module
 pycompile_module="scandir.py"

From 7fecc14ce2943ceaf577ffb3844ca612c0f7fefd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:04 -0400
Subject: [PATCH 0282/4088] python3-ifaddr: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ifaddr/template b/srcpkgs/python3-ifaddr/template
index 3e749f77ec15..eda0bb352d87 100644
--- a/srcpkgs/python3-ifaddr/template
+++ b/srcpkgs/python3-ifaddr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ifaddr'
 pkgname=python3-ifaddr
 version=0.1.7
-revision=2
+revision=3
 wrksrc="ifaddr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 55336543d137c6a9a4a0b0bcc3207bf1276aef74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:38 -0400
Subject: [PATCH 0283/4088] python3-anyio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 1bed9ec51bad..94bdb2541b2d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
 version=3.3.1
-revision=1
+revision=2
 wrksrc=anyio-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From d658f2ad2a0c8fe925cb3f62d4a750ebcfc6415d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:51 -0400
Subject: [PATCH 0284/4088] python3-soupsieve: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index b7b2b55a36d8..5415580cfcc1 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-soupsieve'
 pkgname=python3-soupsieve
 version=1.9.5
-revision=4
+revision=5
 wrksrc="soupsieve-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fa6dcfe76adddfb56d74ef9847882db450205e4c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH 0285/4088] volk: rebuild for Python 3.10, update to 2.5.0.

---
 common/shlibs         |  2 +-
 srcpkgs/volk/template | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 458f7dfcd128..b0b813ffc096 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3224,7 +3224,7 @@ libarcan_a12.so.0.1 arcan-0.6.0_1
 liblwipv6.so.2 lwipv6-1.5a_1
 libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1
 libpipewire-0.3.so.0 libpipewire-0.3.6_1
-libvolk.so.2.2.1 volk-2.2.1_1
+libvolk.so.2.5 volk-2.5.0_1
 libgnuradio-runtime.so.3.8.0 gnuradio-3.8.0.0_1
 libgnuradio-pmt.so.3.8.0 gnuradio-3.8.0.0_1
 libgnuradio-blocks.so.3.8.0 gnuradio-3.8.0.0_1
diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template
index 2bbdd5b9b7a8..60de1486cf93 100644
--- a/srcpkgs/volk/template
+++ b/srcpkgs/volk/template
@@ -1,23 +1,30 @@
 # Template file for 'volk'
 pkgname=volk
-version=2.2.1
-revision=2
+version=2.5.0
+revision=1
+_cpu_features_gitrev="a8397ba4591237c17d18e4acc091f5f3ebe7391e"
 build_style=cmake
 hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six"
-makedepends="boost-devel python3-cheetah3 python3-devel python3-Mako
- python3-six"
+makedepends="boost-devel python3-cheetah3 python3-devel python3-Mako python3-six"
 short_desc="Vector-Optimized Library of Kernels"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://libvolk.org/"
-distfiles="https://github.com/gnuradio/volk/archive/v${version}.tar.gz"
-checksum=283d088f93774a55cb8be058b3d3b4a06d8bd44d6bc0016416f5a7818dd05db4
+distfiles="https://github.com/gnuradio/volk/archive/v${version}.tar.gz
+ https://github.com/google/cpu_features/archive/${_cpu_features_gitrev}.tar.gz"
+checksum="468bebdb8c2ae9b82837ad08abd146dd9a9a48d3de7bea2d0095e4b1557b5299
+ b47031a2a9ab04cb6514285103e51ba92c8f0bf28470cce911ac0c9af781c307"
 
 case "$XBPS_TARGET_MACHINE" in
 	armv6l*)
 		configure_args="-Dhave_mfpu_neon=0";;
 esac
 
+post_extract() {
+	rm -rf cpu_features
+	mv ../cpu_features-${_cpu_features_gitrev} cpu_features
+}
+
 volk-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"

From 0ff41369a2cda21c764866dc0b3d33e9c4e62d5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:54 -0400
Subject: [PATCH 0286/4088] glade3: rebuild for Python 3.10, update to 3.38.2.

---
 srcpkgs/glade3/patches/meson.build.patch | 23 +++++++++++++++++++++++
 srcpkgs/glade3/template                  | 15 ++++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/glade3/patches/meson.build.patch

diff --git a/srcpkgs/glade3/patches/meson.build.patch b/srcpkgs/glade3/patches/meson.build.patch
new file mode 100644
index 000000000000..3dc80c5a9e92
--- /dev/null
+++ b/srcpkgs/glade3/patches/meson.build.patch
@@ -0,0 +1,23 @@
+Circumvent an attempt to run cross-compiled executables during configuration.
+
+--- ./meson.build
++++ ./meson.build
+@@ -215,6 +215,10 @@
+   glade_datadir,
+ )
+ 
++if meson.is_cross_build()
++  # On cross, the test program can't be run, so just assume tls_backend_support
++  tls_backend_support = 'true'
++else
+ tls_backend_support_src = '''
+ #include <stdio.h>
+ #include <gio/gio.h>
+@@ -225,6 +229,7 @@
+ }
+ '''
+ tls_backend_support = cc.run(tls_backend_support_src, dependencies: gio_dep).stdout()
++endif
+ 
+ output = '\nConfiguration:\n\n'
+ output += '\tCompiler:                ' + cc.get_id() + '\n'
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index e8e9f2dd2a29..763632c1e712 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,6 +1,6 @@
 # Template file for 'glade3'
 pkgname=glade3
-version=3.38.1
+version=3.38.2
 revision=1
 wrksrc="glade-${version}"
 build_style=meson
@@ -15,22 +15,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://glade.gnome.org/"
 distfiles="${GNOME_SITE}/glade/${version%.*}/glade-${version}.tar.xz"
-checksum=171a50be4930d4806fc8ce7f5ce3a75b49e9916f9d3037a5b50d35799bd0cfcd
+checksum=98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7
 lib32disabled=yes
+# Requires running an xserver
+make_check=no
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i meson.build -e "/python_dep/s/3.8/3.9/g"
-}
-
-do_check() {
-	# Require running xserver
-	:
-}
-
 libgladeui3_package() {
 	depends="python3-gobject"
 	short_desc="GTK+ User Interface Build core library"

From c140d58c316efa955bee30b6cc62b0b912eb1871 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:22 -0400
Subject: [PATCH 0287/4088] python-isodate: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-isodate/template b/srcpkgs/python-isodate/template
index 9238842e1964..430cb3cfbe1a 100644
--- a/srcpkgs/python-isodate/template
+++ b/srcpkgs/python-isodate/template
@@ -1,7 +1,7 @@
 # Template file for 'python-isodate'
 pkgname=python-isodate
 version=0.6.0
-revision=4
+revision=5
 wrksrc="isodate-${version}"
 build_style=python-module
 pycompile_module="isodate"

From c4e9ab68bb0175e4c0d390d6ae62619a46b8792a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:34 -0400
Subject: [PATCH 0288/4088] python3-SecretStorage: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-SecretStorage/template b/srcpkgs/python3-SecretStorage/template
index a2ff3a2fc457..1ad018612877 100644
--- a/srcpkgs/python3-SecretStorage/template
+++ b/srcpkgs/python3-SecretStorage/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-SecretStorage'
 pkgname=python3-SecretStorage
 version=3.3.1
-revision=1
+revision=2
 wrksrc="SecretStorage-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 912d9120bf305d68b0ea537f0058464394d11ea4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:05 -0400
Subject: [PATCH 0289/4088] python3-importlib_metadata: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-importlib_metadata/template b/srcpkgs/python3-importlib_metadata/template
index 5ae700820df4..95f75fa66350 100644
--- a/srcpkgs/python3-importlib_metadata/template
+++ b/srcpkgs/python3-importlib_metadata/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-importlib_metadata'
 pkgname=python3-importlib_metadata
 version=4.8.1
-revision=1
+revision=2
 wrksrc="importlib_metadata-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 44199842e588bd75a3e18540ddec2a73c1d2b158 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:30 -0400
Subject: [PATCH 0290/4088] python3-precis-i18n: rebuild for Python 3.10

---
 srcpkgs/python3-precis-i18n/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-precis-i18n/template b/srcpkgs/python3-precis-i18n/template
index 41e3d9eb67d0..9ef4da948b7a 100644
--- a/srcpkgs/python3-precis-i18n/template
+++ b/srcpkgs/python3-precis-i18n/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-precis-i18n'
 pkgname=python3-precis-i18n
 version=1.0.1
-revision=3
+revision=4
 wrksrc="precis_i18n-${version}"
 build_style=python3-module
 pycompile_module="precis_i18n"

From 221278e5c8fe13f4242783eb978f04cc784d22fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:00 -0400
Subject: [PATCH 0291/4088] python3-google-api-core: rebuild for Python 3.10

---
 srcpkgs/python3-google-api-core/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-api-core/template b/srcpkgs/python3-google-api-core/template
index 3530e7d8941c..0a1c39d9efc6 100644
--- a/srcpkgs/python3-google-api-core/template
+++ b/srcpkgs/python3-google-api-core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-api-core'
 pkgname=python3-google-api-core
 version=1.26.2
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2be8447c95d81c7ef6af5096d7d2f2c45527a01e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:00 -0400
Subject: [PATCH 0292/4088] python3-google-auth-httplib2: rebuild for Python
 3.10

---
 srcpkgs/python3-google-auth-httplib2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-auth-httplib2/template b/srcpkgs/python3-google-auth-httplib2/template
index c8ecea74b5f3..588fd7ca6a9c 100644
--- a/srcpkgs/python3-google-auth-httplib2/template
+++ b/srcpkgs/python3-google-auth-httplib2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-auth-httplib2'
 pkgname=python3-google-auth-httplib2
 version=0.1.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d2c1a78ca05d0d6b0fe3a1f12f0fd34764608654 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:58 -0400
Subject: [PATCH 0293/4088] python3-uritemplate: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template
index 774b51825e11..77cabdcb824d 100644
--- a/srcpkgs/python3-uritemplate/template
+++ b/srcpkgs/python3-uritemplate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-uritemplate'
 pkgname=python3-uritemplate
 version=3.0.1
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c3e4aeb652652f30397a6b0483956f759f79f3da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:23 -0400
Subject: [PATCH 0294/4088] python3-orderedmultidict: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-orderedmultidict/template b/srcpkgs/python3-orderedmultidict/template
index 7e8c5e0043b9..b0d8803bc072 100644
--- a/srcpkgs/python3-orderedmultidict/template
+++ b/srcpkgs/python3-orderedmultidict/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-orderedmultidict'
 pkgname=python3-orderedmultidict
 version=1.0.1
-revision=2
+revision=3
 wrksrc="orderedmultidict-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c3d91a351e155bb0e61a8d6a116f44f767cedbcb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:35 -0400
Subject: [PATCH 0295/4088] python3-WebOb: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-WebOb/template b/srcpkgs/python3-WebOb/template
index e3de30ca0176..19e796676a07 100644
--- a/srcpkgs/python3-WebOb/template
+++ b/srcpkgs/python3-WebOb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-WebOb'
 pkgname=python3-WebOb
 version=1.8.5
-revision=3
+revision=4
 wrksrc="WebOb-${version}"
 build_style=python3-module
 pycompile_module="webob"

From ebdb1dca226a4a059bec4e312f8d5624dde92372 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:10 -0400
Subject: [PATCH 0296/4088] sip4: rebuild for Python 3.10

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

diff --git a/srcpkgs/sip4/template b/srcpkgs/sip4/template
index 778633e5bb66..25afa57065d0 100644
--- a/srcpkgs/sip4/template
+++ b/srcpkgs/sip4/template
@@ -1,7 +1,7 @@
 # Template file for 'sip4'
 pkgname=sip4
 version=4.19.25
-revision=1
+revision=2
 wrksrc="sip-$version"
 hostmakedepends="python3-devel"
 makedepends="${hostmakedepends}"

From 03c858635f430675bbbdd25ea81dfe6843cd0d33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:59 -0400
Subject: [PATCH 0297/4088] python3-utils: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-utils/template b/srcpkgs/python3-utils/template
index 3adb620d20b5..44f31ded5733 100644
--- a/srcpkgs/python3-utils/template
+++ b/srcpkgs/python3-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-utils'
 pkgname=python3-utils
 version=2.5.6
-revision=1
+revision=2
 wrksrc="python-utils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a9f6cb8ad84dd28062161a519fc0483beb740eb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:33 -0400
Subject: [PATCH 0298/4088] python3-pybind11: rebuild for Python 3.10, update
 to 2.8.0.

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

diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template
index eb8044919575..038b3efb0439 100644
--- a/srcpkgs/python3-pybind11/template
+++ b/srcpkgs/python3-pybind11/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pybind11'
 pkgname=python3-pybind11
-version=2.7.1
-revision=2
+version=2.8.0
+revision=1
 wrksrc="pybind11-${version}"
 build_style=python3-module
 hostmakedepends="cmake python3-setuptools
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pybind/pybind11"
 distfiles="https://github.com/pybind/pybind11/archive/v${version}.tar.gz"
-checksum=616d1c42e4cf14fa27b2a4ff759d7d7b33006fdc5ad8fd603bb2c22622f27020
+checksum=9ca7770fc5453b10b00a4a2f99754d7a29af8952330be5f5602e7c2635fa3e79
 
 post_patch() {
 	# These dependencies are not packaged and don't affect the man page

From 30fae8c4611b1b40036f18f3d3918a34d7e30fda Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:17 -0400
Subject: [PATCH 0299/4088] python3-mpmath: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mpmath/template b/srcpkgs/python3-mpmath/template
index b139d17a4c2e..4087ac129345 100644
--- a/srcpkgs/python3-mpmath/template
+++ b/srcpkgs/python3-mpmath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpmath'
 pkgname=python3-mpmath
 version=1.2.1
-revision=1
+revision=2
 wrksrc="mpmath-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 1d59f314d7f63c287b171eaa2eb0271e8db7fc88 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:20 -0400
Subject: [PATCH 0300/4088] xapps: rebuild for Python 3.10

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

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 1824998fc756..f2c14c32c55b 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,7 +1,7 @@
 # Template file for 'xapps'
 pkgname=xapps
 version=2.0.6
-revision=1
+revision=2
 wrksrc="xapp-${version}"
 build_style=meson
 build_helper="gir"

From e613dd5156401f94037029e77ef265b6fe8c27e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:52 -0400
Subject: [PATCH 0301/4088] python3-dnspython: rebuild for Python 3.10

---
 srcpkgs/python3-dnspython/INSTALL.msg | 2 --
 srcpkgs/python3-dnspython/template    | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 srcpkgs/python3-dnspython/INSTALL.msg

diff --git a/srcpkgs/python3-dnspython/INSTALL.msg b/srcpkgs/python3-dnspython/INSTALL.msg
deleted file mode 100644
index 1af511dc841b..000000000000
--- a/srcpkgs/python3-dnspython/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to perform DNSSEC validation install python3-pycryptodome.
-To do elliptic curves install also python3-ecdsa.
diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template
index 2374c83ca243..0a9a8eb23d8a 100644
--- a/srcpkgs/python3-dnspython/template
+++ b/srcpkgs/python3-dnspython/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-dnspython'
 pkgname=python3-dnspython
 version=2.1.0
-revision=1
+revision=2
 wrksrc="dnspython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools unzip"
 depends="python3"
 checkdepends="python3-attrs python3-async_generator python3-idna python3-curio
  python3-trio python3-outcome python3-sniffio python3-sortedcontainers
- python3-requests python3-requests-toolbelt python3-pycryptodome
- python3-pytest iana-etc"
+ python3-requests python3-requests-toolbelt python3-pytest iana-etc"
 short_desc="DNS toolkit for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"

From 5a833c0e26393edace29c0b5c43be57e767f1920 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:01 -0400
Subject: [PATCH 0302/4088] python3-greenlet: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-greenlet/template b/srcpkgs/python3-greenlet/template
index e0578b9310fa..f43c2e426722 100644
--- a/srcpkgs/python3-greenlet/template
+++ b/srcpkgs/python3-greenlet/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-greenlet'
 pkgname=python3-greenlet
 version=1.1.0
-revision=1
+revision=2
 wrksrc="greenlet-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8c6d93bfbd469356b3730e5129a50fef7474cccd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:48 -0400
Subject: [PATCH 0303/4088] python3-sgmllib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-sgmllib/template b/srcpkgs/python3-sgmllib/template
index fca40a2fb977..f505431e44d2 100644
--- a/srcpkgs/python3-sgmllib/template
+++ b/srcpkgs/python3-sgmllib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sgmllib'
 pkgname=python3-sgmllib
 version=1.0.0
-revision=1
+revision=2
 wrksrc="sgmllib3k-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b1f0e732b01dbde5969089daa485e9151f71dc36 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:08 -0400
Subject: [PATCH 0304/4088] python3-jmespath: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jmespath/template b/srcpkgs/python3-jmespath/template
index 236829aac1e8..397a78d7eea0 100644
--- a/srcpkgs/python3-jmespath/template
+++ b/srcpkgs/python3-jmespath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jmespath'
 pkgname=python3-jmespath
 version=0.10.0
-revision=3
+revision=4
 wrksrc="jmespath.py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d7aeef09d38ca7287de88bbebc61cf9865a7a011 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:38 -0400
Subject: [PATCH 0305/4088] python3-pyscard: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..8bcb0a7053a9 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -2,7 +2,7 @@
 pkgname=python3-pyscard
 _pkgname=pyscard
 version=2.0.1
-revision=1
+revision=2
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"

From 2a027b93d3fb0de39a7c39c7125eca0789c44af2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:34 -0400
Subject: [PATCH 0306/4088] python3-pycountry: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pycountry/template b/srcpkgs/python3-pycountry/template
index 40041309d286..ab364f365741 100644
--- a/srcpkgs/python3-pycountry/template
+++ b/srcpkgs/python3-pycountry/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycountry'
 pkgname=python3-pycountry
 version=19.8.18
-revision=3
+revision=4
 wrksrc="pycountry-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 065bf298960ce4b3cdca785e1784c564d6366108 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:48 -0400
Subject: [PATCH 0307/4088] python3-colorama: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template
index 3545117fe9e3..593df78862bb 100644
--- a/srcpkgs/python3-colorama/template
+++ b/srcpkgs/python3-colorama/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-colorama'
 pkgname=python3-colorama
 version=0.4.4
-revision=4
+revision=5
 wrksrc="colorama-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools"

From 73205c4919652a6ab229ee47d6b3da4194d3be1d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Oct 2021 09:32:50 -0400
Subject: [PATCH 0308/4088] python3-httpx: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template
index 11e6f281d114..1dbdd960e538 100644
--- a/srcpkgs/python3-httpx/template
+++ b/srcpkgs/python3-httpx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-httpx'
 pkgname=python3-httpx
 version=0.19.0
-revision=1
+revision=2
 wrksrc="httpx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 998d93494ced107458a20e3df8bcadf1229a3887 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:35 -0400
Subject: [PATCH 0309/4088] python3-XlsxWriter: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-XlsxWriter/template b/srcpkgs/python3-XlsxWriter/template
index fea90638031d..16027abe137a 100644
--- a/srcpkgs/python3-XlsxWriter/template
+++ b/srcpkgs/python3-XlsxWriter/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-XlsxWriter'
 pkgname=python3-XlsxWriter
 version=1.3.7
-revision=1
+revision=2
 wrksrc="XlsxWriter-RELEASE_${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6646bb1877ca79167bf369a16bd4ee8cf39ab263 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:47 -0400
Subject: [PATCH 0310/4088] python3-click-plugins: rebuild for Python 3.10

---
 srcpkgs/python3-click-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-plugins/template b/srcpkgs/python3-click-plugins/template
index e62d64c0e5a8..142900633bb6 100644
--- a/srcpkgs/python3-click-plugins/template
+++ b/srcpkgs/python3-click-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-click-plugins'
 pkgname=python3-click-plugins
 version=1.1.1
-revision=3
+revision=4
 wrksrc="click-plugins-${version}"
 build_style=python3-module
 pycompile_module="click-plugins"

From 883bd50585d51afe37fdbf0f3ec71c546fa339ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:28 -0400
Subject: [PATCH 0311/4088] python3-Flask: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Flask/template b/srcpkgs/python3-Flask/template
index 36932115048f..1d014901d3b2 100644
--- a/srcpkgs/python3-Flask/template
+++ b/srcpkgs/python3-Flask/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask'
 pkgname=python3-Flask
 version=2.0.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From eb016a45568dc43c99c2e4b023c41a711ef6ea84 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:38 -0400
Subject: [PATCH 0312/4088] python3-aniso8601: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-aniso8601/template b/srcpkgs/python3-aniso8601/template
index 768e5792b8b4..7f1bef3f2180 100644
--- a/srcpkgs/python3-aniso8601/template
+++ b/srcpkgs/python3-aniso8601/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aniso8601'
 pkgname=python3-aniso8601
 version=9.0.1
-revision=1
+revision=2
 wrksrc="aniso8601-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0fcb94ac1915937a2ddad20e1048b51c7e6a3a3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:23 -0400
Subject: [PATCH 0313/4088] python-pbr: rebuild for Python 3.10, update to
 5.6.0.

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

diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
index 6d8ac5a1dbf8..0a3c0dd98037 100644
--- a/srcpkgs/python-pbr/template
+++ b/srcpkgs/python-pbr/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pbr'
 pkgname=python-pbr
-version=5.4.3
-revision=4
+version=5.6.0
+revision=1
 wrksrc="pbr-${version}"
 build_style=python-module
 pycompile_module="pbr"
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0"
 homepage="https://docs.openstack.org/developer/pbr/"
 distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8
+checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
 alternatives="pbr:pbr:/usr/bin/pbr2"
 
 python3-pbr_package() {

From 498a9deca509c906bd78777f6159d5bf5935d543 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:39 -0400
Subject: [PATCH 0314/4088] python3-appdirs: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-appdirs/template b/srcpkgs/python3-appdirs/template
index 393dda8d0253..b1bcbb60be2c 100644
--- a/srcpkgs/python3-appdirs/template
+++ b/srcpkgs/python3-appdirs/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-appdirs'
 pkgname=python3-appdirs
 version=1.4.4
-revision=3
+revision=4
 wrksrc="appdirs-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fa6b0910de4ad34fd2cf27304ec1d78e6386fc8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:52 -0400
Subject: [PATCH 0315/4088] python3-distlib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-distlib/template b/srcpkgs/python3-distlib/template
index 3b44c3689c38..4f8162861c46 100644
--- a/srcpkgs/python3-distlib/template
+++ b/srcpkgs/python3-distlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-distlib'
 pkgname=python3-distlib
 version=0.3.2
-revision=1
+revision=2
 wrksrc="distlib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 688d5206dcda89c48060f3f15930be233c94f35a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:56 -0400
Subject: [PATCH 0316/4088] python3-filelock: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-filelock/template b/srcpkgs/python3-filelock/template
index a69390e02e5e..6d61df8e0115 100644
--- a/srcpkgs/python3-filelock/template
+++ b/srcpkgs/python3-filelock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-filelock'
 pkgname=python3-filelock
 version=3.0.12
-revision=3
+revision=4
 wrksrc="filelock-${version}"
 build_style=python3-module
 pycompile_module="filelock.py"

From c68d62e2b57f5b9e896f73f1780f2fbf51fa7bc6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:39 -0400
Subject: [PATCH 0317/4088] apparmor: rebuild for Python 3.10

---
 srcpkgs/apparmor/patches/python-distutils.patch | 13 +++++++++++++
 srcpkgs/apparmor/template                       |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/apparmor/patches/python-distutils.patch

diff --git a/srcpkgs/apparmor/patches/python-distutils.patch b/srcpkgs/apparmor/patches/python-distutils.patch
new file mode 100644
index 000000000000..9c22c7f11649
--- /dev/null
+++ b/srcpkgs/apparmor/patches/python-distutils.patch
@@ -0,0 +1,13 @@
+distutils is deprecated in python 3.10, which means it imports but prints warnings
+
+--- a/libraries/libapparmor/m4/ac_python_devel.m4
++++ b/libraries/libapparmor/m4/ac_python_devel.m4
+@@ -69,7 +69,7 @@
+         # Check if you have distutils, else fail
+         #
+         AC_MSG_CHECKING([for the distutils Python package])
+-        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
++        ac_distutils_result=`$PYTHON -W ignore -c "import distutils" 2>&1`
+         if test -z "$ac_distutils_result"; then
+                 AC_MSG_RESULT([yes])
+         else
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 2a9e373447b6..64140c0dbc5c 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=3.0.3
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure

From 178dfaf7440c9e5cca9a876fb03743f073416179 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:26 -0400
Subject: [PATCH 0318/4088] python-urwid: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-urwid/template b/srcpkgs/python-urwid/template
index b7eb4393a54f..c575560cec8b 100644
--- a/srcpkgs/python-urwid/template
+++ b/srcpkgs/python-urwid/template
@@ -1,7 +1,7 @@
 # Template file for 'python-urwid'
 pkgname=python-urwid
 version=2.1.2
-revision=1
+revision=2
 wrksrc="urwid-${version}"
 build_style="python-module"
 hostmakedepends="python-setuptools python3-setuptools"

From d53ab72c17db1b8a53a379635e0fa26577b16a01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:41 -0400
Subject: [PATCH 0319/4088] python3-pyudev: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyudev/template b/srcpkgs/python3-pyudev/template
index df31c39b18a3..41936b989a2d 100644
--- a/srcpkgs/python3-pyudev/template
+++ b/srcpkgs/python3-pyudev/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyudev'
 pkgname=python3-pyudev
 version=0.22.0
-revision=1
+revision=2
 wrksrc="pyudev-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4a580654ee2afe09ad8f111275f4186bd07400c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:09 -0400
Subject: [PATCH 0320/4088] samba: rebuild for Python 3.10

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

diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 69ac97f71d34..ed234d824364 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
 # Template file for 'samba'
 pkgname=samba
 version=4.14.7
-revision=1
+revision=2
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"

From 9b3ce40f9bb4eb32a71ba955d62e628b3b52439a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:10 -0400
Subject: [PATCH 0321/4088] shiboken2: rebuild for Python 3.10

---
 srcpkgs/shiboken2/patches/python310.patch | 114 ++++++++++++++++++++++
 srcpkgs/shiboken2/template                |   2 +-
 2 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/shiboken2/patches/python310.patch

diff --git a/srcpkgs/shiboken2/patches/python310.patch b/srcpkgs/shiboken2/patches/python310.patch
new file mode 100644
index 000000000000..1600deda46f2
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/python310.patch
@@ -0,0 +1,114 @@
+The first patch is taken from the issue and resolution documented at
+
+    https://bugreports.qt.io/browse/PYSIDE-1436
+
+Note that strings created as part of the `staticStrings()` set used in the
+`finalizeStaticStrings()` function are created by `createStaticString()`, which
+uses `PyUnicode_InternFromString` to create an owned reference to an interned
+Python string **and** calls Py_INCREF to further guard against the strings
+disappearing. Thus, in `finalizeStaticStrings()`, we need *two* calls to
+Py_DECREF: one to clear the "guard" increment after creation and one to release
+ownership from the creation itself.
+
+The second and third patches are adapted from
+
+    https://codereview.qt-project.org/c/pyside/pyside-setup/+/348390
+
+The second addresses the disappearance of _Py_Mangle from Python 3.10 by
+providing an alternative implementation that was previously reserved for
+Py_LIMITED_API.
+
+The fourth patch was adapted from
+
+    https://codereview.qt-project.org/c/pyside/pyside-setup/+/365403/4
+
+Together with the third patch,t his addresses changes to the typing module that
+caused the pyi binding generator to fail in some cases.
+
+diff -ur a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
+--- a/sources/shiboken2/libshiboken/pep384impl.cpp	2020-11-11 07:51:30.000000000 -0500
++++ b/sources/shiboken2/libshiboken/pep384impl.cpp	2021-09-26 08:47:00.614184926 -0400
+@@ -751,14 +751,14 @@
+ #endif // IS_PY2
+     Shiboken::AutoDecRef privateobj(PyObject_GetAttr(
+         reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name()));
+-#ifndef Py_LIMITED_API
+-    return _Py_Mangle(privateobj, name);
+-#else
+-    // For some reason, _Py_Mangle is not in the Limited API. Why?
+-    size_t plen = PyUnicode_GET_LENGTH(privateobj);
++
++    // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always.
++    // The rest of this function is our own implementation of _Py_Mangle.
++    // Please compare the original function in compile.c .
++    size_t plen = PyUnicode_GET_LENGTH(privateobj.object());
+     /* Strip leading underscores from class name */
+     size_t ipriv = 0;
+-    while (PyUnicode_READ_CHAR(privateobj, ipriv) == '_')
++    while (PyUnicode_READ_CHAR(privateobj.object(), ipriv) == '_')
+         ipriv++;
+     if (ipriv == plen) {
+         Py_INCREF(name);
+@@ -787,7 +787,6 @@
+     if (amount > big_stack)
+         free(resbuf);
+     return result;
+-#endif // else Py_LIMITED_API
+ }
+ 
+ /*****************************************************************************
+diff -ur a/sources/shiboken2/libshiboken/sbkstring.cpp b/sources/shiboken2/libshiboken/sbkstring.cpp
+--- a/sources/shiboken2/libshiboken/sbkstring.cpp	2020-11-11 07:51:30.000000000 -0500
++++ b/sources/shiboken2/libshiboken/sbkstring.cpp	2021-09-26 08:47:00.614184926 -0400
+@@ -247,8 +247,15 @@
+ {
+     auto &set = staticStrings();
+     for (PyObject *ob : set) {
++        // Since Python 3.10, interned strings at deleted at Python exit.
++#if PY_VERSION_HEX >= 0x030a0000
++        Py_DECREF(ob);
++        // createStaticString() calls Py_INCREF()
++        Py_DECREF(ob);
++#else
+         Py_REFCNT(ob) = 1;
+         Py_DECREF(ob);
++#endif
+     }
+     set.clear();
+ }
+diff -ur a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py	2020-11-11 07:51:30.000000000 -0500
++++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py	2021-09-26 08:47:00.614184926 -0400
+@@ -300,6 +300,7 @@
+     "zero(object)": None,
+     "zero(str)": "",
+     "zero(typing.Any)": None,
++    "zero(Any)": None,
+     })
+ 
+ type_map.update({
+diff -ur a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py
+--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py	2020-11-11 07:51:30.000000000 -0500
++++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py	2021-09-26 08:48:27.743171587 -0400
+@@ -43,10 +43,11 @@
+ import re
+ import warnings
+ import types
++import typing
+ import keyword
+ import functools
+ from shibokensupport.signature.mapping import (type_map, update_mapping,
+-    namespace, typing, _NotCalled, ResultVariable, ArrayLikeVariable)
++    namespace, _NotCalled, ResultVariable, ArrayLikeVariable)
+ from shibokensupport.signature.lib.tool import (SimpleNamespace,
+     build_brace_pattern)
+ 
+@@ -222,7 +223,7 @@
+ def to_string(thing):
+     if isinstance(thing, str):
+         return thing
+-    if hasattr(thing, "__name__"):
++    if hasattr(thing, "__name__") and thing.__module__ != "typing":
+         dot = "." in str(thing)
+         name = get_name(thing)
+         return thing.__module__ + "." + name if dot else name
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index ed06a780e1a9..cbddf90093a0 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,7 +1,7 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
 version=5.15.2
-revision=2
+revision=3
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"

From 82d767354951a70ae6d74bbc42956242a2891b96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:02 -0400
Subject: [PATCH 0322/4088] python3-xmlschema: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-xmlschema/template b/srcpkgs/python3-xmlschema/template
index 20b725f01d9b..cfc3d4bc4447 100644
--- a/srcpkgs/python3-xmlschema/template
+++ b/srcpkgs/python3-xmlschema/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xmlschema'
 pkgname=python3-xmlschema
 version=1.6.2
-revision=1
+revision=2
 wrksrc=xmlschema-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-elementpath"

From 84b3a3c384bb530e27a1bad735e9d4653a11eda0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:45 -0400
Subject: [PATCH 0323/4088] python3-canonicaljson: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index 80ee0c02f26e..88ffaede6ebd 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
 version=1.4.0
-revision=1
+revision=2
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f09380689cced56bd1ca5a64462f2a9992537bd3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:58 -0400
Subject: [PATCH 0324/4088] python3-unpaddedbase64: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-unpaddedbase64/template b/srcpkgs/python3-unpaddedbase64/template
index 4b2bdc9b77ce..dab9eac87fe6 100644
--- a/srcpkgs/python3-unpaddedbase64/template
+++ b/srcpkgs/python3-unpaddedbase64/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-unpaddedbase64'
 pkgname=python3-unpaddedbase64
 version=1.1.0
-revision=3
+revision=4
 wrksrc="python-unpaddedbase64-${version}"
 build_style=python3-module
 pycompile_module="unpaddedbase64.py"

From a319678f60536aed1de2eecc6b0a8b9f6e2ec2ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:34 -0400
Subject: [PATCH 0325/4088] python3-TxSNI: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-TxSNI/template b/srcpkgs/python3-TxSNI/template
index 24ee68060f5b..f9604fd89e25 100644
--- a/srcpkgs/python3-TxSNI/template
+++ b/srcpkgs/python3-TxSNI/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-TxSNI'
 pkgname=python3-TxSNI
 version=0.2.0
-revision=1
+revision=2
 wrksrc="txsni-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dd790106445e2e1035948ac7255b0d91707ae4b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:35 -0400
Subject: [PATCH 0326/4088] python3-acme: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 1cc3ede2daed..abdae128a47e 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
 version=1.19.0
-revision=1
+revision=2
 wrksrc="acme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c2775b96286ff8757ce957e8b602b13cd40497be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:54 -0400
Subject: [PATCH 0327/4088] python3-eliot: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-eliot/template b/srcpkgs/python3-eliot/template
index 04251bcc3123..ca60113e4724 100644
--- a/srcpkgs/python3-eliot/template
+++ b/srcpkgs/python3-eliot/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-eliot'
 pkgname=python3-eliot
 version=1.12.0
-revision=3
+revision=4
 wrksrc="eliot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f3783c742982540ce009d9d87097759e7af86165 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:27 -0400
Subject: [PATCH 0328/4088] python3-pem: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pem/template b/srcpkgs/python3-pem/template
index 9622282b8367..07cb02b3f9f9 100644
--- a/srcpkgs/python3-pem/template
+++ b/srcpkgs/python3-pem/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pem'
 pkgname=python3-pem
 version=20.1.0
-revision=1
+revision=2
 wrksrc="pem-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b8e1d17dd1087ec88c8a0457306160335b5e8367 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0329/4088] python3-treq: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template
index 977b97fb6424..d312d6beb046 100644
--- a/srcpkgs/python3-treq/template
+++ b/srcpkgs/python3-treq/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-treq'
 pkgname=python3-treq
 version=20.3.0
-revision=3
+revision=4
 wrksrc="treq-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-incremental"

From 35a2e7f04459b003238c6a2e2e65af68aa89e1c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:41 -0400
Subject: [PATCH 0330/4088] python3-babelfish: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-babelfish/template b/srcpkgs/python3-babelfish/template
index df4e86ded3ed..5a7b7aceb2b0 100644
--- a/srcpkgs/python3-babelfish/template
+++ b/srcpkgs/python3-babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-babelfish'
 pkgname=python3-babelfish
 version=0.5.5
-revision=4
+revision=5
 wrksrc="babelfish-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b0f696e869b650f40b2de52639ef8f5f18035e7c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:43 -0400
Subject: [PATCH 0331/4088] python3-rebulk: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-rebulk/template b/srcpkgs/python3-rebulk/template
index 3d620df0c614..589dfb78cbdc 100644
--- a/srcpkgs/python3-rebulk/template
+++ b/srcpkgs/python3-rebulk/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rebulk'
 pkgname=python3-rebulk
 version=2.0.1
-revision=4
+revision=5
 wrksrc="rebulk-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ca87e5b8f04f6f805fec4036baaa46388b26f358 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:36 -0400
Subject: [PATCH 0332/4088] python3-aiohttp: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template
index c4fb16219e83..b20de6a7b4fb 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiohttp'
 pkgname=python3-aiohttp
 version=3.7.4
-revision=2
+revision=3
 wrksrc="aiohttp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7651a4a09346082026e141232ea3377af00a097c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:51 -0400
Subject: [PATCH 0333/4088] python3-socks: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-socks/template b/srcpkgs/python3-socks/template
index 22ed4b8e0e5d..6c5fa44b0fe7 100644
--- a/srcpkgs/python3-socks/template
+++ b/srcpkgs/python3-socks/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-socks'
 pkgname=python3-socks
 version=1.2.4
-revision=1
+revision=2
 wrksrc="python-socks-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c5d1867da6cf631e7b28d0aa0fd314f1f5a87b68 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:32 -0400
Subject: [PATCH 0334/4088] python3-PyQt5: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index a704d41698bc..37cc00fdcecc 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt5'
 pkgname=python3-PyQt5
 version=5.15.4
-revision=1
+revision=2
 _sipver=12.8.0
 wrksrc="PyQt5-${version}"
 build_helper="qemu qmake"

From 0eb2ff91a62dd4a34c66a6d2092ee240c676ac20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:31 -0400
Subject: [PATCH 0335/4088] python3-Pillow: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index 3541fb1db895..58a348c999e3 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
 version=8.3.2
-revision=1
+revision=2
 wrksrc="Pillow-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 30caa048a5e7f37ba0ee8a817fb4048b698eeeca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:27 -0400
Subject: [PATCH 0336/4088] python3-Cheroot: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Cheroot/template b/srcpkgs/python3-Cheroot/template
index 7dc5e26bf18f..8b20763967e3 100644
--- a/srcpkgs/python3-Cheroot/template
+++ b/srcpkgs/python3-Cheroot/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Cheroot'
 pkgname=python3-Cheroot
 version=8.4.5
-revision=1
+revision=2
 wrksrc="cheroot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 691d22606d450c7ecf55ffc08eece56b34489063 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:07 -0400
Subject: [PATCH 0337/4088] python3-jaraco.collections: rebuild for Python 3.10

---
 srcpkgs/python3-jaraco.collections/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jaraco.collections/template b/srcpkgs/python3-jaraco.collections/template
index 41e658e921e9..b82e8908866a 100644
--- a/srcpkgs/python3-jaraco.collections/template
+++ b/srcpkgs/python3-jaraco.collections/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jaraco.collections'
 pkgname=python3-jaraco.collections
 version=3.0.0
-revision=3
+revision=4
 wrksrc="jaraco.collections-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 65390c3fc33168a21e286c44637971b04a3de264 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:30 -0400
Subject: [PATCH 0338/4088] python3-portend: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-portend/template b/srcpkgs/python3-portend/template
index cc6fe474d96e..5766db04cbef 100644
--- a/srcpkgs/python3-portend/template
+++ b/srcpkgs/python3-portend/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-portend'
 pkgname=python3-portend
 version=2.7.1
-revision=1
+revision=2
 wrksrc="portend-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 744123266b792dbc58c4c3e7f452ee6b77982140 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:03 -0400
Subject: [PATCH 0339/4088] python3-zc.lockfile: rebuild for Python 3.10

---
 srcpkgs/python3-zc.lockfile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zc.lockfile/template b/srcpkgs/python3-zc.lockfile/template
index afac0c19e8b6..50b3eefbf758 100644
--- a/srcpkgs/python3-zc.lockfile/template
+++ b/srcpkgs/python3-zc.lockfile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zc.lockfile'
 pkgname=python3-zc.lockfile
 version=2.0
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4ce4f194f836d6ed842dae3186de84e9784d8b57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:51 -0400
Subject: [PATCH 0340/4088] python3-socketIO-client: rebuild for Python 3.10

---
 srcpkgs/python3-socketIO-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-socketIO-client/template b/srcpkgs/python3-socketIO-client/template
index 1bc4d41c4d84..883125e09427 100644
--- a/srcpkgs/python3-socketIO-client/template
+++ b/srcpkgs/python3-socketIO-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-socketIO-client'
 pkgname=python3-socketIO-client
 version=0.7.2
-revision=5
+revision=6
 wrksrc="socketIO-client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4d4529572fbbdfd9d88c22a306a4d422d1149b6c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:43 -0400
Subject: [PATCH 0341/4088] python3-boolean.py: rebuild for Python 3.10

---
 srcpkgs/python3-boolean.py/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
index 78e6eba59d18..51d0ad491e78 100644
--- a/srcpkgs/python3-boolean.py/template
+++ b/srcpkgs/python3-boolean.py/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-boolean.py'
 pkgname=python3-boolean.py
 version=3.8
-revision=1
+revision=2
 wrksrc="boolean.py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 69bc7d7bad691c4a2a4cc0b2b72a34dc5521af71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:37 -0400
Subject: [PATCH 0342/4088] python3-aionotify: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-aionotify/template b/srcpkgs/python3-aionotify/template
index b2c18dc979b7..be90b5dbf7f0 100644
--- a/srcpkgs/python3-aionotify/template
+++ b/srcpkgs/python3-aionotify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aionotify'
 pkgname=python3-aionotify
 version=0.2.0
-revision=2
+revision=3
 wrksrc="aionotify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 59772b059ad84f9057f03fc3e0507b5c93de5e23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:05 -0400
Subject: [PATCH 0343/4088] python3-inotify: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-inotify/template b/srcpkgs/python3-inotify/template
index 69f753935762..437ac501287c 100644
--- a/srcpkgs/python3-inotify/template
+++ b/srcpkgs/python3-inotify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-inotify'
 pkgname=python3-inotify
 version=0.9.6
-revision=6
+revision=7
 wrksrc="pyinotify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9e0a300eaef1fb99f62445e7de63ec94c5e16f7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:16 -0400
Subject: [PATCH 0344/4088] python3-mccabe: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mccabe/template b/srcpkgs/python3-mccabe/template
index a95ed189baa4..f19e5e6d32e6 100644
--- a/srcpkgs/python3-mccabe/template
+++ b/srcpkgs/python3-mccabe/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mccabe'
 pkgname=python3-mccabe
 version=0.6.1
-revision=5
+revision=6
 wrksrc="mccabe-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5f655d6d4ac42381eef31074c66a8cd9666f6386 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:34 -0400
Subject: [PATCH 0345/4088] python3-pycodestyle: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pycodestyle/template b/srcpkgs/python3-pycodestyle/template
index 8fafc98015d4..0caae52d1f6e 100644
--- a/srcpkgs/python3-pycodestyle/template
+++ b/srcpkgs/python3-pycodestyle/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycodestyle'
 pkgname=python3-pycodestyle
 version=2.7.0
-revision=1
+revision=2
 wrksrc="pycodestyle-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f6bfeef1afc62690b4300bd0b19072a922682e7d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:35 -0400
Subject: [PATCH 0346/4088] python3-pyflakes: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyflakes/template b/srcpkgs/python3-pyflakes/template
index 4df551fa236e..be45e862dfae 100644
--- a/srcpkgs/python3-pyflakes/template
+++ b/srcpkgs/python3-pyflakes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyflakes'
 pkgname=python3-pyflakes
 version=2.3.1
-revision=1
+revision=2
 wrksrc="pyflakes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3480e37f076b48db6219be14f534f7ac8d409652 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:21 -0400
Subject: [PATCH 0347/4088] python-coverage: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
index 332e7baa3b7a..89e30b058c98 100644
--- a/srcpkgs/python-coverage/template
+++ b/srcpkgs/python-coverage/template
@@ -1,7 +1,7 @@
 # Template file for 'python-coverage'
 pkgname=python-coverage
 version=5.0.3
-revision=2
+revision=3
 wrksrc="${pkgname/python-//}-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From b2a11898f458a035cc0147a2ffed2626a79b8b94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:04 -0400
Subject: [PATCH 0348/4088] python3-zope.component: rebuild for Python 3.10

---
 srcpkgs/python3-zope.component/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.component/template b/srcpkgs/python3-zope.component/template
index ffb1e1fbf65c..fb056d383fc9 100644
--- a/srcpkgs/python3-zope.component/template
+++ b/srcpkgs/python3-zope.component/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.component'
 pkgname=python3-zope.component
 version=5.0.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b29d886d2041e5a9495a659ce8aaf725fcf794f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:04 -0400
Subject: [PATCH 0349/4088] python3-zope.configuration: rebuild for Python 3.10

---
 srcpkgs/python3-zope.configuration/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.configuration/template b/srcpkgs/python3-zope.configuration/template
index 35685dd79dc8..b7be9a49a75c 100644
--- a/srcpkgs/python3-zope.configuration/template
+++ b/srcpkgs/python3-zope.configuration/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.configuration'
 pkgname=python3-zope.configuration
 version=4.4.0
-revision=2
+revision=3
 wrksrc="zope.configuration-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From 16f7b97bc98860e816be1cd0c59e2099b7d90165 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:51 -0400
Subject: [PATCH 0350/4088] python3-sphinxcontrib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-sphinxcontrib/template b/srcpkgs/python3-sphinxcontrib/template
index 37f57813e214..d95bfd2e3208 100644
--- a/srcpkgs/python3-sphinxcontrib/template
+++ b/srcpkgs/python3-sphinxcontrib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib'
 pkgname=python3-sphinxcontrib
 version=1.0
-revision=5
+revision=6
 create_wrksrc=yes
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"

From 869ee3f68106264b136c118af40f73836b4c1766 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:05 -0400
Subject: [PATCH 0351/4088] python3-zope.exceptions: rebuild for Python 3.10

---
 srcpkgs/python3-zope.exceptions/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.exceptions/template b/srcpkgs/python3-zope.exceptions/template
index 8f06c14c3758..76f238c25c28 100644
--- a/srcpkgs/python3-zope.exceptions/template
+++ b/srcpkgs/python3-zope.exceptions/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.exceptions'
 pkgname=python3-zope.exceptions
 version=4.4
-revision=2
+revision=3
 wrksrc="zope.exceptions-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-repoze.sphinx.autointerface

From 10e18b63a85723b9df435624adfb886c7ac3ca05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:22 -0400
Subject: [PATCH 0352/4088] python3-oauthlib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-oauthlib/template b/srcpkgs/python3-oauthlib/template
index 6bc69a2f9b71..3a3cb5ac2232 100644
--- a/srcpkgs/python3-oauthlib/template
+++ b/srcpkgs/python3-oauthlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-oauthlib'
 pkgname=python3-oauthlib
 version=3.1.0
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7c4c83c3fdb700f1efc61168f3f130e20d3d3756 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:34 -0400
Subject: [PATCH 0353/4088] python3-Unidecode: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Unidecode/template b/srcpkgs/python3-Unidecode/template
index 9dbf90e2df42..00e54f8c0980 100644
--- a/srcpkgs/python3-Unidecode/template
+++ b/srcpkgs/python3-Unidecode/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Unidecode'
 pkgname=python3-Unidecode
 version=1.1.1
-revision=4
+revision=5
 wrksrc="Unidecode-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c95de850d8aa844bdb894ea1b53e604e99509924 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:54 -0400
Subject: [PATCH 0354/4088] python3-text-unidecode: rebuild for Python 3.10

---
 srcpkgs/python3-text-unidecode/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-text-unidecode/template b/srcpkgs/python3-text-unidecode/template
index cce8aacaf9a9..78b3b84e2234 100644
--- a/srcpkgs/python3-text-unidecode/template
+++ b/srcpkgs/python3-text-unidecode/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-text-unidecode'
 pkgname=python3-text-unidecode
 version=1.2
-revision=3
+revision=4
 wrksrc="text-unidecode-${version}"
 build_style=python3-module
 pycompile_module="text_unidecode"

From a4e980e1b21a77af2c215df2cc0490b367d86c07 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:45 -0400
Subject: [PATCH 0355/4088] python3-certifi: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-certifi/template b/srcpkgs/python3-certifi/template
index ebf9056d7831..ecb66930f3be 100644
--- a/srcpkgs/python3-certifi/template
+++ b/srcpkgs/python3-certifi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-certifi'
 pkgname=python3-certifi
 version=2021.05.30
-revision=1
+revision=2
 wrksrc="python-certifi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6926e09eedc5474ca33ec4ca2351a82ff587fbdc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:50 -0400
Subject: [PATCH 0356/4088] python3-cycler: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cycler/template b/srcpkgs/python3-cycler/template
index 1163ab062489..f05b7644660a 100644
--- a/srcpkgs/python3-cycler/template
+++ b/srcpkgs/python3-cycler/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cycler'
 pkgname=python3-cycler
 version=0.10.0
-revision=7
+revision=8
 wrksrc="cycler-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0448f99ac6596703fe3121ada09bb035d5bcb93b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:12 -0400
Subject: [PATCH 0357/4088] python3-kiwisolver: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-kiwisolver/template b/srcpkgs/python3-kiwisolver/template
index 0b947591cb0f..7185e3066787 100644
--- a/srcpkgs/python3-kiwisolver/template
+++ b/srcpkgs/python3-kiwisolver/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-kiwisolver'
 pkgname=python3-kiwisolver
 version=1.3.1
-revision=1
+revision=2
 wrksrc="kiwisolver-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cppy"

From 7a12daec25fd9613f8edf148a05a6f94cdcecc95 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:14 -0400
Subject: [PATCH 0358/4088] python3-lz4: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-lz4/template b/srcpkgs/python3-lz4/template
index 7cb716632cad..281b5a2acbac 100644
--- a/srcpkgs/python3-lz4/template
+++ b/srcpkgs/python3-lz4/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-lz4'
 pkgname=python3-lz4
 version=3.1.3
-revision=1
+revision=2
 wrksrc="lz4-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools_scm python3-pkgconfig"

From 0d97bcad68caef874ead74b78bfb7bbc6c02ab5b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:03 -0400
Subject: [PATCH 0359/4088] python3-hyper-h2: rebuild for Python 3.10, rename
 python3-h2

---
 srcpkgs/python3-h2/template       | 24 ++++++++++++++++++++++++
 srcpkgs/python3-hyper-h2          |  1 +
 srcpkgs/python3-hyper-h2/template | 18 ------------------
 3 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 srcpkgs/python3-h2/template
 create mode 120000 srcpkgs/python3-hyper-h2
 delete mode 100644 srcpkgs/python3-hyper-h2/template

diff --git a/srcpkgs/python3-h2/template b/srcpkgs/python3-h2/template
new file mode 100644
index 000000000000..29668e4cec4f
--- /dev/null
+++ b/srcpkgs/python3-h2/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-h2'
+pkgname=python3-h2
+version=4.0.0
+revision=2
+wrksrc="h2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-hpack python3-hyperframe"
+short_desc="HTTP/2 State-Machine based protocol implementation (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/python-hyper/h2"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=78753b52cebb63f87097c9a5f969004a61ec4a41f967e41dcc287e26dd9b4143
+
+post_install() {
+	vlicense LICENSE
+}
+
+python3-hyper-h2_package() {
+	build_style=meta
+	short_desc+=" - transitional dummy pkg"
+	depends="python3-h2>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-hyper-h2 b/srcpkgs/python3-hyper-h2
new file mode 120000
index 000000000000..853f8bf94620
--- /dev/null
+++ b/srcpkgs/python3-hyper-h2
@@ -0,0 +1 @@
+python3-h2
\ No newline at end of file
diff --git a/srcpkgs/python3-hyper-h2/template b/srcpkgs/python3-hyper-h2/template
deleted file mode 100644
index ace0cb9258b3..000000000000
--- a/srcpkgs/python3-hyper-h2/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python3-hyper-h2'
-pkgname=python3-hyper-h2
-version=4.0.0
-revision=1
-wrksrc="hyper-h2-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3 python3-hpack python3-hyperframe"
-short_desc="HTTP/2 State-Machine based protocol implementation(Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyper-h2"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ced79b6c3cd967ef6acf405c5e9edfb4069b274799bc261aac7d5d3fec36b011
-
-post_install() {
-	vlicense LICENSE
-}

From ef2bc5bf0fdca35f8b569971a7b21e5e9e14217b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:31 -0400
Subject: [PATCH 0360/4088] python3-priority: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-priority/template b/srcpkgs/python3-priority/template
index 5bc9b04b3054..8772bb6fc739 100644
--- a/srcpkgs/python3-priority/template
+++ b/srcpkgs/python3-priority/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-priority'
 pkgname=python3-priority
 version=2.0.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9ea9ee15ab8593c5a546e95796417160a8036f80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:01 -0400
Subject: [PATCH 0361/4088] python3-wsproto: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-wsproto/template b/srcpkgs/python3-wsproto/template
index 672e36d66176..4098570177e2 100644
--- a/srcpkgs/python3-wsproto/template
+++ b/srcpkgs/python3-wsproto/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-wsproto'
 pkgname=python3-wsproto
 version=1.0.0
-revision=1
+revision=2
 wrksrc="wsproto-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 17def623980dab6141130af282d759ea9d9eaeda Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:28 -0400
Subject: [PATCH 0362/4088] python3-EasyProcess: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-EasyProcess/template b/srcpkgs/python3-EasyProcess/template
index 51854a737d72..2b62ed4ad576 100644
--- a/srcpkgs/python3-EasyProcess/template
+++ b/srcpkgs/python3-EasyProcess/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-EasyProcess'
 pkgname=python3-EasyProcess
 version=0.3
-revision=2
+revision=3
 wrksrc=EasyProcess-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a7a023b54bfdf94d72739674eea08e018271a4b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:37 -0400
Subject: [PATCH 0363/4088] python3-pyqt6-sip: rebuild for Python 3.10

---
 srcpkgs/python3-pyqt6-sip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyqt6-sip/template b/srcpkgs/python3-pyqt6-sip/template
index e7f2517c130e..57547a3f64f7 100644
--- a/srcpkgs/python3-pyqt6-sip/template
+++ b/srcpkgs/python3-pyqt6-sip/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-sip'
 pkgname=python3-pyqt6-sip
 version=13.1.0
-revision=1
+revision=2
 wrksrc="PyQt6_sip-$version"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools sip"

From dbbea79e9efafc3ea25a9c8bb87e91a8fc037b7d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:44 -0400
Subject: [PATCH 0364/4088] python3-requests-ntlm: rebuild for Python 3.10

---
 srcpkgs/python3-requests-ntlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-requests-ntlm/template b/srcpkgs/python3-requests-ntlm/template
index fc5c0dc6aab8..87c03bd6bade 100644
--- a/srcpkgs/python3-requests-ntlm/template
+++ b/srcpkgs/python3-requests-ntlm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-ntlm'
 pkgname=python3-requests-ntlm
 version=1.1.0
-revision=2
+revision=3
 wrksrc="requests-ntlm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 68800f22baf8a6667b56db1f38a75eeb9c6b3dae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:02 -0400
Subject: [PATCH 0365/4088] python3-xmltodict: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-xmltodict/template b/srcpkgs/python3-xmltodict/template
index 14243ddb0063..70a5e0e6068d 100644
--- a/srcpkgs/python3-xmltodict/template
+++ b/srcpkgs/python3-xmltodict/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xmltodict'
 pkgname=python3-xmltodict
 version=0.12.0
-revision=4
+revision=5
 wrksrc="xmltodict-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c57b5a034a4f04b54d1b2fad2ccf70ff79f28eac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:51 -0400
Subject: [PATCH 0366/4088] python3-sortedcontainers: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-sortedcontainers/template b/srcpkgs/python3-sortedcontainers/template
index 059447e2b1ad..618e1d627c1b 100644
--- a/srcpkgs/python3-sortedcontainers/template
+++ b/srcpkgs/python3-sortedcontainers/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sortedcontainers'
 pkgname=python3-sortedcontainers
 version=2.4.0
-revision=1
+revision=2
 wrksrc="sortedcontainers-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 719150a4d533eaca54c8f2fedf7d8eddf10d57e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:44 -0400
Subject: [PATCH 0367/4088] capstone: rebuild for Python 3.10

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

diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template
index aebd3621f97a..255b813f79f0 100644
--- a/srcpkgs/capstone/template
+++ b/srcpkgs/capstone/template
@@ -1,7 +1,7 @@
 # Template file for 'capstone'
 pkgname=capstone
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=1
 hostmakedepends="python-setuptools python3-setuptools"

From 0715bcac6d25fe8bf7767cde1b78dc110de52d63 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:57 -0400
Subject: [PATCH 0368/4088] python3-ultrajson: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 1f4531157db3..9c513c995073 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
 version=4.2.0
-revision=1
+revision=2
 wrksrc="ujson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From bbff8d468a1d66c1173d375183a1a1b6ec45df73 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:11 -0400
Subject: [PATCH 0369/4088] python3-jupyter_widgetsnbextension: rebuild for
 Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
index 06918c86c6d5..c6d4f8df8e31 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/template
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_widgetsnbextension'
 pkgname=python3-jupyter_widgetsnbextension
 version=3.5.1
-revision=2
+revision=3
 wrksrc="widgetsnbextension-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 610ac5651462e4a0fc97317a36c85897acaa412e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:24 -0400
Subject: [PATCH 0370/4088] python-pystache: rebuild for Python 3.10

---
 srcpkgs/python-pystache/patches/setup.patch | 27 +++++++++++++++++++++
 srcpkgs/python-pystache/template            | 13 +++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python-pystache/patches/setup.patch

diff --git a/srcpkgs/python-pystache/patches/setup.patch b/srcpkgs/python-pystache/patches/setup.patch
new file mode 100644
index 000000000000..3849245d01d6
--- /dev/null
+++ b/srcpkgs/python-pystache/patches/setup.patch
@@ -0,0 +1,27 @@
+1. setuptools no longer supports use_2to3, so drop the setup() arg
+2. Drop the pystache-test entrypoint script here rather than in-template
+
+--- ./setup.py
++++ ./setup.py
+@@ -351,13 +351,6 @@
+ 
+     """
+     extra = {}
+-    # TODO: it might be more correct to check whether we are using
+-    #   Distribute instead of setuptools, since use_2to3 doesn't take
+-    #   effect when using Python 2, even when using Distribute.
+-    if py_version >= (3, ):
+-        # Causes 2to3 to be run during the build step.
+-        extra['use_2to3'] = True
+-
+     return extra
+ 
+ 
+@@ -401,7 +394,6 @@
+           entry_points = {
+             'console_scripts': [
+                 'pystache=pystache.commands.render:main',
+-                'pystache-test=pystache.commands.test:main',
+             ],
+           },
+           classifiers = CLASSIFIERS,
diff --git a/srcpkgs/python-pystache/template b/srcpkgs/python-pystache/template
index 4bed7b9403d4..6c85b2d20d3a 100644
--- a/srcpkgs/python-pystache/template
+++ b/srcpkgs/python-pystache/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pystache'
 pkgname=python-pystache
 version=0.5.4
-revision=5
+revision=6
 wrksrc="pystache-${version}"
 build_style=python-module
 pycompile_module="pystache"
@@ -15,10 +15,15 @@ distfiles="${PYPI_SITE}/p/pystache/pystache-${version}.tar.gz"
 checksum=f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a
 alternatives="pystache:pystache:/usr/bin/pystache2"
 
-pre_build() {
-	# no pystache-test entry point
-	sed -i '/pystache-test/d' setup.py
+do_build() {
+	# This is pure python, no need for cross antics
+	python2.7 setup.py build --build-base=build-2.7
+
+	# Convert py2 syntax to py3 since setuptools no longer does it
+	2to3-${py3_ver} -w pystache
+	python3 setup.py build --build-base=build-${py3_ver}
 }
+
 post_install() {
 	vlicense LICENSE
 }

From db0bf9546ea8688170af21ac2dd364adb901c8a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:39 -0400
Subject: [PATCH 0371/4088] ansible-core: rebuild for Python 3.10

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

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 397118d5d692..a92a3479dcf0 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,7 +1,7 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
 version=2.11.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko

From 5497a52b819f427ec3ee0a7630d46b612922f0d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:50 -0400
Subject: [PATCH 0372/4088] python3-smmap: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-smmap/template b/srcpkgs/python3-smmap/template
index 3fff30973c14..20317a484d76 100644
--- a/srcpkgs/python3-smmap/template
+++ b/srcpkgs/python3-smmap/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-smmap'
 pkgname=python3-smmap
 version=2.0.5
-revision=4
+revision=5
 wrksrc="smmap-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b5fd3747e62caabd784d099483f1dbeee4f81926 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:19 -0400
Subject: [PATCH 0373/4088] python-SQLAlchemy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index b4ff86c2762c..7443662c1ed6 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -1,7 +1,7 @@
 # Template file for 'python-SQLAlchemy'
 pkgname=python-SQLAlchemy
 version=1.3.18
-revision=2
+revision=3
 wrksrc="SQLAlchemy-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From f88a305327a570d797dae11277e2ddf718c7aac6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:35 -0400
Subject: [PATCH 0374/4088] python3-WTForms: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-WTForms/template b/srcpkgs/python3-WTForms/template
index fd294b09f00e..aea6345e4710 100644
--- a/srcpkgs/python3-WTForms/template
+++ b/srcpkgs/python3-WTForms/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-WTForms'
 pkgname=python3-WTForms
 version=2.2.1
-revision=4
+revision=5
 wrksrc="WTForms-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e0534e8c96d701ce95919a28aa4824c5cb3980a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:13 -0400
Subject: [PATCH 0375/4088] python3-lazy-object-proxy: rebuild for Python 3.10

---
 srcpkgs/python3-lazy-object-proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template
index 5fe116ab4399..23debafd8af7 100644
--- a/srcpkgs/python3-lazy-object-proxy/template
+++ b/srcpkgs/python3-lazy-object-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-lazy-object-proxy'
 pkgname=python3-lazy-object-proxy
 version=1.5.2
-revision=1
+revision=2
 wrksrc="lazy-object-proxy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From a92e34774a4a601ea4d47bcf271602d003a3376d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:01 -0400
Subject: [PATCH 0376/4088] python3-wrapt: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
index b182006befea..248124652acf 100644
--- a/srcpkgs/python3-wrapt/template
+++ b/srcpkgs/python3-wrapt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-wrapt'
 pkgname=python3-wrapt
 version=1.12.1
-revision=4
+revision=5
 wrksrc="wrapt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e550c8514de08b02d4ce1bc8cf5570197d1a7364 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:36 -0400
Subject: [PATCH 0377/4088] python3-aiodns: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-aiodns/template b/srcpkgs/python3-aiodns/template
index fc5aa977fc68..fb82199d201f 100644
--- a/srcpkgs/python3-aiodns/template
+++ b/srcpkgs/python3-aiodns/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiodns'
 pkgname=python3-aiodns
 version=2.0.0
-revision=2
+revision=3
 wrksrc="aiodns-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8bcdd7332a0ec34e69fe064f876786a52ab18f4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:21 -0400
Subject: [PATCH 0378/4088] python-configobj: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-configobj/template b/srcpkgs/python-configobj/template
index 99d86ab89b8f..ff80e29608cf 100644
--- a/srcpkgs/python-configobj/template
+++ b/srcpkgs/python-configobj/template
@@ -1,7 +1,7 @@
 # Template file for 'python-configobj'
 pkgname=python-configobj
 version=5.0.6
-revision=8
+revision=9
 wrksrc="configobj-${version}"
 build_style=python-module
 pycompile_module="_version.py configobj.py validate.py"

From 4e88a7997261f2f0e2e11c0df634359621d4ba83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:53 -0400
Subject: [PATCH 0379/4088] python3-tabulate: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tabulate/template b/srcpkgs/python3-tabulate/template
index c9007a1cdd57..b5fa805bb8ad 100644
--- a/srcpkgs/python3-tabulate/template
+++ b/srcpkgs/python3-tabulate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tabulate'
 pkgname=python3-tabulate
 version=0.8.7
-revision=1
+revision=2
 wrksrc="tabulate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e0ac71f8476d32aab90319c6a2f739590fcd7d2c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:54 -0400
Subject: [PATCH 0380/4088] python3-terminaltables: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-terminaltables/template b/srcpkgs/python3-terminaltables/template
index 615c5522c441..ff7c30424934 100644
--- a/srcpkgs/python3-terminaltables/template
+++ b/srcpkgs/python3-terminaltables/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-terminaltables'
 pkgname=python3-terminaltables
 version=3.1.0
-revision=3
+revision=4
 wrksrc="terminaltables-${version}"
 build_style=python3-module
 pycompile_module="terminaltables"

From fee5aca5402ebaed824c9bc3416f74fdf14994e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:26 -0400
Subject: [PATCH 0381/4088] python-sqlparse: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
index 8e3b396e3a9d..45224c6c879f 100644
--- a/srcpkgs/python-sqlparse/template
+++ b/srcpkgs/python-sqlparse/template
@@ -1,7 +1,7 @@
 # Template file for 'python-sqlparse'
 pkgname=python-sqlparse
 version=0.3.0
-revision=4
+revision=5
 wrksrc="sqlparse-${version}"
 build_style=python-module
 pycompile_module="sqlparse"

From da40b52ecc3695adc075312e75331b456cc07119 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:32 -0400
Subject: [PATCH 0382/4088] python3-psycopg2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-psycopg2/template b/srcpkgs/python3-psycopg2/template
index ebd3b6b1241a..d7ab66f7f9a6 100644
--- a/srcpkgs/python3-psycopg2/template
+++ b/srcpkgs/python3-psycopg2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-psycopg2'
 pkgname=python3-psycopg2
 version=2.8.3
-revision=4
+revision=5
 wrksrc="psycopg2-${version}"
 build_style=python3-module
 # Require postgresql-libs-devel to find executable: pg_config

From d6f5281883c81b7a90d0614a26c402a4a8431bbb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:48 -0400
Subject: [PATCH 0383/4088] python3-colorclass: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-colorclass/template b/srcpkgs/python3-colorclass/template
index f70af63bfc0f..9dd543eb5a1c 100644
--- a/srcpkgs/python3-colorclass/template
+++ b/srcpkgs/python3-colorclass/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-colorclass'
 pkgname=python3-colorclass
 version=2.2.0
-revision=3
+revision=4
 wrksrc="colorclass-${version}"
 build_style=python3-module
 pycompile_module="colorclass"

From b13f0eb18e7b21e3dafb4f0c76f5dbc08c457584 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:54 -0400
Subject: [PATCH 0384/4088] python3-easygui: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-easygui/template b/srcpkgs/python3-easygui/template
index 27bc2fb0e020..98ccba81fc9f 100644
--- a/srcpkgs/python3-easygui/template
+++ b/srcpkgs/python3-easygui/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-easygui'
 pkgname=python3-easygui
 version=0.98.1
-revision=3
+revision=4
 wrksrc="easygui-${version}"
 build_style=python3-module
 pycompile_module="easygui"

From 2157d98aecc494b4b08a128c6aa45e3d3cc83b6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:18 -0400
Subject: [PATCH 0385/4088] python3-msoffcrypto-tool: rebuild for Python 3.10

---
 srcpkgs/python3-msoffcrypto-tool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-msoffcrypto-tool/template b/srcpkgs/python3-msoffcrypto-tool/template
index 56856151c75c..feb24f7b2bbe 100644
--- a/srcpkgs/python3-msoffcrypto-tool/template
+++ b/srcpkgs/python3-msoffcrypto-tool/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-msoffcrypto-tool'
 pkgname=python3-msoffcrypto-tool
 version=4.12.0
-revision=1
+revision=2
 wrksrc="msoffcrypto-tool-${version}"
 build_style=python3-pep517
 make_install_target="msoffcrypto_tool-${version}-*-*-*.whl"

From 12dfbf102548789c41f7e3c6a9be4ba5baf49769 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:26 -0400
Subject: [PATCH 0386/4088] python3-pcodedmp: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pcodedmp/template b/srcpkgs/python3-pcodedmp/template
index a479c31fcc72..93e95677079e 100644
--- a/srcpkgs/python3-pcodedmp/template
+++ b/srcpkgs/python3-pcodedmp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pcodedmp'
 pkgname=python3-pcodedmp
 version=1.2.6
-revision=3
+revision=4
 wrksrc="pcodedmp-${version}"
 build_style=python3-module
 pycompile_module="pcodedmp"

From e32e38c25096241a0155f6ea88a684cf76ba3b0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:48 -0400
Subject: [PATCH 0387/4088] python3-construct: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-construct/template b/srcpkgs/python3-construct/template
index 9654a32d15bb..8c35a517e09d 100644
--- a/srcpkgs/python3-construct/template
+++ b/srcpkgs/python3-construct/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-construct'
 pkgname=python3-construct
 version=2.10.54
-revision=1
+revision=2
 wrksrc="construct-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c508c3b8704c4f42e7b8c5d8b943d23e0f5236c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:34 -0400
Subject: [PATCH 0388/4088] python3-pycryptodomex: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index 65adb7625e19..7119d0947f50 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycryptodomex'
 pkgname=python3-pycryptodomex
 version=3.10.4
-revision=1
+revision=2
 wrksrc="pycryptodomex-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f501cf5c6e95c3cd410be5ac1de1a0ea96a6e9c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:12 -0400
Subject: [PATCH 0389/4088] olm-python3: rebuild for Python 3.10

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

diff --git a/srcpkgs/olm-python3/template b/srcpkgs/olm-python3/template
index 043420109caf..1056b8270e9b 100644
--- a/srcpkgs/olm-python3/template
+++ b/srcpkgs/olm-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'olm-python3'
 pkgname=olm-python3
 version=3.2.4
-revision=1
+revision=2
 wrksrc="olm-${version}"
 build_wrksrc=python
 build_style=python3-module

From 0f30f9f918f3a76b822825101d230a2e6daf3655 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:24 -0400
Subject: [PATCH 0390/4088] python-pycryptodome: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template
index a566f67cc03b..77b971be4a99 100644
--- a/srcpkgs/python-pycryptodome/template
+++ b/srcpkgs/python-pycryptodome/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pycryptodome'
 pkgname=python-pycryptodome
 version=3.9.7
-revision=2
+revision=3
 wrksrc="pycryptodome-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 6db409483f0fc83a39b347544932ba1d10871ca4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:36 -0400
Subject: [PATCH 0391/4088] python3-aiofiles: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-aiofiles/template b/srcpkgs/python3-aiofiles/template
index a4ae4a79471d..95660af980b3 100644
--- a/srcpkgs/python3-aiofiles/template
+++ b/srcpkgs/python3-aiofiles/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiofiles'
 pkgname=python3-aiofiles
 version=0.7.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"

From c4aab11790785db1209d3522cd5f1ab8d0fe245f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:14 -0400
Subject: [PATCH 0392/4088] python3-logbook: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-logbook/template b/srcpkgs/python3-logbook/template
index aab27f27e2d4..3abe44df7ac4 100644
--- a/srcpkgs/python3-logbook/template
+++ b/srcpkgs/python3-logbook/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-logbook'
 pkgname=python3-logbook
 version=1.5.3
-revision=2
+revision=3
 wrksrc="logbook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel python3-Cython"

From 86018953c6e6e83d74dd3d72f34ad68356caa281 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:26 -0400
Subject: [PATCH 0393/4088] python3-peewee: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
index 5c0594df5dc9..dcd1c9143c3a 100644
--- a/srcpkgs/python3-peewee/template
+++ b/srcpkgs/python3-peewee/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-peewee'
 pkgname=python3-peewee
 version=3.14.4
-revision=1
+revision=2
 wrksrc="peewee-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 7aae8ccafef3551ee47e46af03a9585774375f0a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:18 -0400
Subject: [PATCH 0394/4088] python3-msgpack: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
index 96eff5918dac..d740fd001e8d 100644
--- a/srcpkgs/python3-msgpack/template
+++ b/srcpkgs/python3-msgpack/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-msgpack'
 pkgname=python3-msgpack
 version=1.0.2
-revision=1
+revision=2
 wrksrc="msgpack-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bd0affcc25e05e0779bea11b892e403454048edc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:24 -0400
Subject: [PATCH 0395/4088] python-pyserial: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-pyserial/template b/srcpkgs/python-pyserial/template
index 315f720dbe90..4fba5dbb640e 100644
--- a/srcpkgs/python-pyserial/template
+++ b/srcpkgs/python-pyserial/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyserial'
 pkgname=python-pyserial
 version=3.4
-revision=5
+revision=6
 wrksrc="pyserial-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From ca0d6ed7ae634c50158fcd19a86019541fa19f65 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:09 -0400
Subject: [PATCH 0396/4088] scons: rebuild for Python 3.10

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

diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template
index 883443e34659..574f96858c7b 100644
--- a/srcpkgs/scons/template
+++ b/srcpkgs/scons/template
@@ -1,7 +1,7 @@
 # Template file for 'scons'
 pkgname=scons
 version=4.0.1
-revision=2
+revision=3
 wrksrc="SCons-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From a38772fb11bf78ddbc802a506fe8e643abed1612 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:23 -0400
Subject: [PATCH 0397/4088] python-pathlib2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
index 622b82fe66dd..fc4b7a31fc5f 100644
--- a/srcpkgs/python-pathlib2/template
+++ b/srcpkgs/python-pathlib2/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pathlib2'
 pkgname=python-pathlib2
 version=2.3.4
-revision=5
+revision=6
 wrksrc="pathlib2-${version}"
 build_style=python-module
 pycompile_module="pathlib2"

From 3f504ca9ca528ec56813780b2ee84fdc1c66a6a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:48 -0400
Subject: [PATCH 0398/4088] python3-serpent: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-serpent/template b/srcpkgs/python3-serpent/template
index d156563a2259..fd59e78f1db4 100644
--- a/srcpkgs/python3-serpent/template
+++ b/srcpkgs/python3-serpent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-serpent'
 pkgname=python3-serpent
 version=1.40
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1d14eabb3c918fc966d888a9a7e4ac5298580e43 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:22 -0400
Subject: [PATCH 0399/4088] youtube-dl: rebuild for Python 3.10

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

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 3c1121e5317c..72c70a4ee4b4 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,7 +1,7 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
 version=2021.06.06
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0036691459eef9f7b6b978570c4737a1f1eac665 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:57 -0400
Subject: [PATCH 0400/4088] gst1-python3: rebuild for Python 3.10

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

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 25bde3b7c46d..3f85e16de418 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
 version=1.18.4
-revision=1
+revision=2
 wrksrc="gst-python-${version}"
 build_style=meson
 hostmakedepends="pkg-config python3"

From 7ebeaf73c1af509e2729ec3b5ca94c8910fa9e0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:35 -0400
Subject: [PATCH 0401/4088] python3-pykka: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pykka/template b/srcpkgs/python3-pykka/template
index 72eea6ad026c..7c3d8acc3340 100644
--- a/srcpkgs/python3-pykka/template
+++ b/srcpkgs/python3-pykka/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pykka'
 pkgname=python3-pykka
 version=2.0.2
-revision=3
+revision=4
 wrksrc="Pykka-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7cb66d54dee923548578fc62ec34d88a23ca4fc4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:58 -0400
Subject: [PATCH 0402/4088] python3-uritools: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-uritools/template b/srcpkgs/python3-uritools/template
index 761a8f4a1792..c4d37f1591f0 100644
--- a/srcpkgs/python3-uritools/template
+++ b/srcpkgs/python3-uritools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-uritools'
 pkgname=python3-uritools
 version=3.0.0
-revision=2
+revision=3
 wrksrc="uritools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8e67121a6ea34fc35e298d937dea325b8ee3c8e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:45 -0400
Subject: [PATCH 0403/4088] python3-casttube: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-casttube/template b/srcpkgs/python3-casttube/template
index ca94d184a230..74187dad714b 100644
--- a/srcpkgs/python3-casttube/template
+++ b/srcpkgs/python3-casttube/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-casttube'
 pkgname=python3-casttube
 version=0.2.0
-revision=3
+revision=4
 wrksrc="casttube-${version}"
 build_style=python3-module
 pycompile_module="casttube"

From bb132269fab52ce846518e504bea774730fe05a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:03 -0400
Subject: [PATCH 0404/4088] python3-zeroconf: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index 0b06d05d142f..a08bf018db1d 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
 version=0.30.0
-revision=1
+revision=2
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 10d0d65afcf31125f702adf4e16dc1ecec03db51 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:26 -0400
Subject: [PATCH 0405/4088] python-xdg: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-xdg/template b/srcpkgs/python-xdg/template
index f9a1430433e6..09f1dc1ce2c0 100644
--- a/srcpkgs/python-xdg/template
+++ b/srcpkgs/python-xdg/template
@@ -1,7 +1,7 @@
 # Template file for 'python-xdg'
 pkgname=python-xdg
 version=0.27
-revision=1
+revision=2
 wrksrc="pyxdg-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 536e1b150eefe200e862aa0d9d2a95fda11e8381 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:57 -0400
Subject: [PATCH 0406/4088] python3-txaio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-txaio/template b/srcpkgs/python3-txaio/template
index 4de2e16894fc..99053e1ad2da 100644
--- a/srcpkgs/python3-txaio/template
+++ b/srcpkgs/python3-txaio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-txaio'
 pkgname=python3-txaio
 version=21.2.1
-revision=1
+revision=2
 wrksrc="txaio-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From a6752322acf39768a87ec827b0d66eb74baa7662 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:02 -0400
Subject: [PATCH 0407/4088] python3-hkdf: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-hkdf/template b/srcpkgs/python3-hkdf/template
index b202a4adbf00..f1c95a95bd5a 100644
--- a/srcpkgs/python3-hkdf/template
+++ b/srcpkgs/python3-hkdf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hkdf'
 pkgname=python3-hkdf
 version=0.0.3
-revision=3
+revision=4
 wrksrc="hkdf-${version}"
 build_style=python3-module
 pycompile_module="hkdf.py"

From b7ba509e69f8369d491fb6c877b6bb93dd9ef3d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:03 -0400
Subject: [PATCH 0408/4088] libixion: rebuild for Python 3.10

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

diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 60a21b07ac94..ce0f428979a2 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
 # Template file for 'libixion'
 pkgname=libixion
 version=0.16.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fmt-devel mdds python3-devel spdlog"

From 5b1911c769fe3fef1268667d6d70c0a7d304f2a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:09 -0400
Subject: [PATCH 0409/4088] python3-json5: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..3cbd6b97feea 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
 version=0.9.6
-revision=1
+revision=2
 wrksrc=pyjson5-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5d80686c9d792e59527a8bcc8ec1a5146cc4212e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:11 -0400
Subject: [PATCH 0410/4088] python3-jupyter_server: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 96cc46401f66..f5ef0ff0bdcb 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
 version=1.11.0
-revision=1
+revision=2
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 835e07ae771a1f4f3bb6e6a340be49b916fe070c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:13 -0400
Subject: [PATCH 0411/4088] python3-ldap3: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ldap3/template b/srcpkgs/python3-ldap3/template
index 7ef33806b7fc..ca9d7e828c95 100644
--- a/srcpkgs/python3-ldap3/template
+++ b/srcpkgs/python3-ldap3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ldap3'
 pkgname=python3-ldap3
 version=2.8.1
-revision=1
+revision=2
 wrksrc="ldap3-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 20521f0efaa906a1efda1a6052ff4197ea9ed03a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:27 -0400
Subject: [PATCH 0412/4088] python3-BeautifulSoup4: rebuild for Python 3.10,
 update to 4.10.0.

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

diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index b9c83a0b6c61..cd0535284105 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,22 +1,20 @@
 # Template file for 'python3-BeautifulSoup4'
 pkgname=python3-BeautifulSoup4
-version=4.9.3
+version=4.10.0
 revision=1
 wrksrc="beautifulsoup4-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-soupsieve"
+checkdepends="python3-pytest $depends"
 short_desc="Python3 HTML/XML parser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.crummy.com/software/BeautifulSoup"
 changelog="https://bazaar.launchpad.net/%7Eleonardr/beautifulsoup/bs4/view/head:/CHANGELOG"
 distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25
+checksum=c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891
 
-do_check() {
-	:
-}
 post_install() {
 	vlicense LICENSE
 }

From b107ddc39462f35a0ba8de20e1195af91715e29c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:37 -0400
Subject: [PATCH 0413/4088] SoapySDR: rebuild for Python 3.10

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

diff --git a/srcpkgs/SoapySDR/template b/srcpkgs/SoapySDR/template
index 8d7bfc997789..94e76916ef10 100644
--- a/srcpkgs/SoapySDR/template
+++ b/srcpkgs/SoapySDR/template
@@ -1,7 +1,7 @@
 # Template file for 'SoapySDR'
 pkgname=SoapySDR
 version=0.7.2
-revision=2
+revision=3
 wrksrc="${pkgname}-soapy-sdr-${version}"
 build_style=cmake
 configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3"

From 5ed38651c9b90da51ca5c2b7766f0aead1faa27c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:56 -0400
Subject: [PATCH 0414/4088] gnuradio: rebuild for Python 3.10

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

diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 88dae590f8f5..d41d253fa77b 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
 version=3.8.0.0
-revision=7
+revision=8
 build_style=cmake
 conf_files="/etc/gnuradio/conf.d/*"
 configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"

From b8f32ac3008cd436b867b3b62190c73970f970ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:51 -0400
Subject: [PATCH 0415/4088] python3-deprecation: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-deprecation/template b/srcpkgs/python3-deprecation/template
index 0c8664ddd6da..a8b859309adf 100644
--- a/srcpkgs/python3-deprecation/template
+++ b/srcpkgs/python3-deprecation/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-deprecation'
 pkgname=python3-deprecation
 version=2.1.0
-revision=2
+revision=3
 wrksrc="deprecation-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7640fc2de35b0f69a1892f46d47958643f58dd37 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:57 -0400
Subject: [PATCH 0416/4088] python3-filetype: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-filetype/template b/srcpkgs/python3-filetype/template
index 3dc20eae5254..97170f1398b1 100644
--- a/srcpkgs/python3-filetype/template
+++ b/srcpkgs/python3-filetype/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-filetype'
 pkgname=python3-filetype
 version=1.0.5
-revision=4
+revision=5
 wrksrc="filetype-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9776759be3987b0069899359fca3c91331ab7385 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:36 -0400
Subject: [PATCH 0417/4088] python3-pylast: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index cf5b2fd81cfa..63b2e0104e61 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pylast'
 pkgname=python3-pylast
 version=4.1.0
-revision=2
+revision=3
 wrksrc="pylast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From a8b99e4cc4235034ef26a2f257e6501f38880dce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:22 -0400
Subject: [PATCH 0418/4088] zbar: rebuild for Python 3.10

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

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index f64d87fcfe81..139f17f4ec52 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -1,7 +1,7 @@
 # Template file for 'zbar'
 pkgname=zbar
 version=0.23.1
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper=gir
 configure_args="$(vopt_with qt) --with-gir --with-python=python3"

From 0131b353dfe7fa1bb66819b694c9665fa46e4743 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:50 -0400
Subject: [PATCH 0419/4088] python3-smartypants: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
index 728196e7100c..18e711829981 100644
--- a/srcpkgs/python3-smartypants/template
+++ b/srcpkgs/python3-smartypants/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-smartypants'
 pkgname=python3-smartypants
 version=2.0.1
-revision=1
+revision=2
 wrksrc="smartypants.py-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4c8bd341876a93430883cce554dce54a541bdb6e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:00 -0400
Subject: [PATCH 0420/4088] keystone: rebuild for Python 3.10

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

diff --git a/srcpkgs/keystone/template b/srcpkgs/keystone/template
index ca75eb074dc0..4bea14d5ca2e 100644
--- a/srcpkgs/keystone/template
+++ b/srcpkgs/keystone/template
@@ -1,7 +1,7 @@
 # Template file for 'keystone'
 pkgname=keystone
 version=0.9.2
-revision=2
+revision=3
 build_style=cmake
 configure_args='-DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD=all'
 hostmakedepends="python3-setuptools"

From bfeed4f7deae6ff5d170d0f327953637e3cf5224 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:56 -0400
Subject: [PATCH 0421/4088] python3-filebytes: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-filebytes/template b/srcpkgs/python3-filebytes/template
index c642ed52b996..eb28054bb9fa 100644
--- a/srcpkgs/python3-filebytes/template
+++ b/srcpkgs/python3-filebytes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-filebytes'
 pkgname=python3-filebytes
 version=0.10.2
-revision=2
+revision=3
 wrksrc="filebytes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1552efd49b5989762bed9cae20ad2a04294e7278 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:04 -0400
Subject: [PATCH 0422/4088] libpeas: rebuild for Python 3.10

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

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index c088c6f11478..4e0cd06839f9 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
 version=1.30.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"

From 254f098ed3e77c0f05648e8533716fa3efbc1d0b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:25 -0400
Subject: [PATCH 0423/4088] python-rdflib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template
index c921bf332041..889ffcb7fa53 100644
--- a/srcpkgs/python-rdflib/template
+++ b/srcpkgs/python-rdflib/template
@@ -1,7 +1,7 @@
 # Template file for 'python-rdflib'
 pkgname=python-rdflib
 version=4.2.2
-revision=5
+revision=6
 wrksrc="rdflib-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From ecf74077956cc5016da0435e1d63b315a4f8509d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:49 -0400
Subject: [PATCH 0424/4088] python3-css-parser: rebuild for Python 3.10

---
 srcpkgs/python3-css-parser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template
index 100907943ce7..5ded34efd010 100644
--- a/srcpkgs/python3-css-parser/template
+++ b/srcpkgs/python3-css-parser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-css-parser'
 pkgname=python3-css-parser
 version=1.0.4
-revision=5
+revision=6
 wrksrc="css-parser-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 567968514d8aa2ba4b0b04a7b6361dcc11c8a6bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:50 -0400
Subject: [PATCH 0425/4088] python3-cssutils: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cssutils/template b/srcpkgs/python3-cssutils/template
index 83910cdada3c..33a6857a11b6 100644
--- a/srcpkgs/python3-cssutils/template
+++ b/srcpkgs/python3-cssutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cssutils'
 pkgname=python3-cssutils
 version=1.0.2
-revision=5
+revision=6
 wrksrc="cssutils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c4638ceada0a9df42d1acbabd4ae9c72eeefd65d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:12 -0400
Subject: [PATCH 0426/4088] python3-keyring: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index cd982b2a246f..2fbc05352aed 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
 version=23.1.0
-revision=1
+revision=2
 wrksrc="keyring-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 9b78f71d3f6e9f97325c3eb299bb2fa66ff980e5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:20 -0400
Subject: [PATCH 0427/4088] python3-nbxmpp: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index f0fe8a25297c..332b88092708 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
 version=2.0.2
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 60eed58688c7493f03dfeb94d0cf710753a67243 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:41 -0400
Subject: [PATCH 0428/4088] python3-axolotl-curve25519: rebuild for Python 3.10

---
 srcpkgs/python3-axolotl-curve25519/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-axolotl-curve25519/template b/srcpkgs/python3-axolotl-curve25519/template
index 89a97b2ddfee..b332d62bfa42 100644
--- a/srcpkgs/python3-axolotl-curve25519/template
+++ b/srcpkgs/python3-axolotl-curve25519/template
@@ -2,7 +2,7 @@
 pkgname=python3-axolotl-curve25519
 _pkgname=${pkgname/3/}
 version=0.4.1.post2
-revision=4
+revision=5
 wrksrc="$_pkgname-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2942bf0891438c3056b0577fbb99411216877ed0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:44 -0400
Subject: [PATCH 0429/4088] python3-bottle: rebuild for Python 3.10, update to
 0.12.19.

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

diff --git a/srcpkgs/python3-bottle/template b/srcpkgs/python3-bottle/template
index 6830a7900966..52146ccee896 100644
--- a/srcpkgs/python3-bottle/template
+++ b/srcpkgs/python3-bottle/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bottle'
 pkgname=python3-bottle
-version=0.12.17
-revision=4
+version=0.12.19
+revision=1
 wrksrc="bottle-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="http://bottlepy.org"
 distfiles="${PYPI_SITE}/b/bottle/bottle-${version}.tar.gz"
-checksum=e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c
+checksum=a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c
 
 post_install() {
 	vlicense LICENSE

From b03c7db40dbf548e0bcbcebc775fa572927695b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:00 -0400
Subject: [PATCH 0430/4088] python3-google-api-python-client: rebuild for
 Python 3.10

---
 srcpkgs/python3-google-api-python-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-api-python-client/template b/srcpkgs/python3-google-api-python-client/template
index a3ed75efa6cf..34e19605ea68 100644
--- a/srcpkgs/python3-google-api-python-client/template
+++ b/srcpkgs/python3-google-api-python-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-api-python-client'
 pkgname=python3-google-api-python-client
 version=2.0.2
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e54dc378f2d411a9ca8c88d7ae1d692c77311198 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:14 -0400
Subject: [PATCH 0431/4088] python3-magic: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-magic/template b/srcpkgs/python3-magic/template
index fb4c324dc86b..89ac640e7a4e 100644
--- a/srcpkgs/python3-magic/template
+++ b/srcpkgs/python3-magic/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-magic'
 pkgname=python3-magic
 version=0.4.18
-revision=4
+revision=5
 wrksrc=python-magic-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cc862f6bd5cf120737751eb4fca9fab3a04bf075 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:22 -0400
Subject: [PATCH 0432/4088] python3-oauth2client: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-oauth2client/template b/srcpkgs/python3-oauth2client/template
index 940ae74c9715..5a91e9127e37 100644
--- a/srcpkgs/python3-oauth2client/template
+++ b/srcpkgs/python3-oauth2client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-oauth2client'
 pkgname=python3-oauth2client
 version=4.1.3
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cd8a870e239450b7729508ede5713e558d44e86f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:40 -0400
Subject: [PATCH 0433/4088] python3-asn1crypto: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-asn1crypto/template b/srcpkgs/python3-asn1crypto/template
index 5a04a844de35..2d54a69aaa21 100644
--- a/srcpkgs/python3-asn1crypto/template
+++ b/srcpkgs/python3-asn1crypto/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-asn1crypto'
 pkgname=python3-asn1crypto
 version=1.4.0
-revision=1
+revision=2
 wrksrc="asn1crypto-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 72860c4cbc957767f5554e9da6ea0b46e656233a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:58 -0400
Subject: [PATCH 0434/4088] python3-furl: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-furl/template b/srcpkgs/python3-furl/template
index 0ca409a6f856..b10e98cf00c2 100644
--- a/srcpkgs/python3-furl/template
+++ b/srcpkgs/python3-furl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-furl'
 pkgname=python3-furl
 version=2.1.0
-revision=2
+revision=3
 wrksrc="furl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From eb74399d19da9a3f2bde99fa6e5e6c835c5e68b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:47 -0400
Subject: [PATCH 0435/4088] python3-scrypt: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index f73f4c555766..cb2b79529152 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=3
+revision=4
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 17a0b621fb8c9e1af2c655ad5cbe9dc21eb7ef5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:00 -0400
Subject: [PATCH 0436/4088] python3-vobject: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-vobject/template b/srcpkgs/python3-vobject/template
index f727f5b1a356..ad9a1b9ef714 100644
--- a/srcpkgs/python3-vobject/template
+++ b/srcpkgs/python3-vobject/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vobject'
 pkgname=python3-vobject
 version=0.9.6.1
-revision=4
+revision=5
 wrksrc="vobject-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 519c9679bc68705d2de20222c9bd011d7d23dccf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:53 -0400
Subject: [PATCH 0437/4088] python3-dulwich: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-dulwich/template b/srcpkgs/python3-dulwich/template
index 14abdb26feb2..6d75325b0e2e 100644
--- a/srcpkgs/python3-dulwich/template
+++ b/srcpkgs/python3-dulwich/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dulwich'
 pkgname=python3-dulwich
 version=0.19.14
-revision=4
+revision=5
 wrksrc="dulwich-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 025fdee1ba4356996b6f5d0bc86f943c0b81ac01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:24 -0400
Subject: [PATCH 0438/4088] python3-pam: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pam/template b/srcpkgs/python3-pam/template
index 2cb58192ad1b..2881e3a333c7 100644
--- a/srcpkgs/python3-pam/template
+++ b/srcpkgs/python3-pam/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pam'
 pkgname=python3-pam
 version=1.8.4
-revision=5
+revision=6
 wrksrc="python-pam-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 24acd2bb642d32ea8b4d64432ad3ec4e2b9d0edd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:25 -0400
Subject: [PATCH 0439/4088] python3-passlib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-passlib/template b/srcpkgs/python3-passlib/template
index 29927bd8125c..86a22fd6f01d 100644
--- a/srcpkgs/python3-passlib/template
+++ b/srcpkgs/python3-passlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-passlib'
 pkgname=python3-passlib
 version=1.7.1
-revision=5
+revision=6
 wrksrc="passlib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e709df354d05360b2aea873a39860fe7e0194951 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:31 -0400
Subject: [PATCH 0440/4088] python3-PyBrowserID: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-PyBrowserID/template b/srcpkgs/python3-PyBrowserID/template
index a8cdd9230d3c..1fd8d7f2f798 100644
--- a/srcpkgs/python3-PyBrowserID/template
+++ b/srcpkgs/python3-PyBrowserID/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyBrowserID'
 pkgname=python3-PyBrowserID
 version=0.14.0
-revision=4
+revision=5
 wrksrc="PyBrowserID-${version}"
 build_style=python3-module
 pycompile_module="browserid"

From ea1b749c9b816d3ecb9ad79c423ddaf08bcff3d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:02 -0400
Subject: [PATCH 0441/4088] python3-hawkauthlib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-hawkauthlib/template b/srcpkgs/python3-hawkauthlib/template
index aadb5c2a40df..33a035c87335 100644
--- a/srcpkgs/python3-hawkauthlib/template
+++ b/srcpkgs/python3-hawkauthlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hawkauthlib'
 pkgname=python3-hawkauthlib
 version=2.0.0
-revision=4
+revision=5
 wrksrc="hawkauthlib-${version}"
 build_style=python3-module
 pycompile_module="hawkauthlib"

From 3389273b91213309c9f4bf85bd275847a6c7cc28 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:52 -0400
Subject: [PATCH 0442/4088] python3-docker: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-docker/template b/srcpkgs/python3-docker/template
index 739e95114ab2..86fb5827fb35 100644
--- a/srcpkgs/python3-docker/template
+++ b/srcpkgs/python3-docker/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docker'
 pkgname=python3-docker
 version=5.0.2
-revision=1
+revision=2
 wrksrc="docker-${version}"
 build_style=python3-module
 make_check_target="tests/unit" # other tests fail due to needing a running docker daemon

From 37d899b9b08c5315699928bcfa30222c2d1c38d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:02 -0400
Subject: [PATCH 0443/4088] libArcus: rebuild for Python 3.10

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

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 6f243225cba6..d43a77dbd980 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
 version=4.11.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"

From 0ebc5d034b2839f5f4c30a0811b54264a8871738 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:22 -0400
Subject: [PATCH 0444/4088] python3-numpy-stl: rebuild for Python 3.10

---
 srcpkgs/python3-numpy-stl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template
index 304f74f3c387..4afa60d25c40 100644
--- a/srcpkgs/python3-numpy-stl/template
+++ b/srcpkgs/python3-numpy-stl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numpy-stl'
 pkgname=python3-numpy-stl
 version=2.16.0
-revision=1
+revision=2
 wrksrc="numpy-stl-${version}"
 build_style=python3-module
 build_helper="numpy"

From 3a34b2d6d7141d3efd22a6868d6c534494a97ef4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:46 -0400
Subject: [PATCH 0445/4088] python3-scipy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..5ffc5385a74b 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
 version=1.7.1
-revision=1
+revision=2
 wrksrc="scipy-${version}"
 build_style=python3-module
 build_helper="numpy"

From 46c5d72e5b32711dc55bc5a1a842fd01dc576068 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:48 -0400
Subject: [PATCH 0446/4088] python3-shapely: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 45b0c895a9aa..5f977079abfc 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -2,7 +2,7 @@
 pkgname=python3-shapely
 reverts="1.7a1_1 1.7a1_2 1.7a1_3"
 version=1.7.1
-revision=2
+revision=3
 wrksrc="Shapely-${version}"
 build_style=python3-module
 build_helper=numpy

From 2d7025ada8853ab286e1e7dc70271e803bd3df38 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:24 -0400
Subject: [PATCH 0447/4088] python-pyglet: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-pyglet/template b/srcpkgs/python-pyglet/template
index 947f81ea642a..e5444022ba3e 100644
--- a/srcpkgs/python-pyglet/template
+++ b/srcpkgs/python-pyglet/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyglet'
 pkgname=python-pyglet
 version=1.4.10
-revision=3
+revision=4
 wrksrc="pyglet-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools unzip"

From ef906eaa07c00bea288f79e4912266776d57f407 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:21 -0400
Subject: [PATCH 0448/4088] python3-networkx: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-networkx/template b/srcpkgs/python3-networkx/template
index dee08d3d2feb..4d162dfb968f 100644
--- a/srcpkgs/python3-networkx/template
+++ b/srcpkgs/python3-networkx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-networkx'
 pkgname=python3-networkx
 version=2.6.3
-revision=1
+revision=2
 wrksrc="networkx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4b80de4f6f0e7e6a736b72683552b48a4a760ba7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:34 -0400
Subject: [PATCH 0449/4088] python3-pycollada: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pycollada/template b/srcpkgs/python3-pycollada/template
index bf80cd0e0d31..7aae12006353 100644
--- a/srcpkgs/python3-pycollada/template
+++ b/srcpkgs/python3-pycollada/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycollada'
 pkgname=python3-pycollada
 version=0.7.1
-revision=2
+revision=3
 wrksrc="pycollada-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 00256b3b5e20635f41455a9e48db28ee10f0632d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:45 -0400
Subject: [PATCH 0450/4088] python3-rtree: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-rtree/template b/srcpkgs/python3-rtree/template
index 5ec7cc4541bb..34bf662591b7 100644
--- a/srcpkgs/python3-rtree/template
+++ b/srcpkgs/python3-rtree/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rtree'
 pkgname=python3-rtree
 version=0.9.5
-revision=2
+revision=3
 wrksrc="rtree-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools libspatialindex-devel python3-wheel"

From d34b4783a86b2d0f03fdd4cfac9d7f599da66331 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:53 -0400
Subject: [PATCH 0451/4088] python3-svg.path: rebuild for Python 3.10

---
 srcpkgs/python3-svg.path/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index c5372b1416ae..1414aab29c03 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
 version=4.1
-revision=1
+revision=2
 wrksrc="svg.path-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fec6171fc9e1871e737c224e736a0f2563ed4c8f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:53 -0400
Subject: [PATCH 0452/4088] python3-sympy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template
index 0375c96501b6..5f553a6f527e 100644
--- a/srcpkgs/python3-sympy/template
+++ b/srcpkgs/python3-sympy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sympy'
 pkgname=python3-sympy
 version=1.8
-revision=1
+revision=2
 wrksrc="sympy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9347c572fc6f11d7de6f39885f64f0dcbebf3052 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:41 -0400
Subject: [PATCH 0453/4088] python3-atspi: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-atspi/template b/srcpkgs/python3-atspi/template
index 36ffedcc59f4..bc33709ddd88 100644
--- a/srcpkgs/python3-atspi/template
+++ b/srcpkgs/python3-atspi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-atspi'
 pkgname=python3-atspi
 version=2.38.0
-revision=3
+revision=4
 wrksrc="pyatspi-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"

From a0634e5e593e865af83f8f36fa19fb7bb308cb82 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:48 -0400
Subject: [PATCH 0454/4088] python3-setproctitle: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
index fc848b086c9e..36148a426f97 100644
--- a/srcpkgs/python3-setproctitle/template
+++ b/srcpkgs/python3-setproctitle/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-setproctitle'
 pkgname=python3-setproctitle
 version=1.2.1
-revision=1
+revision=2
 wrksrc="setproctitle-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1859fbac1e9e7a65a8e38c88e6b0f5c84a7a6d7f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:01 -0400
Subject: [PATCH 0455/4088] python3-xapp: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-xapp/template b/srcpkgs/python3-xapp/template
index ac7117ecd142..a67732e34031 100644
--- a/srcpkgs/python3-xapp/template
+++ b/srcpkgs/python3-xapp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xapp'
 pkgname=python3-xapp
 version=2.0.1
-revision=2
+revision=3
 build_style=python3-module
 pycompile_module="xapp"
 hostmakedepends="python3-setuptools"

From 56e0ff689917c0862b502894e0d43542d09b0593 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:27 -0400
Subject: [PATCH 0456/4088] python3-ConfigArgParse: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ConfigArgParse/template b/srcpkgs/python3-ConfigArgParse/template
index 986ebe5e05d2..c1db1f71924f 100644
--- a/srcpkgs/python3-ConfigArgParse/template
+++ b/srcpkgs/python3-ConfigArgParse/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ConfigArgParse'
 pkgname=python3-ConfigArgParse
 version=1.4.1
-revision=1
+revision=2
 wrksrc="ConfigArgParse-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 623a3c41f1b7b8a1f15551ce74956dfcbccfc766 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:52 -0400
Subject: [PATCH 0457/4088] python3-distro: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..d573bc5b60c8 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
 version=1.6.0
-revision=1
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e5eb66defd340408b5c1ee1f88de4fa9b1d8479a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:25 -0400
Subject: [PATCH 0458/4088] python3-parsedatetime: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-parsedatetime/template b/srcpkgs/python3-parsedatetime/template
index 3ce0cde30dc6..ec2a6262a10e 100644
--- a/srcpkgs/python3-parsedatetime/template
+++ b/srcpkgs/python3-parsedatetime/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-parsedatetime'
 pkgname=python3-parsedatetime
 version=2.6
-revision=2
+revision=3
 wrksrc="parsedatetime-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0d4c380a60ba74979ddda8fbf8d9e564782b6bfb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:58 -0400
Subject: [PATCH 0459/4088] python3-gevent: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-gevent/template b/srcpkgs/python3-gevent/template
index 4ec0c1ce42ea..f7657e48ab65 100644
--- a/srcpkgs/python3-gevent/template
+++ b/srcpkgs/python3-gevent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gevent'
 pkgname=python3-gevent
 version=21.1.2
-revision=1
+revision=2
 wrksrc="gevent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 78b81f9e4a6920e05d26b46543243eb715435449 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:56 -0400
Subject: [PATCH 0460/4088] python3-feedparser: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-feedparser/template b/srcpkgs/python3-feedparser/template
index 69f6e486d5f7..97a5d8d49373 100644
--- a/srcpkgs/python3-feedparser/template
+++ b/srcpkgs/python3-feedparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-feedparser'
 pkgname=python3-feedparser
 version=6.0.8
-revision=1
+revision=2
 wrksrc="feedparser-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 40def39c1bf1d08fc65cc687d5fb549a8c77c44c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:03 -0400
Subject: [PATCH 0461/4088] python3-html5lib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
index 11d27069e0ad..f3df8e0f79e7 100644
--- a/srcpkgs/python3-html5lib/template
+++ b/srcpkgs/python3-html5lib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-html5lib'
 pkgname=python3-html5lib
 version=1.1
-revision=1
+revision=2
 wrksrc="html5lib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a6673d36d23718ff3a507782e9b95341c21656a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:02 -0400
Subject: [PATCH 0462/4088] python3-xlib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-xlib/template b/srcpkgs/python3-xlib/template
index ec75db18408b..f8cdd0c9c09b 100644
--- a/srcpkgs/python3-xlib/template
+++ b/srcpkgs/python3-xlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xlib'
 pkgname=python3-xlib
 version=0.30
-revision=1
+revision=2
 wrksrc=python-xlib-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 2052ce366ee2188cd456d0b92aadf2d5169ef6e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:14 -0400
Subject: [PATCH 0463/4088] python3-llfuse: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template
index 1d4d0c7e7837..8623c5adcd2c 100644
--- a/srcpkgs/python3-llfuse/template
+++ b/srcpkgs/python3-llfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-llfuse'
 pkgname=python3-llfuse
 version=1.4.1
-revision=1
+revision=2
 wrksrc="llfuse-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"

From 8de681016494a2dfdded8e12b543528ae5bafe28 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:53 -0400
Subject: [PATCH 0464/4088] python3-docopt: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-docopt/template b/srcpkgs/python3-docopt/template
index 553ac4d2e1ad..e96fb179b7ca 100644
--- a/srcpkgs/python3-docopt/template
+++ b/srcpkgs/python3-docopt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docopt'
 pkgname=python3-docopt
 version=0.6.2
-revision=7
+revision=8
 wrksrc="docopt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1bcd68841b6b4816376e85162d8b8f44c498041f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:45 -0400
Subject: [PATCH 0465/4088] python3-ruamel.yaml: rebuild for Python 3.10

---
 srcpkgs/python3-ruamel.yaml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ruamel.yaml/template b/srcpkgs/python3-ruamel.yaml/template
index 1efff06c001f..dec65a97e27f 100644
--- a/srcpkgs/python3-ruamel.yaml/template
+++ b/srcpkgs/python3-ruamel.yaml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ruamel.yaml'
 pkgname=python3-ruamel.yaml
 version=0.16.12
-revision=2
+revision=3
 wrksrc="ruamel.yaml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 94c8cc137772cd5604944b3971cb3e83c8230ca8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:27 -0400
Subject: [PATCH 0466/4088] python3-Arrow: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Arrow/template b/srcpkgs/python3-Arrow/template
index 3c81e5ba65fa..3330d66e08e8 100644
--- a/srcpkgs/python3-Arrow/template
+++ b/srcpkgs/python3-Arrow/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Arrow'
 pkgname=python3-Arrow
 version=0.15.5
-revision=3
+revision=4
 wrksrc="arrow-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e5d9bca557c21ce365e6accb1c6171a96c6dd863 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:14 -0400
Subject: [PATCH 0467/4088] python3-logfury: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-logfury/template b/srcpkgs/python3-logfury/template
index b718e762ff29..3a639e807a26 100644
--- a/srcpkgs/python3-logfury/template
+++ b/srcpkgs/python3-logfury/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-logfury'
 pkgname=python3-logfury
 version=0.1.2
-revision=7
+revision=8
 wrksrc="logfury-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2ffcdcd3bdf92bf0a8c64a0f844b7b373277d1af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:44 -0400
Subject: [PATCH 0468/4088] python3-botocore: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index 72884e6d76a7..6b2c6f07ac35 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-botocore'
 pkgname=python3-botocore
 version=1.17.28
-revision=3
+revision=4
 wrksrc="botocore-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e4238883d304afb1766fb235d6b4ff0eeb1d2c0e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:41 -0400
Subject: [PATCH 0469/4088] python3-authres: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-authres/template b/srcpkgs/python3-authres/template
index 254830e55fef..88ec54db1f31 100644
--- a/srcpkgs/python3-authres/template
+++ b/srcpkgs/python3-authres/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-authres'
 pkgname=python3-authres
 version=1.2.0
-revision=3
+revision=4
 wrksrc="authres-${version}"
 build_style=python3-module
 pycompile_module=authres

From 0b15cc857efbf1abcde7c848bd6a44f6ab784577 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:15 -0400
Subject: [PATCH 0470/4088] python3-markdown-math: rebuild for Python 3.10

---
 srcpkgs/python3-markdown-math/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-markdown-math/template b/srcpkgs/python3-markdown-math/template
index 7e4b46dd7683..d707e9c3ca70 100644
--- a/srcpkgs/python3-markdown-math/template
+++ b/srcpkgs/python3-markdown-math/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-markdown-math'
 pkgname=python3-markdown-math
 version=0.8
-revision=1
+revision=2
 wrksrc=python-markdown-math-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6efe2845516e99d819bed50f5f4bfe00a5a08a14 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:54 -0400
Subject: [PATCH 0471/4088] python3-editor: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-editor/template b/srcpkgs/python3-editor/template
index e329df8af9d1..baae71755b3e 100644
--- a/srcpkgs/python3-editor/template
+++ b/srcpkgs/python3-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-editor'
 pkgname=python3-editor
 version=1.0.4
-revision=4
+revision=5
 wrksrc="python-editor-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4d9a0824efe3f36226cb5df25a990fa98ca490e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:43 -0400
Subject: [PATCH 0472/4088] python3-regex: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 99fa391a566c..68fbfc2b03c4 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
 version=2021.8.28
-revision=1
+revision=2
 wrksrc="regex-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"

From 659201d42f6060740a709324279dd07f0d29f682 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:57 -0400
Subject: [PATCH 0473/4088] python3-tzlocal: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tzlocal/template b/srcpkgs/python3-tzlocal/template
index 73114a2aadc9..660f28f40188 100644
--- a/srcpkgs/python3-tzlocal/template
+++ b/srcpkgs/python3-tzlocal/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tzlocal'
 pkgname=python3-tzlocal
 version=2.1
-revision=3
+revision=4
 wrksrc="tzlocal-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 81e062517c3825451b381f331e08823ba3f4e7da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:56 -0400
Subject: [PATCH 0474/4088] python3-fido2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
index 6f50bbb8dfb9..4c38a86445e6 100644
--- a/srcpkgs/python3-fido2/template
+++ b/srcpkgs/python3-fido2/template
@@ -2,7 +2,7 @@
 pkgname=python3-fido2
 _pkgname=fido2
 version=0.9.1
-revision=1
+revision=2
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 59a72089a57f8a9b698341ea5918ad88318596af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:48 -0400
Subject: [PATCH 0475/4088] downloader-cli: rebuild for Python 3.10

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

diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index f56449f6f966..9b54bb31cf90 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'downloader-cli'
 pkgname=downloader-cli
 version=0.3.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3 python3-downloader-cli"

From 20aff89b98fbb27c0f3d5a9f5aa7363a9bffeaa9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:56 -0400
Subject: [PATCH 0476/4088] python3-ffmpeg-python: rebuild for Python 3.10

---
 srcpkgs/python3-ffmpeg-python/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ffmpeg-python/template b/srcpkgs/python3-ffmpeg-python/template
index 171400f6f4df..b0073d3774ed 100644
--- a/srcpkgs/python3-ffmpeg-python/template
+++ b/srcpkgs/python3-ffmpeg-python/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ffmpeg-python'
 pkgname=python3-ffmpeg-python
 version=0.2.0
-revision=3
+revision=4
 wrksrc="ffmpeg-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From df6ce98f93cd0224e03878a000cb81b914eabb34 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:07 -0400
Subject: [PATCH 0477/4088] python3-itunespy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-itunespy/template b/srcpkgs/python3-itunespy/template
index 5a80c11c93af..c9d49fed524d 100644
--- a/srcpkgs/python3-itunespy/template
+++ b/srcpkgs/python3-itunespy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-itunespy'
 pkgname=python3-itunespy
 version=1.6
-revision=2
+revision=3
 wrksrc="itunespy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ba9dd3ef4b198b1251dbaf1f362277fc9ae8e38d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:18 -0400
Subject: [PATCH 0478/4088] python3-musicbrainzngs: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template
index cfa6fa5bec4c..69c5e4a29586 100644
--- a/srcpkgs/python3-musicbrainzngs/template
+++ b/srcpkgs/python3-musicbrainzngs/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-musicbrainzngs'
 pkgname=python3-musicbrainzngs
 version=0.7.1
-revision=1
+revision=2
 wrksrc="musicbrainzngs-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 7e1e4b1e6547be5c682b13fba6562d99b364677b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:19 -0400
Subject: [PATCH 0479/4088] python3-mutagen: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mutagen/template b/srcpkgs/python3-mutagen/template
index 6e069c3de349..be0231f93861 100644
--- a/srcpkgs/python3-mutagen/template
+++ b/srcpkgs/python3-mutagen/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mutagen'
 pkgname=python3-mutagen
 version=1.45.1
-revision=1
+revision=2
 wrksrc="mutagen-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"

From 41baf448811c86cf243fc0c8712605881810c192 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:32 -0400
Subject: [PATCH 0480/4088] python3-pyDes: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyDes/template b/srcpkgs/python3-pyDes/template
index 0ee082893d0d..afd047221375 100644
--- a/srcpkgs/python3-pyDes/template
+++ b/srcpkgs/python3-pyDes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyDes'
 pkgname=python3-pyDes
 version=2.0.1
-revision=1
+revision=2
 wrksrc="pyDes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 74c31278c3ef36021302b6a125519dc18302d9bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0481/4088] python3-pysocks: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pysocks/template b/srcpkgs/python3-pysocks/template
index 399fe375df84..7c7430bf34bf 100644
--- a/srcpkgs/python3-pysocks/template
+++ b/srcpkgs/python3-pysocks/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pysocks'
 pkgname=python3-pysocks
 version=1.7.0
-revision=3
+revision=4
 wrksrc="PySocks-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 610c2a20838f117395470ba5bfb046832aa64c30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:44 -0400
Subject: [PATCH 0482/4088] python3-rich: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index e83be32122d1..8226c8e0bee7 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
 version=10.12.0
-revision=1
+revision=2
 wrksrc="rich-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 00b13348580c51ec9d930b02dc1fafcde696281b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:49 -0400
Subject: [PATCH 0483/4088] python3-simber: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-simber/template b/srcpkgs/python3-simber/template
index 88c31abe65a1..27bd0df0d1f4 100644
--- a/srcpkgs/python3-simber/template
+++ b/srcpkgs/python3-simber/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simber'
 pkgname=python3-simber
 version=0.2.3
-revision=1
+revision=2
 wrksrc="simber-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9e87e547e4262fab17e8306bbe58ee90e6df4274 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Oct 2021 09:32:50 -0400
Subject: [PATCH 0484/4088] python3-spotipy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-spotipy/template b/srcpkgs/python3-spotipy/template
index c57db2a92d33..a0a2aba69d93 100644
--- a/srcpkgs/python3-spotipy/template
+++ b/srcpkgs/python3-spotipy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-spotipy'
 pkgname=python3-spotipy
 version=2.19.0
-revision=1
+revision=2
 wrksrc="spotipy-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"

From 671f7c4476ee5b95dcbf8c69b08874be55ee72d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:03 -0400
Subject: [PATCH 0485/4088] python3-youtube-search: rebuild for Python 3.10

---
 srcpkgs/python3-youtube-search/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-youtube-search/template b/srcpkgs/python3-youtube-search/template
index 7de7b44f8b8f..d79b41a77e33 100644
--- a/srcpkgs/python3-youtube-search/template
+++ b/srcpkgs/python3-youtube-search/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-youtube-search'
 pkgname=python3-youtube-search
 version=2.1.0
-revision=2
+revision=3
 _gitver=86af3e73bd340f37be56f2be6a5ff706b16e454e
 create_wrksrc=yes
 build_wrksrc="youtube-search-${version}"

From 22e09c26ad9da18d7b21dfc47dbefebdac0bc8e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Oct 2021 09:32:50 -0400
Subject: [PATCH 0486/4088] python3-youtubesearch: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 46a3d40bad3e..54f0fc9a1db1 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
 version=1.4.9
-revision=1
+revision=2
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ae971aa1f2daae5fbebb6b651bdb5cae9db53c05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:03 -0400
Subject: [PATCH 0487/4088] python3-ytmusicapi: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 57d5d136ffff..d02f2cb65c31 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
 version=0.19.3
-revision=1
+revision=2
 wrksrc="ytmusicapi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ab308a5e09c9ebf7bec4a705c466516b26cf9cf7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:39 -0400
Subject: [PATCH 0488/4088] python3-argcomplete: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template
index 3fd7daf0f856..52155e689421 100644
--- a/srcpkgs/python3-argcomplete/template
+++ b/srcpkgs/python3-argcomplete/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-argcomplete'
 pkgname=python3-argcomplete
 version=1.12.3
-revision=1
+revision=2
 wrksrc="argcomplete-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5fdf952da3c21212cfa37a2445241b28d26b7865 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:13 -0400
Subject: [PATCH 0489/4088] opencv: rebuild for Python 3.10, update to 3.4.15.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 4ebf6fe915ed..10c687200014 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=3.4.10
-revision=2
+version=3.4.15
+revision=1
 build_style=cmake
 configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
  -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://opencv.org"
 distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz"
-checksum=1ed6f5b02a7baf14daca04817566e7c98ec668cec381e0edf534fa49f10f58a2
+checksum=b1e8470b18e9e793bf70b4ae051bbc9bf81fa45f8cbfee1e6c88858c90be8ff7
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 0ce622980850434ba8e5a856bf9e8fa3e7e71f94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:32 -0400
Subject: [PATCH 0490/4088] python3-PyOpenGL-accelerate: rebuild for Python
 3.10

---
 srcpkgs/python3-PyOpenGL-accelerate/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyOpenGL-accelerate/template b/srcpkgs/python3-PyOpenGL-accelerate/template
index baadac0fbe65..8ecd4c8052eb 100644
--- a/srcpkgs/python3-PyOpenGL-accelerate/template
+++ b/srcpkgs/python3-PyOpenGL-accelerate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyOpenGL-accelerate'
 pkgname=python3-PyOpenGL-accelerate
 version=3.1.5
-revision=2
+revision=3
 wrksrc="PyOpenGL-accelerate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
@@ -14,6 +14,11 @@ homepage="http://pyopengl.sourceforge.net/"
 distfiles="${PYPI_SITE}/P/PyOpenGL-accelerate/PyOpenGL-accelerate-${version}.tar.gz"
 checksum=12e5518b0216a478527c7ce5ddce623c3d0517adeb87226da767772e8b7f2f06
 
+post_extract() {
+	# Make sure Cython regenerates C files
+	rm src/*.c
+}
+
 post_install() {
 	vlicense license.txt LICENSE
 }

From 5615dc7c592e20ad04fb6b7e1d2a2c0f052eb1fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:50 -0400
Subject: [PATCH 0491/4088] python3-cups: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cups/template b/srcpkgs/python3-cups/template
index bcdb9803e8f1..a7f311f4fe0a 100644
--- a/srcpkgs/python3-cups/template
+++ b/srcpkgs/python3-cups/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cups'
 pkgname=python3-cups
 version=2.0.1
-revision=1
+revision=2
 wrksrc="pycups-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 7441cd74e5343005be44a4fa257d1a2303ce811c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:43 -0400
Subject: [PATCH 0492/4088] python3-rencode: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template
index 0edbd561f0fc..39ad56145c05 100644
--- a/srcpkgs/python3-rencode/template
+++ b/srcpkgs/python3-rencode/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rencode'
 pkgname=python3-rencode
 version=1.0.6
-revision=6
+revision=7
 wrksrc="rencode-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-wheel"

From 56e13c05cfffcf5df0c327dcd215e5d95f76ef5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:06 -0400
Subject: [PATCH 0493/4088] pywal: rebuild for Python 3.10

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

diff --git a/srcpkgs/pywal/template b/srcpkgs/pywal/template
index 5a78316ef938..0935cb659810 100644
--- a/srcpkgs/pywal/template
+++ b/srcpkgs/pywal/template
@@ -1,7 +1,7 @@
 # Template file for 'pywal'
 pkgname=pywal
 version=3.3.0
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="pywal"
 hostmakedepends="python3-setuptools"

From 5a4e44755f1aec5d67fdd5f31a5efbc82c8862fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:51 -0400
Subject: [PATCH 0494/4088] python3-discid: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-discid/template b/srcpkgs/python3-discid/template
index 850aa859fcdf..12b5399f5245 100644
--- a/srcpkgs/python3-discid/template
+++ b/srcpkgs/python3-discid/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-discid'
 pkgname=python3-discid
 version=1.2.0
-revision=3
+revision=4
 wrksrc="discid-${version}"
 build_style=python3-module
 pycompile_module=discid

From b7448abe137e8a9306177d4e583a18ecb48c9aba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:33 -0400
Subject: [PATCH 0495/4088] python3-pycdio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pycdio/template b/srcpkgs/python3-pycdio/template
index 3697ba333622..3f6e3d99d7b8 100644
--- a/srcpkgs/python3-pycdio/template
+++ b/srcpkgs/python3-pycdio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycdio'
 pkgname=python3-pycdio
 version=2.1.0
-revision=2
+revision=3
 wrksrc=pycdio-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config swig"

From 914a6f7f368607cc53619b00bdc529f2c0f4aceb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:50 -0400
Subject: [PATCH 0496/4088] python3-curl: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index e985ecf8534f..cb54ef3564ea 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=10
+revision=11
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 5d8d5835df47d8d9316e0566d5f83b6fa4bf069b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:25 -0400
Subject: [PATCH 0497/4088] python3-parse: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-parse/template b/srcpkgs/python3-parse/template
index b5591256079d..dbedba715312 100644
--- a/srcpkgs/python3-parse/template
+++ b/srcpkgs/python3-parse/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-parse'
 pkgname=python3-parse
 version=1.18.0
-revision=1
+revision=2
 wrksrc="parse-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 024565d3255c464b6be4dfc4825d2ad4194bfafb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:49 -0400
Subject: [PATCH 0498/4088] python3-shodan: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-shodan/template b/srcpkgs/python3-shodan/template
index ad3bab903a3c..34dbb28be2be 100644
--- a/srcpkgs/python3-shodan/template
+++ b/srcpkgs/python3-shodan/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-shodan'
 pkgname=python3-shodan
 version=1.25.0
-revision=1
+revision=2
 wrksrc="shodan-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 181ec5eb6eb47cc97bdc6b00382afc5d4facb1ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:29 -0400
Subject: [PATCH 0499/4088] python3-Flask-RESTful: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-RESTful/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-RESTful/template b/srcpkgs/python3-Flask-RESTful/template
index 5ed3f4334348..fbaec115ddbf 100644
--- a/srcpkgs/python3-Flask-RESTful/template
+++ b/srcpkgs/python3-Flask-RESTful/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-RESTful'
 pkgname=python3-Flask-RESTful
 version=0.3.9
-revision=1
+revision=2
 wrksrc="flask-restful-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f7fcd580b43b68848e598bc34a76974be0bd2427 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:43 -0400
Subject: [PATCH 0500/4088] python3-blessed: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index 1da3227f00c1..f646113f9cf6 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-blessed'
 pkgname=python3-blessed
 version=1.18.1
-revision=1
+revision=2
 wrksrc="blessed-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 359215ee43065577746cd17212c688f51f2f2e29 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:38 -0400
Subject: [PATCH 0501/4088] python3-pysigset: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pysigset/template b/srcpkgs/python3-pysigset/template
index c86e96a9728b..52454f9bc251 100644
--- a/srcpkgs/python3-pysigset/template
+++ b/srcpkgs/python3-pysigset/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pysigset'
 pkgname=python3-pysigset
 version=0.4.0
-revision=1
+revision=2
 wrksrc="pysigset-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2cc780af909b45a44f648604d878c3a4a3003973 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:44 -0400
Subject: [PATCH 0502/4088] python3-requests-unixsocket: rebuild for Python
 3.10

---
 srcpkgs/python3-requests-unixsocket/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-requests-unixsocket/template b/srcpkgs/python3-requests-unixsocket/template
index 34c34c090464..dc0155c26dd6 100644
--- a/srcpkgs/python3-requests-unixsocket/template
+++ b/srcpkgs/python3-requests-unixsocket/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-unixsocket'
 pkgname=python3-requests-unixsocket
 version=0.2.0
-revision=3
+revision=4
 wrksrc="requests-unixsocket-${version}"
 build_style=python3-module
 pycompile_module="requests_unixsocket"

From 4f330b247255899bf57943f5423cb4e128ee7a58 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:47 -0400
Subject: [PATCH 0503/4088] python3-scruffy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-scruffy/template b/srcpkgs/python3-scruffy/template
index aa41057a72ae..56a29fb2590b 100644
--- a/srcpkgs/python3-scruffy/template
+++ b/srcpkgs/python3-scruffy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scruffy'
 pkgname=python3-scruffy
 version=0.3.8.2
-revision=1
+revision=2
 wrksrc="scruffy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d05d08a330e27822e1575d060ae771a8cbddffd3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:32 -0400
Subject: [PATCH 0504/4088] python3-pulsectl: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index 79fe26537e87..006363a1c5d4 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pulsectl'
 pkgname=python3-pulsectl
 version=20.5.1
-revision=1
+revision=2
 wrksrc="pulsectl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cdae895bb3c6070926e9a50c1edc78ee8c49d05d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:52 -0400
Subject: [PATCH 0505/4088] python3-stevedore: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-stevedore/template b/srcpkgs/python3-stevedore/template
index 9964fe3dd94e..8c4a4c8c9a39 100644
--- a/srcpkgs/python3-stevedore/template
+++ b/srcpkgs/python3-stevedore/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-stevedore'
 pkgname=python3-stevedore
 version=3.2.0
-revision=2
+revision=3
 wrksrc="stevedore-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"

From 677f4678816aa34a3ffa471b8c5059c1560dabc0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:59 -0400
Subject: [PATCH 0506/4088] python3-virtualenv: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 2c575aef0b27..2bca84fb2ded 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
 version=20.4.7
-revision=1
+revision=2
 wrksrc="virtualenv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 98054c8892eff14cf24b41d13011962c2ed7b8ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:59 -0400
Subject: [PATCH 0507/4088] python3-virtualenv-clone: rebuild for Python 3.10

---
 srcpkgs/python3-virtualenv-clone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-virtualenv-clone/template b/srcpkgs/python3-virtualenv-clone/template
index 55bdbd282f19..307b80b7fb8e 100644
--- a/srcpkgs/python3-virtualenv-clone/template
+++ b/srcpkgs/python3-virtualenv-clone/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-virtualenv-clone'
 pkgname=python3-virtualenv-clone
 version=0.5.4
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 67b238dd5f0ed0b562c857cfcd67b2573d59b120 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:05 -0400
Subject: [PATCH 0508/4088] libvirt-python3: rebuild for Python 3.10

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

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 85722602cd8f..4924bb423015 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
 version=7.8.0
-revision=1
+revision=2
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel libvirt-devel libapparmor-devel"

From 5ea234fd810d37ab516cf2aa8b9fe73e9cadd78d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:32 -0400
Subject: [PATCH 0509/4088] python3-PyOpenGL: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-PyOpenGL/template b/srcpkgs/python3-PyOpenGL/template
index 542a0592d5a1..39b11b78badd 100644
--- a/srcpkgs/python3-PyOpenGL/template
+++ b/srcpkgs/python3-PyOpenGL/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyOpenGL'
 pkgname=python3-PyOpenGL
 version=3.1.5
-revision=3
+revision=4
 wrksrc="PyOpenGL-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 91be259b3633c220d3347cca48d13bfe45353ccf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:47 -0400
Subject: [PATCH 0510/4088] python3-click-log: rebuild for Python 3.10

---
 srcpkgs/python3-click-log/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template
index d4d8bbb2218d..6f966c248fc9 100644
--- a/srcpkgs/python3-click-log/template
+++ b/srcpkgs/python3-click-log/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-click-log'
 pkgname=python3-click-log
 version=0.3.2
-revision=4
+revision=5
 wrksrc="click-log-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 90087036094b2143ce4ebe0a8ac9591a507b299d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:47 -0400
Subject: [PATCH 0511/4088] python3-click-threading: rebuild for Python 3.10

---
 srcpkgs/python3-click-threading/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
index b59619805956..b639065db3d6 100644
--- a/srcpkgs/python3-click-threading/template
+++ b/srcpkgs/python3-click-threading/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-click-threading'
 pkgname=python3-click-threading
 version=0.4.4
-revision=4
+revision=5
 wrksrc="click-threading-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 699348d6dcec2da7f616d2faff24a11af1f72048 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:21 -0400
Subject: [PATCH 0512/4088] python-distutils-extra: rebuild for Python 3.10

---
 srcpkgs/python-distutils-extra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-distutils-extra/template b/srcpkgs/python-distutils-extra/template
index 47d4c8cf11f7..ca6940049ad0 100644
--- a/srcpkgs/python-distutils-extra/template
+++ b/srcpkgs/python-distutils-extra/template
@@ -1,7 +1,7 @@
 # Template file for 'python-distutils-extra'
 pkgname=python-distutils-extra
 version=2.39
-revision=7
+revision=8
 build_style=python-module
 hostmakedepends="intltool python-setuptools python3-setuptools"
 depends="python"

From a467fad5dcc6d9712f2adb25ba305d9755809c35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:49 -0400
Subject: [PATCH 0513/4088] python3-cssselect: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template
index 42383703e637..117fd099c314 100644
--- a/srcpkgs/python3-cssselect/template
+++ b/srcpkgs/python3-cssselect/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cssselect'
 pkgname=python3-cssselect
 version=1.1.0
-revision=5
+revision=6
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7d83733ce739bd68faa7097570c10039d9316141 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:16 -0400
Subject: [PATCH 0514/4088] python3-minidb: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-minidb/template b/srcpkgs/python3-minidb/template
index b7b24fe1635a..7c63ae3ef621 100644
--- a/srcpkgs/python3-minidb/template
+++ b/srcpkgs/python3-minidb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-minidb'
 pkgname=python3-minidb
 version=2.0.2
-revision=4
+revision=5
 wrksrc="minidb-${version}"
 build_style=python3-module
 pycompile_module="minidb.py"

From aba4ac2e9dd54efe9d3cbad39b5b56b59d927e89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:50 -0400
Subject: [PATCH 0515/4088] fifengine: rebuild for Python 3.10

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

diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 6a2cc79a4487..0b432258903e 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
 # Template file for 'fifengine'
 pkgname=fifengine
 version=0.4.2
-revision=6
+revision=7
 build_style=cmake
 pycompile_module="fife"
 hostmakedepends="swig python3"

From fedde02af23a289407bc70adb4e6fca4155c8edc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:30 -0400
Subject: [PATCH 0516/4088] python3-Levenshtein: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Levenshtein/template b/srcpkgs/python3-Levenshtein/template
index 896de875574e..a7a1caf1d510 100644
--- a/srcpkgs/python3-Levenshtein/template
+++ b/srcpkgs/python3-Levenshtein/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Levenshtein'
 pkgname=python3-Levenshtein
 version=0.12.0
-revision=5
+revision=6
 wrksrc=python-Levenshtein-$version
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"

From de0184acadd68c587686ae3fda0d14131532bfc2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:28 -0400
Subject: [PATCH 0517/4088] python3-pillow-simd: rebuild for Python 3.10

---
 srcpkgs/python3-pillow-simd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pillow-simd/template b/srcpkgs/python3-pillow-simd/template
index 6b0f0eee9e0c..cb5a09503bbe 100644
--- a/srcpkgs/python3-pillow-simd/template
+++ b/srcpkgs/python3-pillow-simd/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pillow-simd'
 pkgname=python3-pillow-simd
 version=7.1.2
-revision=2
+revision=3
 archs="x86_64*"
 wrksrc="pillow-simd-${version}"
 build_style=python3-module

From c926cbf2dd17cee9437ea61c4f334f12622a7463 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:12 -0400
Subject: [PATCH 0518/4088] python3-keyutils: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
index 6a71cbb6b4e4..c6a713aa51ff 100644
--- a/srcpkgs/python3-keyutils/template
+++ b/srcpkgs/python3-keyutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-keyutils'
 pkgname=python3-keyutils
 version=0.6
-revision=5
+revision=6
 wrksrc=python-keyutils-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b875786d6d50074d55b8d5ac4d3f8bed93b547d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:12 -0400
Subject: [PATCH 0519/4088] python3-kitchen: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-kitchen/template b/srcpkgs/python3-kitchen/template
index 390e1982ba32..e766db6be6ef 100644
--- a/srcpkgs/python3-kitchen/template
+++ b/srcpkgs/python3-kitchen/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-kitchen'
 pkgname=python3-kitchen
 version=1.2.6
-revision=5
+revision=6
 wrksrc="kitchen-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6063b33f10a8f3831468c1a071318b2ad0f92f92 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:00 -0400
Subject: [PATCH 0520/4088] python3-gpg: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-gpg/template b/srcpkgs/python3-gpg/template
index a9ac107c83ee..dfd80bce0aee 100644
--- a/srcpkgs/python3-gpg/template
+++ b/srcpkgs/python3-gpg/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gpg'
 pkgname=python3-gpg
 version=1.10.0
-revision=6
+revision=7
 wrksrc="gpg-${version}"
 build_style=python3-module
 hostmakedepends="swig gpgme-devel python3-devel"

From 66a2986f94daa1c921c56da44655afd46ddc8787 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:47 -0400
Subject: [PATCH 0521/4088] python3-click-repl: rebuild for Python 3.10

---
 srcpkgs/python3-click-repl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-repl/template b/srcpkgs/python3-click-repl/template
index bcae416544c9..b5cf6e495fcb 100644
--- a/srcpkgs/python3-click-repl/template
+++ b/srcpkgs/python3-click-repl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-click-repl'
 pkgname=python3-click-repl
 version=0.1.6
-revision=2
+revision=3
 wrksrc="click-repl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 116efab3cae7ddf997b262008f4248f3721d2936 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:03 -0400
Subject: [PATCH 0522/4088] python3-humanize: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-humanize/template b/srcpkgs/python3-humanize/template
index 1c0beac81f69..f8f1d33c1eac 100644
--- a/srcpkgs/python3-humanize/template
+++ b/srcpkgs/python3-humanize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-humanize'
 pkgname=python3-humanize
 version=2.0.0
-revision=3
+revision=4
 wrksrc="humanize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 5e6b1f95f7c15c6900ff41f71dc6120393cbe5fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:04 -0400
Subject: [PATCH 0523/4088] python3-icalendar: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-icalendar/template b/srcpkgs/python3-icalendar/template
index 2899feb66f8a..898f9c04fa6d 100644
--- a/srcpkgs/python3-icalendar/template
+++ b/srcpkgs/python3-icalendar/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-icalendar'
 pkgname=python3-icalendar
 version=4.0.7
-revision=1
+revision=2
 wrksrc="icalendar-${version}"
 build_style=python3-module
 make_check_target=src/icalendar/tests

From 1a05fbacf45860300662dede870b812a92b1487d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0524/4088] python3-pyte: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template
index 219dc653f9c2..ff0cb97d6696 100644
--- a/srcpkgs/python3-pyte/template
+++ b/srcpkgs/python3-pyte/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyte'
 pkgname=python3-pyte
 version=0.8.0
-revision=5
+revision=6
 wrksrc="pyte-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7ec4ee850b069e9463ab5742fdefdb019acbb008 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:35 -0400
Subject: [PATCH 0525/4088] python3-pyfiglet: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyfiglet/template b/srcpkgs/python3-pyfiglet/template
index 6257b9274bbb..7a4ad9eedeb6 100644
--- a/srcpkgs/python3-pyfiglet/template
+++ b/srcpkgs/python3-pyfiglet/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyfiglet'
 pkgname=python3-pyfiglet
 version=0.8.0
-revision=3
+revision=4
 wrksrc="pyfiglet-${version}"
 build_style="python3-module"
 pycompile_module="pyfiglet"

From ce5f95051c5892ddc68404120239782274c128da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:53 -0400
Subject: [PATCH 0526/4088] python3-telegram: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-telegram/template b/srcpkgs/python3-telegram/template
index 13cc66ab33c7..3c442a0a22f2 100644
--- a/srcpkgs/python3-telegram/template
+++ b/srcpkgs/python3-telegram/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-telegram'
 pkgname=python3-telegram
 version=0.14.0
-revision=1
+revision=2
 wrksrc=python-telegram-${version}
 build_style=python3-module
 hostmakedepends="python3"

From dbcbf610fe593e5d3d656550dbfa873ec49c96cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:46 -0400
Subject: [PATCH 0527/4088] configshell-fb: rebuild for Python 3.10

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

diff --git a/srcpkgs/configshell-fb/template b/srcpkgs/configshell-fb/template
index 91163d68e8b4..7a79e3b6935b 100644
--- a/srcpkgs/configshell-fb/template
+++ b/srcpkgs/configshell-fb/template
@@ -1,7 +1,7 @@
 # Template file for 'configshell-fb'
 pkgname=configshell-fb
 version=1.1.29
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-six python3-urwid python3-parsing"

From 843451be2d1323365f66bca7b2a902a47df911b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:08 -0400
Subject: [PATCH 0528/4088] rtslib-fb: rebuild for Python 3.10

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

diff --git a/srcpkgs/rtslib-fb/template b/srcpkgs/rtslib-fb/template
index e0af5dd69bef..7efd3670d4a9 100644
--- a/srcpkgs/rtslib-fb/template
+++ b/srcpkgs/rtslib-fb/template
@@ -1,7 +1,7 @@
 # Template file for 'rtslib-fb'
 pkgname=rtslib-fb
 version=2.1.74
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-six python3-pyudev"

From 8825030c33070e565200820c3f46d51dfb0684a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:50 -0400
Subject: [PATCH 0529/4088] python3-smbc: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-smbc/template b/srcpkgs/python3-smbc/template
index d469f74f97c5..0e5af27c6eff 100644
--- a/srcpkgs/python3-smbc/template
+++ b/srcpkgs/python3-smbc/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-smbc'
 pkgname=python3-smbc
 version=1.0.23
-revision=1
+revision=2
 wrksrc="pysmbc-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel python3-setuptools"

From 5d35851e1589545452161e651232e9fcbbfc12ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:38 -0400
Subject: [PATCH 0530/4088] python3-pyside2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index db5ac6ef97c8..edad85a5112f 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
 version=5.15.2
-revision=1
+revision=2
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"

From dbfda011352ef5ad3420992f5cb7953ff8260915 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:50 -0400
Subject: [PATCH 0531/4088] python3-daemonize: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-daemonize/template b/srcpkgs/python3-daemonize/template
index 274e42079fc0..caf1fbf54a7c 100644
--- a/srcpkgs/python3-daemonize/template
+++ b/srcpkgs/python3-daemonize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-daemonize'
 pkgname=python3-daemonize
 version=2.5.0
-revision=4
+revision=5
 wrksrc="daemonize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 576f686ee72a3ffddd72be9882dea92087299ab1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:04 -0400
Subject: [PATCH 0532/4088] python3-ijson: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ijson/template b/srcpkgs/python3-ijson/template
index 2fb5be71f9e6..0c310b0c22c7 100644
--- a/srcpkgs/python3-ijson/template
+++ b/srcpkgs/python3-ijson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ijson'
 pkgname=python3-ijson
 version=3.1.4
-revision=1
+revision=2
 wrksrc="ijson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 4c4f3b650691d58d505e23cb19a1f8bd0f6bb060 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:14 -0400
Subject: [PATCH 0533/4088] python3-macaroons: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 94ee7e21d59c..4e3be864adcb 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-macaroons'
 pkgname=python3-macaroons
 version=0.13.0
-revision=4
+revision=5
 wrksrc="pymacaroons-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e21312c1363a38e9909df8c579c485bc8ca807d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:20 -0400
Subject: [PATCH 0534/4088] python3-netaddr: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-netaddr/template b/srcpkgs/python3-netaddr/template
index 7f5485225958..923951082db1 100644
--- a/srcpkgs/python3-netaddr/template
+++ b/srcpkgs/python3-netaddr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-netaddr'
 pkgname=python3-netaddr
 version=0.8.0
-revision=1
+revision=2
 wrksrc="netaddr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 39baa3844a13ee189779970232bed70f15e64964 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:27 -0400
Subject: [PATCH 0535/4088] python3-phonenumbers: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 5b0341499bac..4242d2623783 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
 version=8.12.13
-revision=1
+revision=2
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From babcb0a96e45d83a6e3343daf7c7ffc44277edeb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:46 -0400
Subject: [PATCH 0536/4088] python3-saml2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 07b7e142efae..355d99a85c68 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
 version=6.5.1
-revision=1
+revision=2
 wrksrc="pysaml2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dea219bc2289d1a02293708f6196ca919190f56f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:49 -0400
Subject: [PATCH 0537/4088] python3-signedjson: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 9edb9c24b149..60616a1791dc 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-signedjson'
 pkgname=python3-signedjson
 version=1.1.0
-revision=3
+revision=4
 wrksrc="python-signedjson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0f34a2af0c06d67fd911c9bac52a5a09da03aa3f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:57 -0400
Subject: [PATCH 0538/4088] python3-txacme: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-txacme/template b/srcpkgs/python3-txacme/template
index 3e33991a003c..530f438ed447 100644
--- a/srcpkgs/python3-txacme/template
+++ b/srcpkgs/python3-txacme/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-txacme'
 pkgname=python3-txacme
 version=0.9.3
-revision=2
+revision=3
 wrksrc="txacme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 274fc859e2247c9e771f2bb64260eb632cd4b9b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:53 -0400
Subject: [PATCH 0539/4088] python3-dogpile.cache: rebuild for Python 3.10

---
 srcpkgs/python3-dogpile.cache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dogpile.cache/template b/srcpkgs/python3-dogpile.cache/template
index 9c4643ae5c15..474444756f8a 100644
--- a/srcpkgs/python3-dogpile.cache/template
+++ b/srcpkgs/python3-dogpile.cache/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dogpile.cache'
 pkgname=python3-dogpile.cache
 version=1.1.1
-revision=1
+revision=2
 wrksrc="dogpile.cache-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 60362606a5b6898bcd28b0c5576d61e6e4f4ca26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:55 -0400
Subject: [PATCH 0540/4088] python3-enzyme: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-enzyme/template b/srcpkgs/python3-enzyme/template
index 0aa833ee0c72..fd374ccac60e 100644
--- a/srcpkgs/python3-enzyme/template
+++ b/srcpkgs/python3-enzyme/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-enzyme'
 pkgname=python3-enzyme
 version=0.4.1
-revision=4
+revision=5
 wrksrc="enzyme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6a91ad879747f7af40a0e79335798d3182e8c8b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:01 -0400
Subject: [PATCH 0541/4088] python3-guessit: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-guessit/template b/srcpkgs/python3-guessit/template
index 8945e95b0416..9c9533ce479f 100644
--- a/srcpkgs/python3-guessit/template
+++ b/srcpkgs/python3-guessit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-guessit'
 pkgname=python3-guessit
 version=3.1.1
-revision=3
+revision=4
 wrksrc="guessit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bab8f8fa485abff386ffd8aba1d6b374c5466574 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0542/4088] python3-pysrt: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pysrt/template b/srcpkgs/python3-pysrt/template
index 2f5097e0eae1..175429082e85 100644
--- a/srcpkgs/python3-pysrt/template
+++ b/srcpkgs/python3-pysrt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pysrt'
 pkgname=python3-pysrt
 version=1.1.2
-revision=3
+revision=4
 wrksrc="pysrt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6b8b8279fe7cc9e5a8858aebb64dec8c1b9157da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:42 -0400
Subject: [PATCH 0543/4088] python3-rarfile: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-rarfile/template b/srcpkgs/python3-rarfile/template
index 247e8607ab66..60d5d3e1bc6d 100644
--- a/srcpkgs/python3-rarfile/template
+++ b/srcpkgs/python3-rarfile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rarfile'
 pkgname=python3-rarfile
 version=4.0
-revision=3
+revision=4
 wrksrc="rarfile-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 069b50aad2a7e5ad236bae52bd3219191092d281 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:37 -0400
Subject: [PATCH 0544/4088] python3-aiohttp_socks: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index 48ac973d33b1..e51b27df2e48 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiohttp_socks'
 pkgname=python3-aiohttp_socks
 version=0.6.0
-revision=1
+revision=2
 wrksrc="aiohttp_socks-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 32908f60699de7d38080c95c05bb38709a4da068 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:43 -0400
Subject: [PATCH 0545/4088] python3-blinker: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-blinker/template b/srcpkgs/python3-blinker/template
index c500b7cc5ed5..609af96d16d8 100644
--- a/srcpkgs/python3-blinker/template
+++ b/srcpkgs/python3-blinker/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-blinker'
 pkgname=python3-blinker
 version=1.4
-revision=6
+revision=7
 wrksrc="blinker-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c84f5281f9cf6f9a389bd0e572046bf9a4667df6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:19 -0400
Subject: [PATCH 0546/4088] python3-natsort: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-natsort/template b/srcpkgs/python3-natsort/template
index 0cc3ea1e95ea..64aaf872cb8f 100644
--- a/srcpkgs/python3-natsort/template
+++ b/srcpkgs/python3-natsort/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-natsort'
 pkgname=python3-natsort
 version=6.0.0
-revision=4
+revision=5
 wrksrc="natsort-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f8c090408621c3d2d096ba0311c2b45693e041f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:58 -0400
Subject: [PATCH 0547/4088] python3-urwidtrees: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..20e9c4a508f8 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
 version=1.0.3
-revision=1
+revision=2
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 35015f309578189c76a4882274521217d1092c77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0548/4088] python3-tqdm: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tqdm/template b/srcpkgs/python3-tqdm/template
index 96c8d07f0496..138ede2b4bd1 100644
--- a/srcpkgs/python3-tqdm/template
+++ b/srcpkgs/python3-tqdm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tqdm'
 pkgname=python3-tqdm
 version=4.48.2
-revision=3
+revision=4
 wrksrc="tqdm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a9e2287bd03dcdb0485a9f608fa53e8570c4c2f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:17 -0400
Subject: [PATCH 0549/4088] python3-mpd2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mpd2/template b/srcpkgs/python3-mpd2/template
index 042cd65b6c34..3661cfe47ce6 100644
--- a/srcpkgs/python3-mpd2/template
+++ b/srcpkgs/python3-mpd2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpd2'
 pkgname=python3-mpd2
 version=3.0.4
-revision=1
+revision=2
 wrksrc=python-mpd2-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 76b253614ab4967bc50737d803f4317a504ba498 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:32 -0400
Subject: [PATCH 0550/4088] python3-PyQt5-webengine: rebuild for Python 3.10

---
 srcpkgs/python3-PyQt5-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 2db65a201307..84f8d667cc64 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt5-webengine'
 pkgname=python3-PyQt5-webengine
 version=5.15.4
-revision=1
+revision=2
 wrksrc="PyQtWebEngine-${version}"
 build_helper="qmake"
 hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel

From 9d203f640ac68bb27cb9f30c42f416a3db89d0df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:26 -0400
Subject: [PATCH 0551/4088] python3-pdfminer.six: rebuild for Python 3.10

---
 srcpkgs/python3-pdfminer.six/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pdfminer.six/template b/srcpkgs/python3-pdfminer.six/template
index 753dbfb9b816..4b7abb3370ab 100644
--- a/srcpkgs/python3-pdfminer.six/template
+++ b/srcpkgs/python3-pdfminer.six/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pdfminer.six'
 pkgname=python3-pdfminer.six
 version=20201018
-revision=1
+revision=2
 wrksrc=pdfminer.six-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 88699d603d65d9a5d29a15dd094ab92d7572a78e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:04 -0400
Subject: [PATCH 0552/4088] libsearpc: rebuild for Python 3.10

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

diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 22fbb7987d06..66e769c177a4 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -3,7 +3,7 @@
 pkgname=libsearpc
 # 3.2-latest (as of 2021-04-10)
 version=3.2.0.20200318
-revision=1
+revision=2
 _gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90
 wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure

From 8d6cb04893f201e9c3441f23e8bd41565ff1e9f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:25 -0400
Subject: [PATCH 0553/4088] python-reportlab: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-reportlab/template b/srcpkgs/python-reportlab/template
index 65ad7fdd8dba..019923f4d680 100644
--- a/srcpkgs/python-reportlab/template
+++ b/srcpkgs/python-reportlab/template
@@ -1,7 +1,7 @@
 # Template file for 'python-reportlab'
 pkgname=python-reportlab
 version=3.5.42
-revision=2
+revision=3
 wrksrc="reportlab-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools freetype-devel"

From 536062f935abc5e989ce74e70d3352184c5c2703 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:19 -0400
Subject: [PATCH 0554/4088] python-M2Crypto: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 4c684d18f576..55f5130596a4 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,7 +1,7 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=6
+revision=7
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"

From 1024e0c0ed84eca726645afe8de166bf6ea27abb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:27 -0400
Subject: [PATCH 0555/4088] python3-CherryPy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-CherryPy/template b/srcpkgs/python3-CherryPy/template
index 90b48900c9d4..44d83c9b3ada 100644
--- a/srcpkgs/python3-CherryPy/template
+++ b/srcpkgs/python3-CherryPy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-CherryPy'
 pkgname=python3-CherryPy
 version=18.6.0
-revision=3
+revision=4
 wrksrc="CherryPy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From cdc67b1bce432bc35bb47bff9c0a0686b958f4cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:46 -0400
Subject: [PATCH 0556/4088] python3-sabyenc3: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-sabyenc3/template b/srcpkgs/python3-sabyenc3/template
index 5583ba6f20b5..e0f10fd8b804 100644
--- a/srcpkgs/python3-sabyenc3/template
+++ b/srcpkgs/python3-sabyenc3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sabyenc3'
 pkgname=python3-sabyenc3
 version=4.0.2
-revision=2
+revision=3
 wrksrc=sabyenc3-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b4caeec35b857aa1068e6b8282d1ddb6b3ab0579 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:29 -0400
Subject: [PATCH 0557/4088] python3-IPy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-IPy/template b/srcpkgs/python3-IPy/template
index d994678b636d..3a5ed3dc60f1 100644
--- a/srcpkgs/python3-IPy/template
+++ b/srcpkgs/python3-IPy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-IPy'
 pkgname=python3-IPy
 version=1.01
-revision=1
+revision=2
 wrksrc="IPy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c607867acbb8f6827a30eaa039397eab67a5011a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:44 -0400
Subject: [PATCH 0558/4088] python3-ripe-atlas-cousteau: rebuild for Python
 3.10

---
 srcpkgs/python3-ripe-atlas-cousteau/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ripe-atlas-cousteau/template b/srcpkgs/python3-ripe-atlas-cousteau/template
index 1e4422abef16..3a49c6367f4e 100644
--- a/srcpkgs/python3-ripe-atlas-cousteau/template
+++ b/srcpkgs/python3-ripe-atlas-cousteau/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ripe-atlas-cousteau'
 pkgname=python3-ripe-atlas-cousteau
 version=1.4.2
-revision=4
+revision=5
 wrksrc="ripe-atlas-cousteau-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f517f2307f0ed86acf366a3035ec1decef7a5dea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:45 -0400
Subject: [PATCH 0559/4088] python3-ripe-atlas-sagan: rebuild for Python 3.10

---
 srcpkgs/python3-ripe-atlas-sagan/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ripe-atlas-sagan/template b/srcpkgs/python3-ripe-atlas-sagan/template
index b7b42ae5f49f..5505d63a7f17 100644
--- a/srcpkgs/python3-ripe-atlas-sagan/template
+++ b/srcpkgs/python3-ripe-atlas-sagan/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ripe-atlas-sagan'
 pkgname=python3-ripe-atlas-sagan
 version=1.3.0
-revision=4
+revision=5
 wrksrc="ripe.atlas.sagan-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4e0881d90884bb6c98ebfa1fc6349b2ce757eb25 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:40 -0400
Subject: [PATCH 0560/4088] avahi-discover: rebuild for Python 3.10

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

diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 9012d73a30eb..669dc83bd472 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
 #
 pkgname=avahi-discover
 version=0.8
-revision=3
+revision=4
 wrksrc="avahi-${version}"
 build_style=gnu-configure
 build_helper="gir"

From abae4fb9372e3eaac49571ed93908fcbd35b395d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:42 -0400
Subject: [PATCH 0561/4088] python3-binaryornot: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
index 56b30d88215d..d84f85eb17b5 100644
--- a/srcpkgs/python3-binaryornot/template
+++ b/srcpkgs/python3-binaryornot/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-binaryornot'
 pkgname=python3-binaryornot
 version=0.4.4
-revision=1
+revision=2
 wrksrc="binaryornot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 85b4e408345f09a990837e1370648c5b787e3f0a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:51 -0400
Subject: [PATCH 0562/4088] python3-debian: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
index 5d35bef5f22e..64b081d0a3e5 100644
--- a/srcpkgs/python3-debian/template
+++ b/srcpkgs/python3-debian/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-debian'
 pkgname=python3-debian
 version=0.1.40
-revision=1
+revision=2
 wrksrc="python-debian-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3f41e04312d12f5a4203300021298a29519088b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:13 -0400
Subject: [PATCH 0563/4088] python3-license-expression: rebuild for Python 3.10

---
 srcpkgs/python3-license-expression/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
index 32e6b2df88a6..d658dbd185b7 100644
--- a/srcpkgs/python3-license-expression/template
+++ b/srcpkgs/python3-license-expression/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-license-expression'
 pkgname=python3-license-expression
 version=21.6.14
-revision=1
+revision=2
 wrksrc="license-expression-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-setuptools_scm"

From 5786c4c3987f08a19067610cd450f956235c62e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:01 -0400
Subject: [PATCH 0564/4088] python3-xdg-variables: rebuild for Python 3.10

---
 srcpkgs/python3-xdg-variables/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-xdg-variables/template b/srcpkgs/python3-xdg-variables/template
index 37e9689bf1af..865bfb7fa867 100644
--- a/srcpkgs/python3-xdg-variables/template
+++ b/srcpkgs/python3-xdg-variables/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xdg-variables'
 pkgname=python3-xdg-variables
 version=4.0.1
-revision=2
+revision=3
 wrksrc="xdg-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9fcdfa0ee4beb2a3fa1bb2592a0ae9697ed01abf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:55 -0400
Subject: [PATCH 0565/4088] python3-enchant: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index 43ca65c38702..88b59dc454b3 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-enchant'
 pkgname=python3-enchant
 version=3.2.0
-revision=1
+revision=2
 wrksrc="pyenchant-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools enchant2-devel"

From 0b309cf2f87ea84f6f26bf4968e7b0951d21dd1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:41 -0400
Subject: [PATCH 0566/4088] python3-pyxattr: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyxattr/template b/srcpkgs/python3-pyxattr/template
index f7f075a7a3e3..3e9d5fb2fc85 100644
--- a/srcpkgs/python3-pyxattr/template
+++ b/srcpkgs/python3-pyxattr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyxattr'
 pkgname=python3-pyxattr
 version=0.7.2
-revision=1
+revision=2
 wrksrc="pyxattr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ba9c8975860ffb94b2978fa8c232762c9d07e953 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:50 -0400
Subject: [PATCH 0567/4088] flake8: rebuild for Python 3.10

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

diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index 5b5d795f7410..d5e68dde1b92 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,7 +1,7 @@
 # Template file for 'flake8'
 pkgname=flake8
 version=3.9.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pycodestyle python3-pyflakes python3-mccabe"

From 501290d07543c0b4d1ba4d7c787c6392231ebb59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:02 -0400
Subject: [PATCH 0568/4088] python3-hjson: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-hjson/template b/srcpkgs/python3-hjson/template
index 628c19d82e3f..7aae774e54af 100644
--- a/srcpkgs/python3-hjson/template
+++ b/srcpkgs/python3-hjson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hjson'
 pkgname=python3-hjson
 version=3.0.1
-revision=2
+revision=3
 wrksrc="hjson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 931688aedff2af02331c8f1822d88a144bdd154d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:21 -0400
Subject: [PATCH 0569/4088] python3-nose2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-nose2/template b/srcpkgs/python3-nose2/template
index d1f95c3e3736..3f8c029ee795 100644
--- a/srcpkgs/python3-nose2/template
+++ b/srcpkgs/python3-nose2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nose2'
 pkgname=python3-nose2
 version=0.8.0
-revision=4
+revision=5
 wrksrc="nose2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fc3e539a22632f4ee612be4fe0ab36d4e7fa9445 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:02 -0400
Subject: [PATCH 0570/4088] python3-yapf: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-yapf/template b/srcpkgs/python3-yapf/template
index 1fda3e07b9ab..6313b100d19a 100644
--- a/srcpkgs/python3-yapf/template
+++ b/srcpkgs/python3-yapf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yapf'
 pkgname=python3-yapf
 version=0.29.0
-revision=2
+revision=3
 wrksrc="yapf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 66bb881cf717581fe4e2654c7958c71ef2e385d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:05 -0400
Subject: [PATCH 0571/4088] python3-zope.location: rebuild for Python 3.10

---
 srcpkgs/python3-zope.location/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.location/template b/srcpkgs/python3-zope.location/template
index f45b5272d185..91efa1487d8a 100644
--- a/srcpkgs/python3-zope.location/template
+++ b/srcpkgs/python3-zope.location/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.location'
 pkgname=python3-zope.location
 version=4.2
-revision=4
+revision=5
 wrksrc="zope.location-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-repoze.sphinx.autointerface

From 352f5e63467932f06442fd5f10a13620907bac39 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:06 -0400
Subject: [PATCH 0572/4088] python3-zope.testing: rebuild for Python 3.10

---
 srcpkgs/python3-zope.testing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.testing/template b/srcpkgs/python3-zope.testing/template
index 48373ebb5633..4c09c0405b2f 100644
--- a/srcpkgs/python3-zope.testing/template
+++ b/srcpkgs/python3-zope.testing/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.testing'
 pkgname=python3-zope.testing
 version=4.7
-revision=3
+revision=4
 wrksrc="zope.testing-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 044891cc35ccdc60f0bf11a47320d9b4e2beea42 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:06 -0400
Subject: [PATCH 0573/4088] python3-zope.testrunner: rebuild for Python 3.10

---
 srcpkgs/python3-zope.testrunner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.testrunner/template b/srcpkgs/python3-zope.testrunner/template
index bf3f0bf774f4..3c561f5a3c5b 100644
--- a/srcpkgs/python3-zope.testrunner/template
+++ b/srcpkgs/python3-zope.testrunner/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.testrunner'
 pkgname=python3-zope.testrunner
 version=5.2
-revision=1
+revision=2
 wrksrc="zope.testrunner-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib"

From e64cf7341ff910de92ac0066255508d69c3adf3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:26 -0400
Subject: [PATCH 0574/4088] python3-pathspec: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pathspec/template b/srcpkgs/python3-pathspec/template
index 31dbee00b297..de4e78864c4a 100644
--- a/srcpkgs/python3-pathspec/template
+++ b/srcpkgs/python3-pathspec/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pathspec'
 pkgname=python3-pathspec
 version=0.9.0
-revision=1
+revision=2
 wrksrc="pathspec-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9c4c97b3377494fbf4e2453e9f876d739a6d41ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:39 -0400
Subject: [PATCH 0575/4088] python3-argh: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-argh/template b/srcpkgs/python3-argh/template
index 633671c032c1..48cf823f9f67 100644
--- a/srcpkgs/python3-argh/template
+++ b/srcpkgs/python3-argh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-argh'
 pkgname=python3-argh
 version=0.26.2
-revision=4
+revision=5
 wrksrc="argh-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5ee7f81dd3a0c2f1cda0b9dcc7e79141e893ecf2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:26 -0400
Subject: [PATCH 0576/4088] python3-pathtools: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pathtools/template b/srcpkgs/python3-pathtools/template
index 6c4376596f5f..8ef09959edc4 100644
--- a/srcpkgs/python3-pathtools/template
+++ b/srcpkgs/python3-pathtools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pathtools'
 pkgname=python3-pathtools
 version=0.1.2
-revision=4
+revision=5
 wrksrc="pathtools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 22c43cbf6b926628311a2e853e741debd8dec440 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:38 -0400
Subject: [PATCH 0577/4088] python3-ansicolor: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ansicolor/template b/srcpkgs/python3-ansicolor/template
index 657c0fcf3501..45792486aaa4 100644
--- a/srcpkgs/python3-ansicolor/template
+++ b/srcpkgs/python3-ansicolor/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ansicolor'
 pkgname=python3-ansicolor
 version=0.2.6
-revision=5
+revision=6
 wrksrc="ansicolor-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6393a6e71cc816f619eaf9bd76c9a9e82442216d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:44 -0400
Subject: [PATCH 0578/4088] python3-requests-oauthlib: rebuild for Python 3.10

---
 srcpkgs/python3-requests-oauthlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-requests-oauthlib/template b/srcpkgs/python3-requests-oauthlib/template
index 0cc1644a53c6..7b5da65ea221 100644
--- a/srcpkgs/python3-requests-oauthlib/template
+++ b/srcpkgs/python3-requests-oauthlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-oauthlib'
 pkgname=python3-requests-oauthlib
 version=1.3.0
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0270c9da356ed35f53038e6e41a1cb8926dbaf6c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:23 -0400
Subject: [PATCH 0579/4088] python3-outcome: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-outcome/template b/srcpkgs/python3-outcome/template
index b1fd6e6cf06e..6894bb392146 100644
--- a/srcpkgs/python3-outcome/template
+++ b/srcpkgs/python3-outcome/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-outcome'
 pkgname=python3-outcome
 version=1.1.0
-revision=1
+revision=2
 wrksrc="outcome-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c2ec7a03e7d3e631622ec71798a8c73bc0b8af34 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:50 -0400
Subject: [PATCH 0580/4088] python3-slugify: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-slugify/template b/srcpkgs/python3-slugify/template
index 31e2eff0715a..6a61cfcaef8c 100644
--- a/srcpkgs/python3-slugify/template
+++ b/srcpkgs/python3-slugify/template
@@ -3,7 +3,7 @@ pkgname=python3-slugify
 # Please don't update. Only required by Transifx-client,
 # doesn't work with newer versions
 version=1.2.6
-revision=3
+revision=4
 wrksrc="python-slugify-${version}"
 build_style=python3-module
 pycompile_module="slugify"

From 9e77595b9f21b1a294f7c5ee9b3350c535571e8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:11 -0400
Subject: [PATCH 0581/4088] python3-kaptan: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-kaptan/template b/srcpkgs/python3-kaptan/template
index c2a0d57586d9..d5fc872e8bfb 100644
--- a/srcpkgs/python3-kaptan/template
+++ b/srcpkgs/python3-kaptan/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-kaptan'
 pkgname=python3-kaptan
 version=0.5.12
-revision=4
+revision=5
 wrksrc="kaptan-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e249dc9c8e93b92f9e939062b2d4e502c93062fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:13 -0400
Subject: [PATCH 0582/4088] python3-libtmux: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-libtmux/template b/srcpkgs/python3-libtmux/template
index e1c7918acf65..44d935083354 100644
--- a/srcpkgs/python3-libtmux/template
+++ b/srcpkgs/python3-libtmux/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-libtmux'
 pkgname=python3-libtmux
 version=0.8.5
-revision=4
+revision=5
 wrksrc="libtmux-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2fb9addce840249427a26b1b2f912745b8d9bde7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:43 -0400
Subject: [PATCH 0583/4088] python3-requests-file: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-requests-file/template b/srcpkgs/python3-requests-file/template
index 8d9626dc7e49..a3add73a029e 100644
--- a/srcpkgs/python3-requests-file/template
+++ b/srcpkgs/python3-requests-file/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-file'
 pkgname=python3-requests-file
 version=1.4.3
-revision=2
+revision=3
 wrksrc="requests-file-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f329167efcd298dcc548e4609ed208efc0dd7f60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:22 -0400
Subject: [PATCH 0584/4088] python3-numexpr: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
index 16f21540547d..64be5908b161 100644
--- a/srcpkgs/python3-numexpr/template
+++ b/srcpkgs/python3-numexpr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numexpr'
 pkgname=python3-numexpr
 version=2.7.2
-revision=2
+revision=3
 wrksrc="numexpr-${version}"
 build_style=python3-module
 build_helper=numpy

From a04e8a6b198a9eaedb157fde5c2a1ae1d6ff1fe6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:54 -0400
Subject: [PATCH 0585/4088] python3-testtools: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-testtools/template b/srcpkgs/python3-testtools/template
index 3fcae7eec932..6808cb30369a 100644
--- a/srcpkgs/python3-testtools/template
+++ b/srcpkgs/python3-testtools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-testtools'
 pkgname=python3-testtools
 version=2.4.0
-revision=3
+revision=4
 wrksrc="testtools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"

From 2dc2ce743412183d60a952dbcd35f3b2edbddc6c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:54 -0400
Subject: [PATCH 0586/4088] python3-termcolor: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-termcolor/template b/srcpkgs/python3-termcolor/template
index 890e115ac65c..dbb215aa5be3 100644
--- a/srcpkgs/python3-termcolor/template
+++ b/srcpkgs/python3-termcolor/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-termcolor'
 pkgname=python3-termcolor
 version=1.1.0
-revision=8
+revision=9
 wrksrc="termcolor-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 8430bc6112633413300d92285c88948335e86f0b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:15 -0400
Subject: [PATCH 0587/4088] python3-matplotlib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..bed2c06ca9a6 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
 version=3.4.3
-revision=1
+revision=2
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"

From 1bbac7d09f9b066c933fc477514a84d56bb0f17b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:24 -0400
Subject: [PATCH 0588/4088] python3-pandas: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index dddbed3bc052..b843b4d69b56 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
 version=1.3.3
-revision=1
+revision=2
 wrksrc="pandas-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"

From e16cd6bc3abb361e9540ebdde3589fb96a656640 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:08 -0400
Subject: [PATCH 0589/4088] python3-joblib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-joblib/template b/srcpkgs/python3-joblib/template
index f19a6f4609ac..2294e969abfd 100644
--- a/srcpkgs/python3-joblib/template
+++ b/srcpkgs/python3-joblib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-joblib'
 pkgname=python3-joblib
 version=1.0.1
-revision=1
+revision=2
 wrksrc="joblib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 667a7102dfbdb4e2276b7597fbe4e63fe6afbf58 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:54 -0400
Subject: [PATCH 0590/4088] python3-threadpoolctl: rebuild for Python 3.10,
 update to 3.0.0.

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

diff --git a/srcpkgs/python3-threadpoolctl/template b/srcpkgs/python3-threadpoolctl/template
index fb0b4457ea65..4850f45c80fa 100644
--- a/srcpkgs/python3-threadpoolctl/template
+++ b/srcpkgs/python3-threadpoolctl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-threadpoolctl'
 pkgname=python3-threadpoolctl
-version=2.2.0
+version=3.0.0
 revision=1
 wrksrc="threadpoolctl-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/joblib/threadpoolctl"
 distfiles="${PYPI_SITE}/t/threadpoolctl/threadpoolctl-${version}.tar.gz"
-checksum=86d4b6801456d780e94681d155779058759eaef3c3564758b17b6c99db5f81cb
+checksum=d03115321233d0be715f0d3a5ad1d6c065fe425ddc2d671ca8e45e9fd5d7a52a
 
 post_install() {
 	vlicense LICENSE

From 900deee6503ba8ed9b88c9a8a20cc7091ccc168a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:05 -0400
Subject: [PATCH 0591/4088] python3-imageio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 608859d5371c..0fcca3af4a5a 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
 version=2.9.0
-revision=2
+revision=3
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a46966c6b94d9ac17d068efa004ca6163c1a8812 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:41 -0400
Subject: [PATCH 0592/4088] python3-pywt: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template
index e5837f85be84..0320b03b0e6c 100644
--- a/srcpkgs/python3-pywt/template
+++ b/srcpkgs/python3-pywt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pywt'
 pkgname=python3-pywt
 version=1.1.1
-revision=2
+revision=3
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="numpy"

From 282e55be14f5052f3d7ac427de27248ed6377a62 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:55 -0400
Subject: [PATCH 0593/4088] python3-tifffile: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index abff878eb8d1..cc343a24a3b3 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
 version=2021.8.30
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 944f03f6c6d823df697b9e9b6b9e65ea66725dcb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:02 -0400
Subject: [PATCH 0594/4088] python3-html2text: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-html2text/template b/srcpkgs/python3-html2text/template
index 5adc859fcc80..59e847fc5d12 100644
--- a/srcpkgs/python3-html2text/template
+++ b/srcpkgs/python3-html2text/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-html2text'
 pkgname=python3-html2text
 version=2020.1.16
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 pycompile_module="html2text"

From c9aeec02b1aa23806a2b0f55c34faf6d1bfde838 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:03 -0400
Subject: [PATCH 0595/4088] python3-hypercorn: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index 9635ad9fe533..f44154778e51 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-hypercorn'
 pkgname=python3-hypercorn
 version=0.11.2
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-h11 python3-hyper-h2 python3-priority
+depends="python3-h11 python3-h2 python3-priority
  python3-toml python3-typing_extensions python3-wsproto"
 checkdepends="python3-pytest-asyncio $depends"
 short_desc="Python ASGI server based on hyper and inspired by gunicorn"

From 3d35bba5681d5c91380c9c0df53387bb99a169a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:33 -0400
Subject: [PATCH 0596/4088] python3-PyVirtualDisplay: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-PyVirtualDisplay/template b/srcpkgs/python3-PyVirtualDisplay/template
index eee012dca6eb..2e44847e5219 100644
--- a/srcpkgs/python3-PyVirtualDisplay/template
+++ b/srcpkgs/python3-PyVirtualDisplay/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyVirtualDisplay'
 pkgname=python3-PyVirtualDisplay
 version=2.2
-revision=1
+revision=2
 wrksrc=PyVirtualDisplay-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 063b89721d520dd8c33243381621e636917a34d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:37 -0400
Subject: [PATCH 0597/4088] python3-pyqt6: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyqt6/template b/srcpkgs/python3-pyqt6/template
index d31478791068..a4a2a0ed36d7 100644
--- a/srcpkgs/python3-pyqt6/template
+++ b/srcpkgs/python3-pyqt6/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6'
 pkgname=python3-pyqt6
 version=6.1.1
-revision=1
+revision=2
 wrksrc=PyQt6-$version
 build_style=sip-build
 build_helper=qemu

From 298ecf75680f12d908d2562bc095de6e888c00bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:41 -0400
Subject: [PATCH 0598/4088] python3-pytools: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..a19a57e6c588 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
 version=2021.2.8
-revision=1
+revision=2
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 34e43418a951dfd740ba42dcd54e84bb234824b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:41 -0400
Subject: [PATCH 0599/4088] python3-pywinrm: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pywinrm/template b/srcpkgs/python3-pywinrm/template
index be07eb711bb4..24c8b63fec06 100644
--- a/srcpkgs/python3-pywinrm/template
+++ b/srcpkgs/python3-pywinrm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pywinrm'
 pkgname=python3-pywinrm
 version=0.4.2
-revision=1
+revision=2
 wrksrc="pywinrm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a902ef44f7c73b64be516c3af408cfbaffe7633b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:41 -0400
Subject: [PATCH 0600/4088] python3-audioread: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-audioread/template b/srcpkgs/python3-audioread/template
index 0fad35d5c50a..ba9a6fca85c2 100644
--- a/srcpkgs/python3-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-audioread'
 pkgname=python3-audioread
 version=2.1.8
-revision=5
+revision=6
 wrksrc="audioread-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 875d1cb4736b0047ec81609536502e3e02747888 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:06 -0400
Subject: [PATCH 0601/4088] python3-intervaltree: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-intervaltree/template b/srcpkgs/python3-intervaltree/template
index 0d894d25faae..94091ac4d81d 100644
--- a/srcpkgs/python3-intervaltree/template
+++ b/srcpkgs/python3-intervaltree/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-intervaltree'
 pkgname=python3-intervaltree
 version=3.1.0
-revision=1
+revision=2
 wrksrc="intervaltree-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9e323abf7b1f7f85f4dc7bf44c428671d8ba1e80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:34 -0400
Subject: [PATCH 0602/4088] python3-pyelftools: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
index 587e9b511948..f201ac09bba0 100644
--- a/srcpkgs/python3-pyelftools/template
+++ b/srcpkgs/python3-pyelftools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyelftools'
 pkgname=python3-pyelftools
 version=0.25
-revision=6
+revision=7
 wrksrc="pyelftools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0d46f04052e039b266769056ee42ef8da829e23e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:45 -0400
Subject: [PATCH 0603/4088] python3-ropgadget: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template
index 73d28153afb6..6ff8980ab2b0 100644
--- a/srcpkgs/python3-ropgadget/template
+++ b/srcpkgs/python3-ropgadget/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ropgadget'
 pkgname=python3-ropgadget
 version=6.6
-revision=1
+revision=2
 wrksrc="ROPGadget-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9285df5520301fa5786e3bbb7c50c5650d7d9316 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:59 -0400
Subject: [PATCH 0604/4088] python3-userpath: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index 174c15846c63..b557bc2528af 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-userpath'
 pkgname=python3-userpath
 version=1.7.0
-revision=1
+revision=2
 wrksrc="userpath-${version}"
 build_style=python3-module
 pycompile_module="userpath"

From 808af2bc6c94f5f75a41ca00fc97efbb2da9f272 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:35 -0400
Subject: [PATCH 0605/4088] python3-pygame: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pygame/template b/srcpkgs/python3-pygame/template
index eeb29dd59b11..14ccc0334677 100644
--- a/srcpkgs/python3-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pygame'
 pkgname=python3-pygame
 version=2.0.1
-revision=2
+revision=3
 wrksrc="pygame-${version}"
 build_style=python3-module
 make_build_args="cython"

From de964e5899b45b1d6c9346fdcfde5bceb6f21551 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:58 -0400
Subject: [PATCH 0606/4088] python3-geojson: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-geojson/template b/srcpkgs/python3-geojson/template
index fe456fa2ad3e..26cb68bea1fa 100644
--- a/srcpkgs/python3-geojson/template
+++ b/srcpkgs/python3-geojson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-geojson'
 pkgname=python3-geojson
 version=2.5.0
-revision=3
+revision=4
 wrksrc="geojson-${version}"
 build_style=python3-module
 pycompile_module="geojson"

From f20dc21ccc7175ccdb363b6d7d5907f0b5d67d6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:22 -0400
Subject: [PATCH 0607/4088] python-nose: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template
index 95f3607a40aa..76a0cd0a0406 100644
--- a/srcpkgs/python-nose/template
+++ b/srcpkgs/python-nose/template
@@ -1,7 +1,7 @@
 # Template file for 'python-nose'
 pkgname=python-nose
 version=1.3.7
-revision=6
+revision=7
 wrksrc="nose-${version}"
 build_style=python-module
 pycompile_module="nose"

From edf22538e35b41c7a09f026d144fc88d847961c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:19 -0400
Subject: [PATCH 0608/4088] python3-mypy_extensions: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mypy_extensions/template b/srcpkgs/python3-mypy_extensions/template
index 6aa9229a9fc6..f3b420936d6c 100644
--- a/srcpkgs/python3-mypy_extensions/template
+++ b/srcpkgs/python3-mypy_extensions/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mypy_extensions'
 pkgname=python3-mypy_extensions
 version=0.4.3
-revision=3
+revision=4
 wrksrc="mypy_extensions-${version}"
 build_style=python3-module
 pycompile_module="mypy_extensions.py"

From 02b045b6da58a9a2dd975436a79497a5dadcaf39 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:57 -0400
Subject: [PATCH 0609/4088] python3-typed-ast: rebuild for Python 3.10

---
 srcpkgs/python3-typed-ast/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-typed-ast/template b/srcpkgs/python3-typed-ast/template
index 1e5bbf1d855f..d81bec57e4fc 100644
--- a/srcpkgs/python3-typed-ast/template
+++ b/srcpkgs/python3-typed-ast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-typed-ast'
 pkgname=python3-typed-ast
 version=1.4.3
-revision=1
+revision=2
 wrksrc="typed_ast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cf1d6a3006ca23aad5ec0b07b71d43329ee4b4ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:38 -0400
Subject: [PATCH 0610/4088] python3-altgraph: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-altgraph/template b/srcpkgs/python3-altgraph/template
index 4a1c1462158a..d340010e5b85 100644
--- a/srcpkgs/python3-altgraph/template
+++ b/srcpkgs/python3-altgraph/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-altgraph'
 pkgname=python3-altgraph
 version=0.17
-revision=1
+revision=2
 wrksrc="altgraph-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4294822fefa86e0a527a7178a662d1612a9e1f33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:09 -0400
Subject: [PATCH 0611/4088] python3-jsonrpc-server: rebuild for Python 3.10

---
 srcpkgs/python3-jsonrpc-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jsonrpc-server/template b/srcpkgs/python3-jsonrpc-server/template
index 3551d7f95ac8..de96976ad0a2 100644
--- a/srcpkgs/python3-jsonrpc-server/template
+++ b/srcpkgs/python3-jsonrpc-server/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsonrpc-server'
 pkgname=python3-jsonrpc-server
 version=0.4.0
-revision=1
+revision=2
 wrksrc="${pkgname/3}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From adfc9cb8c1a1c70a767a4e51203fe4f946783fb8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:33 -0400
Subject: [PATCH 0612/4088] python3-QtPy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-QtPy/template b/srcpkgs/python3-QtPy/template
index 8205641c6b54..b9ddef1af192 100644
--- a/srcpkgs/python3-QtPy/template
+++ b/srcpkgs/python3-QtPy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-QtPy'
 pkgname=python3-QtPy
 version=1.9.0
-revision=2
+revision=3
 wrksrc=QtPy-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 23bb0b07bce127e1f2c5ac87e6b29fa551ddc052 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:10 -0400
Subject: [PATCH 0613/4088] python3-jupyter_console: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index 09cd8e5d5406..3124f3854a19 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_console'
 pkgname=python3-jupyter_console
 version=6.4.0
-revision=1
+revision=2
 wrksrc="jupyter_console-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c8e1cd8090a14d31d8284c0866845c2d5826b74c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:10 -0400
Subject: [PATCH 0614/4088] python3-jupyter_ipywidgets: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index 9dd693ee4ae9..d07272aeb3f0 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_ipywidgets'
 pkgname=python3-jupyter_ipywidgets
 version=7.6.3
-revision=1
+revision=2
 wrksrc="ipywidgets-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 561d2b57eb7b657310bcce556fb8d29e7c98a0cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:01 -0400
Subject: [PATCH 0615/4088] python3-grpcio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index d6904aa19f47..aeed305988a1 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.39.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"

From 71b7c348625921a832b30ae2f9178fb62a0d6c0b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:43 -0400
Subject: [PATCH 0616/4088] python3-blessings: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-blessings/template b/srcpkgs/python3-blessings/template
index d901e189a1e3..48765b336b09 100644
--- a/srcpkgs/python3-blessings/template
+++ b/srcpkgs/python3-blessings/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-blessings'
 pkgname=python3-blessings
 version=1.7
-revision=4
+revision=5
 wrksrc="blessings-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cb8abf94cb5c4c45f9a93f869a9e00ed7c9f6b29 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:50 -0400
Subject: [PATCH 0617/4088] python3-snakeoil: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template
index 7b3aa1420bb9..7d7242262e28 100644
--- a/srcpkgs/python3-snakeoil/template
+++ b/srcpkgs/python3-snakeoil/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-snakeoil'
 pkgname=python3-snakeoil
 version=0.8.8
-revision=1
+revision=2
 wrksrc="snakeoil-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 49f19ee58be9b7d14a6e74fe15085ea95b5cbed2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:58 -0400
Subject: [PATCH 0618/4088] python3-gitchangelog: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template
index 348dc2c83b6d..865258ec883c 100644
--- a/srcpkgs/python3-gitchangelog/template
+++ b/srcpkgs/python3-gitchangelog/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gitchangelog'
 pkgname=python3-gitchangelog
 version=3.0.4
-revision=4
+revision=5
 wrksrc="gitchangelog-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 7b5ede7afef5e6aa38b7bd863fc77e361ef67acf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:59 -0400
Subject: [PATCH 0619/4088] python3-validators: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-validators/template b/srcpkgs/python3-validators/template
index ab6044686629..87275771403f 100644
--- a/srcpkgs/python3-validators/template
+++ b/srcpkgs/python3-validators/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-validators'
 pkgname=python3-validators
 version=0.14.2
-revision=2
+revision=3
 wrksrc="validators-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4e0220945f3b4e1dc9c8b9fb3f7d5110be2f6bd5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:48 -0400
Subject: [PATCH 0620/4088] python3-sh: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-sh/template b/srcpkgs/python3-sh/template
index 4dcd84699a0c..440c03cee0cc 100644
--- a/srcpkgs/python3-sh/template
+++ b/srcpkgs/python3-sh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sh'
 pkgname=python3-sh
 version=1.14.2
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dfa0ad631f7cc2aace0b300107be97d160bc8763 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:38 -0400
Subject: [PATCH 0621/4088] ansible: rebuild for Python 3.10

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

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 41123332a2a0..34388da31eab 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,7 +1,7 @@
 # Template file for 'ansible'
 pkgname=ansible
 version=4.1.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="ansible-core"

From 4dd6758a35e3bcea180fa200444e7f37c0ad15c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:02 -0400
Subject: [PATCH 0622/4088] python3-hiredis: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-hiredis/template b/srcpkgs/python3-hiredis/template
index f71bf705aa49..aea57041a500 100644
--- a/srcpkgs/python3-hiredis/template
+++ b/srcpkgs/python3-hiredis/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hiredis'
 pkgname=python3-hiredis
 version=2.0.0
-revision=1
+revision=2
 wrksrc="hiredis-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From cd7e6f96ca46fefc00e91dee0909a6daadbffe9b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:46 -0400
Subject: [PATCH 0623/4088] python3-ciso8601: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e10fd942e3ce 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
 version=2.2.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1216b88d0296c47a0ecadd161e33143f7a2976e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:24 -0400
Subject: [PATCH 0624/4088] python3-pamqp: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pamqp/template b/srcpkgs/python3-pamqp/template
index e995e55f27a7..5e063c62f43f 100644
--- a/srcpkgs/python3-pamqp/template
+++ b/srcpkgs/python3-pamqp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pamqp'
 pkgname=python3-pamqp
 version=2.3.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e162690da6834aa64c6c6b89cde82eca581fc888 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:07 -0400
Subject: [PATCH 0625/4088] maturin: rebuild for Python 3.10

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

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 9ae41f703192..57b4f7eccb54 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,7 +1,7 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.11.4
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 # Disable the 'rustls' feature, which leads to bad platform compatibility

From aba48054b12ff706d10f58f819182b90538a1b42 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:33 -0400
Subject: [PATCH 0626/4088] python3-pyaes: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template
index 6a047eeb6ee7..f4d237d75d94 100644
--- a/srcpkgs/python3-pyaes/template
+++ b/srcpkgs/python3-pyaes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyaes'
 pkgname=python3-pyaes
 version=1.6.1
-revision=5
+revision=6
 wrksrc="pyaes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 44caa10827642c9e1512398bd7f6d55f70df95d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:59 -0400
Subject: [PATCH 0627/4088] python3-gitdb: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-gitdb/template b/srcpkgs/python3-gitdb/template
index 9fc299b8d80f..60b322745dec 100644
--- a/srcpkgs/python3-gitdb/template
+++ b/srcpkgs/python3-gitdb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gitdb'
 pkgname=python3-gitdb
 version=2.0.5
-revision=4
+revision=5
 wrksrc="gitdb2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ba6fd33132f151f95d9b20572a46e8e5e20cd3e5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:28 -0400
Subject: [PATCH 0628/4088] python3-Flask-Babel: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-Babel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Babel/template b/srcpkgs/python3-Flask-Babel/template
index 00087dab0d70..51170ebf145b 100644
--- a/srcpkgs/python3-Flask-Babel/template
+++ b/srcpkgs/python3-Flask-Babel/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Babel'
 pkgname=python3-Flask-Babel
 version=2.0.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3fd82b63475eb5648a72b7d6e1dcef5bea84a7dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:28 -0400
Subject: [PATCH 0629/4088] python3-Flask-Login: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-Login/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Login/template b/srcpkgs/python3-Flask-Login/template
index 1b5a3045ed87..023331ee75bc 100644
--- a/srcpkgs/python3-Flask-Login/template
+++ b/srcpkgs/python3-Flask-Login/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Login'
 pkgname=python3-Flask-Login
 version=0.5.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6628d839fa16b91dadf2bbad35745dffa9e086f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:28 -0400
Subject: [PATCH 0630/4088] python3-Flask-Mail: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-Mail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Mail/template b/srcpkgs/python3-Flask-Mail/template
index 18542847ecb2..52b408c131ca 100644
--- a/srcpkgs/python3-Flask-Mail/template
+++ b/srcpkgs/python3-Flask-Mail/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Mail'
 pkgname=python3-Flask-Mail
 version=0.9.1
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 198b899df772b8d46e4c38c8bf5a98f2ef9a3758 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:29 -0400
Subject: [PATCH 0631/4088] python3-Flask-SQLAlchemy: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-SQLAlchemy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-SQLAlchemy/template b/srcpkgs/python3-Flask-SQLAlchemy/template
index dbcc1b9cd990..b1da228a9193 100644
--- a/srcpkgs/python3-Flask-SQLAlchemy/template
+++ b/srcpkgs/python3-Flask-SQLAlchemy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-SQLAlchemy'
 pkgname=python3-Flask-SQLAlchemy
 version=2.5.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c9a5fe63fc23362a9c4a0ae9a838a7caa9f8fcf8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:29 -0400
Subject: [PATCH 0632/4088] python3-Flask-WTF: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-WTF/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-WTF/template b/srcpkgs/python3-Flask-WTF/template
index 4780e96e154e..916955690cb7 100644
--- a/srcpkgs/python3-Flask-WTF/template
+++ b/srcpkgs/python3-Flask-WTF/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-WTF'
 pkgname=python3-Flask-WTF
 version=0.14.3
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3fc9ea238082163382e3da74e734ac06670a7f38 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:00 -0400
Subject: [PATCH 0633/4088] python3-webassets: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-webassets/template b/srcpkgs/python3-webassets/template
index 45d1406ef522..061bbbd0247d 100644
--- a/srcpkgs/python3-webassets/template
+++ b/srcpkgs/python3-webassets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-webassets'
 pkgname=python3-webassets
 version=0.12.1
-revision=5
+revision=6
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fc4aa4d015508cdef6a6b499c4dae3364b281b4c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:26 -0400
Subject: [PATCH 0634/4088] python-tempita: rebuild for Python 3.10

---
 srcpkgs/python-tempita/template | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
index bd61a4b21def..ab6b7710c5de 100644
--- a/srcpkgs/python-tempita/template
+++ b/srcpkgs/python-tempita/template
@@ -1,7 +1,7 @@
 # Template file for 'python-tempita'
 pkgname=python-tempita
 version=0.5.2
-revision=6
+revision=7
 wrksrc="Tempita-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -15,6 +15,20 @@ license="MIT"
 distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
 checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
 
+post_patch() {
+	# setuptools no longer supports use_2to3
+	vsed -i setup.py -e '/use_2to3/d'
+}
+
+do_build() {
+	# This is pure python, no need for cross antics
+	python2.7 setup.py build --build-base=build-2.7
+
+	# Convert py2 syntax to py3 since setuptools no longer does it
+	2to3-${py3_ver} -w tempita
+	python3 setup.py build --build-base=build-${py3_ver}
+}
+
 python3-tempita_package() {
 	depends="python3"
 	pycompile_module="tempita"

From fca434f69fe7e4ca1ca5e955e80c52fcaeeb29b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0635/4088] python3-pysol_cards: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..66da654deae1 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
 version=0.10.2
-revision=1
+revision=2
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"

From 38d730323b2646ccd3c07a5a5d76f4f5826f3090 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:42 -0400
Subject: [PATCH 0636/4088] python3-random2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-random2/template b/srcpkgs/python3-random2/template
index 39c64b50e15b..e8853196fe6a 100644
--- a/srcpkgs/python3-random2/template
+++ b/srcpkgs/python3-random2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-random2'
 pkgname=python3-random2
 version=1.0.1
-revision=6
+revision=7
 wrksrc="random2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools unzip"

From 3a35f973c3c063f796e0fa87099a30bbd4c45cf1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:30 -0400
Subject: [PATCH 0637/4088] python3-pmw: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pmw/template b/srcpkgs/python3-pmw/template
index 9703297e18a8..e14d5b6ded9e 100644
--- a/srcpkgs/python3-pmw/template
+++ b/srcpkgs/python3-pmw/template
@@ -1,7 +1,7 @@
 # Template for python-pmw
 pkgname=python3-pmw
 version=2.0.1
-revision=3
+revision=4
 short_desc="Python 3 Tkinter widget toolkit"
 homepage="http://pmw.sourceforge.net/"
 license="MIT"

From 09904bb076393444dd94fae9626a42992fe405c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:40 -0400
Subject: [PATCH 0638/4088] python3-astroid: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 93c0b1e527f0..43aeed136fd8 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
 version=2.8.0
-revision=1
+revision=2
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 93902fc9be993ef6a478277c89bfe1ab4c7d0514 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:06 -0400
Subject: [PATCH 0639/4088] python3-isort: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
index e2f7d8e37530..f7956a7dcbd3 100644
--- a/srcpkgs/python3-isort/template
+++ b/srcpkgs/python3-isort/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-isort'
 pkgname=python3-isort
 version=5.9.3
-revision=1
+revision=2
 wrksrc="isort-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1d9eb03cd8efb91d9d4cb4c78b171bb064cf7d99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:29 -0400
Subject: [PATCH 0640/4088] python3-platformdirs: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index b93a313c468a..e5b09121ded8 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
 version=2.3.0
-revision=1
+revision=2
 wrksrc="platformdirs-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-setuptools_scm"

From 511c0d5426e0243b51bcc772ae62aa645730cb57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:01 -0400
Subject: [PATCH 0641/4088] python3-websockets: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template
index 1ae81212c5c8..843e39207072 100644
--- a/srcpkgs/python3-websockets/template
+++ b/srcpkgs/python3-websockets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-websockets'
 pkgname=python3-websockets
 version=10.0
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3a4c7d876bd1a3268db7cc8756dbbc3f2863f81a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:41 -0400
Subject: [PATCH 0642/4088] python3-pythondialog: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pythondialog/template b/srcpkgs/python3-pythondialog/template
index 0edc20a69538..2c6e259f2a36 100644
--- a/srcpkgs/python3-pythondialog/template
+++ b/srcpkgs/python3-pythondialog/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pythondialog'
 pkgname=python3-pythondialog
 version=3.5.1
-revision=2
+revision=3
 wrksrc="pythondialog-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8e04c2cca516b0944ff77e876020916ddeb4e1df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:59 -0400
Subject: [PATCH 0643/4088] python3-vdf: rebuild for Python 3.10, update to
 3.4.

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

diff --git a/srcpkgs/python3-vdf/template b/srcpkgs/python3-vdf/template
index 0389375421fc..6a81e0e11428 100644
--- a/srcpkgs/python3-vdf/template
+++ b/srcpkgs/python3-vdf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vdf'
 pkgname=python3-vdf
-version=3.2
-revision=3
+version=3.4
+revision=1
 wrksrc=vdf-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ValvePython/vdf"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ad790a34a20d9c5f36b8bd9e93658f85a9e90be7c84bb3a24f893b531a94e3ca
+checksum=c9fb42b6de9daf475cd229377d0c32d6e87c0f21e874a35e0e679eb201723a67
 
 post_install() {
 	vlicense LICENSE

From aa8fd5e08dc4923e397b6c2f69dd851e5d832de6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:49 -0400
Subject: [PATCH 0644/4088] python3-slixmpp: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-slixmpp/template b/srcpkgs/python3-slixmpp/template
index 1426cb9703a9..71c312498a1b 100644
--- a/srcpkgs/python3-slixmpp/template
+++ b/srcpkgs/python3-slixmpp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-slixmpp'
 pkgname=python3-slixmpp
 version=1.5.2
-revision=2
+revision=3
 wrksrc="slixmpp-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools python3-Cython"

From 68cc69186029699c9034001071ed588d6631cf06 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:15 -0400
Subject: [PATCH 0645/4088] python3-marshmallow: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-marshmallow/template b/srcpkgs/python3-marshmallow/template
index 65939bde732f..326728b29d13 100644
--- a/srcpkgs/python3-marshmallow/template
+++ b/srcpkgs/python3-marshmallow/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-marshmallow'
 pkgname=python3-marshmallow
 version=3.7.0
-revision=2
+revision=3
 wrksrc="marshmallow-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5564f4bf1d6bffe9bec5646f96f5a2ed63ce1431 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:21 -0400
Subject: [PATCH 0646/4088] python-evdev: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-evdev/template b/srcpkgs/python-evdev/template
index ded33276800d..f61e63cfc5f1 100644
--- a/srcpkgs/python-evdev/template
+++ b/srcpkgs/python-evdev/template
@@ -1,7 +1,7 @@
 # Template file for 'python-evdev'
 pkgname=python-evdev
 version=1.2.0
-revision=4
+revision=5
 build_style=python-module
 pycompile_module="evdev"
 hostmakedepends="python-setuptools python3-setuptools"

From 0747a5a27fee5d87352138cb77ddbfd7273272aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:46 -0400
Subject: [PATCH 0647/4088] python3-cli_helpers: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cli_helpers/template b/srcpkgs/python3-cli_helpers/template
index 91e22d2471c2..a6b29fa02012 100644
--- a/srcpkgs/python3-cli_helpers/template
+++ b/srcpkgs/python3-cli_helpers/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cli_helpers'
 pkgname=python3-cli_helpers
 version=1.2.1
-revision=3
+revision=4
 wrksrc="cli_helpers-${version}"
 build_style=python3-module
 pycompile_module="cli_helpers"

From a2f474fbbbcc905ee8d6198b8b2a8d418fac9c2f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:27 -0400
Subject: [PATCH 0648/4088] python3-pgspecial: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pgspecial/template b/srcpkgs/python3-pgspecial/template
index 1f5abba564fb..e0279616a906 100644
--- a/srcpkgs/python3-pgspecial/template
+++ b/srcpkgs/python3-pgspecial/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pgspecial'
 pkgname=python3-pgspecial
 version=1.11.9
-revision=3
+revision=4
 wrksrc="pgspecial-${version}"
 build_style=python3-module
 pycompile_module="pgspecial"

From 2ed1fddaf2901c2ce8613a6ce0be305a716b9b69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:08 -0400
Subject: [PATCH 0649/4088] mercurial: rebuild for Python 3.10

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

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 4f84407dc8b7..d58c1971087b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,7 +1,7 @@
 # Template file for 'mercurial'
 pkgname=mercurial
 version=5.9.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
 makedepends="python3-devel"

From 597501696fe02d5277ff1ebb4c0a3ca7f7fef7ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:56 -0400
Subject: [PATCH 0650/4088] python3-feedgenerator: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-feedgenerator/template b/srcpkgs/python3-feedgenerator/template
index 5af4acd7353c..aa12bb77df9d 100644
--- a/srcpkgs/python3-feedgenerator/template
+++ b/srcpkgs/python3-feedgenerator/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-feedgenerator'
 pkgname=python3-feedgenerator
 version=1.9.1
-revision=4
+revision=5
 wrksrc="feedgenerator-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8eebec9c9c51d05df57777ebfbd986d81f27b1fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:23 -0400
Subject: [PATCH 0651/4088] python3-oletools: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index e10c68ad5b2e..08b132fac61b 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-oletools'
 pkgname=python3-oletools
 version=0.60
-revision=1
+revision=2
 wrksrc="oletools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1b9530ff77043de47d3dfb6c38a90d6c72c4e480 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:27 -0400
Subject: [PATCH 0652/4088] python3-pefile: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pefile/template b/srcpkgs/python3-pefile/template
index 4d82cfafe16d..1b52b12ba82c 100644
--- a/srcpkgs/python3-pefile/template
+++ b/srcpkgs/python3-pefile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pefile'
 pkgname=python3-pefile
 version=2019.4.18
-revision=3
+revision=4
 wrksrc="pefile-${version}"
 build_style=python3-module
 pycompile_module="pefile.py peutils.py ordlookup"

From a999cd80432f14ad52410c4e682dad6b0c74cc44 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:00 -0400
Subject: [PATCH 0653/4088] python3-virustotal-api: rebuild for Python 3.10

---
 srcpkgs/python3-virustotal-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-virustotal-api/template b/srcpkgs/python3-virustotal-api/template
index b3551336f586..297a73582374 100644
--- a/srcpkgs/python3-virustotal-api/template
+++ b/srcpkgs/python3-virustotal-api/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-virustotal-api'
 pkgname=python3-virustotal-api
 version=1.1.11
-revision=3
+revision=4
 wrksrc="virustotal-api-${version}"
 build_style=python3-module
 pycompile_module="virus_total_apis"

From 82ce0806f35d262a2b62c50e1f8e5e8e0b6781b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:03 -0400
Subject: [PATCH 0654/4088] python3-yara: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index 264cbf00ba48..d98797f45c7b 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yara'
 pkgname=python3-yara
 version=4.1.2
-revision=1
+revision=2
 wrksrc="yara-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cd9e0546d39af947c5136360dd11cf5a2245e527 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:35 -0400
Subject: [PATCH 0655/4088] python3-pykeepass: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index dc3fe59fa411..b7097bd99e87 100644
--- a/srcpkgs/python3-pykeepass/template
+++ b/srcpkgs/python3-pykeepass/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pykeepass'
 pkgname=python3-pykeepass
 version=3.2.1
-revision=2
+revision=3
 wrksrc="pykeepass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a16cae3902351081cabde4b7145b3717083f17c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:40 -0400
Subject: [PATCH 0656/4088] python3-arxiv2bib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-arxiv2bib/template b/srcpkgs/python3-arxiv2bib/template
index b59206102e3a..1459771c64de 100644
--- a/srcpkgs/python3-arxiv2bib/template
+++ b/srcpkgs/python3-arxiv2bib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-arxiv2bib'
 pkgname=python3-arxiv2bib
 version=1.0.8
-revision=5
+revision=6
 wrksrc="arxiv2bib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 231e19cc2fb1eaf0d3a9760c5be3cfbb1da3d896 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:42 -0400
Subject: [PATCH 0657/4088] python3-bibtexparser: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-bibtexparser/template b/srcpkgs/python3-bibtexparser/template
index 0f0a67dc3515..aa6651428b66 100644
--- a/srcpkgs/python3-bibtexparser/template
+++ b/srcpkgs/python3-bibtexparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bibtexparser'
 pkgname=python3-bibtexparser
 version=1.1.0
-revision=4
+revision=5
 wrksrc="bibtexparser-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 199af9990a0f6c1033e93b8a9d811a319aa28cf9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:53 -0400
Subject: [PATCH 0658/4088] python3-doi: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-doi/template b/srcpkgs/python3-doi/template
index acd3b05c84dc..9d5f7c726926 100644
--- a/srcpkgs/python3-doi/template
+++ b/srcpkgs/python3-doi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-doi'
 pkgname=python3-doi
 version=0.2.0
-revision=2
+revision=3
 wrksrc="python-doi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1eba3b1026badcfe8b7a7916308471ada779ba5d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:02 -0400
Subject: [PATCH 0659/4088] python3-habanero: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-habanero/template b/srcpkgs/python3-habanero/template
index 62a95d37dc82..e54990267ebd 100644
--- a/srcpkgs/python3-habanero/template
+++ b/srcpkgs/python3-habanero/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-habanero'
 pkgname=python3-habanero
 version=0.6.2
-revision=4
+revision=5
 wrksrc="habanero-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 56d9d166f47612f7ed90fa6227a23e65a6329e80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:06 -0400
Subject: [PATCH 0660/4088] python3-isbnlib: rebuild for Python 3.10, uppdate
 to 3.10.8.

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

diff --git a/srcpkgs/python3-isbnlib/template b/srcpkgs/python3-isbnlib/template
index d8eaa48e2a95..5e9c0b1c12e5 100644
--- a/srcpkgs/python3-isbnlib/template
+++ b/srcpkgs/python3-isbnlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-isbnlib'
 pkgname=python3-isbnlib
-version=3.9.6
-revision=4
+version=3.10.8
+revision=1
 wrksrc="isbnlib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="LGPL-3.0-only"
 homepage="https://github.com/xlcnd/isbnlib"
 distfiles="${PYPI_SITE}/i/isbnlib/isbnlib-${version}.tar.gz"
-checksum=d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b
+checksum=ea406ef2e14388ab396495f0f604d2d3c96cb5a256b96bc0556dd871cd7dc7b4

From c26926e7ff56b28f72c68507b4a986a379eab00d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:07 -0400
Subject: [PATCH 0661/4088] python3-janus: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-janus/template b/srcpkgs/python3-janus/template
index 9cd15ccf6487..721d151c2f96 100644
--- a/srcpkgs/python3-janus/template
+++ b/srcpkgs/python3-janus/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-janus'
 pkgname=python3-janus
 version=0.5.0
-revision=2
+revision=3
 wrksrc="janus-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 909e34745d045a083e0357b5a343187d0eb20903 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:16 -0400
Subject: [PATCH 0662/4088] python3-matrix-nio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-matrix-nio/template b/srcpkgs/python3-matrix-nio/template
index f819fbd2c176..39355ab99912 100644
--- a/srcpkgs/python3-matrix-nio/template
+++ b/srcpkgs/python3-matrix-nio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-matrix-nio'
 pkgname=python3-matrix-nio
 version=0.15.1
-revision=2
+revision=3
 wrksrc="matrix-nio-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-aiohttp python3-aiofiles python3-h11
- python3-hyper-h2 python3-logbook python3-jsonschema python3-unpaddedbase64
+ python3-h2 python3-logbook python3-jsonschema python3-unpaddedbase64
  python3-pycryptodome olm-python3 python3-peewee python3-cachetools
  python3-atomicwrites"
 short_desc="Python3 matrix.org client library designed without builtin io"

From cfc48c0f4d70e484323822dab8d15a0ea257f8d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:34 -0400
Subject: [PATCH 0663/4088] python3-pydbus: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pydbus/template b/srcpkgs/python3-pydbus/template
index 73fd2ac5a2ad..3f95a3b6fcdc 100644
--- a/srcpkgs/python3-pydbus/template
+++ b/srcpkgs/python3-pydbus/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pydbus'
 pkgname=python3-pydbus
 version=0.6.0
-revision=2
+revision=3
 wrksrc="pydbus-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From abe00762b4d58b9861a754d14bc6a7a630651d9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:43 -0400
Subject: [PATCH 0664/4088] brltty: rebuild for Python 3.10, update to 6.4.

---
 srcpkgs/brltty/patches/time64.patch | 16 ----------------
 srcpkgs/brltty/template             |  7 +++----
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/brltty/patches/time64.patch

diff --git a/srcpkgs/brltty/patches/time64.patch b/srcpkgs/brltty/patches/time64.patch
deleted file mode 100644
index d90b5913997b..000000000000
--- a/srcpkgs/brltty/patches/time64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Programs/system_linux.c	2020-04-05 12:35:34.000000000 +0200
-+++ b/Programs/system_linux.c	2020-12-03 14:12:42.292642038 +0100
-@@ -957,9 +957,12 @@
- writeInputEvent (UinputObject *uinput, uint16_t type, uint16_t code, int32_t value) {
- #ifdef HAVE_LINUX_UINPUT_H
-   struct input_event event;
-+  struct timeval tv;
- 
-   memset(&event, 0, sizeof(event));
--  gettimeofday(&event.time, NULL);
-+  gettimeofday(&tv, NULL);
-+  event.input_event_sec = tv.tv_sec;
-+  event.input_event_usec = tv.tv_usec;
-   event.type = type;
-   event.code = code;
-   event.value = value;
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..b1b673a44e22 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
-version=6.1
-revision=2
+version=6.4
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
@@ -12,7 +12,7 @@ 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
+checksum=bc7573b0d0ab865c36607945b64c209312405571788f3b409397726f6143eaa6
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in
@@ -65,7 +65,6 @@ brltty-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/brltty-config
 		vmove usr/include
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"

From a460e7375e61c7d33289e81a10699d83f2b3a1b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:04 -0400
Subject: [PATCH 0665/4088] liblouis: rebuild for Python 3.10

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

diff --git a/srcpkgs/liblouis/template b/srcpkgs/liblouis/template
index 74d925a3ee49..e7fc54be187a 100644
--- a/srcpkgs/liblouis/template
+++ b/srcpkgs/liblouis/template
@@ -1,7 +1,7 @@
 # Template file for 'liblouis'
 pkgname=liblouis
 version=3.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ucs4"
 hostmakedepends="pkg-config help2man python3-devel"

From cc7bb84f69a0a7f0f623febd9b365f127241ae61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:11 -0400
Subject: [PATCH 0666/4088] speech-dispatcher: rebuild for Python 3.10

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

diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index b0283ed40192..d7d1e47c9b7f 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
 # Template file for 'speech-dispatcher'
 pkgname=speech-dispatcher
 version=0.10.2
-revision=1
+revision=2
 wrksrc="speechd-${version}"
 build_style=gnu-configure
 # Disable support for sundry non-free TTS systems (said support causes

From dfcf1568eea5d5da56f9033498ef479179f89888 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:03 -0400
Subject: [PATCH 0667/4088] libcap-ng: rebuild for Python 3.10

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

diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index 99eab8e614fc..669bec6f56cd 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'libcap-ng'
 pkgname=libcap-ng
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-python --without-python3"
 short_desc="Alternate POSIX capabilities library"

From bfc119fc031b678eb9d3ea4e0bfc4ba5ea133365 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:13 -0400
Subject: [PATCH 0668/4088] opencv4: rebuild for Python 3.10, update to 4.5.3.

---
 common/shlibs            | 102 ++++++++++++++++++++-------------------
 srcpkgs/opencv4/template |  10 ++--
 2 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b0b813ffc096..eda1db94ebf4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2085,56 +2085,58 @@ libopencv_imgproc.so.3.4 libopencv-3.4.1_1
 libopencv_core.so.3.4 libopencv-3.4.1_1
 libopencv_superres.so.3.4 libopencv-3.4.1_1
 libopencv_videostab.so.3.4 libopencv-3.4.1_1
-libopencv_quality.so.4.3 libopencv4-4.3.0_1
-libopencv_reg.so.4.3 libopencv4-4.3.0_1
-libopencv_surface_matching.so.4.3 libopencv4-4.3.0_1
-libopencv_xphoto.so.4.3 libopencv4-4.3.0_1
-libopencv_freetype.so.4.3 libopencv4-4.3.0_1
-libopencv_fuzzy.so.4.3 libopencv4-4.3.0_1
-libopencv_hfs.so.4.3 libopencv4-4.3.0_1
-libopencv_img_hash.so.4.3 libopencv4-4.3.0_1
-libopencv_line_descriptor.so.4.3 libopencv4-4.3.0_1
-libopencv_saliency.so.4.3 libopencv4-4.3.0_1
-libopencv_structured_light.so.4.3 libopencv4-4.3.0_1
-libopencv_aruco.so.4.3 libopencv4-4.3.0_1
-libopencv_bgsegm.so.4.3 libopencv4-4.3.0_1
-libopencv_bioinspired.so.4.3 libopencv4-4.3.0_1
-libopencv_ccalib.so.4.3 libopencv4-4.3.0_1
-libopencv_face.so.4.3 libopencv4-4.3.0_1
-libopencv_tracking.so.4.3 libopencv4-4.3.0_1
-libopencv_xfeatures2d.so.4.3 libopencv4-4.3.0_1
-libopencv_optflow.so.4.3 libopencv4-4.3.0_1
-libopencv_ximgproc.so.4.3 libopencv4-4.3.0_1
-libopencv_plot.so.4.3 libopencv4-4.3.0_1
-libopencv_text.so.4.3 libopencv4-4.3.0_1
-libopencv_ml.so.4.3 libopencv4-4.3.0_1
-libopencv_objdetect.so.4.3 libopencv4-4.3.0_1
-libopencv_dnn.so.4.3 libopencv4-4.3.0_1
-libopencv_shape.so.4.3 libopencv4-4.3.0_1
-libopencv_stitching.so.4.3 libopencv4-4.3.0_1
-libopencv_photo.so.4.3 libopencv4-4.3.0_1
-libopencv_video.so.4.3 libopencv4-4.3.0_1
-libopencv_calib3d.so.4.3 libopencv4-4.3.0_1
-libopencv_features2d.so.4.3 libopencv4-4.3.0_1
-libopencv_flann.so.4.3 libopencv4-4.3.0_1
-libopencv_highgui.so.4.3 libopencv4-4.3.0_1
-libopencv_videoio.so.4.3 libopencv4-4.3.0_1
-libopencv_imgcodecs.so.4.3 libopencv4-4.3.0_1
-libopencv_imgproc.so.4.3 libopencv4-4.3.0_1
-libopencv_core.so.4.3 libopencv4-4.3.0_1
-libopencv_superres.so.4.3 libopencv4-4.3.0_1
-libopencv_videostab.so.4.3 libopencv4-4.3.0_1
-libopencv_gapi.so.4.3 libopencv4-4.3.0_1
-libopencv_xobjdetect.so.4.3 libopencv4-4.3.0_1
-libopencv_datasets.so.4.3 libopencv4-4.3.0_1
-libopencv_dnn_objdetect.so.4.3 libopencv4-4.3.0_1
-libopencv_dnn_superres.so.4.3 libopencv4-4.3.0_1
-libopencv_dpm.so.4.3 libopencv4-4.3.0_1
-libopencv_phase_unwrapping.so.4.3 libopencv4-4.3.0_1
-libopencv_stereo.so.4.3 libopencv4-4.3.0_1
-libopencv_rapid.so.4.3 libopencv4-4.3.0_1
-libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
-libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
+libopencv_quality.so.4.5 libopencv4-4.5.3_1
+libopencv_reg.so.4.5 libopencv4-4.5.3_1
+libopencv_surface_matching.so.4.5 libopencv4-4.5.3_1
+libopencv_xphoto.so.4.5 libopencv4-4.5.3_1
+libopencv_freetype.so.4.5 libopencv4-4.5.3_1
+libopencv_fuzzy.so.4.5 libopencv4-4.5.3_1
+libopencv_hfs.so.4.5 libopencv4-4.5.3_1
+libopencv_img_hash.so.4.5 libopencv4-4.5.3_1
+libopencv_line_descriptor.so.4.5 libopencv4-4.5.3_1
+libopencv_saliency.so.4.5 libopencv4-4.5.3_1
+libopencv_structured_light.so.4.5 libopencv4-4.5.3_1
+libopencv_aruco.so.4.5 libopencv4-4.5.3_1
+libopencv_bgsegm.so.4.5 libopencv4-4.5.3_1
+libopencv_bioinspired.so.4.5 libopencv4-4.5.3_1
+libopencv_ccalib.so.4.5 libopencv4-4.5.3_1
+libopencv_face.so.4.5 libopencv4-4.5.3_1
+libopencv_tracking.so.4.5 libopencv4-4.5.3_1
+libopencv_xfeatures2d.so.4.5 libopencv4-4.5.3_1
+libopencv_optflow.so.4.5 libopencv4-4.5.3_1
+libopencv_ximgproc.so.4.5 libopencv4-4.5.3_1
+libopencv_plot.so.4.5 libopencv4-4.5.3_1
+libopencv_text.so.4.5 libopencv4-4.5.3_1
+libopencv_ml.so.4.5 libopencv4-4.5.3_1
+libopencv_objdetect.so.4.5 libopencv4-4.5.3_1
+libopencv_dnn.so.4.5 libopencv4-4.5.3_1
+libopencv_shape.so.4.5 libopencv4-4.5.3_1
+libopencv_stitching.so.4.5 libopencv4-4.5.3_1
+libopencv_photo.so.4.5 libopencv4-4.5.3_1
+libopencv_video.so.4.5 libopencv4-4.5.3_1
+libopencv_calib3d.so.4.5 libopencv4-4.5.3_1
+libopencv_features2d.so.4.5 libopencv4-4.5.3_1
+libopencv_flann.so.4.5 libopencv4-4.5.3_1
+libopencv_highgui.so.4.5 libopencv4-4.5.3_1
+libopencv_videoio.so.4.5 libopencv4-4.5.3_1
+libopencv_imgcodecs.so.4.5 libopencv4-4.5.3_1
+libopencv_imgproc.so.4.5 libopencv4-4.5.3_1
+libopencv_core.so.4.5 libopencv4-4.5.3_1
+libopencv_superres.so.4.5 libopencv4-4.5.3_1
+libopencv_videostab.so.4.5 libopencv4-4.5.3_1
+libopencv_gapi.so.4.5 libopencv4-4.5.3_1
+libopencv_xobjdetect.so.4.5 libopencv4-4.5.3_1
+libopencv_datasets.so.4.5 libopencv4-4.5.3_1
+libopencv_dnn_objdetect.so.4.5 libopencv4-4.5.3_1
+libopencv_dnn_superres.so.4.5 libopencv4-4.5.3_1
+libopencv_dpm.so.4.5 libopencv4-4.5.3_1
+libopencv_phase_unwrapping.so.4.5 libopencv4-4.5.3_1
+libopencv_stereo.so.4.5 libopencv4-4.5.3_1
+libopencv_rapid.so.4.5 libopencv4-4.5.3_1
+libopencv_intensity_transform.so.4.5 libopencv4-4.5.3_1
+libopencv_alphamat.so.4.5 libopencv4-4.5.3_1
+libopencv_barcode.so.4.5 libopencv4-4.5.3_1
+libopencv_mcc.so.4.5 libopencv4-4.5.3_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index f15c5f1ec2f1..69fec13d8f4b 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv4'
 pkgname=opencv4
-version=4.3.0
-revision=4
+version=4.5.3
+revision=1
 wrksrc=opencv-${version}
 build_style=cmake
 configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -10,7 +10,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
  -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib}
  -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}
  -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules
- -DBUILD_opencv_rgbd=OFF"
+ -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
 hostmakedepends="pkg-config eigen python-numpy python3-numpy"
 makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
  jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
@@ -22,8 +22,8 @@ license="BSD-3-Clause"
 homepage="https://opencv.org"
 distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
 	https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a
-	acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55"
+checksum="77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab
+ 73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d110c52fdf8e0de3e64a2dd7152ac547a8392eb1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:04 -0400
Subject: [PATCH 0669/4088] libopenshot: rebuild for Python 3.10

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

diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 595ff6f7edcc..b9996036b6ed 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
 # Template file for 'libopenshot'
 pkgname=libopenshot
 version=0.2.5
-revision=4
+revision=5
 archs="i686 x86_64 ppc64le"
 build_style=cmake
 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1

From 7517ead760bb42381b7567151209ad2eb6ad2c20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:08 -0400
Subject: [PATCH 0670/4088] mlt: rebuild for Python 3.10

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

diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 7c5316f778e9..857a88d3a3ce 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -1,7 +1,7 @@
 # Template file for 'mlt'
 pkgname=mlt
 version=6.22.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
  --enable-gpl --enable-gpl3 --disable-swfdec --without-kde

From 87b289181d8bf6765ae89e4725f21ce3d17e1fac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 3 Oct 2021 22:32:53 -0400
Subject: [PATCH 0671/4088] vtk: rebuild for Python 3.10

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

diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 8811247ae7e5..858aa31b9c03 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=6
+revision=7
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"

From d7e6881deaf9b97fbb4e7629a0c9bbe8fcc53166 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:52 -0400
Subject: [PATCH 0672/4088] python3-stem: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-stem/template b/srcpkgs/python3-stem/template
index b8778508bf64..5b575e6a5ffc 100644
--- a/srcpkgs/python3-stem/template
+++ b/srcpkgs/python3-stem/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-stem'
 pkgname=python3-stem
 version=1.8.0
-revision=3
+revision=4
 wrksrc="stem-${version/b/}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 38cfd9c36781499d4d6c3c0d197450e43e11ff5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:20 -0400
Subject: [PATCH 0673/4088] python3-neovim: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-neovim/template b/srcpkgs/python3-neovim/template
index f6e2a8175a50..38fc21f01780 100644
--- a/srcpkgs/python3-neovim/template
+++ b/srcpkgs/python3-neovim/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-neovim'
 pkgname=python3-neovim
 version=0.4.3
-revision=1
+revision=2
 wrksrc="pynvim-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 0d3318fd144443c5b824bb9b47fabd77c5a1e07a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:56 -0400
Subject: [PATCH 0674/4088] gpsd: rebuild for Python 3.10

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

diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 29d5c239162c..cf2bb26beefb 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -1,7 +1,7 @@
 # Template file for 'gpsd'
 pkgname=gpsd
 version=3.23.1
-revision=1
+revision=2
 build_style=scons
 make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin
  udevdir=/usr/lib/udev CC=${CC} qt_versioned=5"

From c61a66f17e88f66d0981c314a002f230e6f10946 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:20 -0400
Subject: [PATCH 0675/4088] wxPython4: rebuild for Python 3.10

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

diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index 1f32be9131ce..554174105a36 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
 version=4.0.7
-revision=3
+revision=4
 wrksrc="wxPython-${version}"
 build_style=python3-module
 make_build_args="--skip-build"

From 3bc140f1bee516076a635c3b77d1375154fd07a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:06 -0400
Subject: [PATCH 0676/4088] lilv: rebuild for Python 3.10

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

diff --git a/srcpkgs/lilv/template b/srcpkgs/lilv/template
index 07f123dcb67b..e37a44777e5a 100644
--- a/srcpkgs/lilv/template
+++ b/srcpkgs/lilv/template
@@ -1,7 +1,7 @@
 # Template file for 'lilv'
 pkgname=lilv
 version=0.24.12
-revision=1
+revision=2
 build_style=waf3
 configure_args="--dyn-manifest"
 hostmakedepends="pkg-config"

From 6f148952dcc30bdf62c48ae705b7ebe176165eb6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:33 -0400
Subject: [PATCH 0677/4088] python3-Pyro4: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Pyro4/template b/srcpkgs/python3-Pyro4/template
index a60b9ff99da9..401d2ce3046a 100644
--- a/srcpkgs/python3-Pyro4/template
+++ b/srcpkgs/python3-Pyro4/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Pyro4'
 pkgname=python3-Pyro4
 version=4.80
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 176945b48e0db228e628a103f1719da48c196ad2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:24 -0400
Subject: [PATCH 0678/4088] python3-pafy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
index e9f5c9db1ef0..e4e8d8e254b7 100644
--- a/srcpkgs/python3-pafy/template
+++ b/srcpkgs/python3-pafy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pafy'
 pkgname=python3-pafy
 version=0.5.5
-revision=3
+revision=4
 wrksrc="pafy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools youtube-dl"

From 53279a039e4cb227ed74960d52f03de8ecdbd9b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:18 -0400
Subject: [PATCH 0679/4088] python3-musicpd: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-musicpd/template b/srcpkgs/python3-musicpd/template
index 8b1d23a98264..91ef69f441ab 100644
--- a/srcpkgs/python3-musicpd/template
+++ b/srcpkgs/python3-musicpd/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-musicpd'
 pkgname=python3-musicpd
 version=0.4.4
-revision=3
+revision=4
 wrksrc="python-musicpd-${version}"
 build_style=python3-module
 pycompile_module="musicpd.py"

From f48258d43e185373099e29ff8a8719862623c025 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:09 -0400
Subject: [PATCH 0680/4088] mopidy: rebuild for Python 3.10

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

diff --git a/srcpkgs/mopidy/template b/srcpkgs/mopidy/template
index dda7bcfc7d19..b5ba4a154891 100644
--- a/srcpkgs/mopidy/template
+++ b/srcpkgs/mopidy/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy'
 pkgname=mopidy
 version=3.0.1
-revision=3
+revision=4
 wrksrc="Mopidy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx python3-sphinx_rtd_theme python3-pykka"

From 4c156559e0d9e4882106d5087ab10d7bdf5b8523 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0681/4088] python3-pyspotify: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyspotify/template b/srcpkgs/python3-pyspotify/template
index de246d9fc9c1..05c786364f11 100644
--- a/srcpkgs/python3-pyspotify/template
+++ b/srcpkgs/python3-pyspotify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyspotify'
 pkgname=python3-pyspotify
 version=2.1.3
-revision=2
+revision=3
 wrksrc="pyspotify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi python3-pycparser"

From f6ed13ea0b27501f66cedc556a9b5b3897c4a512 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:34 -0400
Subject: [PATCH 0682/4088] python3-SoCo: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-SoCo/template b/srcpkgs/python3-SoCo/template
index 809ffcd3a219..adc9a66b713a 100644
--- a/srcpkgs/python3-SoCo/template
+++ b/srcpkgs/python3-SoCo/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-SoCo'
 pkgname=python3-SoCo
 version=0.18.1
-revision=3
+revision=4
 wrksrc="SoCo-${version}"
 build_style=python3-module
 pycompile_module="soco"

From d380752c3813546fff133c84c71c7aa1fc04dd51 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:46 -0400
Subject: [PATCH 0683/4088] python3-chromecast: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index 14e67519a212..cd54fcaf8977 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
 version=8.1.0
-revision=1
+revision=2
 wrksrc="pychromecast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-casttube"

From 5a7ed4aa5696101262c9f004105062d2c6344215 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:20 -0400
Subject: [PATCH 0684/4088] python3-netifaces: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-netifaces/template b/srcpkgs/python3-netifaces/template
index c22ff5f18186..14a40217aed2 100644
--- a/srcpkgs/python3-netifaces/template
+++ b/srcpkgs/python3-netifaces/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-netifaces'
 pkgname=python3-netifaces
 version=0.11.0
-revision=1
+revision=2
 wrksrc="netifaces-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7e211e846424cac0121d0367e72dd2844337e6b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:06 -0400
Subject: [PATCH 0685/4088] mailnag: rebuild for Python 3.10

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

diff --git a/srcpkgs/mailnag/template b/srcpkgs/mailnag/template
index 5fbc5deff10d..df5a5b834ad2 100644
--- a/srcpkgs/mailnag/template
+++ b/srcpkgs/mailnag/template
@@ -1,7 +1,7 @@
 # Template file for 'mailnag'
 pkgname=mailnag
 version=2.2.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3 gettext"
 depends="python3-gobject python3-dbus python3-xdg libsecret gtk+3"

From 273a0fc6ed42069516be6a9b09f8f8e21fcf746b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:41 -0400
Subject: [PATCH 0686/4088] python3-autobahn: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-autobahn/template b/srcpkgs/python3-autobahn/template
index 45397af2ecd4..7c07ec94ad8c 100644
--- a/srcpkgs/python3-autobahn/template
+++ b/srcpkgs/python3-autobahn/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-autobahn'
 pkgname=python3-autobahn
 version=21.3.1
-revision=1
+revision=2
 wrksrc="autobahn-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From 93e98db69a2b535a8bd62350ff00e815eb780f16 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:51 -0400
Subject: [PATCH 0687/4088] python3-spake2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-spake2/template b/srcpkgs/python3-spake2/template
index df74c2cdc783..a1b30e83d1f2 100644
--- a/srcpkgs/python3-spake2/template
+++ b/srcpkgs/python3-spake2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-spake2'
 pkgname=python3-spake2
 version=0.8
-revision=3
+revision=4
 wrksrc="python-spake2-${version}"
 build_style=python3-module
 pycompile_module="spake2"

From 6d4c6c94871b664361e9f361887ae71f223d7640 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:57 -0400
Subject: [PATCH 0688/4088] python3-txtorcon: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template
index 3f31d4ccdf79..761388e15e82 100644
--- a/srcpkgs/python3-txtorcon/template
+++ b/srcpkgs/python3-txtorcon/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-txtorcon'
 pkgname=python3-txtorcon
 version=21.1.0
-revision=1
+revision=2
 wrksrc="txtorcon-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From 30796e03d3711df32c6d08584103c369d825e8ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:51 -0400
Subject: [PATCH 0689/4088] fontforge: rebuild for Python 3.10

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

diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template
index 1f1e377855d0..7c116429856d 100644
--- a/srcpkgs/fontforge/template
+++ b/srcpkgs/fontforge/template
@@ -1,7 +1,7 @@
 # Template file for 'fontforge'
 pkgname=fontforge
 version=20201107
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake ca-certificates gettext libltdl-devel libtool m4
  pkg-config python3"

From b9bbc311ae1b01a6aef21880efe8ad7c765707f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:04 -0400
Subject: [PATCH 0690/4088] liborcus: rebuild for Python 3.10

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

diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index 8c4ca51cf9f3..2f5feb6f6e7d 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
 # Template file for 'liborcus'
 pkgname=liborcus
 version=0.16.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3"
 makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"

From 2e8292926791412010728763274995d1e1eab20b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:04 -0400
Subject: [PATCH 0691/4088] libplist: rebuild for Python 3.10

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

diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template
index eb3e8773be58..416314a9f631 100644
--- a/srcpkgs/libplist/template
+++ b/srcpkgs/libplist/template
@@ -1,7 +1,7 @@
 # Template file for 'libplist'
 pkgname=libplist
 version=2.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool pkgconf python3 python3-Cython"

From 851ff823658621315c0826b04124072a959d3aff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:03 -0400
Subject: [PATCH 0692/4088] libbytesize: rebuild for Python 3.10

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

diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index bfba4dc5fa25..8694f8571c3b 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,7 +1,7 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
 version=2.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext python3"
 makedepends="mpfr-devel pcre2-devel"

From 7fb5ca9412d08e340f62d2d5981e2b75c113af94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH 0693/4088] volume_key: rebuild for Python 3.10

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

diff --git a/srcpkgs/volume_key/template b/srcpkgs/volume_key/template
index 64cc8f7d334c..7887040a1cd8 100644
--- a/srcpkgs/volume_key/template
+++ b/srcpkgs/volume_key/template
@@ -1,7 +1,7 @@
 # Template file for 'volume_key'
 pkgname=volume_key
 version=0.3.12
-revision=4
+revision=5
 build_style=gnu-configure
 make_build_args="PYTHON3_CFLAGS=-I${XBPS_CROSS_BASE}/${py3_inc}
  PYTHON_CFLAGS=-I${XBPS_CROSS_BASE}/${py2_inc}"

From c4b82d36aea31822419042fb59f2e6d17d7610a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:03 -0400
Subject: [PATCH 0694/4088] libcec: rebuild for Python 3.10

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

diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index bf232fb89eb8..b247acf44974 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -1,7 +1,7 @@
 # Template file for 'libcec'
 pkgname=libcec
 version=6.0.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
 configure_args="Python_ADDITIONAL_VERSIONS=${py3_ver}"

From 03910e358810eb0c14018eff3c819f77509a1737 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:11 -0400
Subject: [PATCH 0695/4088] python3-jupyterlab_server: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index cff562165c4a..6fbf7b0a5cd8 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
 version=2.8.1
-revision=1
+revision=2
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-jupyter_notebook python3-jupyter_server"

From 799fa856291152462036d3f05e602269fa8b3446 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:20 -0400
Subject: [PATCH 0696/4088] python3-nbclassic: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-nbclassic/template b/srcpkgs/python3-nbclassic/template
index c718a64909bd..0306c4e45bcf 100644
--- a/srcpkgs/python3-nbclassic/template
+++ b/srcpkgs/python3-nbclassic/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbclassic'
 pkgname=python3-nbclassic
 version=0.3.1
-revision=1
+revision=2
 wrksrc=nbclassic-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8389f22422b2d93cc127b1c17f2cf227b1d3b49f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:38 -0400
Subject: [PATCH 0697/4088] python3-ansiwrap: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ansiwrap/template b/srcpkgs/python3-ansiwrap/template
index 8d1108fa13d7..06705e84977d 100644
--- a/srcpkgs/python3-ansiwrap/template
+++ b/srcpkgs/python3-ansiwrap/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ansiwrap'
 pkgname=python3-ansiwrap
 version=0.8.4
-revision=1
+revision=2
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a082d0456bf436eae2280bdc91a847d5a4ac642a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:40 -0400
Subject: [PATCH 0698/4088] python3-asteval: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-asteval/template b/srcpkgs/python3-asteval/template
index b4c5a672b023..1845f504d20b 100644
--- a/srcpkgs/python3-asteval/template
+++ b/srcpkgs/python3-asteval/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-asteval'
 pkgname=python3-asteval
 version=0.9.21
-revision=1
+revision=2
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fbe5e756bb6b8c1c147721a15d77d0ec797934fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:01 -0400
Subject: [PATCH 0699/4088] ldapdomaindump: rebuild for Python 3.10

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

diff --git a/srcpkgs/ldapdomaindump/template b/srcpkgs/ldapdomaindump/template
index a0f4948c8d49..3952035d06f8 100644
--- a/srcpkgs/ldapdomaindump/template
+++ b/srcpkgs/ldapdomaindump/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapdomaindump'
 pkgname=ldapdomaindump
 version=0.9.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-ldap3 python3-dnspython"

From 449135c43852d62cf8e19aa5ff08b6cac362feb5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:26 -0400
Subject: [PATCH 0700/4088] python3-pdfrw: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pdfrw/template b/srcpkgs/python3-pdfrw/template
index a99d11f452ce..8b4fb96b7519 100644
--- a/srcpkgs/python3-pdfrw/template
+++ b/srcpkgs/python3-pdfrw/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pdfrw'
 pkgname=python3-pdfrw
 version=0.4
-revision=5
+revision=6
 wrksrc="pdfrw-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ba46c9213b2d9844728be3faae2519764d51b298 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:28 -0400
Subject: [PATCH 0701/4088] python3-pikepdf: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 1d073466aaf7..25e55edf1133 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
 version=3.1.0
-revision=1
+revision=2
 wrksrc="pikepdf-${version}"
 build_style=python3-module
 hostmakedepends="python3-pybind11 python3-setuptools_scm python3-wheel"

From 6be4f799f534106d73c7fbf1fe37325d8d8abc01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:30 -0400
Subject: [PATCH 0702/4088] python3-MechanicalSoup: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-MechanicalSoup/template b/srcpkgs/python3-MechanicalSoup/template
index f763efcf4e72..2fff0656397a 100644
--- a/srcpkgs/python3-MechanicalSoup/template
+++ b/srcpkgs/python3-MechanicalSoup/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-MechanicalSoup'
 pkgname=python3-MechanicalSoup
 version=0.12.0
-revision=3
+revision=4
 wrksrc=MechanicalSoup-${version}
 build_style=python3-module
 pycompile_module="mechanicalsoup"

From 64598cc1f41fc7af2ed7dd05b70b332ed534d995 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:33 -0400
Subject: [PATCH 0703/4088] python3-ReParser: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ReParser/template b/srcpkgs/python3-ReParser/template
index f37eeb897edf..8f0e2961881b 100644
--- a/srcpkgs/python3-ReParser/template
+++ b/srcpkgs/python3-ReParser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ReParser'
 pkgname=python3-ReParser
 version=1.4.3
-revision=3
+revision=4
 wrksrc=ReParser-${version}
 build_style=python3-module
 pycompile_module="reparser.py"

From 85ad3abab1809b694ef2fa52a8809929605d95ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:43 -0400
Subject: [PATCH 0704/4088] python3-readlike: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-readlike/template b/srcpkgs/python3-readlike/template
index a9057e180c36..5779c37ec31a 100644
--- a/srcpkgs/python3-readlike/template
+++ b/srcpkgs/python3-readlike/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-readlike'
 pkgname=python3-readlike
 version=0.1.3
-revision=3
+revision=4
 wrksrc=readlike-${version}
 build_style=python3-module
 pycompile_module="readlike.py"

From 187d60fbe1aff0fcf91778f853acb0b042f61552 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:05 -0400
Subject: [PATCH 0705/4088] python3-injector: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-injector/template b/srcpkgs/python3-injector/template
index cc43c1e60123..daf71c0e3760 100644
--- a/srcpkgs/python3-injector/template
+++ b/srcpkgs/python3-injector/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-injector'
 pkgname=python3-injector
 version=0.18.4
-revision=1
+revision=2
 wrksrc="injector-${version}"
 build_style=python3-module
 hostmakedepends="python3-typing_extensions python3-setuptools"

From c2c88e1aae5ff7c9baabf598bd2e6de591e6a2b5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:22 -0400
Subject: [PATCH 0706/4088] python3-nvml: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-nvml/template b/srcpkgs/python3-nvml/template
index fa61e05e862f..4aa7ea45a889 100644
--- a/srcpkgs/python3-nvml/template
+++ b/srcpkgs/python3-nvml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nvml'
 pkgname=python3-nvml
 version=0.2.4
-revision=1
+revision=2
 wrksrc="py3nvml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ac40bc64ec3df2a299f137d491cd5a98d6835f03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:45 -0400
Subject: [PATCH 0707/4088] python3-rx: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-rx/template b/srcpkgs/python3-rx/template
index 202151531f5a..a91b6f56ec08 100644
--- a/srcpkgs/python3-rx/template
+++ b/srcpkgs/python3-rx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rx'
 pkgname=python3-rx
 version=3.1.1
-revision=1
+revision=2
 wrksrc="RxPY-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pytest"

From a048c9d36bab98248e7b269b278c3faace3e7262 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:17 -0400
Subject: [PATCH 0708/4088] ufw: rebuild for Python 3.10

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

diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index baa38a4fe466..31470532739f 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -1,7 +1,7 @@
 # Template file for 'ufw'
 pkgname=ufw
 version=0.36.1
-revision=1
+revision=2
 _major_minor="${version%.*}"
 build_style=python3-module
 conf_files="

From 5b3aaef0ce4a383180b997cafb553c0a3aeefa70 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:25 -0400
Subject: [PATCH 0709/4088] python3-path-and-address: rebuild for Python 3.10

---
 srcpkgs/python3-path-and-address/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-path-and-address/template b/srcpkgs/python3-path-and-address/template
index 086457de3a92..a540825f1550 100644
--- a/srcpkgs/python3-path-and-address/template
+++ b/srcpkgs/python3-path-and-address/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-path-and-address'
 pkgname=python3-path-and-address
 version=2.0.1
-revision=2
+revision=3
 wrksrc="path-and-address-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From aa1c5f597a75b95e5b408194bfe2b41e8575d28a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:44 -0400
Subject: [PATCH 0710/4088] python3-bsddb3: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-bsddb3/template b/srcpkgs/python3-bsddb3/template
index a8d9a319c91d..0e8e413ee3c2 100644
--- a/srcpkgs/python3-bsddb3/template
+++ b/srcpkgs/python3-bsddb3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bsddb3'
 pkgname=python3-bsddb3
 version=6.2.7
-revision=1
+revision=2
 wrksrc="bsddb3-${version}"
 build_style=python3-module
 make_build_args="--berkeley-db=${XBPS_CROSS_BASE}/usr"

From ac74e1da1c72a655541395d949b9254fc1ce3196 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:56 -0400
Subject: [PATCH 0711/4088] gnuradio-osmosdr: rebuild for Python 3.10

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

diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 20c33836d6f9..886d2a9db2af 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-osmosdr'
 pkgname=gnuradio-osmosdr
 version=0.2.0
-revision=3
+revision=4
 wrksrc="gr-osmosdr-${version}"
 build_style=cmake
 hostmakedepends="pkg-config swig python3 gnuradio"

From bdd10de6a0a7400f1545e5330eb14ea284150620 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:49 -0400
Subject: [PATCH 0712/4088] eyeD3: rebuild for Python 3.10, update to 0.9.6.

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

diff --git a/srcpkgs/eyeD3/template b/srcpkgs/eyeD3/template
index c37f3c0f0c64..eb06072f66a4 100644
--- a/srcpkgs/eyeD3/template
+++ b/srcpkgs/eyeD3/template
@@ -1,15 +1,14 @@
 # Template file for 'eyeD3'
 pkgname=eyeD3
-version=0.9.5
-revision=2
+version=0.9.6
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-grako python3-pylast python3-setuptools python3-deprecation
- python3-filetype"
+depends="python3-pylast python3-setuptools python3-deprecation python3-filetype"
 short_desc="Python3 tool for mp3's ID3 tags manipulation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://eyed3.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/nicfit/eyeD3/master/HISTORY.rst"
 distfiles="https://github.com/nicfit/eyeD3/archive/v${version}.tar.gz"
-checksum=a0df2d2e7d366514f44bc553f723e92aa4bdd3f5fb1e5118e228dc9cd3ff6ff3
+checksum=7120ebc014cf3004984be39a08ff7ac0377c212d578cafb77be982e835ebfd5c

From 5baac42901d3b10b63e313be96e22d58c0ead245 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:19 -0400
Subject: [PATCH 0713/4088] python3-mygpoclient: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mygpoclient/template b/srcpkgs/python3-mygpoclient/template
index 6ed17293703c..4c329f799243 100644
--- a/srcpkgs/python3-mygpoclient/template
+++ b/srcpkgs/python3-mygpoclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mygpoclient'
 pkgname=python3-mygpoclient
 version=1.8
-revision=6
+revision=7
 wrksrc="mygpoclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 8278ea80dbea4ab29e96acc772f02b4da77e018f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:30 -0400
Subject: [PATCH 0714/4088] python3-podcastparser: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-podcastparser/template b/srcpkgs/python3-podcastparser/template
index 71342f79e084..83b0010656be 100644
--- a/srcpkgs/python3-podcastparser/template
+++ b/srcpkgs/python3-podcastparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-podcastparser'
 pkgname=python3-podcastparser
 version=0.6.5
-revision=3
+revision=4
 wrksrc="podcastparser-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 7064d9a39e48ef37fb1aafbeb97e577762cb8015 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:36 -0400
Subject: [PATCH 0715/4088] python3-aiohttp-cors: rebuild for Python 3.10

---
 srcpkgs/python3-aiohttp-cors/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aiohttp-cors/template b/srcpkgs/python3-aiohttp-cors/template
index 14eb43d1e33a..5d0ad3380260 100644
--- a/srcpkgs/python3-aiohttp-cors/template
+++ b/srcpkgs/python3-aiohttp-cors/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiohttp-cors'
 pkgname=python3-aiohttp-cors
 version=0.7.0
-revision=3
+revision=4
 wrksrc="aiohttp-cors-${version}"
 build_style=python3-module
 pycompile_module="aiohttp_cors"

From f79481cd39ecf60843c89a5e9af474fb249df1e5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:32 -0400
Subject: [PATCH 0716/4088] python3-py-cpuinfo: rebuild for Python 3.10

---
 srcpkgs/python3-py-cpuinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-py-cpuinfo/template b/srcpkgs/python3-py-cpuinfo/template
index f3cba9fbf044..13513e80a9ce 100644
--- a/srcpkgs/python3-py-cpuinfo/template
+++ b/srcpkgs/python3-py-cpuinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-py-cpuinfo'
 pkgname=python3-py-cpuinfo
 version=8.0.0
-revision=1
+revision=2
 wrksrc="py-cpuinfo-${version}"
 build_style=python3-module
 hostmakedepends=python3-setuptools

From 32a64a9a5bf7aae91871e582f48734b3e1cbafc8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:55 -0400
Subject: [PATCH 0717/4088] gns3-net-converter: rebuild for Python 3.10

---
 srcpkgs/gns3-net-converter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gns3-net-converter/template b/srcpkgs/gns3-net-converter/template
index 3f638386cf5a..157017bc444a 100644
--- a/srcpkgs/gns3-net-converter/template
+++ b/srcpkgs/gns3-net-converter/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-net-converter'
 pkgname=gns3-net-converter
 version=1.3.0
-revision=5
+revision=6
 build_style=python3-module
 pycompile_module="gns3converter"
 hostmakedepends="python3-setuptools"

From e4dcfc5616d8bea6739059df9a9de0a41af0bd1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:04 -0400
Subject: [PATCH 0718/4088] libpwquality: rebuild for Python 3.10

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

diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index df964fc63f48..5489a4144cc5 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -1,7 +1,7 @@
 # Template file for 'libpwquality'
 pkgname=libpwquality
 version=1.4.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security"
 hostmakedepends="libtool automake gettext-devel python3-devel"

From 5a63f4b1b9be1f341de6da3c19f8380258ed6ddc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:03 -0400
Subject: [PATCH 0719/4088] libgit2-glib: rebuild for Python 3.10

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

diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 00e6439339ba..baf7f440a246 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2-glib'
 pkgname=libgit2-glib
 version=0.99.0.1
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)

From 3bf0cda8b78fb6f61b6c3a95f3ba4e25140c9b52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:34 -0400
Subject: [PATCH 0720/4088] python3-pyfavicon: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyfavicon/template b/srcpkgs/python3-pyfavicon/template
index 583027b9062d..d2437798b793 100644
--- a/srcpkgs/python3-pyfavicon/template
+++ b/srcpkgs/python3-pyfavicon/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyfavicon'
 pkgname=python3-pyfavicon
 version=0.1.1
-revision=2
+revision=3
 wrksrc=pyfavicon-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ee09c8c64c04ad2b32fded95a60cfae8641c936a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:37 -0400
Subject: [PATCH 0721/4088] python3-pyotp: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyotp/template b/srcpkgs/python3-pyotp/template
index c0053bcc6202..218c0abc2ed0 100644
--- a/srcpkgs/python3-pyotp/template
+++ b/srcpkgs/python3-pyotp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyotp'
 pkgname=python3-pyotp
 version=2.3.0
-revision=4
+revision=5
 wrksrc="pyotp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1f816c788c920e552089f68b25393b4ea097a495 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:42 -0400
Subject: [PATCH 0722/4088] python3-pyzbar: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pyzbar/template b/srcpkgs/python3-pyzbar/template
index ce1d59993af8..d342b7176b2a 100644
--- a/srcpkgs/python3-pyzbar/template
+++ b/srcpkgs/python3-pyzbar/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyzbar'
 pkgname=python3-pyzbar
 version=0.1.8
-revision=4
+revision=5
 wrksrc="pyzbar-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e7354b17f5bd2f3039e81372dc66eeef5436b313 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:03 -0400
Subject: [PATCH 0723/4088] python3-yoyo-migrations: rebuild for Python 3.10

---
 srcpkgs/python3-yoyo-migrations/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-yoyo-migrations/template b/srcpkgs/python3-yoyo-migrations/template
index 0aefa4989d4d..45c1764ede02 100644
--- a/srcpkgs/python3-yoyo-migrations/template
+++ b/srcpkgs/python3-yoyo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yoyo-migrations'
 pkgname=python3-yoyo-migrations
 version=7.3.2
-revision=1
+revision=2
 wrksrc=yoyo-migrations-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 588296387ef29a101a7356f79be3dfbf984d1c0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:57 -0400
Subject: [PATCH 0724/4088] python3-typogrify: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
index f168a9cad689..f0b9a1a1ef45 100644
--- a/srcpkgs/python3-typogrify/template
+++ b/srcpkgs/python3-typogrify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-typogrify'
 pkgname=python3-typogrify
 version=2.0.7
-revision=1
+revision=2
 wrksrc="typogrify-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ecbcadc440bc9f4d9da98d11a4505636ca7301fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:33 -0400
Subject: [PATCH 0725/4088] python3-Ropper: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Ropper/template b/srcpkgs/python3-Ropper/template
index 59cab9a85e42..0b45d055e78a 100644
--- a/srcpkgs/python3-Ropper/template
+++ b/srcpkgs/python3-Ropper/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Ropper'
 pkgname=python3-Ropper
 version=1.13.6
-revision=1
+revision=2
 wrksrc="Ropper-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8bed73ac33cf43b3ff5c5861ca57ad4c53447024 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:17 -0400
Subject: [PATCH 0726/4088] unicorn: rebuild for Python 3.10

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

diff --git a/srcpkgs/unicorn/template b/srcpkgs/unicorn/template
index 03d017506326..2389b1ca9869 100644
--- a/srcpkgs/unicorn/template
+++ b/srcpkgs/unicorn/template
@@ -1,7 +1,7 @@
 # Template file for 'unicorn'
 pkgname=unicorn
 version=1.0.2
-revision=1
+revision=2
 hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
 short_desc="Lightweight multi-platform, multi-architecture CPU emulator framework"
 maintainer="Piraty <piraty1@inbox.ru>"

From 60cfa5d987309d7b207c8b0a7d4a30c581043341 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:52 -0400
Subject: [PATCH 0727/4088] gedit: rebuild for Python 3.10

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

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 26778866273c..b4e862c26ad0 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
 # Template file for 'gedit'
 pkgname=gedit
 version=40.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"

From ec691e88d3806611cd300e63e8a4de398f7c222f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:23 -0400
Subject: [PATCH 0728/4088] zeitgeist: rebuild for Python 3.10

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

diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template
index 1066a3bf9f7c..29fb74f357ca 100644
--- a/srcpkgs/zeitgeist/template
+++ b/srcpkgs/zeitgeist/template
@@ -1,7 +1,7 @@
 # Template file for 'zeitgeist'
 pkgname=zeitgeist
 version=1.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-fts --enable-datahub $(vopt_enable gir introspection)"

From ad818aced5c7783814918374f9dff59f0855d6b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:51 -0400
Subject: [PATCH 0729/4088] gajim: rebuild for Python 3.10

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

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 4067251e1134..49eda2f31542 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,7 +1,7 @@
 # Template file for 'gajim'
 pkgname=gajim
 version=1.3.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools

From a4e0e0c9ae1c5c47632d47189818a1361a7e7836 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:41 -0400
Subject: [PATCH 0730/4088] python3-axolotl: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-axolotl/template b/srcpkgs/python3-axolotl/template
index b0146e392b3f..d1b1f2e0fb98 100644
--- a/srcpkgs/python3-axolotl/template
+++ b/srcpkgs/python3-axolotl/template
@@ -2,7 +2,7 @@
 pkgname=python3-axolotl
 _pkgname=${pkgname/3/}
 version=0.2.3
-revision=4
+revision=5
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4e121f4261b101a94bc6c8c805901315c29792cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:42 -0400
Subject: [PATCH 0731/4088] python3-qrcode: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-qrcode/template b/srcpkgs/python3-qrcode/template
index 81013dfba48e..50a1966adb5b 100644
--- a/srcpkgs/python3-qrcode/template
+++ b/srcpkgs/python3-qrcode/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-qrcode'
 pkgname=python3-qrcode
 version=6.1
-revision=4
+revision=5
 wrksrc="qrcode-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d5ed5e242ab1f3a21d76b5b581bcb9e8639f6669 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:07 -0400
Subject: [PATCH 0732/4088] med: rebuild for Python 3.10

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

diff --git a/srcpkgs/med/template b/srcpkgs/med/template
index d4a1e3b2bc76..5bbbace2e1c8 100644
--- a/srcpkgs/med/template
+++ b/srcpkgs/med/template
@@ -1,7 +1,7 @@
 # Template file for 'med'
 pkgname=med
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-swig=yes --includedir=/usr/include/med"
 hostmakedepends="gcc-fortran swig"

From ee2939609e4ab86c7628245ecce983ae35919f9d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:29 -0400
Subject: [PATCH 0733/4088] python3-pivy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index 9940fe5cce01..dadb816ae3a3 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pivy'
 pkgname=python3-pivy
 version=0.6.6
-revision=1
+revision=2
 wrksrc="pivy-${version}"
 build_style=cmake
 hostmakedepends="python3-devel swig"

From 0d50dbb29ed068889e2dda0c836eabe7a38df1e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:41 -0400
Subject: [PATCH 0734/4088] beancount: rebuild for Python 3.10

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

diff --git a/srcpkgs/beancount/template b/srcpkgs/beancount/template
index ab1aacd4f71b..0a7556ffb04b 100644
--- a/srcpkgs/beancount/template
+++ b/srcpkgs/beancount/template
@@ -1,7 +1,7 @@
 # Template file for 'beancount'
 pkgname=beancount
 version=2.3.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"

From 4049e67b69e0588fb50ada541ed933b324484820 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:15 -0400
Subject: [PATCH 0735/4088] python3-markdown2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-markdown2/template b/srcpkgs/python3-markdown2/template
index 5d60d3c7ce42..3dc1ceea51dd 100644
--- a/srcpkgs/python3-markdown2/template
+++ b/srcpkgs/python3-markdown2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-markdown2'
 pkgname=python3-markdown2
 version=2.4.0
-revision=1
+revision=2
 wrksrc=python-markdown2-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 085e2dc6eabe12589fa398f901e0103db33e1f41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:55 -0400
Subject: [PATCH 0736/4088] python3-etesync: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-etesync/template b/srcpkgs/python3-etesync/template
index b16ac0fd8acd..2c51d83fc972 100644
--- a/srcpkgs/python3-etesync/template
+++ b/srcpkgs/python3-etesync/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-etesync'
 pkgname=python3-etesync
 version=0.12.1
-revision=2
+revision=3
 wrksrc="etesync-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 604a7bf3016a05dd5e68fca448711aef2f1b8567 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:07 -0400
Subject: [PATCH 0737/4088] radicale: rebuild for Python 3.10

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

diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 0500a4b773d5..3c8356a5fcb6 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,7 +1,7 @@
 # Template file for 'radicale'
 pkgname=radicale
 version=3.0.6
-revision=2
+revision=3
 wrksrc="Radicale-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6d885456a6b4f57130c491dad184de9a96c7a39e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:31 -0400
Subject: [PATCH 0738/4088] python3-PyFxA: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-PyFxA/template b/srcpkgs/python3-PyFxA/template
index c7fdfff1c930..94341f363fbc 100644
--- a/srcpkgs/python3-PyFxA/template
+++ b/srcpkgs/python3-PyFxA/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyFxA'
 pkgname=python3-PyFxA
 version=0.7.3
-revision=3
+revision=4
 wrksrc="PyFxA-${version}"
 build_style=python3-module
 pycompile_module="fxa"

From f68a50abb7c36d2bc88620fe2bbe3125b8e085e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:37 -0400
Subject: [PATCH 0739/4088] python3-aiorpcx: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-aiorpcx/template b/srcpkgs/python3-aiorpcx/template
index c8b4b39d53a7..25a707330172 100644
--- a/srcpkgs/python3-aiorpcx/template
+++ b/srcpkgs/python3-aiorpcx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiorpcx'
 pkgname=python3-aiorpcx
 version=0.18.7
-revision=1
+revision=2
 wrksrc="aiorpcX-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f54d020d50e93be2c0dd6165f61166de45fa9770 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:54 -0400
Subject: [PATCH 0740/4088] python3-ecdsa: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index ec82d04e288b..e4ea73661515 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ecdsa'
 pkgname=python3-ecdsa
 version=0.16.1
-revision=1
+revision=2
 wrksrc="python-ecdsa-python-ecdsa-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e1d43f209a417d90ff365d087d6e1270348cf025 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:09 -0400
Subject: [PATCH 0741/4088] python3-jsonrpclib: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jsonrpclib/template b/srcpkgs/python3-jsonrpclib/template
index 6887e6aa140d..11781cb107c1 100644
--- a/srcpkgs/python3-jsonrpclib/template
+++ b/srcpkgs/python3-jsonrpclib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsonrpclib'
 pkgname=python3-jsonrpclib
 version=0.4.0
-revision=4
+revision=5
 wrksrc="jsonrpclib-pelix-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2c4b5d1a26f16ff875143d827980e37489a23eac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:42 -0400
Subject: [PATCH 0742/4088] python3-bitstring: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-bitstring/template b/srcpkgs/python3-bitstring/template
index 3696935078db..7eb05df81dd1 100644
--- a/srcpkgs/python3-bitstring/template
+++ b/srcpkgs/python3-bitstring/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bitstring'
 pkgname=python3-bitstring
 version=3.1.7
-revision=1
+revision=2
 wrksrc="bitstring-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 58b0f72db5a17429f2706917f7de5faf0a885caa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:56 -0400
Subject: [PATCH 0743/4088] python3-fasteners: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template
index be3fd0ac5414..937627c24f6e 100644
--- a/srcpkgs/python3-fasteners/template
+++ b/srcpkgs/python3-fasteners/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fasteners'
 pkgname=python3-fasteners
 version=0.16.3
-revision=1
+revision=2
 wrksrc="fasteners-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d0147df8b074641b3571218d00c3faf618ae7a5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:44 -0400
Subject: [PATCH 0744/4088] python3-cached-property: rebuild for Python 3.10

---
 srcpkgs/python3-cached-property/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cached-property/template b/srcpkgs/python3-cached-property/template
index 07032f40d4c9..7d088f3cd023 100644
--- a/srcpkgs/python3-cached-property/template
+++ b/srcpkgs/python3-cached-property/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cached-property'
 pkgname=python3-cached-property
 version=1.5.1
-revision=4
+revision=5
 wrksrc="cached-property-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bbb25dba7d30fcedcf15343f88a5d75b2d724a38 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:52 -0400
Subject: [PATCH 0745/4088] python3-dockerpty: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-dockerpty/template b/srcpkgs/python3-dockerpty/template
index 980ebd13c58f..5b1504e90c74 100644
--- a/srcpkgs/python3-dockerpty/template
+++ b/srcpkgs/python3-dockerpty/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dockerpty'
 pkgname=python3-dockerpty
 version=0.4.1
-revision=6
+revision=7
 wrksrc="dockerpty-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 84d008241b48eb35204ff3b5b8ad37631df5a848 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:53 -0400
Subject: [PATCH 0746/4088] python3-dotenv: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-dotenv/template b/srcpkgs/python3-dotenv/template
index d71df0b9fb62..de10357bf378 100644
--- a/srcpkgs/python3-dotenv/template
+++ b/srcpkgs/python3-dotenv/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dotenv'
 pkgname=python3-dotenv
 version=0.19.0
-revision=1
+revision=2
 wrksrc="python-dotenv-${version}"
 build_style=python3-module
 # CLI tests and test_set_key_permission_error fail in xbps-src's build environment

From ec2742af78495227a1eee0adf4af12aa9dd99f01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:54 -0400
Subject: [PATCH 0747/4088] python3-texttable: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-texttable/template b/srcpkgs/python3-texttable/template
index 108a1883fbef..e553b75c55f8 100644
--- a/srcpkgs/python3-texttable/template
+++ b/srcpkgs/python3-texttable/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-texttable'
 pkgname=python3-texttable
 version=1.6.1
-revision=4
+revision=5
 wrksrc="texttable-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7850cff9e15e298c2bc302f3331b2ca9c52ccdfb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:41 -0400
Subject: [PATCH 0748/4088] binwalk: rebuild for Python 3.10

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

diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index 6c61fff87aeb..210ea288857d 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,7 +1,7 @@
 # Template file for 'binwalk'
 pkgname=binwalk
 version=2.3.1
-revision=1
+revision=2
 build_style=python3-module
 pycompile_module="binwalk"
 hostmakedepends="python3"

From dbea5b67280b2ebd6ba05043f31939a9cf7e47b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:32 -0400
Subject: [PATCH 0749/4088] python3-PyPDF2: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-PyPDF2/template b/srcpkgs/python3-PyPDF2/template
index b6c055a5569e..98a0a64176ec 100644
--- a/srcpkgs/python3-PyPDF2/template
+++ b/srcpkgs/python3-PyPDF2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyPDF2'
 pkgname=python3-PyPDF2
 version=1.26.0
-revision=3
+revision=4
 wrksrc="PyPDF2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 48363f5eac06ce3403119475ce9b63d6009bad0e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:09 -0400
Subject: [PATCH 0750/4088] python3-jsondiff: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jsondiff/template b/srcpkgs/python3-jsondiff/template
index 3ced80f96448..bf26ba630960 100644
--- a/srcpkgs/python3-jsondiff/template
+++ b/srcpkgs/python3-jsondiff/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsondiff'
 pkgname=python3-jsondiff
 version=1.3.0
-revision=1
+revision=2
 wrksrc="jsondiff-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9a4cf67486d3ef58259c0a639b021959f1ea2426 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:13 -0400
Subject: [PATCH 0751/4088] python3-libarchive-c: rebuild for Python 3.10

---
 srcpkgs/python3-libarchive-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..66b07e5e9134 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
 version=3.1
-revision=1
+revision=2
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 561a2fcf6cec9e40b86c987fa2492100a6497f80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:15 -0400
Subject: [PATCH 0752/4088] tlsh: rebuild for Python 3.10

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

diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template
index 4ee1ccdc728a..c4625ea2c74d 100644
--- a/srcpkgs/tlsh/template
+++ b/srcpkgs/tlsh/template
@@ -1,7 +1,7 @@
 # Template file for 'tlsh'
 pkgname=tlsh
 version=3.19.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-devel"

From 1e1d3f43d31237cea5af96358ed105b7427cdbc7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:05 -0400
Subject: [PATCH 0753/4088] libtorrent-rasterbar: rebuild for Python 3.10

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

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 861805fd5ca3..b1ceddc95282 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.14
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

From 6d0d80e2f1ea773ef245e633d29282b728236f4d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:38 -0400
Subject: [PATCH 0754/4088] Uranium: rebuild for Python 3.10

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

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 2eb1d4ff9586..2b5d8de87994 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
 version=4.11.0
-revision=1
+revision=2
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
 hostmakedepends="python3 gettext"

From 1488bb44228a3acf87099f54548f4264c467eb25 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:02 -0400
Subject: [PATCH 0755/4088] libSavitar: rebuild for Python 3.10

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

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index b04e434a1cf2..6389c5d9d530 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,7 +1,7 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
 version=4.11.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"

From 74607a179ddcf65b5e8a466545b5989c2a7c08fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:36 -0400
Subject: [PATCH 0756/4088] python3-pynest2d: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 5cf5a0a79c52..1af1547f5704 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynest2d'
 pkgname=python3-pynest2d
 version=4.11.0
-revision=1
+revision=2
 wrksrc="pynest2d-${version}"
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=14"

From 02bb75a5eb3e6927c5097a4294404d98066d5840 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0757/4088] python3-trimesh: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index f3cdf42708e8..538fb9767a1c 100644
--- a/srcpkgs/python3-trimesh/template
+++ b/srcpkgs/python3-trimesh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-trimesh'
 pkgname=python3-trimesh
 version=3.9.32
-revision=1
+revision=2
 wrksrc="trimesh-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e74669a1585625ed8c9a94bb585cd20db1fc74e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:39 -0400
Subject: [PATCH 0758/4088] python3-apsw: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-apsw/template b/srcpkgs/python3-apsw/template
index bb3d9815d5d8..1aa2a86f8902 100644
--- a/srcpkgs/python3-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-apsw'
 pkgname=python3-apsw
 version=3.36.0r1
-revision=1
+revision=2
 wrksrc="apsw-${version/r/-r}"
 build_style=python3-module
 make_build_args="--enable=load_extension"

From 249d50d277cff43489907365eb69cd38eb5d8cb7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:08 -0400
Subject: [PATCH 0759/4088] rrdtool: rebuild for Python 3.10

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

diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c8f93b641397..53d8b08aef1a 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,12 +1,15 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
 version=1.7.2
-revision=9
+revision=10
 build_style=gnu-configure
+# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
+# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="--enable-perl --enable-perl-site-install
  --with-perl-options=INSTALLDIRS=vendor --enable-ruby
  --enable-ruby-site-install --enable-python --enable-lua
- --enable-lua-site-install --enable-tcl --disable-libwrap"
+ --enable-lua-site-install --enable-tcl --disable-libwrap
+ am_cv_python_version=${py3_ver}"
 hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser"
 makedepends="libxml2-devel pango-devel python3-devel ruby-devel LuaJIT-devel perl"
 depends="dejavu-fonts-ttf"

From da86818a15e38d94f36bbf8e17ad3198f2228689 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:45 -0400
Subject: [PATCH 0760/4088] cinnamon-screensaver: rebuild for Python 3.10

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

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 2a711b6e88ac..6952100a2268 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
 version=4.8.1
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel gobject-introspection

From bc6d5f2fa312857f15e1b9ac2a39e17d34da9fa3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:11 -0400
Subject: [PATCH 0761/4088] nemo: rebuild for Python 3.10

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

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 7760e034163f..7925d1840cf9 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo'
 pkgname=nemo
 version=4.8.6
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"

From ef6f50654fd1aea67fb9fcb417e31bdcd5c5976f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:55 -0400
Subject: [PATCH 0762/4088] python3-tinycss: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tinycss/template b/srcpkgs/python3-tinycss/template
index 39cda657470e..d30096c21656 100644
--- a/srcpkgs/python3-tinycss/template
+++ b/srcpkgs/python3-tinycss/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tinycss'
 pkgname=python3-tinycss
 version=0.4
-revision=3
+revision=4
 wrksrc=tinycss-${version}
 build_style=python3-module
 pycompile_module="tinycss"

From 7e0f3488cc83bc52fc0fec4f88ede8a0e32a5935 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:45 -0400
Subject: [PATCH 0763/4088] certbot: rebuild for Python 3.10

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

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index c0e37936d935..2b7a00ff5fd5 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot'
 pkgname=certbot
 version=1.19.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-acme python3-ConfigArgParse python3-configobj

From b1ae78212c57bf69beddb332ca376ee3a5e3bc23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:41 -0400
Subject: [PATCH 0764/4088] python3-augeas: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-augeas/template b/srcpkgs/python3-augeas/template
index aca8cfac46eb..792230f64f7b 100644
--- a/srcpkgs/python3-augeas/template
+++ b/srcpkgs/python3-augeas/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-augeas'
 pkgname=python3-augeas
 version=1.1.0
-revision=1
+revision=2
 wrksrc="python-augeas-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools augeas-devel python3-cffi"

From 25e5bc8116ea7411c1bb524ebb1ad4b968b6572c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:46 -0400
Subject: [PATCH 0765/4088] compizconfig-python: rebuild for Python 3.10

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

diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template
index f23f921c3bcb..f8d0e01dd054 100644
--- a/srcpkgs/compizconfig-python/template
+++ b/srcpkgs/compizconfig-python/template
@@ -1,7 +1,7 @@
 # Template file for 'compizconfig-python'
 pkgname=compizconfig-python
 version=0.8.18
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config glib-devel gettext-devel

From b19c0941f448b495421de59ffa9fb432d20ce590 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:46 -0400
Subject: [PATCH 0766/4088] python3-cjkwrap: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cjkwrap/template b/srcpkgs/python3-cjkwrap/template
index 79a14c56462f..46a569d3db58 100644
--- a/srcpkgs/python3-cjkwrap/template
+++ b/srcpkgs/python3-cjkwrap/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cjkwrap'
 pkgname=python3-cjkwrap
 version=2.2
-revision=3
+revision=4
 wrksrc="cjkwrap-v${version}"
 build_style=python3-module
 pycompile_module="cjkwrap.py"

From 4a23182052064147dad2bcb8c77e4636c07b3c99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:01 -0400
Subject: [PATCH 0767/4088] python3-grequests: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-grequests/template b/srcpkgs/python3-grequests/template
index 7343ca6928d4..b6eb840fbbce 100644
--- a/srcpkgs/python3-grequests/template
+++ b/srcpkgs/python3-grequests/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grequests'
 pkgname=python3-grequests
 version=0.6.0
-revision=1
+revision=2
 wrksrc="grequests-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f2fb3a408ef5e6e5bc8f560a3f856af23d79da2e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:17 -0400
Subject: [PATCH 0768/4088] python3-mpv: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mpv/template b/srcpkgs/python3-mpv/template
index 2dbdbb89b330..3cccc3ee6c11 100644
--- a/srcpkgs/python3-mpv/template
+++ b/srcpkgs/python3-mpv/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpv'
 pkgname=python3-mpv
 version=0.5.2
-revision=1
+revision=2
 wrksrc="python-mpv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 27cb2fc39844fb2bf1980cc59c8a503c3f8cf5a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:44 -0400
Subject: [PATCH 0769/4088] canto-next: rebuild for Python 3.10

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

diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template
index 8fd497829427..36eaab9d43c3 100644
--- a/srcpkgs/canto-next/template
+++ b/srcpkgs/canto-next/template
@@ -1,7 +1,7 @@
 # Template file for 'canto-next'
 pkgname=canto-next
 version=0.9.7
-revision=5
+revision=6
 build_style=python3-module
 pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"

From fdb7a16061033e6212926835b9b1c2a7b7eb0373 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:45 -0400
Subject: [PATCH 0770/4088] python3-cchardet: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cchardet/template b/srcpkgs/python3-cchardet/template
index 27c0903bdcde..a7b00cda3974 100644
--- a/srcpkgs/python3-cchardet/template
+++ b/srcpkgs/python3-cchardet/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cchardet'
 pkgname=python3-cchardet
 version=2.1.7
-revision=1
+revision=2
 wrksrc="cchardet-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 44fd9f740240229d1a277151ff17e8f13b65e768 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:03 -0400
Subject: [PATCH 0771/4088] python3-html5-parser: rebuild for Python 3.10

---
 srcpkgs/python3-html5-parser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
index f160e5893a4e..ab976093b6c2 100644
--- a/srcpkgs/python3-html5-parser/template
+++ b/srcpkgs/python3-html5-parser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-html5-parser'
 pkgname=python3-html5-parser
 version=0.4.9
-revision=4
+revision=5
 wrksrc="html5-parser-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"

From 18b613dfa0e0b8873c5774f20dcbfc76317ddfca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:16 -0400
Subject: [PATCH 0772/4088] python3-mechanize: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
index 0d73fc8766fc..b23d78fd5bd1 100644
--- a/srcpkgs/python3-mechanize/template
+++ b/srcpkgs/python3-mechanize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mechanize'
 pkgname=python3-mechanize
 version=0.4.3
-revision=6
+revision=7
 wrksrc="mechanize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7a0cbe28236208e809b9ddd3f0c3e4a86a01d42a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:33 -0400
Subject: [PATCH 0773/4088] python3-pychm: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pychm/template b/srcpkgs/python3-pychm/template
index 22a591835a3b..e3652388850b 100644
--- a/srcpkgs/python3-pychm/template
+++ b/srcpkgs/python3-pychm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pychm'
 pkgname=python3-pychm
 version=0.8.6
-revision=2
+revision=3
 wrksrc=pychm-${version}
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From f6e18ce65b28e6d767354674f4f6ea5f0e341bf2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:55 -0400
Subject: [PATCH 0774/4088] python3-ewmh: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ewmh/template b/srcpkgs/python3-ewmh/template
index 4e295c61366e..d88beb7ac92e 100644
--- a/srcpkgs/python3-ewmh/template
+++ b/srcpkgs/python3-ewmh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ewmh'
 pkgname=python3-ewmh
 version=0.1.6
-revision=5
+revision=6
 wrksrc="ewmh-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b9de54f25070f8d4e70eeebc54037744442cfaa8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:42 -0400
Subject: [PATCH 0775/4088] borg: rebuild for Python 3.10

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

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index eec74271bcac..05f9d91f16a8 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,7 +1,7 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.17
-revision=2
+revision=3
 wrksrc="borgbackup-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel openssl-devel"

From a49c636423f0fa6fada70e1458df011133075c33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:35 -0400
Subject: [PATCH 0776/4088] python3-pykwalify: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pykwalify/template b/srcpkgs/python3-pykwalify/template
index 04447f045298..c3797d7a729a 100644
--- a/srcpkgs/python3-pykwalify/template
+++ b/srcpkgs/python3-pykwalify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pykwalify'
 pkgname=python3-pykwalify
 version=1.8.0
-revision=1
+revision=2
 wrksrc="pykwalify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 67ba888e1369371bdd3311ed116e156894a854dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:08 -0400
Subject: [PATCH 0777/4088] python3-jellyfish: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index d852e40e355b..c1b55e36e8ef 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
 version=0.7.2
-revision=3
+revision=4
 wrksrc="jellyfish-${version}"
 build_style=python3-module
 pycompile_module="jellyfish"

From 4fd3e6ae95f31cf6792aaf13ec706dee60b1ffdb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:18 -0400
Subject: [PATCH 0778/4088] python3-munkres: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-munkres/template b/srcpkgs/python3-munkres/template
index a70cfec07135..5dd0f0da8cf5 100644
--- a/srcpkgs/python3-munkres/template
+++ b/srcpkgs/python3-munkres/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-munkres'
 pkgname=python3-munkres
 version=1.1.4
-revision=1
+revision=2
 wrksrc="munkres-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b345a8bfe7b59940870a48d3756b06662d6216e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:20 -0400
Subject: [PATCH 0779/4088] python-b2sdk: rebuild for Python 3.10

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

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 206681516c03..1274f7051157 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -2,7 +2,7 @@
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
 version=1.12.0
-revision=1
+revision=2
 wrksrc="b2sdk-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-pip"

From 1e5f7aaaffe5811c2409041e79dc92217e4d6bc8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:43 -0400
Subject: [PATCH 0780/4088] python3-boto3: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 676a30a30811..8bdbb542b350 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
 version=1.18.44
-revision=1
+revision=2
 wrksrc="boto3-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 290379b1f35c1c14849e45c1a4da004e01e2b4be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:46 -0400
Subject: [PATCH 0781/4088] python3-s3transfer: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-s3transfer/template b/srcpkgs/python3-s3transfer/template
index 559d3f508eff..525c3ad252f5 100644
--- a/srcpkgs/python3-s3transfer/template
+++ b/srcpkgs/python3-s3transfer/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-s3transfer'
 pkgname=python3-s3transfer
 version=0.3.3
-revision=3
+revision=4
 wrksrc="s3transfer-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a1a9d986b66ecc60a48353706f8c94b6922cb692 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:52 -0400
Subject: [PATCH 0782/4088] gdb: rebuild for Python 3.10

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

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 2b62dd8f2947..552faa668a2a 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=11.1
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline

From 6e50904bef63701befdc1487c485cf7df064baec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:04 -0400
Subject: [PATCH 0783/4088] python3-i3ipc: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-i3ipc/template b/srcpkgs/python3-i3ipc/template
index d7cc59ed26ea..7172c5b3c287 100644
--- a/srcpkgs/python3-i3ipc/template
+++ b/srcpkgs/python3-i3ipc/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-i3ipc'
 pkgname=python3-i3ipc
 version=2.2.1
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bd2d338a328518dbd9b1731b9555e21237f22e8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:37 -0400
Subject: [PATCH 0784/4088] python3-pypandoc: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..1b172c843f91 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
 version=1.6.3
-revision=1
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 702070c847bdad41b787003dd8523453c2ffc224 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:12 -0400
Subject: [PATCH 0785/4088] notmuch: rebuild for Python 3.10

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

diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 5197c2d6071a..c7a25199498a 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
 version=0.32.2
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr
  --emacslispdir=/usr/share/emacs/site-lisp/notmuch

From fa009e78d71f09986028ef58558ff4fcbee18808 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:58 -0400
Subject: [PATCH 0786/4088] python3-usb: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..d76e7cda9f2c 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
 version=1.2.1
-revision=1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 225c2808545f74c4ca51195656dd06f390147ac7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:52 -0400
Subject: [PATCH 0787/4088] python3-dkimpy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-dkimpy/template b/srcpkgs/python3-dkimpy/template
index 0993d5899261..8818893dcb69 100644
--- a/srcpkgs/python3-dkimpy/template
+++ b/srcpkgs/python3-dkimpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dkimpy'
 pkgname=python3-dkimpy
 version=1.0.5
-revision=1
+revision=2
 wrksrc="dkimpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1aa1a789befc7c816fc326020115acd8c7f0432d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:30 -0400
Subject: [PATCH 0788/4088] python3-Markups: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-Markups/template b/srcpkgs/python3-Markups/template
index b216c9777b98..b956b249d9d0 100644
--- a/srcpkgs/python3-Markups/template
+++ b/srcpkgs/python3-Markups/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Markups'
 pkgname=python3-Markups
 version=3.0.0
-revision=5
+revision=6
 wrksrc="Markups-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3906aaa367b7e44e543bfde4f5e8d9dc1d2a32a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:37 -0400
Subject: [PATCH 0789/4088] python3-alembic: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-alembic/template b/srcpkgs/python3-alembic/template
index 5cbdd6d4c5a5..454db2f96a30 100644
--- a/srcpkgs/python3-alembic/template
+++ b/srcpkgs/python3-alembic/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-alembic'
 pkgname=python3-alembic
 version=1.7.1
-revision=1
+revision=2
 wrksrc="alembic-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bdcbe0344659fe841a4fb5d499fa01a5f2c4ee11 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:47 -0400
Subject: [PATCH 0790/4088] python3-cloudscraper: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-cloudscraper/template b/srcpkgs/python3-cloudscraper/template
index d9326d5630ae..ad8e7835116d 100644
--- a/srcpkgs/python3-cloudscraper/template
+++ b/srcpkgs/python3-cloudscraper/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cloudscraper'
 pkgname=python3-cloudscraper
 version=1.2.58
-revision=1
+revision=2
 wrksrc=cloudscraper-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6409a5211a12a6f85d5e4f0818fa748714a5fcf9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:50 -0400
Subject: [PATCH 0791/4088] python3-dateparser: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-dateparser/template b/srcpkgs/python3-dateparser/template
index 1eda5ea90962..9d7c54cd818e 100644
--- a/srcpkgs/python3-dateparser/template
+++ b/srcpkgs/python3-dateparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dateparser'
 pkgname=python3-dateparser
 version=1.0.0
-revision=1
+revision=2
 wrksrc=dateparser-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f7be2ef840cfa09148f693f5b0cb65d612c09321 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:32 -0400
Subject: [PATCH 0792/4088] python3-pure-protobuf: rebuild for Python 3.10

---
 srcpkgs/python3-pure-protobuf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pure-protobuf/template b/srcpkgs/python3-pure-protobuf/template
index 3be6c1600f8b..5dc4006d2959 100644
--- a/srcpkgs/python3-pure-protobuf/template
+++ b/srcpkgs/python3-pure-protobuf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pure-protobuf'
 pkgname=python3-pure-protobuf
 version=2.0.1
-revision=2
+revision=3
 wrksrc=protobuf-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0450369552e1283a507c6d8b2a71c8aa30b286cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:23 -0400
Subject: [PATCH 0793/4088] znc: rebuild for Python 3.10

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

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..dcb788e647dc 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="
  --enable-python

From cc3aa28dc7b1dbf374e32e3b88d2c830248ac4f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:23 -0400
Subject: [PATCH 0794/4088] zim: rebuild for Python 3.10

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

diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template
index 665278081937..ad7b7f1cc9c8 100644
--- a/srcpkgs/zim/template
+++ b/srcpkgs/zim/template
@@ -1,7 +1,7 @@
 # Template file for 'zim'
 pkgname=zim
 version=0.74.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-gobject python3-xdg gtk+3"
 depends="python3-gobject python3-xdg gtk+3 desktop-file-utils"

From 4fc1b0b68ce917d598902d55c4e3307b219d15d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 3 Oct 2021 22:32:53 -0400
Subject: [PATCH 0795/4088] z3: rebuild for Python 3.10

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

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 43fca894b542..bca042082b3f 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.12
-revision=3
+revision=4
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From 1707dc508796f19fca0c484ae42cba8ea2726316 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Sep 2021 14:43:44 -0400
Subject: [PATCH 0796/4088] zfs: rebuild for Python 3.10

---
 srcpkgs/zfs/patches/python310.patch | 92 +++++++++++++++++++++++++++++
 srcpkgs/zfs/template                |  2 +-
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/zfs/patches/python310.patch

diff --git a/srcpkgs/zfs/patches/python310.patch b/srcpkgs/zfs/patches/python310.patch
new file mode 100644
index 000000000000..e4d42b121274
--- /dev/null
+++ b/srcpkgs/zfs/patches/python310.patch
@@ -0,0 +1,92 @@
+Most fo the patch taken from
+
+    https://github.com/openzfs/zfs/commit/08cd0717359b1a18693e3c8e6d6e5a2819b35a48
+
+but this fix still missed the `print (sys.version[[:3]])"` part of the test,
+which extracts "3.1" on Python 3.10. The right fix is to properly split
+sys.version on '.' and rejoin the first two components.
+
+diff -ur a/config/always-pyzfs.m4 b/config/always-pyzfs.m4
+--- a/config/always-pyzfs.m4	2021-09-15 16:30:47.164862738 -0400
++++ b/config/always-pyzfs.m4	2021-09-29 14:34:51.288636042 -0400
+@@ -47,6 +47,21 @@
+ 	AC_SUBST(DEFINE_PYZFS)
+ 
+ 	dnl #
++	dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs
++	dnl #
++	AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [
++		ZFS_AC_PYTHON_MODULE([packaging], [], [
++			ZFS_AC_PYTHON_MODULE([distlib], [], [
++				AS_IF([test "x$enable_pyzfs" = xyes], [
++					AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed")
++				], [test "x$enable_pyzfs" != xno], [
++					enable_pyzfs=no
++				])
++			])
++		])
++	])
++
++	dnl #
+ 	dnl # Require python-devel libraries
+ 	dnl #
+ 	AS_IF([test "x$enable_pyzfs" = xcheck  -o "x$enable_pyzfs" = xyes], [
+diff -ur a/config/ax_python_devel.m4 b/config/ax_python_devel.m4
+--- a/config/ax_python_devel.m4	2021-09-15 16:30:47.164862738 -0400
++++ b/config/ax_python_devel.m4	2021-09-29 14:40:23.293455112 -0400
+@@ -97,9 +97,18 @@
+ 	# Check for a version of Python >= 2.1.0
+ 	#
+ 	AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
+-	ac_supports_python_ver=`$PYTHON -c "import sys; \
+-		ver = sys.version.split ()[[0]]; \
+-		print (ver >= '2.1.0')"`
++	ac_supports_python_ver=`cat<<EOD | $PYTHON -
++from __future__ import print_function;
++import sys;
++try:
++	from packaging import version;
++except ImportError:
++	from distlib import version;
++ver = sys.version.split ()[[0]];
++(tst_cmp, tst_ver) = ">= '2.1.0'".split ();
++tst_ver = tst_ver.strip ("'");
++eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))")
++EOD`
+ 	if test "$ac_supports_python_ver" != "True"; then
+ 		if test -z "$PYTHON_NOVERSIONCHECK"; then
+ 			AC_MSG_RESULT([no])
+@@ -126,9 +135,21 @@
+ 	#
+ 	if test -n "$1"; then
+ 		AC_MSG_CHECKING([for a version of Python $1])
+-		ac_supports_python_ver=`$PYTHON -c "import sys; \
+-			ver = sys.version.split ()[[0]]; \
+-			print (ver $1)"`
++		# Why the strip ()?  Because if we don't, version.parse
++		# will, for example, report 3.10.0 >= '3.11.0'
++		ac_supports_python_ver=`cat<<EOD | $PYTHON -
++
++from __future__ import print_function;
++import sys;
++try:
++	from packaging import version;
++except ImportError:
++	from distlib import version;
++ver = sys.version.split ()[[0]];
++(tst_cmp, tst_ver) = "$1".split ();
++tst_ver = tst_ver.strip ("'");
++eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))")
++EOD`
+ 		if test "$ac_supports_python_ver" = "True"; then
+ 		   AC_MSG_RESULT([yes])
+ 		else
+@@ -203,7 +224,7 @@
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[[:3]])"`
++					print ('.'.join(sys.version.split('.')[[:2]]))"`
+ 			fi
+ 		fi
+ 
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index bc8e21e48ce0..de2ca4b5c9e1 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From e4f8d80d85d7470782d8c58b2541b92cb94f10cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:22 -0400
Subject: [PATCH 0797/4088] yubikey-manager: rebuild for Python 3.10

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

diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template
index f8615631a1ca..5feaf434931d 100644
--- a/srcpkgs/yubikey-manager/template
+++ b/srcpkgs/yubikey-manager/template
@@ -1,7 +1,7 @@
 # Template file for 'yubikey-manager'
 pkgname=yubikey-manager
 version=4.0.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="libfido2 python3-click python3-fido2 python3-openssl

From ee6e2fe350a5766376ad30a727f2ef50129d097e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 3 Oct 2021 22:32:53 -0400
Subject: [PATCH 0798/4088] ytmdl: rebuild for Python 3.10

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

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 055ee8f1123d..0b7b01875eeb 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,7 +1,7 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
 version=2021.08.01
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama

From 6a0521908e564955bb91f42b6af53abcb143739a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:22 -0400
Subject: [PATCH 0799/4088] ytcc: rebuild for Python 3.10

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

diff --git a/srcpkgs/ytcc/template b/srcpkgs/ytcc/template
index 4e6979b3e2f4..99a0c9b91122 100644
--- a/srcpkgs/ytcc/template
+++ b/srcpkgs/ytcc/template
@@ -1,7 +1,7 @@
 # Template file for 'ytcc'
 pkgname=ytcc
 version=1.8.2
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-SQLAlchemy python3-feedparser python3-lxml python3-youtube-dl

From 7b2121bb6c877ab8fe55159eec3a539004f34449 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:22 -0400
Subject: [PATCH 0800/4088] yt-dlp: rebuild for Python 3.10

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

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index ce5563f6b17f..5f3204cf2fb0 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,7 +1,7 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
 version=2021.09.25
-revision=1
+revision=2
 wrksrc="$pkgname"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 20c30eca62248b6fd275843285159e73c28fc543 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:22 -0400
Subject: [PATCH 0801/4088] yq: rebuild for Python 3.10

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

diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index 4d959b5d4bee..a57cdf99617b 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -1,7 +1,7 @@
 # Template file for 'yq'
 pkgname=yq
 version=2.12.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-yaml"

From b89b1b2ccc6c0600585662ca1ad9151eaa687853 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:21 -0400
Subject: [PATCH 0802/4088] you-get: rebuild for Python 3.10

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

diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index 882c01bb1dcb..dd9c03f3f77d 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,7 +1,7 @@
 # Template file for 'you-get'
 pkgname=you-get
 version=0.4.1536
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pysocks python3-setuptools"

From 9f6f8ebe9b79b290d0dbdda42500494582ca5f92 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:21 -0400
Subject: [PATCH 0803/4088] xpra: rebuild for Python 3.10, update to 4.2.3.

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

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..36791e9cbb89 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.3
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=69759c716d0dd50dba7c816f8a4c4afdfee4553d1aa8bd5104874e95a4ffd207
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 6dca42e73542e9b82245aeb8dc52f0f33de912e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:21 -0400
Subject: [PATCH 0804/4088] xonsh: rebuild for Python 3.10

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

diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index 8b4e48eae050..150d83d4c8f7 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,7 +1,7 @@
 # Template file for 'xonsh'
 pkgname=xonsh
 version=0.10.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 checkdepends="python3-pytest python3-prompt_toolkit python3-Pygments"

From a51459232a473f46303775089a902db136732a70 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:21 -0400
Subject: [PATCH 0805/4088] xmldiff: rebuild for Python 3.10

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

diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template
index 8f252be20612..e377c916f3cb 100644
--- a/srcpkgs/xmldiff/template
+++ b/srcpkgs/xmldiff/template
@@ -1,7 +1,7 @@
 # Template file for 'xmldiff'
 pkgname=xmldiff
 version=2.4
-revision=3
+revision=4
 wrksrc="xmldiff-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3ba76efc7fa47ca77f8aca7d56bb4f7970fa7a00 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:21 -0400
Subject: [PATCH 0806/4088] xkcdpass: rebuild for Python 3.10

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

diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template
index da25764f4551..22c88b8236dc 100644
--- a/srcpkgs/xkcdpass/template
+++ b/srcpkgs/xkcdpass/template
@@ -1,7 +1,7 @@
 # Template file for 'xkcdpass'
 pkgname=xkcdpass
 version=1.19.3
-revision=1
+revision=2
 wrksrc="XKCD-password-generator-xkcdpass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From acc489de9c3120dc0635a86d29a12ca818377a5a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 3 Oct 2021 22:32:53 -0400
Subject: [PATCH 0807/4088] xen: rebuild for Python 3.10

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

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 3565845e9dc3..deb572fe8b9c 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=4
+revision=5
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64

From 8a269d3d0ab0587799b0dd4d8e8ef80750ade187 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:21 -0400
Subject: [PATCH 0808/4088] xdot: rebuild for Python 3.10

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

diff --git a/srcpkgs/xdot/template b/srcpkgs/xdot/template
index 4bb947902385..d75b757cc848 100644
--- a/srcpkgs/xdot/template
+++ b/srcpkgs/xdot/template
@@ -1,7 +1,7 @@
 # Template file for 'xdot'
 pkgname=xdot
 version=1.2
-revision=1
+revision=2
 wrksrc="xdot.py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ee9599f08eb4463e9eef80ff7b934474e959067e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:21 -0400
Subject: [PATCH 0809/4088] xcb-proto: rebuild for Python 3.10

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

diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template
index bd8bcc2b242e..406869052bcf 100644
--- a/srcpkgs/xcb-proto/template
+++ b/srcpkgs/xcb-proto/template
@@ -1,7 +1,7 @@
 # Template file for 'xcb-proto'
 pkgname=xcb-proto
 version=1.14.1
-revision=1
+revision=2
 wrksrc="xcbproto-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="python3 automake"

From 20942afa64b773e09a11f9375202f8c01afa7a09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:20 -0400
Subject: [PATCH 0810/4088] wpgtk: rebuild for Python 3.10

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

diff --git a/srcpkgs/wpgtk/template b/srcpkgs/wpgtk/template
index a851b76ff273..733d3635b566 100644
--- a/srcpkgs/wpgtk/template
+++ b/srcpkgs/wpgtk/template
@@ -1,7 +1,7 @@
 # Template file for 'wpgtk'
 pkgname=wpgtk
 version=6.1.3
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-Pillow pywal libxslt"

From c5bd6f1f219aef19558ee532cfe856bdec838161 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:20 -0400
Subject: [PATCH 0811/4088] whipper: rebuild for Python 3.10

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

diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index 00bca3fea9bf..c5bbd74cfacc 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -1,7 +1,7 @@
 # Template file for 'whipper'
 pkgname=whipper
 version=0.10.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 makedepends="libsndfile-devel python3-devel"

From 3a76611c01dbd3bfc1f635259029a332c806ee9d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:20 -0400
Subject: [PATCH 0812/4088] wfuzz: rebuild for Python 3.10

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

diff --git a/srcpkgs/wfuzz/template b/srcpkgs/wfuzz/template
index f0f7b1b0fe0a..3e072535a74c 100644
--- a/srcpkgs/wfuzz/template
+++ b/srcpkgs/wfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wfuzz'
 pkgname=wfuzz
 version=3.1.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-chardet python3-curl python3-future python3-lxml python3-parse

From 57b7a1ec667f5b0fbb6e402b9773ab225ca39804 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:20 -0400
Subject: [PATCH 0813/4088] weechat: rebuild for Python 3.10

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

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index a3fb6c498bf1..ff04a2e4aa16 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON

From fd9553e6663453521ccd869ad19f9f621db6ee99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:20 -0400
Subject: [PATCH 0814/4088] weather: rebuild for Python 3.10

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

diff --git a/srcpkgs/weather/template b/srcpkgs/weather/template
index e56980adc5b1..9aa38b74fcbd 100644
--- a/srcpkgs/weather/template
+++ b/srcpkgs/weather/template
@@ -1,7 +1,7 @@
 # Template file for 'weather'
 pkgname=weather
 version=2.4.1
-revision=2
+revision=3
 depends="python3"
 conf_files="/etc/weatherrc"
 short_desc="CLI utility for current (METAR) weather conditions and forecasts"

From 7704bced130a3e0c3afd8979e001c16f997ab7a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH 0815/4088] vpn-slice: rebuild for Python 3.10

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

diff --git a/srcpkgs/vpn-slice/template b/srcpkgs/vpn-slice/template
index c0f5aaa2308b..281d4d9ef80a 100644
--- a/srcpkgs/vpn-slice/template
+++ b/srcpkgs/vpn-slice/template
@@ -1,7 +1,7 @@
 # Template file for 'vpn-slice'
 pkgname=vpn-slice
 version=0.15
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-dnspython python3-setproctitle iproute2"

From 3262a5c9ecb598923734866322d63dfd983f00e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH 0816/4088] voltron: rebuild for Python 3.10

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

diff --git a/srcpkgs/voltron/template b/srcpkgs/voltron/template
index 310e41474fb2..f60d235b1dae 100644
--- a/srcpkgs/voltron/template
+++ b/srcpkgs/voltron/template
@@ -1,7 +1,7 @@
 # Template file for 'voltron'
 pkgname=voltron
 version=0.1.7
-revision=5
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-blessed python3-Flask python3-Pygments python3-pysigset

From b6d0a79b1fbf51f54305b123ecb3a63592fa3c87 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH 0817/4088] volctl: rebuild for Python 3.10

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

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 6f956713b51a..217720acb79c 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,7 +1,7 @@
 # Template file for 'volctl'
 pkgname=volctl
 version=0.9.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-pulsectl"

From d50e4c59466cc80f2d45d444f6b2d9e4ff5badad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH 0818/4088] visidata: rebuild for Python 3.10

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

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index 49a97ffec9eb..008275215bf0 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,7 +1,7 @@
 # Template file for 'visidata'
 pkgname=visidata
 version=2.6
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-dateutil"

From 15ee98542dd312b3202eb68bf944c5b2c1a8a93b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH 0819/4088] virtualenvwrapper: rebuild for Python 3.10

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

diff --git a/srcpkgs/virtualenvwrapper/template b/srcpkgs/virtualenvwrapper/template
index f007b7fec02f..f0e18f6fafce 100644
--- a/srcpkgs/virtualenvwrapper/template
+++ b/srcpkgs/virtualenvwrapper/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualenvwrapper'
 pkgname=virtualenvwrapper
 version=4.8.4
-revision=4
+revision=5
 build_style=python3-module
 pycompile_module="virtualenvwrapper"
 hostmakedepends="python3-setuptools python3-pbr"

From 671e2e13c38625d7cc0540c5572fd2e426535658 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH 0820/4088] virtme: rebuild for Python 3.10

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

diff --git a/srcpkgs/virtme/template b/srcpkgs/virtme/template
index 3f432f493a7c..de62c6501876 100644
--- a/srcpkgs/virtme/template
+++ b/srcpkgs/virtme/template
@@ -1,7 +1,7 @@
 # Template file for 'virtme'
 pkgname=virtme
 version=0.1.1
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="virtme"
 hostmakedepends="python3-setuptools"

From 0a40808b9d6c1355b2ee3d456272c090554f53f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:18 -0400
Subject: [PATCH 0821/4088] virt-manager: rebuild for Python 3.10

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

diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template
index 768530547dd7..f3f6a7424a1b 100644
--- a/srcpkgs/virt-manager/template
+++ b/srcpkgs/virt-manager/template
@@ -1,7 +1,7 @@
 # Template file for 'virt-manager'
 pkgname=virt-manager
 version=3.2.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/share/${pkgname}/virtManager"
 hostmakedepends="gettext python3-docutils gtk-update-icon-cache"

From 9ce497a0fc243eab1144ee8e9006bbfa11716b3c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:18 -0400
Subject: [PATCH 0822/4088] vimiv: rebuild for Python 3.10

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

diff --git a/srcpkgs/vimiv/template b/srcpkgs/vimiv/template
index 80b0a104e1ad..b478dc2f09d5 100644
--- a/srcpkgs/vimiv/template
+++ b/srcpkgs/vimiv/template
@@ -1,7 +1,7 @@
 # Template file for 'vimiv'
 pkgname=vimiv
 version=0.9.1
-revision=5
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
 makedepends="python3-devel"

From 9e7eaeee1786cebc1c87a5ef6f34f74e43235d96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:18 -0400
Subject: [PATCH 0823/4088] vim: rebuild for Python 3.10

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

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 35b81645fa52..3802307b156c 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
 version=8.2.3459
-revision=1
+revision=2
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)

From 1278f57b8867f0d7c8dc479334553252d23e3508 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:18 -0400
Subject: [PATCH 0824/4088] vidcutter: rebuild for Python 3.10

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

diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template
index 1fc9b4e50abd..92c6cc6817d0 100644
--- a/srcpkgs/vidcutter/template
+++ b/srcpkgs/vidcutter/template
@@ -1,7 +1,7 @@
 # Template file for 'vidcutter'
 pkgname=vidcutter
 version=6.0.0
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="mpv-devel python3-devel"

From b3761cd537920f0969ffa45d20ce5b8aa9455d57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:18 -0400
Subject: [PATCH 0825/4088] vdirsyncer: rebuild for Python 3.10

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

diff --git a/srcpkgs/vdirsyncer/template b/srcpkgs/vdirsyncer/template
index 874b368d6a10..379c01388b43 100644
--- a/srcpkgs/vdirsyncer/template
+++ b/srcpkgs/vdirsyncer/template
@@ -1,7 +1,7 @@
 # Template file for 'vdirsyncer'
 pkgname=vdirsyncer
 version=0.18.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-atomicwrites python3-click python3-click-log

From 66a1945653e3abaf08429d71df8bfc46df756ad0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:18 -0400
Subject: [PATCH 0826/4088] variety: rebuild for Python 3.10

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

diff --git a/srcpkgs/variety/template b/srcpkgs/variety/template
index 792ba6621f42..df2ef21744d0 100644
--- a/srcpkgs/variety/template
+++ b/srcpkgs/variety/template
@@ -1,7 +1,7 @@
 # Template file for 'variety'
 pkgname=variety
 version=0.8.5
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="usr/share/variety/plugins"
 hostmakedepends="python3-distutils-extra intltool"

From 3d589b2232d61948d3a5879bfd7532bddabebb5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:18 -0400
Subject: [PATCH 0827/4088] vapoursynth: rebuild for Python 3.10

---
 srcpkgs/vapoursynth/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index 8508ca671104..3d0692e631d6 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,8 +1,11 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
 version=R52
-revision=2
+revision=3
 build_style=gnu-configure
+# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
+# until this is fixed upstream, manually define am_cv_python_version to circumvent
+configure_args="am_cv_python_version=${py3_ver}"
 hostmakedepends="automake libtool nasm pkg-config python3-Cython"
 makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel
  libxml2-devel"

From ee0c239958aae2c54425fb0c7cac6690d45a6a53 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:17 -0400
Subject: [PATCH 0828/4088] uwsgi: rebuild for Python 3.10

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

diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 3b2e8bf885f3..8a29c001b5e4 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,7 +1,7 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
 version=2.0.19.1
-revision=2
+revision=3
 hostmakedepends="python3"
 makedepends="python3-devel"
 short_desc="Fast, self-healing application container server"

From 13ef4577d3b45a8bb13151072bc10413f8512450 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:17 -0400
Subject: [PATCH 0829/4088] urlwatch: rebuild for Python 3.10

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

diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index f6098a2707ce..a10260a19af1 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
 # Template file for 'urlwatch'
 pkgname=urlwatch
 version=2.23
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs python3-keyring python3-minidb python3-requests

From 58ffef14f349c9e7603e7263ffb420f12528fe10 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:17 -0400
Subject: [PATCH 0830/4088] urlscan: rebuild for Python 3.10

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

diff --git a/srcpkgs/urlscan/template b/srcpkgs/urlscan/template
index dc2573b31876..18328d17f90a 100644
--- a/srcpkgs/urlscan/template
+++ b/srcpkgs/urlscan/template
@@ -1,7 +1,7 @@
 # Template file for 'urlscan'
 pkgname=urlscan
 version=0.9.5
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urwid"

From b5b537f05881c5c91f0f0930f5ca1902be629f3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:17 -0400
Subject: [PATCH 0831/4088] urh: rebuild for Python 3.10

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

diff --git a/srcpkgs/urh/template b/srcpkgs/urh/template
index 3b1ad98c2ab1..330eca018b23 100644
--- a/srcpkgs/urh/template
+++ b/srcpkgs/urh/template
@@ -1,7 +1,7 @@
 # Template file for 'urh'
 pkgname=urh
 version=2.8.8
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"
 makedepends="python3-devel python3-PyQt5 libairspy-devel librtlsdr-devel

From e8037f04954e9dfafdd61bf9a54f08e4233dddce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:17 -0400
Subject: [PATCH 0832/4088] unknown-horizons: rebuild for Python 3.10

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

diff --git a/srcpkgs/unknown-horizons/template b/srcpkgs/unknown-horizons/template
index e1bb72e5743a..0eca01266be7 100644
--- a/srcpkgs/unknown-horizons/template
+++ b/srcpkgs/unknown-horizons/template
@@ -1,7 +1,7 @@
 # Template file for 'unknown-horizons'
 pkgname=unknown-horizons
 version=2019.1
-revision=5
+revision=6
 build_style=python3-module
 hostmakedepends="python3 intltool git python3-Pillow"
 depends="python3 fifengine python3-yaml"

From 079cd9678d99e72c8918512b08c655d97f5b7b44 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:17 -0400
Subject: [PATCH 0833/4088] ulauncher: rebuild for Python 3.10

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

diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 775cacc19c53..b7ccb02ca049 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,7 +1,7 @@
 # Template file for 'ulauncher'
 pkgname=ulauncher
 version=5.13.0
-revision=1
+revision=2
 wrksrc=${pkgname}
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool python3-Levenshtein

From 4e26acca9a561d0fa1ea618b4056a2d4bccebabe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:16 -0400
Subject: [PATCH 0834/4088] ueberzug: rebuild for Python 3.10

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

diff --git a/srcpkgs/ueberzug/template b/srcpkgs/ueberzug/template
index 2fc61421d858..dd815ee12c0b 100644
--- a/srcpkgs/ueberzug/template
+++ b/srcpkgs/ueberzug/template
@@ -1,7 +1,7 @@
 # Template file for 'ueberzug'
 pkgname=ueberzug
 version=18.1.8
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libX11-devel libXext-devel"

From 18a59176decece83255293fdf0adc57756d590ec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:16 -0400
Subject: [PATCH 0835/4088] udiskie: rebuild for Python 3.10

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

diff --git a/srcpkgs/udiskie/template b/srcpkgs/udiskie/template
index 4eaa6717861e..cbb155e0a524 100644
--- a/srcpkgs/udiskie/template
+++ b/srcpkgs/udiskie/template
@@ -1,7 +1,7 @@
 # Template file for 'udiskie'
 pkgname=udiskie
 version=2.2.0
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools python3-gobject"
 depends="gtk+3 libnotify python3-docopt python3-gobject python3-keyutils

From 5a05d50dfc0a76f2460b1c2a850109b21b6fe262 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:16 -0400
Subject: [PATCH 0836/4088] tzupdate: rebuild for Python 3.10

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

diff --git a/srcpkgs/tzupdate/template b/srcpkgs/tzupdate/template
index 4fd4f8649b5b..21a52091d160 100644
--- a/srcpkgs/tzupdate/template
+++ b/srcpkgs/tzupdate/template
@@ -1,7 +1,7 @@
 # Template file for 'tzupdate'
 pkgname=tzupdate
 version=2.0.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests"

From e492041d082693553aa6ce4270c14b5f12751e99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:16 -0400
Subject: [PATCH 0837/4088] txt2tags: rebuild for Python 3.10

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
index ac72e72deaec..72b60d970d10 100644
--- a/srcpkgs/txt2tags/template
+++ b/srcpkgs/txt2tags/template
@@ -1,7 +1,7 @@
 # Template file for 'txt2tags'
 pkgname=txt2tags
 version=3.7
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="python3"

From 513a05bd967ef0ecf207055b597f968dceb1684e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:16 -0400
Subject: [PATCH 0838/4088] tuir: rebuild for Python 3.10

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

diff --git a/srcpkgs/tuir/template b/srcpkgs/tuir/template
index 63f354846e2e..354d6d71678a 100644
--- a/srcpkgs/tuir/template
+++ b/srcpkgs/tuir/template
@@ -1,7 +1,7 @@
 # Template file for 'tuir'
 pkgname=tuir
 version=1.29.0
-revision=3
+revision=4
 wrksrc="$pkgname-v$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 54095e03566869a580e1d189848a25939ae5f66d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:16 -0400
Subject: [PATCH 0839/4088] tuimoji: rebuild for Python 3.10

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

diff --git a/srcpkgs/tuimoji/template b/srcpkgs/tuimoji/template
index d011d6e76c8d..8c1dc6724bfe 100644
--- a/srcpkgs/tuimoji/template
+++ b/srcpkgs/tuimoji/template
@@ -1,7 +1,7 @@
 # Template file for 'tuimoji'
 pkgname=tuimoji
 version=1.0.0
-revision=4
+revision=5
 build_style=python3-module
 pycompile_module="tuimoji"
 hostmakedepends="python3-setuptools"

From 95b0911d0f035195eb43e86b01093558988d4790 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:16 -0400
Subject: [PATCH 0840/4088] tryton: rebuild for Python 3.10

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

diff --git a/srcpkgs/tryton/template b/srcpkgs/tryton/template
index 45f552618590..18588e3914a6 100644
--- a/srcpkgs/tryton/template
+++ b/srcpkgs/tryton/template
@@ -1,7 +1,7 @@
 # Template file for 'tryton'
 pkgname=tryton
 version=5.4.2
-revision=2
+revision=3
 build_style=python3-module
 pycompile_module="tryton"
 hostmakedepends="python3-setuptools"

From b3d88a580fde4b35ccd876b5eba2fa216b1c0bf8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:16 -0400
Subject: [PATCH 0841/4088] treeline: rebuild for Python 3.10

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

diff --git a/srcpkgs/treeline/template b/srcpkgs/treeline/template
index e38760eac38c..92cbd5c97185 100644
--- a/srcpkgs/treeline/template
+++ b/srcpkgs/treeline/template
@@ -1,7 +1,7 @@
 # Template file for 'treeline'
 pkgname=treeline
 version=3.1.4
-revision=1
+revision=2
 wrksrc="TreeLine-${version}"
 pycompile_dirs="usr/share/treeline"
 hostmakedepends="python3"

From da634b02f60da920f65e20a01340393d1a3c91ee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:15 -0400
Subject: [PATCH 0842/4088] trash-cli: rebuild for Python 3.10

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

diff --git a/srcpkgs/trash-cli/template b/srcpkgs/trash-cli/template
index b2819de5e821..d093cfcd1a25 100644
--- a/srcpkgs/trash-cli/template
+++ b/srcpkgs/trash-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'trash-cli'
 pkgname=trash-cli
 version=0.20.12.26
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3"
 depends="python3-psutil"

From cb86223030a4df72b8b5bb38016818960194cb82 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:15 -0400
Subject: [PATCH 0843/4088] trackma: rebuild for Python 3.10

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

diff --git a/srcpkgs/trackma/template b/srcpkgs/trackma/template
index 84105421496f..5e9dd9282bde 100644
--- a/srcpkgs/trackma/template
+++ b/srcpkgs/trackma/template
@@ -1,7 +1,7 @@
 # Template file for 'trackma'
 pkgname=trackma
 version=0.8.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-urwid python3-gobject"

From b8d2e6d0870a3ec3efbc1798e3cfe96b3df12d36 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:15 -0400
Subject: [PATCH 0844/4088] tox: rebuild for Python 3.10

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

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 9a07286b9bbc..a4f384bd9ccb 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,7 +1,7 @@
 # Template file for 'tox'
 pkgname=tox
 version=3.24.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-filelock python3-packaging

From 2e39fd1e8d3c49b8882e0be7d14c8ec189199d46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:15 -0400
Subject: [PATCH 0845/4088] torbrowser-launcher: rebuild for Python 3.10

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

diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template
index dbc5a5ca66ad..5101f30bd950 100644
--- a/srcpkgs/torbrowser-launcher/template
+++ b/srcpkgs/torbrowser-launcher/template
@@ -1,7 +1,7 @@
 # Template file for 'torbrowser-launcher'
 pkgname=torbrowser-launcher
 version=0.3.5
-revision=1
+revision=2
 archs="i686 x86_64" # limited by Tor Browser itself
 build_style=python3-module
 hostmakedepends="gettext python3-distro python3-setuptools"

From 0de60d38e0d8ed4aaf29685bb8737b97c3f55df1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:15 -0400
Subject: [PATCH 0846/4088] toot: rebuild for Python 3.10

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

diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template
index 08fdeba7978b..8bee87c957a1 100644
--- a/srcpkgs/toot/template
+++ b/srcpkgs/toot/template
@@ -1,7 +1,7 @@
 # Template file for 'toot'
 pkgname=toot
 version=0.27.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-requests python3-setuptools python3-wcwidth

From b179ec88fbdc6aeec63d5374f32cd2610dcc896f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:15 -0400
Subject: [PATCH 0847/4088] todoman: rebuild for Python 3.10

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

diff --git a/srcpkgs/todoman/template b/srcpkgs/todoman/template
index 44da76455559..40a807f74b9c 100644
--- a/srcpkgs/todoman/template
+++ b/srcpkgs/todoman/template
@@ -1,7 +1,7 @@
 # Template file for 'todoman'
 pkgname=todoman
 version=4.0.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-icalendar python3-urwid python3-xdg python3-parsedatetime

From 960ace77b894e372c55909009b872d0ec108ecc1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:15 -0400
Subject: [PATCH 0848/4088] thinkpad-scripts: rebuild for Python 3.10

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

diff --git a/srcpkgs/thinkpad-scripts/template b/srcpkgs/thinkpad-scripts/template
index 8cd66a271f30..a143931ba6c2 100644
--- a/srcpkgs/thinkpad-scripts/template
+++ b/srcpkgs/thinkpad-scripts/template
@@ -1,7 +1,7 @@
 # Template file for 'thinkpad-scripts'
 pkgname=thinkpad-scripts
 version=4.12.0
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="tps"
 hostmakedepends="gettext python3-setuptools"

From 57317e33c02702b5c25be398756a611cfc5e5bf4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:14 -0400
Subject: [PATCH 0849/4088] thefuck: rebuild for Python 3.10

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

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..267a27d7789a 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
 version=3.31
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte

From 12d70d0b9af748abe5e7fe99a9be47faa39e43d0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:14 -0400
Subject: [PATCH 0850/4088] texworks: rebuild for Python 3.10, update to 0.6.6.

---
 srcpkgs/texworks/patches/cross.patch | 66 +++++++---------------------
 srcpkgs/texworks/patches/qt515.patch | 21 ---------
 srcpkgs/texworks/template            | 14 +++---
 3 files changed, 22 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/texworks/patches/qt515.patch

diff --git a/srcpkgs/texworks/patches/cross.patch b/srcpkgs/texworks/patches/cross.patch
index af924d58da8c..3c34950c0fef 100644
--- a/srcpkgs/texworks/patches/cross.patch
+++ b/srcpkgs/texworks/patches/cross.patch
@@ -1,53 +1,19 @@
---- a/modules/QtPDF/CMake/Modules/FindPoppler.cmake	2017-04-29 18:23:51.000000000 +0200
-+++ b/modules/QtPDF/CMake/Modules/FindPoppler.cmake	2018-08-29 09:13:02.788284947 +0200
-@@ -69,15 +69,7 @@
-   MESSAGE(STATUS "Could not find libpoppler." )
- ENDIF ()
+--- a/modules/QtPDF/CMake/Modules/FindPoppler.cmake
++++ b/modules/QtPDF/CMake/Modules/FindPoppler.cmake
+@@ -79,15 +79,7 @@
+ endif ()
  
--# Scan poppler libraries for dependencies on Fontconfig
--INCLUDE(GetPrerequisites)
--MARK_AS_ADVANCED(gp_cmd)
--GET_PREREQUISITES("${POPPLER_BASE_LIBRARIES}" POPPLER_PREREQS TRUE FALSE "" "")
--IF ("${POPPLER_PREREQS}" MATCHES "fontconfig")
--  SET(POPPLER_NEEDS_FONTCONFIG TRUE)
--ELSE ()
--  SET(POPPLER_NEEDS_FONTCONFIG FALSE)
--ENDIF ()
-+SET(POPPLER_NEEDS_FONTCONFIG TRUE)
- 
- 
- FIND_PATH(POPPLER_QT_INCLUDE_DIR NAMES poppler-qt${QT_VERSION_MAJOR}.h poppler-link.h
---- a/CMakeLists.txt	2017-04-29 18:23:51.000000000 +0200
-+++ b/CMakeLists.txt	2018-08-29 10:49:36.290088209 +0200
-@@ -91,7 +91,6 @@
- SET(TeXworks_VERSION ${TeXworks_VER_MAJOR}.${TeXworks_VER_MINOR}.${TeXworks_VER_PATCH})
  
- # Make sure we have up-to-date git commit infos
--IF ( NOT CMAKE_CROSSCOMPILING )
- 	IF ( WIN32 )
- 		EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.bat WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
- 		ADD_CUSTOM_TARGET(GitRev ALL COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.bat WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Update git commit info")
-@@ -99,7 +98,6 @@
- 		EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
- 		ADD_CUSTOM_TARGET(GitRev ALL COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Update git commit info")
- 	ENDIF ( WIN32 )
--ENDIF ( NOT CMAKE_CROSSCOMPILING)
- MESSAGE( STATUS "Git commit info updated" )
- 
- # Recover git commit info from `src/GitRev.h`.
-@@ -361,7 +359,6 @@
- # Some header files contain components that must be dynamically generated. For
- # example, `getDefaultBinPaths.sh` is a script that tries to figure out the
- # appropriate path to TeX binaries on UNIX-like systems.
--IF ( UNIX AND NOT CMAKE_CROSSCOMPILING )
-   IF ( NOT EXISTS ${TeXworks_SOURCE_DIR}/src/DefaultBinaryPaths.h )
-     MESSAGE(STATUS "Generating DefaultBinaryPaths.h")
- 
-@@ -371,7 +368,6 @@
-       WORKING_DIRECTORY ${TeXworks_SOURCE_DIR}
-     )
-   ENDIF ()
--ENDIF ()
+-# Scan poppler libraries for dependencies on Fontconfig
+-include(GetPrerequisites)
+-mark_as_advanced(gp_cmd)
+-get_prerequisites("${Poppler_LIBRARY}" Poppler_PREREQS TRUE FALSE "" "")
+-if ("${Poppler_PREREQS}" MATCHES "fontconfig")
+-  set(Poppler_NEEDS_FONTCONFIG TRUE)
+-else ()
+-  set(Poppler_NEEDS_FONTCONFIG FALSE)
+-endif ()
++set(Poppler_NEEDS_FONTCONFIG TRUE)
  
- # Building
- # ========
+ # -----------------------
+ # Find Poppler components
diff --git a/srcpkgs/texworks/patches/qt515.patch b/srcpkgs/texworks/patches/qt515.patch
deleted file mode 100644
index 9c77c157e463..000000000000
--- a/srcpkgs/texworks/patches/qt515.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From a5352a3a94e3685125650b65e6197de060326cc2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
-Date: Fri, 1 May 2020 08:05:46 +0200
-Subject: [PATCH] <QtPDF> Fix compilation with Qt 5.15
-
----
- modules/QtPDF/src/PDFBackend.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/QtPDF/src/PDFBackend.cpp b/modules/QtPDF/src/PDFBackend.cpp
-index 0305d87a..500d20aa 100644
---- a/modules/QtPDF/src/PDFBackend.cpp
-+++ b/modules/QtPDF/src/PDFBackend.cpp
-@@ -14,6 +14,7 @@
- 
- #include <PDFBackend.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- 
- namespace QtPDF {
diff --git a/srcpkgs/texworks/template b/srcpkgs/texworks/template
index 87ca84049343..55f9b4ede715 100644
--- a/srcpkgs/texworks/template
+++ b/srcpkgs/texworks/template
@@ -1,22 +1,20 @@
 # Template file for 'texworks'
 pkgname=texworks
-version=0.6.3
-revision=4
+version=0.6.6
+revision=1
 wrksrc="texworks-release-${version}"
 build_style=cmake
 configure_args="-DTW_BUILD_ID=Void -DWITH_LUA=ON -DWITH_PYTHON=ON
  -DDESIRED_QT_VERSION:STRING=5"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="lua53-devel python3-devel qt5-tools-devel qt5-script-devel
- poppler-qt5-devel hunspell-devel"
+ qt5-declarative-devel poppler-qt5-devel hunspell-devel"
 depends="hunspell dejavu-fonts-ttf"
 short_desc="TeX editor"
 maintainer="Bosco <jboscogg@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.tug.org/texworks"
 distfiles="https://github.com/texworks/texworks/archive/release-${version}.tar.gz"
-checksum=b4695539b9666935d2c467cc618c7d79c174e2ec728e31f72df8534862a5c290
-
-do_check() {
-	: # requires xserver
-}
+checksum=c0742fd76de0cacdd52bbf406788a4fe30ee281df2cf085531d98ee4b7f9b72f
+# Tests require xserver
+make_check=no

From b6a1bbc8144ea059d1e9757fadcbe1c8d4cf25d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:14 -0400
Subject: [PATCH 0851/4088] termtosvg: rebuild for Python 3.10

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

diff --git a/srcpkgs/termtosvg/template b/srcpkgs/termtosvg/template
index 1773e20868d1..36718432a276 100644
--- a/srcpkgs/termtosvg/template
+++ b/srcpkgs/termtosvg/template
@@ -1,7 +1,7 @@
 # Template file for 'termtosvg'
 pkgname=termtosvg
 version=1.1.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyte python3-lxml python3-wcwidth"

From 245d5fe7b10131dcc4ce555290f5a9b26067a80b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:14 -0400
Subject: [PATCH 0852/4088] terminator: rebuild for Python 3.10

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

diff --git a/srcpkgs/terminator/template b/srcpkgs/terminator/template
index cbb554c45f81..b4c0363ff0c8 100644
--- a/srcpkgs/terminator/template
+++ b/srcpkgs/terminator/template
@@ -1,7 +1,7 @@
 # Template file for 'terminator'
 pkgname=terminator
 version=2.1.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="intltool python3-setuptools"
 depends="desktop-file-utils gsettings-desktop-schemas libkeybinder3 libnotify

From 308c3656f2c166b6e4156eb8a4a76432afc919b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:14 -0400
Subject: [PATCH 0853/4088] terminal_markdown_viewer: rebuild for Python 3.10

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

diff --git a/srcpkgs/terminal_markdown_viewer/template b/srcpkgs/terminal_markdown_viewer/template
index b13f8ac93fbf..cf6dc4cbaa6c 100644
--- a/srcpkgs/terminal_markdown_viewer/template
+++ b/srcpkgs/terminal_markdown_viewer/template
@@ -1,7 +1,7 @@
 # Template file for 'terminal_markdown_viewer'
 pkgname=terminal_markdown_viewer
 version=1.6.3
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="mdv"
 hostmakedepends="python3-setuptools"

From 8c59ce16cd45bfbbba5b7481a3db3f2c8e6fe1fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:14 -0400
Subject: [PATCH 0854/4088] termdown: rebuild for Python 3.10

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

diff --git a/srcpkgs/termdown/template b/srcpkgs/termdown/template
index 7e136c346080..a7179641e6f2 100644
--- a/srcpkgs/termdown/template
+++ b/srcpkgs/termdown/template
@@ -1,7 +1,7 @@
 # Template file for 'termdown'
 pkgname=termdown
 version=1.17.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-dateutil python3-click python3-pyfiglet"

From 66bd2e9a7b8aea25530932dafd47ca548c754345 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:14 -0400
Subject: [PATCH 0855/4088] telepresence: rebuild for Python 3.10

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

diff --git a/srcpkgs/telepresence/template b/srcpkgs/telepresence/template
index 0f28d8f19c2d..f254c19baa8f 100644
--- a/srcpkgs/telepresence/template
+++ b/srcpkgs/telepresence/template
@@ -1,7 +1,7 @@
 # Template file for 'telepresence'
 pkgname=telepresence
 version=0.107
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=python3-module
 hostmakedepends="python3-pip python3-setuptools git"

From 6ab5df73def03a852cebaa57ee0df95b04065f92 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:13 -0400
Subject: [PATCH 0856/4088] telegram-tg: rebuild for Python 3.10

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

diff --git a/srcpkgs/telegram-tg/template b/srcpkgs/telegram-tg/template
index 9d2c800d7a8f..a8a5c9c617d5 100644
--- a/srcpkgs/telegram-tg/template
+++ b/srcpkgs/telegram-tg/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-tg'
 pkgname=telegram-tg
 version=0.17.0
-revision=1
+revision=2
 wrksrc=tg-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0cfb948763138d76002ff6f2ac24190bce46708e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:13 -0400
Subject: [PATCH 0857/4088] tekaim: rebuild for Python 3.10

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

diff --git a/srcpkgs/tekaim/template b/srcpkgs/tekaim/template
index 90f03cafaf77..cae6c46e2a57 100644
--- a/srcpkgs/tekaim/template
+++ b/srcpkgs/tekaim/template
@@ -1,7 +1,7 @@
 # Template file for 'tekaim'
 pkgname=tekaim
 version=1.6.0
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3"
 depends="curl maim python3 xclip"

From eaa817248dbe87bb3d1eff626633690c3f7c8074 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:13 -0400
Subject: [PATCH 0858/4088] targetcli-fb: rebuild for Python 3.10

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

diff --git a/srcpkgs/targetcli-fb/template b/srcpkgs/targetcli-fb/template
index a6bf09b0aab7..cfabceced3e6 100644
--- a/srcpkgs/targetcli-fb/template
+++ b/srcpkgs/targetcli-fb/template
@@ -1,7 +1,7 @@
 # Template file for 'targetcli-fb'
 pkgname=targetcli-fb
 version=2.1.54
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="configshell-fb python3-six rtslib-fb python3-parsing python3-gobject"

From 3af034f7777ffc690f41aba17714fbfa5ca21e6c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:13 -0400
Subject: [PATCH 0859/4088] system-config-printer: rebuild for Python 3.10

---
 srcpkgs/system-config-printer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/system-config-printer/template b/srcpkgs/system-config-printer/template
index 1fcaeccf9814..d5d63f61835c 100644
--- a/srcpkgs/system-config-printer/template
+++ b/srcpkgs/system-config-printer/template
@@ -1,7 +1,7 @@
 # Template file for 'system-config-printer'
 pkgname=system-config-printer
 version=1.5.13
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_dirs="usr/share/system-config-printer"
 configure_args="--with-udev-rules"

From 79072fe297ae9689d5328bde9f84f2f5790c7792 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:13 -0400
Subject: [PATCH 0860/4088] syncplay: rebuild for Python 3.10

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

diff --git a/srcpkgs/syncplay/template b/srcpkgs/syncplay/template
index f5e4454b9102..7f857527e844 100644
--- a/srcpkgs/syncplay/template
+++ b/srcpkgs/syncplay/template
@@ -1,7 +1,7 @@
 # Template file for 'syncplay'
 pkgname=syncplay
 version=1.6.9
-revision=1
+revision=2
 build_style=gnu-makefile
 pycompile_dirs="usr/lib/syncplay/syncplay"
 depends="desktop-file-utils python3-pyside2 python3-Twisted

From 6318645997d229c6c6e78b169522f000233991cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:12 -0400
Subject: [PATCH 0861/4088] synapse: rebuild for Python 3.10

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index f541e07ede83..752e4cf5bbdb 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
 # Template file for 'synapse'
 pkgname=synapse
 version=1.44.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson

From df2a0faf0b262e68bf5a79e19b5a3d1b86cd5236 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:12 -0400
Subject: [PATCH 0862/4088] sumo: rebuild for Python 3.10

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

diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index 4c1eb6876a46..e760fdd45aee 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
 # Template file for 'sumo'
 pkgname=sumo
 version=1.5.0
-revision=3
+revision=4
 build_style=cmake
 python_version=3
 hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"

From b1d90f1a6efa42e63e886c2f6b1658f1a32de0b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:12 -0400
Subject: [PATCH 0863/4088] subversion: rebuild for Python 3.10

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

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index d270e7e30059..acf378142fd8 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -4,7 +4,7 @@
 #
 pkgname=subversion
 version=1.14.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
  --with-gnome-keyring --with-editor=vi --disable-mod-activation

From a864862461de6546ef7e7efb8db43942bc386086 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:12 -0400
Subject: [PATCH 0864/4088] subuser: rebuild for Python 3.10

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

diff --git a/srcpkgs/subuser/template b/srcpkgs/subuser/template
index 1d6aaa5d695f..3429d6ea5cb7 100644
--- a/srcpkgs/subuser/template
+++ b/srcpkgs/subuser/template
@@ -1,7 +1,7 @@
 # Template file for 'subuser'
 pkgname=subuser
 version=0.6.2
-revision=4
+revision=5
 archs="x86_64*"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ca579e41aa541e440c5254ee50a88d42f878aa23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:12 -0400
Subject: [PATCH 0865/4088] subliminal: rebuild for Python 3.10

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

diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template
index 2e16355a28a2..cda1b3d1df32 100644
--- a/srcpkgs/subliminal/template
+++ b/srcpkgs/subliminal/template
@@ -1,7 +1,7 @@
 # Template file for 'subliminal'
 pkgname=subliminal
 version=2.1.0
-revision=5
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-guessit python3-babelfish python3-enzyme

From 5beb0411d0cb0b34b411e5604eb3a4851882b65a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:12 -0400
Subject: [PATCH 0866/4088] streamlink: rebuild for Python 3.10

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

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 8298fb19e21d..fb7d9e6a9704 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,7 +1,7 @@
 # Template file for 'streamlink'
 pkgname=streamlink
 version=2.4.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-lxml python3-pycryptodome python3-pycountry

From 7744320f08de4a4762bd8e26aac2892060a25a8c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:12 -0400
Subject: [PATCH 0867/4088] stig: rebuild for Python 3.10

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

diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..8f6f7cc177b5 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,7 +1,7 @@
 # Template file for 'stig'
 pkgname=stig
 version=0.12.2a0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-blinker python3-natsort python3-xdg python3-aiohttp

From 83a0f3ae317a56c130a70b597293afed0bf031de Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:12 -0400
Subject: [PATCH 0868/4088] stcgal: rebuild for Python 3.10

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

diff --git a/srcpkgs/stcgal/template b/srcpkgs/stcgal/template
index df13d3b770fe..5f01ac715c49 100644
--- a/srcpkgs/stcgal/template
+++ b/srcpkgs/stcgal/template
@@ -1,7 +1,7 @@
 # Template file for 'stcgal'
 pkgname=stcgal
 version=1.6
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="stcgal"
 hostmakedepends="python3-setuptools"

From 0ab1d1946dfda40ed4d499efb6cdcf619065bc16 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:11 -0400
Subject: [PATCH 0869/4088] sssd: rebuild for Python 3.10

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

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 61ead1c9e44e..60a47ac85c00 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,12 +1,15 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=3
+revision=4
 build_style=gnu-configure
+# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
+# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora
  --with-test-dir=/dev/shm --with-python3-bindings --with-pid-path=/run
- --with-sudo-lib-path=/usr/lib/sssd --without-python2-bindings"
+ --with-sudo-lib-path=/usr/lib/sssd --without-python2-bindings
+ am_cv_python_version=${py3_ver}"
 hostmakedepends="pkg-config nscd bind xmlcatmgr docbook-xsl"
 makedepends="pam-devel popt-devel talloc-devel tdb-devel tevent-devel ldb-devel
  ding-libs-devel libldap-devel mit-krb5-devel c-ares-devel glib-devel

From afb9a4ee32efca41fb56a723c1b18d7593443fd4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:11 -0400
Subject: [PATCH 0870/4088] sshuttle: rebuild for Python 3.10

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

diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template
index eadcff89acce..b029f2575cf6 100644
--- a/srcpkgs/sshuttle/template
+++ b/srcpkgs/sshuttle/template
@@ -1,7 +1,7 @@
 # Template file for 'sshuttle'
 pkgname=sshuttle
 version=1.0.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-Sphinx"
 depends="python3-psutil"

From df4b9355959c249f192d9b0c3053f8d2bf2016a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:11 -0400
Subject: [PATCH 0871/4088] ssh-audit: rebuild for Python 3.10

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

diff --git a/srcpkgs/ssh-audit/template b/srcpkgs/ssh-audit/template
index 892ba3a5f110..49b0a9f97eb2 100644
--- a/srcpkgs/ssh-audit/template
+++ b/srcpkgs/ssh-audit/template
@@ -1,7 +1,7 @@
 # Template file for 'ssh-audit'
 pkgname=ssh-audit
 version=2.5.0
-revision=1
+revision=2
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="python3"

From 0a46614fb82c14a245bef13be692446d1447f806 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:11 -0400
Subject: [PATCH 0872/4088] sqlmap: rebuild for Python 3.10

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 4a8fadcba4a6..72fb632e23f4 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,7 +1,7 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
 version=1.5.10
-revision=1
+revision=2
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
 short_desc="Automatic SQL injection and database takeover tool"

From 5573ee932c51de4419ee4cc42c650cf85b62afb1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:11 -0400
Subject: [PATCH 0873/4088] speedtest-cli: rebuild for Python 3.10

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

diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template
index a188bbcffc1a..a9282a31e9db 100644
--- a/srcpkgs/speedtest-cli/template
+++ b/srcpkgs/speedtest-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'speedtest-cli'
 pkgname=speedtest-cli
 version=2.1.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"

From c0ec1190210cf917f8be835213852406b54f2382 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:11 -0400
Subject: [PATCH 0874/4088] soundconverter: rebuild for Python 3.10

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

diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template
index 38f7f8a8bfec..9c68520a688a 100644
--- a/srcpkgs/soundconverter/template
+++ b/srcpkgs/soundconverter/template
@@ -1,7 +1,7 @@
 # Template file for 'soundconverter'
 pkgname=soundconverter
 version=4.0.1
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/${pkgname}/python/${pkgname}"
 hostmakedepends="glib intltool pkg-config python3-gobject python3-distutils-extra"

From a60825a45fb4806e988a6b912f7d52a4578fb815 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:11 -0400
Subject: [PATCH 0875/4088] sonata: rebuild for Python 3.10

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

diff --git a/srcpkgs/sonata/template b/srcpkgs/sonata/template
index 2f0aabafd29f..70eef57612c4 100644
--- a/srcpkgs/sonata/template
+++ b/srcpkgs/sonata/template
@@ -3,7 +3,7 @@ pkgname=sonata
 # allow updating to 1.7.0, xbps considers 1.7a1 and 1.7b1 to be newer than 1.7.0
 reverts="1.7a2_1 1.7a2_2 1.7a2_3 1.7b1_1 1.7b1_2 1.7b1_3 1.7b1_4"
 version=1.7.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-mpd2 python3-gobject gtk+3"

From ea37d360f5f2c4d50452a3b4b8b8bed182582a20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:10 -0400
Subject: [PATCH 0876/4088] sigil: rebuild for Python 3.10

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

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..d8e4f32e88b6 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,7 +1,7 @@
 # Template file for 'sigil'
 pkgname=sigil
 version=1.7.0
-revision=1
+revision=2
 wrksrc="Sigil-${version}"
 build_style=cmake
 pycompile_dirs="usr/share/sigil/python3lib"

From 2208a941fbeb5b4935b1e0792eb07a3411b4ea32 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:10 -0400
Subject: [PATCH 0877/4088] setzer: rebuild for Python 3.10

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

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index 4546753dbd66..6886e65e860c 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,7 +1,7 @@
 # Template file for 'setzer'
 pkgname=setzer
 version=0.4.1
-revision=1
+revision=2
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"

From bf12c914c649fb4de83b72569f6c7de7d11a24f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:10 -0400
Subject: [PATCH 0878/4088] setconf: rebuild for Python 3.10

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

diff --git a/srcpkgs/setconf/template b/srcpkgs/setconf/template
index 7798af93dd4a..6c719340f190 100644
--- a/srcpkgs/setconf/template
+++ b/srcpkgs/setconf/template
@@ -1,7 +1,7 @@
 # Template file for 'setconf'
 pkgname=setconf
 version=0.7.7
-revision=2
+revision=3
 build_style=python3-module
 pycompile_module="setconf.py"
 hostmakedepends="python3-setuptools"

From bb0694070e299fa9b15170a1e9415c763a94ebab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:10 -0400
Subject: [PATCH 0879/4088] seafile-libclient: rebuild for Python 3.10, update
 to 8.0.4.

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

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index e83f6ec3ac74..ac6f9f48038e 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,7 +1,7 @@
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
-version=8.0.3
+version=8.0.4
 revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile/archive/v${version}.tar.gz"
-checksum=5f6b57ec1a38d290c729223d7f4a04cab9fe8c8f4c6817d617af1643510e752f
+checksum=1c17cf589a2093f8d5423e56b2f6a098fdd44e8b7b9ffb62846270458aa0d197
 
 pre_configure() {
 	./autogen.sh

From 0a3f8382eaaad5c4baf439ca500a7ae844813a53 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:10 -0400
Subject: [PATCH 0880/4088] scribus: rebuild for Python 3.10

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

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..62234c7f5223 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"

From ad6d2dc516aed8ed9accc474f098fd82cace4dab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:09 -0400
Subject: [PATCH 0881/4088] screenplain: rebuild for Python 3.10

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

diff --git a/srcpkgs/screenplain/template b/srcpkgs/screenplain/template
index 84716b43ddba..650e71564c77 100644
--- a/srcpkgs/screenplain/template
+++ b/srcpkgs/screenplain/template
@@ -1,7 +1,7 @@
 # Template file for 'screenplain'
 pkgname=screenplain
 version=0.9.0
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-reportlab"

From 2dbc4ef82882b1cfaddb093ea8435b7924f099a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:09 -0400
Subject: [PATCH 0882/4088] screenkey: rebuild for Python 3.10

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

diff --git a/srcpkgs/screenkey/template b/srcpkgs/screenkey/template
index ca4d61b7d426..4541a207058c 100644
--- a/srcpkgs/screenkey/template
+++ b/srcpkgs/screenkey/template
@@ -1,7 +1,7 @@
 # Template file for 'screenkey'
 pkgname=screenkey
 version=1.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="intltool python3-setuptools python3-distutils-extra
  python3-Babel"

From bd4d69fe2067a731ce3c3dda394ff264b8dd9591 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:09 -0400
Subject: [PATCH 0883/4088] scapy: rebuild for Python 3.10

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

diff --git a/srcpkgs/scapy/template b/srcpkgs/scapy/template
index 2ad04a0b845a..c58ea4f37fc1 100644
--- a/srcpkgs/scapy/template
+++ b/srcpkgs/scapy/template
@@ -1,7 +1,7 @@
 # Template file for 'scapy'
 pkgname=scapy
 version=2.4.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="tcpdump python3"

From 6e4906e8223183b0ded1d65becefa39b560ed12e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:09 -0400
Subject: [PATCH 0884/4088] salt: rebuild for Python 3.10

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

diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 8959d4f90018..2265082b8f4e 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,7 +1,7 @@
 # Template file for 'salt'
 pkgname=salt
 version=3003.3
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq

From 2a9bd633ab5d0fe2a1049e9b964953f41f9e03b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:09 -0400
Subject: [PATCH 0885/4088] safeeyes: rebuild for Python 3.10

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

diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index 071aa2f82c9c..c4f6cdef00f3 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,7 +1,7 @@
 # Template file for 'safeeyes'
 pkgname=safeeyes
 version=2.1.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pip python3-devel pkg-config"
 makedepends="python3-devel cairo-devel libgirepository-devel"

From f97edb3034022411c15ec42e60ca787a946cbca0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:09 -0400
Subject: [PATCH 0886/4088] sabnzbd: rebuild for Python 3.10

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

diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template
index 1d3c9f9942b7..47105b29f209 100644
--- a/srcpkgs/sabnzbd/template
+++ b/srcpkgs/sabnzbd/template
@@ -1,7 +1,7 @@
 # Template file for 'sabnzbd'
 pkgname=sabnzbd
 version=3.2.1
-revision=1
+revision=2
 wrksrc="SABnzbd-${version}"
 pycompile_dirs="/usr/share/sabnzbd"
 hostmakedepends="python3 gettext"

From 1a1d79bd61920abb61be7b569f18fb3862b4a4c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:08 -0400
Subject: [PATCH 0887/4088] s3cmd: rebuild for Python 3.10

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

diff --git a/srcpkgs/s3cmd/template b/srcpkgs/s3cmd/template
index 40cd669dc978..56671c568562 100644
--- a/srcpkgs/s3cmd/template
+++ b/srcpkgs/s3cmd/template
@@ -1,7 +1,7 @@
 # Template file for 's3cmd'
 pkgname=s3cmd
 version=2.1.0
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-dateutil"

From 798872bd7953b7d27865260ccfa51fcc6b9092dc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:08 -0400
Subject: [PATCH 0888/4088] rubber: rebuild for Python 3.10

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

diff --git a/srcpkgs/rubber/template b/srcpkgs/rubber/template
index 1264c3642f73..90561803f3ff 100644
--- a/srcpkgs/rubber/template
+++ b/srcpkgs/rubber/template
@@ -1,7 +1,7 @@
 # Template file for 'rubber'
 pkgname=rubber
 version=1.5.1
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3"
 depends="python3 virtual?tex"

From 0b7116e4534ddca35465420a79d70c650ca1dc3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:08 -0400
Subject: [PATCH 0889/4088] rpm: rebuild for Python 3.10

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

diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 9f6f522b9a3b..2bd5ff9883e4 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,10 +1,13 @@
 # Template file for 'rpm'
 pkgname=rpm
 version=4.16.1.3
-revision=1
+revision=2
 build_style=gnu-configure
+# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
+# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="--with-lua --with-cap --with-acl --with-external-db
- --enable-python PYTHON=python3 --sharedstatedir=/var/lib"
+ --enable-python PYTHON=python3 --sharedstatedir=/var/lib
+ am_cv_python_version=${py3_ver}"
 hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
  python3-setuptools"
 makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel

From e68a774d8b14cc3ee1f0bf8b4ac6280720b0019c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:08 -0400
Subject: [PATCH 0890/4088] rmlint: rebuild for Python 3.10

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

diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template
index 52b0a13cfad5..0f8a1ab6dea4 100644
--- a/srcpkgs/rmlint/template
+++ b/srcpkgs/rmlint/template
@@ -1,7 +1,7 @@
 # Template file for 'rmlint'
 pkgname=rmlint
 version=2.10.1
-revision=3
+revision=4
 build_style=scons
 hostmakedepends="pkg-config python3-Sphinx glib-devel"
 makedepends="libblkid-devel elfutils-devel json-glib-devel"

From ebe881699a627e2e06768b085bfccac4883761e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:08 -0400
Subject: [PATCH 0891/4088] ripe-atlas-tools: rebuild for Python 3.10

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

diff --git a/srcpkgs/ripe-atlas-tools/template b/srcpkgs/ripe-atlas-tools/template
index 8e82f0da29a2..dee72787f622 100644
--- a/srcpkgs/ripe-atlas-tools/template
+++ b/srcpkgs/ripe-atlas-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'ripe-atlas-tools'
 pkgname=ripe-atlas-tools
 version=2.3.0
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="ripe/atlas/tools"
 hostmakedepends="python3-setuptools"

From 660e35c87be920be3b7b7d69da4fcc6761806f77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:08 -0400
Subject: [PATCH 0892/4088] rhythmbox: rebuild for Python 3.10

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

diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template
index 1d229ee9428c..2ba3fa6d1518 100644
--- a/srcpkgs/rhythmbox/template
+++ b/srcpkgs/rhythmbox/template
@@ -1,7 +1,7 @@
 # Template file for 'rhythmbox'
 pkgname=rhythmbox
 version=3.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --with-gudev --without-hal

From d57ef2d8da8522b930de5e894432fae584731b26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:07 -0400
Subject: [PATCH 0893/4088] reuse: rebuild for Python 3.10

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

diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
index fc605fd20264..156b73ea9dbe 100644
--- a/srcpkgs/reuse/template
+++ b/srcpkgs/reuse/template
@@ -1,7 +1,7 @@
 # Template file for 'reuse'
 pkgname=reuse
 version=0.13.0
-revision=1
+revision=2
 build_style=python3-module
 make_check_args="--deselect tests/test_lint.py::test_lint_read_errors
  --deselect tests/test_report.py::test_generate_project_report_read_error"

From 52d54944ea86bf76a93c91689012373cfef66179 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:07 -0400
Subject: [PATCH 0894/4088] renderdoc: rebuild for Python 3.10

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

diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index 4615d45c52c9..9e66938c9bc4 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -1,7 +1,7 @@
 # Template file for 'renderdoc'
 pkgname=renderdoc
 version=1.12
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON
  -DENABLE_RENDERDOCCMD=ON -DENABLE_VULKAN=ON -DENABLE_XCB=ON -DENABLE_XLIB=ON

From 902db0eb4ed2f3027cf3d695765b4abbce97712b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:07 -0400
Subject: [PATCH 0895/4088] remhind: rebuild for Python 3.10

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

diff --git a/srcpkgs/remhind/template b/srcpkgs/remhind/template
index a4b7362e4875..fc490d8f96bb 100644
--- a/srcpkgs/remhind/template
+++ b/srcpkgs/remhind/template
@@ -1,7 +1,7 @@
 # Template file for 'remhind'
 pkgname=remhind
 version=0.1.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-gobject-devel python3-cairo-devel"
 depends="python3-icalendar python3-dateutil python3-gobject python3-toml

From 33636a49bb791561edafc1a11a6fa8e7b334d7af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:07 -0400
Subject: [PATCH 0896/4088] redshift: rebuild for Python 3.10

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

diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template
index b907fc9019c4..c3a85f299bf9 100644
--- a/srcpkgs/redshift/template
+++ b/srcpkgs/redshift/template
@@ -1,7 +1,7 @@
 # Template file for 'redshift'
 pkgname=redshift
 version=1.12
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-gui --disable-geoclue $(vopt_enable geoclue2)"
 hostmakedepends="gettext-devel intltool pkg-config python3-devel"

From 092959d6c287955088b4fcc6dc631d5b835d95c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:07 -0400
Subject: [PATCH 0897/4088] rednotebook: rebuild for Python 3.10

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

diff --git a/srcpkgs/rednotebook/template b/srcpkgs/rednotebook/template
index 6d2b21c43ae5..c76f106bb029 100644
--- a/srcpkgs/rednotebook/template
+++ b/srcpkgs/rednotebook/template
@@ -1,7 +1,7 @@
 # Template file for 'rednotebook'
 pkgname=rednotebook
 version=2.19
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3"
 depends="desktop-file-utils gtksourceview hicolor-icon-theme python3-enchant

From 866c43f86b7e373530347d77708ddeec3af2526a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:07 -0400
Subject: [PATCH 0898/4088] rdiff-backup: rebuild for Python 3.10

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

diff --git a/srcpkgs/rdiff-backup/template b/srcpkgs/rdiff-backup/template
index a237dd4ce4c0..3d20a93e161d 100644
--- a/srcpkgs/rdiff-backup/template
+++ b/srcpkgs/rdiff-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'rdiff-backup'
 pkgname=rdiff-backup
 version=2.0.5
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel librsync-devel"

From 72f5eb0acb7eecc40d34e49791b1bb92f05233f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:07 -0400
Subject: [PATCH 0899/4088] ranger: rebuild for Python 3.10

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

diff --git a/srcpkgs/ranger/template b/srcpkgs/ranger/template
index 13156b638a52..812940d5e488 100644
--- a/srcpkgs/ranger/template
+++ b/srcpkgs/ranger/template
@@ -1,7 +1,7 @@
 # Template file for 'ranger'
 pkgname=ranger
 version=1.9.3
-revision=2
+revision=3
 build_style=python3-module
 pycompile_module="ranger"
 hostmakedepends="python3"

From 554b1c7c8b810f4d5a124014a725450aba347e83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:06 -0400
Subject: [PATCH 0900/4088] qytdl: rebuild for Python 3.10

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

diff --git a/srcpkgs/qytdl/template b/srcpkgs/qytdl/template
index d29023adacfd..e68091fe7c2c 100644
--- a/srcpkgs/qytdl/template
+++ b/srcpkgs/qytdl/template
@@ -1,7 +1,7 @@
 # Template file for 'qytdl'
 pkgname=qytdl
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 pycompile_dirs="usr/share/qytdl/src"
 depends="desktop-file-utils python3-PyQt5 python3-youtube-dl"

From f6c86b97b022a2b34a51113bf195fadb37681cdb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:06 -0400
Subject: [PATCH 0901/4088] qutebrowser: rebuild for Python 3.10

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

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..0bf14ec8cc3c 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,7 +1,7 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
 version=2.3.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-yaml

From 32d659a9b47210f161e349d19c5281d01d87b29c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:06 -0400
Subject: [PATCH 0902/4088] quodlibet: rebuild for Python 3.10

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

diff --git a/srcpkgs/quodlibet/template b/srcpkgs/quodlibet/template
index f45668529d68..0253eb320bfe 100644
--- a/srcpkgs/quodlibet/template
+++ b/srcpkgs/quodlibet/template
@@ -1,7 +1,7 @@
 # Template file for 'quodlibet'
 pkgname=quodlibet
 version=4.4.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_module="quodlibet"
 hostmakedepends="intltool python3-devel"

From d4fc00758ec208dcba2f8fe6d6d039c544cfad1b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:06 -0400
Subject: [PATCH 0903/4088] qomui: rebuild for Python 3.10

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

diff --git a/srcpkgs/qomui/template b/srcpkgs/qomui/template
index b74138381bef..9965eb13c193 100644
--- a/srcpkgs/qomui/template
+++ b/srcpkgs/qomui/template
@@ -1,7 +1,7 @@
 # Template file for 'qomui'
 pkgname=qomui
 version=0.8.2
-revision=4
+revision=5
 build_style=python3-module
 pycompile_module="qomui"
 hostmakedepends="python3 python3-setuptools"

From 0aa78d5ae24d930906af3ed0d34bc1c8420353c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:06 -0400
Subject: [PATCH 0904/4088] qmk: rebuild for Python 3.10

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

diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template
index 033ff91fa1ff..81cb0951ba3d 100644
--- a/srcpkgs/qmk/template
+++ b/srcpkgs/qmk/template
@@ -1,7 +1,7 @@
 # Template file for 'qmk'
 pkgname=qmk
 version=0.0.35
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs

From 2e3a0cbaa338c60680d4b8bf0051662853c10408 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:05 -0400
Subject: [PATCH 0905/4088] python3-zope.security: rebuild for Python 3.10

---
 srcpkgs/python3-zope.security/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.security/template b/srcpkgs/python3-zope.security/template
index 73a82360ce0f..11f2f902f258 100644
--- a/srcpkgs/python3-zope.security/template
+++ b/srcpkgs/python3-zope.security/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.security'
 pkgname=python3-zope.security
 version=5.1.1
-revision=3
+revision=4
 wrksrc="zope.security-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-zope.proxy"

From 61b50ff3c5ea06c99d239980dc8ae181bb2f7014 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:04 -0400
Subject: [PATCH 0906/4088] python3-zope.copy: rebuild for Python 3.10

---
 srcpkgs/python3-zope.copy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.copy/template b/srcpkgs/python3-zope.copy/template
index cc22130112ad..75a9319b7f81 100644
--- a/srcpkgs/python3-zope.copy/template
+++ b/srcpkgs/python3-zope.copy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.copy'
 pkgname=python3-zope.copy
 version=4.2
-revision=3
+revision=4
 wrksrc="zope.copy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 770246d1a5ad2f1c7f65e3ae3ec2ecfdebab5b5f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:04 -0400
Subject: [PATCH 0907/4088] python3-zope.cachedescriptors: rebuild for Python
 3.10

---
 srcpkgs/python3-zope.cachedescriptors/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.cachedescriptors/template b/srcpkgs/python3-zope.cachedescriptors/template
index abf2630b0946..737d32f6b5cd 100644
--- a/srcpkgs/python3-zope.cachedescriptors/template
+++ b/srcpkgs/python3-zope.cachedescriptors/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.cachedescriptors'
 pkgname=python3-zope.cachedescriptors
 version=4.3.1
-revision=3
+revision=4
 wrksrc="zope.cachedescriptors-${version}"
 build_style=python3-module
 pycompile_module="zope/cachedescriptors"

From b0541a8df771e79a687abbc8694f74a1e82a0bb5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:04 -0400
Subject: [PATCH 0908/4088] python3-zipstream: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-zipstream/template b/srcpkgs/python3-zipstream/template
index 1430081027b2..c4c350512acf 100644
--- a/srcpkgs/python3-zipstream/template
+++ b/srcpkgs/python3-zipstream/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zipstream'
 pkgname=python3-zipstream
 version=1.1.4
-revision=6
+revision=7
 wrksrc="python-zipstream-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 62a25d2e393cba6cef443240e88f24ccf2ffed49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:02 -0400
Subject: [PATCH 0909/4088] python3-yamllint: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template
index 6aeedcabe3f3..70c4643e21a6 100644
--- a/srcpkgs/python3-yamllint/template
+++ b/srcpkgs/python3-yamllint/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yamllint'
 pkgname=python3-yamllint
 version=1.15.0
-revision=4
+revision=5
 wrksrc="yamllint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9841cdd36283eaf62fb38f84189290e644be3198 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:02 -0400
Subject: [PATCH 0910/4088] python3-xxhash: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-xxhash/template b/srcpkgs/python3-xxhash/template
index e185a1163521..f7a847b4b54e 100644
--- a/srcpkgs/python3-xxhash/template
+++ b/srcpkgs/python3-xxhash/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xxhash'
 pkgname=python3-xxhash
 version=2.0.2
-revision=1
+revision=2
 wrksrc="xxhash-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c06524da9f06908f4b05cbfa53f6638888b2d546 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:02 -0400
Subject: [PATCH 0911/4088] python3-xlrd: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-xlrd/template b/srcpkgs/python3-xlrd/template
index bf8cc5060c9d..b9fe611cd13f 100644
--- a/srcpkgs/python3-xlrd/template
+++ b/srcpkgs/python3-xlrd/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xlrd'
 pkgname=python3-xlrd
 version=2.0.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 12ce039f135072f5c83bdcb0303e7113d2610946 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:01 -0400
Subject: [PATCH 0912/4088] python3-wikipedia: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-wikipedia/template b/srcpkgs/python3-wikipedia/template
index e38ba5792884..f27ab33e0326 100644
--- a/srcpkgs/python3-wikipedia/template
+++ b/srcpkgs/python3-wikipedia/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-wikipedia'
 pkgname=python3-wikipedia
 version=1.4.0
-revision=5
+revision=6
 wrksrc="wikipedia-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 58e8109b1179eaa74b459cf8c2fd7a870bdcc579 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:00 -0400
Subject: [PATCH 0913/4088] python3-watchman: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
index c06e798cd574..e525ebef073a 100644
--- a/srcpkgs/python3-watchman/template
+++ b/srcpkgs/python3-watchman/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-watchman'
 pkgname=python3-watchman
 version=1.4.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_wrksrc="pywatchman-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Hoang Nguyen <hoang@wetrust.io>"
 license="BSD-3-Clause"
 homepage="https://facebook.github.io/watchman/"
 distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
- https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
+ https://raw.githubusercontent.com/facebook/watchman/main/watchman/python/LICENSE>LICENSE.txt"
 checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
  d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
 conflicts="python-watchman>=0"

From a04a30547a07b8b14f83ab754910906214580621 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:00 -0400
Subject: [PATCH 0914/4088] python3-watchdog: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-watchdog/template b/srcpkgs/python3-watchdog/template
index df369a2bce4f..ab3eb772c7da 100644
--- a/srcpkgs/python3-watchdog/template
+++ b/srcpkgs/python3-watchdog/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-watchdog'
 pkgname=python3-watchdog
 version=0.9.0
-revision=4
+revision=5
 wrksrc="watchdog-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9cbeb8f89219f0c64cb8d8195a3a36fc9920c0f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:00 -0400
Subject: [PATCH 0915/4088] python3-voluptuous: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-voluptuous/template b/srcpkgs/python3-voluptuous/template
index d8514443b4f6..8e37fdf329e5 100644
--- a/srcpkgs/python3-voluptuous/template
+++ b/srcpkgs/python3-voluptuous/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-voluptuous'
 pkgname=python3-voluptuous
 version=0.11.5
-revision=5
+revision=6
 wrksrc="voluptuous-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 63f8e87f1aca3a96fa31cbde378c4152cbb82e77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:00 -0400
Subject: [PATCH 0916/4088] python3-vispy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-vispy/template b/srcpkgs/python3-vispy/template
index 8d6b70aaef60..fbb06c91e0bf 100644
--- a/srcpkgs/python3-vispy/template
+++ b/srcpkgs/python3-vispy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vispy'
 pkgname=python3-vispy
 version=0.6.1
-revision=4
+revision=5
 wrksrc="vispy-${version}"
 build_style=python3-module
 build_helper=numpy

From 7246573f825a82788b1924c5996203d55ba5c8ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:59 -0400
Subject: [PATCH 0917/4088] python3-vint: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-vint/template b/srcpkgs/python3-vint/template
index 3944d9b507ea..5424ffb0ce37 100644
--- a/srcpkgs/python3-vint/template
+++ b/srcpkgs/python3-vint/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vint'
 pkgname=python3-vint
 version=0.3.19
-revision=5
+revision=6
 wrksrc="vim-vint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 27ae2cc422152a86d714d773ef26b5d8d3c8ca50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:59 -0400
Subject: [PATCH 0918/4088] python3-uvloop: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..d82237af7be1 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
 version=0.16.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-Cython"

From 79af4394d3fb39ae7d3f7a4f257f8ac9aea0af3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:58 -0400
Subject: [PATCH 0919/4088] python3-urlgrabber: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-urlgrabber/template b/srcpkgs/python3-urlgrabber/template
index 3eacefc9d09d..39739be80514 100644
--- a/srcpkgs/python3-urlgrabber/template
+++ b/srcpkgs/python3-urlgrabber/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-urlgrabber'
 pkgname=python3-urlgrabber
 version=4.0.0
-revision=3
+revision=4
 wrksrc="urlgrabber-${version}"
 build_style=python3-module
 pycompile_module="urlgrabber"

From e8b475711ad031395ef5a75e34415dafaceeb99a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:58 -0400
Subject: [PATCH 0920/4088] python3-urbandict: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-urbandict/template b/srcpkgs/python3-urbandict/template
index 430acb937dcb..8589e50b9890 100644
--- a/srcpkgs/python3-urbandict/template
+++ b/srcpkgs/python3-urbandict/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-urbandict'
 pkgname=python3-urbandict
 version=0.6.1
-revision=3
+revision=4
 wrksrc="urbandict-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6c027230d4507dff5f7d60010cf1615c08dae7f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:58 -0400
Subject: [PATCH 0921/4088] python3-unittest-mixins: rebuild for Python 3.10

---
 srcpkgs/python3-unittest-mixins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-unittest-mixins/template b/srcpkgs/python3-unittest-mixins/template
index f597b3bd7768..d2a60925a606 100644
--- a/srcpkgs/python3-unittest-mixins/template
+++ b/srcpkgs/python3-unittest-mixins/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-unittest-mixins'
 pkgname=python3-unittest-mixins
 version=1.6
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6094b99db4a5f734b361811579c2db86b0e0923c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0922/4088] python3-twitter: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-twitter/template b/srcpkgs/python3-twitter/template
index 386917ff15cc..160b347ac237 100644
--- a/srcpkgs/python3-twitter/template
+++ b/srcpkgs/python3-twitter/template
@@ -2,7 +2,7 @@
 pkgname=python3-twitter
 _pkgname=${pkgname/3/}
 version=3.5
-revision=4
+revision=5
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fa6673d3de65c3e0ba4e5d0b0707d87344ef022b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0923/4088] python3-tweepy: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-tweepy/template b/srcpkgs/python3-tweepy/template
index 921520e09c35..d71fa028f64f 100644
--- a/srcpkgs/python3-tweepy/template
+++ b/srcpkgs/python3-tweepy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tweepy'
 pkgname=python3-tweepy
 version=3.9.0
-revision=1
+revision=2
 wrksrc="tweepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8d86205de1cb2a609f724ecc4acaa7d99d37067e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0924/4088] python3-ttystatus: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-ttystatus/template b/srcpkgs/python3-ttystatus/template
index f3408d4f7186..b35cd4a0ebcb 100644
--- a/srcpkgs/python3-ttystatus/template
+++ b/srcpkgs/python3-ttystatus/template
@@ -2,7 +2,7 @@
 pkgname=python3-ttystatus
 _pkgname=${pkgname/3/}
 version=0.38
-revision=4
+revision=5
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 94d4910ebe4e84c9b7dc9e976f9dbf04ec735dd3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0925/4088] python3-trio: rebuild for Python 3.10

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

diff --git a/srcpkgs/python3-trio/template b/srcpkgs/python3-trio/template
index 57d52e33cfa2..f0e92f106c1c 100644
--- a/srcpkgs/python3-trio/template
+++ b/srcpkgs/python3-trio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-trio'
 pkgname=python3-trio
 version=0.19.0
-revision=1
+revision=2
 wrksrc="trio-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d0b1a2d09586d76870cee648a2bf78cf0a8a077e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:56 -0400
Subject: [PATCH 0926/4088] python3-transifex-client: rebuild for Python 3.10

---
 srcpkgs/python3-transifex-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-transifex-client/template b/srcpkgs/python3-transifex-client/template
index e34c310c0a85..af34e58ba811 100644
--- a/srcpkgs/python3-transifex-client/template
+++ b/srcpkgs/python3-transifex-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-transifex-client'
 pkgname=python3-transifex-client
 version=0.13.6
-revision=3
+revision=4
 wrksrc="transifex-client-${version}"
 build_style=python3-module
 pycompile_module="txclib"

From 347a1f700a415d4682ae12891d4fd7f365ecb219 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:55 -0400
Subject: [PATCH 0927/4088] python3-tokenize-rt: rebuild for Python 3.10

---
 srcpkgs/python3-tokenize-rt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tokenize-rt/template b/srcpkgs/python3-tokenize-rt/template
index 65e6dcac58cb..387e896ac700 100644
--- a/srcpkgs/python3-tokenize-rt/template
+++ b/srcpkgs/python3-tokenize-rt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tokenize-rt'
 pkgname=python3-tokenize-rt
 version=4.1.0
-revision=1
+revision=2
 wrksrc="tokenize-rt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6860e7d14bceea04f463699b0c271c6c4b7ede50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:55 -0400
Subject: [PATCH 0928/4088] python3-tmuxp: rebuild for Python 3.10

---
 srcpkgs/python3-tmuxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tmuxp/template b/srcpkgs/python3-tmuxp/template
index a8b755c343ed..9dd029e4d1ca 100644
--- a/srcpkgs/python3-tmuxp/template
+++ b/srcpkgs/python3-tmuxp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tmuxp'
 pkgname=python3-tmuxp
 version=1.7.2
-revision=3
+revision=4
 wrksrc="tmuxp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bc8205a51f9586cd1af96e78fd9eb6229510ef99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:55 -0400
Subject: [PATCH 0929/4088] python3-tldextract: rebuild for Python 3.10

---
 srcpkgs/python3-tldextract/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tldextract/template b/srcpkgs/python3-tldextract/template
index 3c769d6233ea..b671868a3a49 100644
--- a/srcpkgs/python3-tldextract/template
+++ b/srcpkgs/python3-tldextract/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tldextract'
 pkgname=python3-tldextract
 version=2.2.2
-revision=2
+revision=3
 wrksrc="tldextract-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c4d779ae516347addab9d0da53b21353f27fba81 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:53 -0400
Subject: [PATCH 0930/4088] python3-tables: rebuild for Python 3.10

---
 srcpkgs/python3-tables/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-tables/template b/srcpkgs/python3-tables/template
index 37ab6df363ab..766b76fd5018 100644
--- a/srcpkgs/python3-tables/template
+++ b/srcpkgs/python3-tables/template
@@ -1,22 +1,26 @@
 # Template file for 'python3-tables'
 pkgname=python3-tables
 version=3.6.1
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-pycompile_module="tables"
 # XXX: c-blosc (using internal for now)
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel python3-numpy python3-Cython hdf5-devel lzo-devel bzip2-devel"
-depends="python3-setuptools python3-numpy python3-numexpr python3-six"
+hostmakedepends="python3-setuptools python3-numpy python3-Cython"
+makedepends="python3-devel hdf5-devel lzo-devel bzip2-devel"
+depends="python3-numpy python3-numexpr"
 short_desc="Hierarchical datasets for Python3"
 maintainer="pulux <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="http://www.pytables.org/"
-# changelog=$homepage/release-notes/RELEASE_NOTES_v3.4.x.html
+changelog="http://www.pytables.org/release_notes.html"
 distfiles="${PYPI_SITE}/t/tables/tables-${version}.tar.gz"
 checksum=49a972b8a7c27a8a173aeb05f67acb45fe608b64cd8e9fa667c0962a60b71b49
 
+post_extract() {
+	# Make sure Cython is run during build
+	rm tables/*.c
+}
+
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }

From 05577d58b23334a5b343b4518818c63d7f4db6db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:53 -0400
Subject: [PATCH 0931/4088] python3-subunit: rebuild for Python 3.10

---
 srcpkgs/python3-subunit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-subunit/template b/srcpkgs/python3-subunit/template
index e16ef316a7e0..3a7c68e9460f 100644
--- a/srcpkgs/python3-subunit/template
+++ b/srcpkgs/python3-subunit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-subunit'
 pkgname=python3-subunit
 version=1.4.0
-revision=2
+revision=3
 wrksrc=subunit-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9948664dff6eafd24eb911e51a97dad37b33e068 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:53 -0400
Subject: [PATCH 0932/4088] python3-stormssh: rebuild for Python 3.10

---
 srcpkgs/python3-stormssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-stormssh/template b/srcpkgs/python3-stormssh/template
index d3986e9290db..ccf4966ab1e5 100644
--- a/srcpkgs/python3-stormssh/template
+++ b/srcpkgs/python3-stormssh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-stormssh'
 pkgname=python3-stormssh
 version=0.7.0
-revision=4
+revision=5
 wrksrc=storm-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2279a268ddebd6ed10ac3a5d7874351ee67bd856 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:50 -0400
Subject: [PATCH 0933/4088] python3-snappy: rebuild for Python 3.10

---
 srcpkgs/python3-snappy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template
index 39803e64e476..9b66fc65ca1e 100644
--- a/srcpkgs/python3-snappy/template
+++ b/srcpkgs/python3-snappy/template
@@ -2,7 +2,7 @@
 pkgname=python3-snappy
 _pkgname=python-snappy
 version=0.5.4
-revision=4
+revision=5
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6f204aee02b759f934efd4d6a4043083e8e85b17 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:49 -0400
Subject: [PATCH 0934/4088] python3-simplegeneric: rebuild for Python 3.10

---
 srcpkgs/python3-simplegeneric/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-simplegeneric/template b/srcpkgs/python3-simplegeneric/template
index e5972608a2a3..2d02151dcac2 100644
--- a/srcpkgs/python3-simplegeneric/template
+++ b/srcpkgs/python3-simplegeneric/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simplegeneric'
 pkgname=python3-simplegeneric
 version=0.8.1
-revision=7
+revision=8
 wrksrc="simplegeneric-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools"

From 1d415d197eb8d9321f307724b0195370cc17e3bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:49 -0400
Subject: [PATCH 0935/4088] python3-simplebayes: rebuild for Python 3.10

---
 srcpkgs/python3-simplebayes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-simplebayes/template b/srcpkgs/python3-simplebayes/template
index 4a97e0af35c7..d4c823f508b5 100644
--- a/srcpkgs/python3-simplebayes/template
+++ b/srcpkgs/python3-simplebayes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simplebayes'
 pkgname=python3-simplebayes
 version=1.5.8
-revision=4
+revision=5
 wrksrc="simplebayes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From eca433f6c6265693c9e1955332a8d04349ae108f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:47 -0400
Subject: [PATCH 0936/4088] python3-sentry: rebuild for Python 3.10

---
 srcpkgs/python3-sentry/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sentry/template b/srcpkgs/python3-sentry/template
index c2056965cad9..8acd33217f59 100644
--- a/srcpkgs/python3-sentry/template
+++ b/srcpkgs/python3-sentry/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sentry'
 pkgname=python3-sentry
 version=1.0.0
-revision=1
+revision=2
 wrksrc="sentry-python-${version}"
 build_style=python3-module
 hostmakedepends=python3-setuptools

From da0ff663a9fe3496ebb16eebd583434cd531c36a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:47 -0400
Subject: [PATCH 0937/4088] python3-seaborn: rebuild for Python 3.10

---
 srcpkgs/python3-seaborn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-seaborn/template b/srcpkgs/python3-seaborn/template
index e68fcf025aff..1d0d10781984 100644
--- a/srcpkgs/python3-seaborn/template
+++ b/srcpkgs/python3-seaborn/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-seaborn'
 pkgname=python3-seaborn
 version=0.11.1
-revision=1
+revision=2
 wrksrc="seaborn-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6be01142eed9eb717a13ee3799207a11ea127d11 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:47 -0400
Subject: [PATCH 0938/4088] python3-scour: rebuild for Python 3.10

---
 srcpkgs/python3-scour/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scour/template b/srcpkgs/python3-scour/template
index 5dd2d4f0a483..cef185041201 100644
--- a/srcpkgs/python3-scour/template
+++ b/srcpkgs/python3-scour/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scour'
 pkgname=python3-scour
 version=0.38.2
-revision=1
+revision=2
 wrksrc="scour-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b9c33c7adfdb02172a41d5da4116556eeed51883 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:46 -0400
Subject: [PATCH 0939/4088] python3-scikit-video: rebuild for Python 3.10

---
 srcpkgs/python3-scikit-video/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scikit-video/template b/srcpkgs/python3-scikit-video/template
index 84af20de4fe2..7333a6aef247 100644
--- a/srcpkgs/python3-scikit-video/template
+++ b/srcpkgs/python3-scikit-video/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scikit-video'
 pkgname=python3-scikit-video
 version=1.1.11
-revision=3
+revision=4
 wrksrc="scikit-video-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-scipy python3-Pillow"

From a1b98a36139437e32b018267f0d3f951cc85e63f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:46 -0400
Subject: [PATCH 0940/4088] python3-scikit-learn: rebuild for Python 3.10

---
 srcpkgs/python3-scikit-learn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scikit-learn/template b/srcpkgs/python3-scikit-learn/template
index d57af6eafab6..3241794a5733 100644
--- a/srcpkgs/python3-scikit-learn/template
+++ b/srcpkgs/python3-scikit-learn/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scikit-learn'
 pkgname=python3-scikit-learn
 version=0.24.2
-revision=1
+revision=2
 wrksrc="scikit-learn-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-scipy"

From aff10188852456cf8a07a02b9d3a51fe84a77bf1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:46 -0400
Subject: [PATCH 0941/4088] python3-scikit-image: rebuild for Python 3.10

---
 srcpkgs/python3-scikit-image/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index 3a8a84bff61a..49b214c11aef 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scikit-image'
 pkgname=python3-scikit-image
 version=0.18.3
-revision=1
+revision=2
 _pkgname="${pkgname#python3-}"
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module

From f73b981ca377c284857888b3c26da92b06d4376e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:46 -0400
Subject: [PATCH 0942/4088] python3-s-tui: rebuild for Python 3.10

---
 srcpkgs/python3-s-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-s-tui/template b/srcpkgs/python3-s-tui/template
index f49346d13e7a..09feced6238a 100644
--- a/srcpkgs/python3-s-tui/template
+++ b/srcpkgs/python3-s-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-s-tui'
 pkgname=python3-s-tui
 version=1.1.3
-revision=1
+revision=2
 wrksrc="s-tui-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cca65df0988e2c89f2b54f245885c09396d44a65 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:45 -0400
Subject: [PATCH 0943/4088] python3-ruamel.yaml.clib: rebuild for Python 3.10

---
 srcpkgs/python3-ruamel.yaml.clib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ruamel.yaml.clib/template b/srcpkgs/python3-ruamel.yaml.clib/template
index f9fbcfc3ad70..2106f15635e0 100644
--- a/srcpkgs/python3-ruamel.yaml.clib/template
+++ b/srcpkgs/python3-ruamel.yaml.clib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ruamel.yaml.clib'
 pkgname=python3-ruamel.yaml.clib
 version=0.2.6
-revision=1
+revision=2
 wrksrc="ruamel.yaml.clib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7f4249e6aeb443d6f548664cd2883a94d427e7ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:45 -0400
Subject: [PATCH 0944/4088] python3-rss2email: rebuild for Python 3.10

---
 srcpkgs/python3-rss2email/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-rss2email/template b/srcpkgs/python3-rss2email/template
index bdb3c181fc65..155d32b0d568 100644
--- a/srcpkgs/python3-rss2email/template
+++ b/srcpkgs/python3-rss2email/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rss2email'
 pkgname=python3-rss2email
 version=3.13.1
-revision=1
+revision=2
 wrksrc="rss2email-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d0e4d350084e935e16cc771a2c324d8885ebe617 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:44 -0400
Subject: [PATCH 0945/4088] python3-requests-mock: rebuild for Python 3.10

---
 srcpkgs/python3-requests-mock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-requests-mock/template b/srcpkgs/python3-requests-mock/template
index 4b4a071e3528..bc808321d85c 100644
--- a/srcpkgs/python3-requests-mock/template
+++ b/srcpkgs/python3-requests-mock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-mock'
 pkgname=python3-requests-mock
 version=1.8.0
-revision=1
+revision=2
 wrksrc="requests-mock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"

From 6ff12fcb1c0daefd3f428e947c16676db58b5bcf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:43 -0400
Subject: [PATCH 0946/4088] python3-redis: rebuild for Python 3.10

---
 srcpkgs/python3-redis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
index 7c968b4a894b..f228a1c88df3 100644
--- a/srcpkgs/python3-redis/template
+++ b/srcpkgs/python3-redis/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-redis'
 pkgname=python3-redis
 version=3.5.3
-revision=3
+revision=4
 wrksrc="redis-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 07c9c7de6dd6e36296d86632a010d36d2fa24fd6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:42 -0400
Subject: [PATCH 0947/4088] python3-readability-lxml: rebuild for Python 3.10

---
 srcpkgs/python3-readability-lxml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template
index 74241baaf677..798cc9c5f4cc 100644
--- a/srcpkgs/python3-readability-lxml/template
+++ b/srcpkgs/python3-readability-lxml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-readability-lxml'
 pkgname=python3-readability-lxml
 version=0.8.1
-revision=3
+revision=4
 wrksrc="readability-lxml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cfb1e751475248b37d8631afbb8802f05aa57c87 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:42 -0400
Subject: [PATCH 0948/4088] python3-raven: rebuild for Python 3.10

---
 srcpkgs/python3-raven/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-raven/template b/srcpkgs/python3-raven/template
index b5cca7188617..ea4b615479e4 100644
--- a/srcpkgs/python3-raven/template
+++ b/srcpkgs/python3-raven/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-raven'
 pkgname=python3-raven
 version=6.10.0
-revision=4
+revision=5
 wrksrc="raven-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5868697c0206697971319554b40ef0bec3e3311b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:42 -0400
Subject: [PATCH 0949/4088] python3-quart: rebuild for Python 3.10

---
 srcpkgs/python3-quart/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index 335b7c3c608a..743b7e1c9cc2 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-quart'
 pkgname=python3-quart
 version=0.15.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 141a6545b3849330414a34d08833a050ab4572bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:41 -0400
Subject: [PATCH 0950/4088] python3-pyx: rebuild for Python 3.10

---
 srcpkgs/python3-pyx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyx/template b/srcpkgs/python3-pyx/template
index c39d94f7c3c6..01568b3a26bd 100644
--- a/srcpkgs/python3-pyx/template
+++ b/srcpkgs/python3-pyx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyx'
 pkgname=python3-pyx
 version=0.15
-revision=2
+revision=3
 wrksrc="PyX-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e44c326937228a323097d61531e6ba97cdf142ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:41 -0400
Subject: [PATCH 0951/4088] python3-pytest-xvfb: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-xvfb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-xvfb/template b/srcpkgs/python3-pytest-xvfb/template
index e4e0503b7310..0bd9b2f21bca 100644
--- a/srcpkgs/python3-pytest-xvfb/template
+++ b/srcpkgs/python3-pytest-xvfb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-xvfb'
 pkgname=python3-pytest-xvfb
 version=2.0.0
-revision=2
+revision=3
 wrksrc=pytest-xvfb-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 26273af22ed5e8e6d9c4f33b9f21211b1aa9d1cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:40 -0400
Subject: [PATCH 0952/4088] python3-pytest-timeout: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-timeout/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-timeout/template b/srcpkgs/python3-pytest-timeout/template
index 354b1eedcd7c..a3ebcf843ffe 100644
--- a/srcpkgs/python3-pytest-timeout/template
+++ b/srcpkgs/python3-pytest-timeout/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-timeout'
 pkgname=python3-pytest-timeout
 version=1.4.2
-revision=1
+revision=2
 wrksrc="pytest-timeout-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 47b581e688b24f32be2ac74a123ced2671cec7c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:40 -0400
Subject: [PATCH 0953/4088] python3-pytest-subtests: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-subtests/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template
index d661679f345c..ca33ba8b7d58 100644
--- a/srcpkgs/python3-pytest-subtests/template
+++ b/srcpkgs/python3-pytest-subtests/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-subtests'
 pkgname=python3-pytest-subtests
 version=0.5.0
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 45f85fbba1452a7024dc6ed58ce4e09ceea01582 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:40 -0400
Subject: [PATCH 0954/4088] python3-pytest-qt: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template
index 1944d757e6f5..5b7e57435afc 100644
--- a/srcpkgs/python3-pytest-qt/template
+++ b/srcpkgs/python3-pytest-qt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-qt'
 pkgname=python3-pytest-qt
 version=3.3.0
-revision=3
+revision=4
 wrksrc=pytest-qt-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 6bda091fae970d0b4f34b744e974f286b94bf50a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:40 -0400
Subject: [PATCH 0955/4088] python3-pytest-mock: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-mock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index 43ce2c842703..56d4cda8dc34 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-mock'
 pkgname=python3-pytest-mock
 version=3.5.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b86ff607e3ca9d3032610d59baaf8940004854c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:40 -0400
Subject: [PATCH 0956/4088] python3-pytest-httpserver: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-httpserver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index 12afe88ffe07..931083244be0 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-httpserver'
 pkgname=python3-pytest-httpserver
 version=1.0.1
-revision=1
+revision=2
 wrksrc=pytest-httpserver-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3ab6f39435294b397bb073f7df0a6af40466b984 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:40 -0400
Subject: [PATCH 0957/4088] python3-pytest-flake8: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-flake8/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-flake8/template b/srcpkgs/python3-pytest-flake8/template
index 701d19fad336..e5d81277ac9a 100644
--- a/srcpkgs/python3-pytest-flake8/template
+++ b/srcpkgs/python3-pytest-flake8/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-flake8'
 pkgname=python3-pytest-flake8
 version=1.0.7
-revision=1
+revision=2
 wrksrc=pytest-flake8-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c7ed7bc4758f42d24674079a9bdcd79373fcd1ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:40 -0400
Subject: [PATCH 0958/4088] python3-pytest-fixture-config: rebuild for Python
 3.10

---
 srcpkgs/python3-pytest-fixture-config/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template
index d2a7beaae135..3c22c9f0fb47 100644
--- a/srcpkgs/python3-pytest-fixture-config/template
+++ b/srcpkgs/python3-pytest-fixture-config/template
@@ -2,7 +2,7 @@
 pkgname=python3-pytest-fixture-config
 _pkgname=${pkgname#*-}
 version=1.3.0
-revision=5
+revision=6
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 52eaf54474bfb185a0282f47e46275e85e3738c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:40 -0400
Subject: [PATCH 0959/4088] python3-pytest-cov: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-cov/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index 40c6f46098fe..fcf45557bbf5 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-cov'
 pkgname=python3-pytest-cov
 version=2.12.1
-revision=1
+revision=2
 wrksrc="pytest-cov-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 65723dd838cd16ee4b3dbb205b9851c91eedee3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0960/4088] python3-pytest-asyncio: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-asyncio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index f9f703015364..8c1dbdaf20c2 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-asyncio'
 pkgname=python3-pytest-asyncio
 version=0.14.0
-revision=1
+revision=2
 wrksrc="pytest-asyncio-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cecb7384feff50c724003b8f844cb5e66433d633 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0961/4088] python3-pytest-aiohttp: rebuild for Python 3.10

---
 srcpkgs/python3-pytest-aiohttp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-aiohttp/template b/srcpkgs/python3-pytest-aiohttp/template
index b0a34b27ce70..0d88edc7edce 100644
--- a/srcpkgs/python3-pytest-aiohttp/template
+++ b/srcpkgs/python3-pytest-aiohttp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-aiohttp'
 pkgname=python3-pytest-aiohttp
 version=0.3.0
-revision=1
+revision=2
 wrksrc="pytest-aiohttp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dd615060f386a768ffc25ab9d5426ffde7880794 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:39 -0400
Subject: [PATCH 0962/4088] python3-pytaglib: rebuild for Python 3.10

---
 srcpkgs/python3-pytaglib/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index 98121d054b9c..b398e0218f13 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pytaglib'
 pkgname=python3-pytaglib
 version=1.4.6
-revision=1
+revision=2
 wrksrc="pytaglib-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel taglib-devel"
 short_desc="Python bindings for the TagLib C++ library"
 maintainer="Stefano Ragni <st3r4g@protonmail.com>"
@@ -12,3 +12,9 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/supermihi/pytaglib"
 distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
 checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
+
+post_extract() {
+	# Make sure Cython generates an up-to-date source file
+	rm src/taglib.cpp
+	cythonize src/taglib.pyx
+}

From 6c2322e414b6e610b14b3164ab8dc246f4d56a04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:38 -0400
Subject: [PATCH 0963/4088] python3-pysdl2: rebuild for Python 3.10

---
 srcpkgs/python3-pysdl2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pysdl2/template b/srcpkgs/python3-pysdl2/template
index da6af540f98c..060b69dfc993 100644
--- a/srcpkgs/python3-pysdl2/template
+++ b/srcpkgs/python3-pysdl2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pysdl2'
 pkgname=python3-pysdl2
 version=0.9.6
-revision=3
+revision=4
 wrksrc="py-sdl2-rel_${version//./_}"
 build_style=python3-module
 pycompile_module="sdl2"

From b7f961b5e1049111e01d933a38cb3fe3c0200a4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:38 -0400
Subject: [PATCH 0964/4088] python3-pyscss: rebuild for Python 3.10

---
 srcpkgs/python3-pyscss/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyscss/template b/srcpkgs/python3-pyscss/template
index 1dad6f1f4bc6..b3b4ef468e2e 100644
--- a/srcpkgs/python3-pyscss/template
+++ b/srcpkgs/python3-pyscss/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyscss'
 pkgname=python3-pyscss
 version=1.3.7
-revision=3
+revision=4
 wrksrc="pyScss-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools pcre-devel"

From dd5412cda16e6e613e5dc2b5b029d3d41041e09a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:38 -0400
Subject: [PATCH 0965/4088] python3-pyqtgraph: rebuild for Python 3.10

---
 srcpkgs/python3-pyqtgraph/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyqtgraph/template b/srcpkgs/python3-pyqtgraph/template
index 89c3e582d1db..ac1a599fb6d9 100644
--- a/srcpkgs/python3-pyqtgraph/template
+++ b/srcpkgs/python3-pyqtgraph/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqtgraph'
 pkgname=python3-pyqtgraph
 version=0.11.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${pkgname#*-}-${version}"
 build_style=python3-module
 make_install_args="--no-compile"

From b4975b678a366ba2afc79840c4f4b5fe847abb24 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:37 -0400
Subject: [PATCH 0966/4088] python3-pyqt6-networkauth: rebuild for Python 3.10

---
 srcpkgs/python3-pyqt6-networkauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyqt6-networkauth/template b/srcpkgs/python3-pyqt6-networkauth/template
index e5142193c69e..ec12b9491d6e 100644
--- a/srcpkgs/python3-pyqt6-networkauth/template
+++ b/srcpkgs/python3-pyqt6-networkauth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-networkauth'
 pkgname=python3-pyqt6-networkauth
 version=6.1.1
-revision=1
+revision=2
 wrksrc=PyQt6_NetworkAuth-$version
 build_style=sip-build
 hostmakedepends="python3-pyqt6-network-devel qt6-networkauth-devel

From 42340d31e71a1e1cd213e73063daa8db57a15d0c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:37 -0400
Subject: [PATCH 0967/4088] python3-pyqt6-charts: rebuild for Python 3.10

---
 srcpkgs/python3-pyqt6-charts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyqt6-charts/template b/srcpkgs/python3-pyqt6-charts/template
index 17a6c1334a96..a186b2a04f5d 100644
--- a/srcpkgs/python3-pyqt6-charts/template
+++ b/srcpkgs/python3-pyqt6-charts/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-charts'
 pkgname=python3-pyqt6-charts
 version=6.1.1
-revision=1
+revision=2
 wrksrc=PyQt6_Charts-$version
 build_style=sip-build
 hostmakedepends="qt6-charts-devel python3-pyqt6-widgets-devel

From 9d4d88bcab8cfa2ff8788c01e0d8c090e94b023d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:37 -0400
Subject: [PATCH 0968/4088] python3-pyqt6-3d: rebuild for Python 3.10

---
 srcpkgs/python3-pyqt6-3d/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyqt6-3d/template b/srcpkgs/python3-pyqt6-3d/template
index 3986b2a41934..7e22e6371aab 100644
--- a/srcpkgs/python3-pyqt6-3d/template
+++ b/srcpkgs/python3-pyqt6-3d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-3d'
 pkgname=python3-pyqt6-3d
 version=6.1.1
-revision=1
+revision=2
 wrksrc=PyQt6_3D-$version
 build_style=sip-build
 hostmakedepends="python3-pyqt6-gui-devel qt6-3d-devel

From 740150cc13d66c9344b77b209b7804c6ed1f8f1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:37 -0400
Subject: [PATCH 0969/4088] python3-pyperclip: rebuild for Python 3.10

---
 srcpkgs/python3-pyperclip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyperclip/template b/srcpkgs/python3-pyperclip/template
index 510e462b103d..fe8e5095fa43 100644
--- a/srcpkgs/python3-pyperclip/template
+++ b/srcpkgs/python3-pyperclip/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyperclip'
 pkgname=python3-pyperclip
 version=1.8.1
-revision=1
+revision=2
 wrksrc=pyperclip-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e3efaed4e4664a7751a768995f3db74c9f3b4580 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:36 -0400
Subject: [PATCH 0970/4088] python3-pyopencl: rebuild for Python 3.10, update
 to 2021.2.8.

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 8330c1b41cf1..bd6fbdd3e632 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2021.2.6
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=df208546d28a3274ba7b554d50643ed1e393b8f3f75a43b24b83d3ee76597587
+checksum=15809b5d2b9a86ad01e31d176c00415436805ac884c4d197d9263bfe98280d76
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From 72b68d523797bf4b1aa7dfc98fc88191bb69115a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:36 -0400
Subject: [PATCH 0971/4088] python3-pylru: rebuild for Python 3.10

---
 srcpkgs/python3-pylru/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pylru/template b/srcpkgs/python3-pylru/template
index 08758701c6b8..a44b59ad2714 100644
--- a/srcpkgs/python3-pylru/template
+++ b/srcpkgs/python3-pylru/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pylru'
 pkgname=python3-pylru
 version=1.2.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ef6488b9b62a5120b14a1d8eaced9416639dd11d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:36 -0400
Subject: [PATCH 0972/4088] python3-pylibgen: rebuild for Python 3.10

---
 srcpkgs/python3-pylibgen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pylibgen/template b/srcpkgs/python3-pylibgen/template
index 4d77619ae935..dcae865ad1a1 100644
--- a/srcpkgs/python3-pylibgen/template
+++ b/srcpkgs/python3-pylibgen/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pylibgen'
 pkgname=python3-pylibgen
 version=2.0.2
-revision=2
+revision=3
 wrksrc="pylibgen-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4afc606142b7e0024716103e4409f3d7d4ff07fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:35 -0400
Subject: [PATCH 0973/4088] python3-pyinfra: rebuild for Python 3.10

---
 srcpkgs/python3-pyinfra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 7f92b2aa50b3..118590b5fdea 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
 version=1.4.16
-revision=1
+revision=2
 wrksrc="pyinfra-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 03a4e53323b5f0e6847d00cd1956f85514991483 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:33 -0400
Subject: [PATCH 0974/4088] python3-pyacoustid: rebuild for Python 3.10

---
 srcpkgs/python3-pyacoustid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyacoustid/template b/srcpkgs/python3-pyacoustid/template
index 8673b26e75cd..6e6f4f8c70cc 100644
--- a/srcpkgs/python3-pyacoustid/template
+++ b/srcpkgs/python3-pyacoustid/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyacoustid'
 pkgname=python3-pyacoustid
 version=1.2.0
-revision=1
+revision=2
 wrksrc="pyacoustid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0b0e7eadfbfb37fc716c4ed461be362bd2d75358 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:33 -0400
Subject: [PATCH 0975/4088] python3-pyFFTW: rebuild for Python 3.10

---
 srcpkgs/python3-pyFFTW/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyFFTW/template b/srcpkgs/python3-pyFFTW/template
index 7b3221459560..2d6655127630 100644
--- a/srcpkgs/python3-pyFFTW/template
+++ b/srcpkgs/python3-pyFFTW/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyFFTW'
 pkgname=python3-pyFFTW
 version=0.12.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"

From 91335ee99f4be43f6af778e8d48b7ef717a0875d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:32 -0400
Subject: [PATCH 0976/4088] python3-pwntools: rebuild for Python 3.10

---
 srcpkgs/python3-pwntools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index 89fee2e5995b..8c0e33fa2749 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pwntools'
 pkgname=python3-pwntools
 version=4.6.0
-revision=1
+revision=2
 wrksrc="pwntools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From de4fa2bbada12c3a67434e9d8905ff349cd64753 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:31 -0400
Subject: [PATCH 0977/4088] python3-proselint: rebuild for Python 3.10

---
 srcpkgs/python3-proselint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-proselint/template b/srcpkgs/python3-proselint/template
index 3a35c6998615..ed0008cfbed0 100644
--- a/srcpkgs/python3-proselint/template
+++ b/srcpkgs/python3-proselint/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-proselint'
 pkgname=python3-proselint
 version=0.10.2
-revision=4
+revision=5
 wrksrc="proselint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d3c8eacd9ae6639368bd1f0efef0f857a2fe71c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:31 -0400
Subject: [PATCH 0978/4088] python3-progress: rebuild for Python 3.10

---
 srcpkgs/python3-progress/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template
index ee6b3ffc932e..a47654388306 100644
--- a/srcpkgs/python3-progress/template
+++ b/srcpkgs/python3-progress/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-progress'
 pkgname=python3-progress
 version=1.5
-revision=4
+revision=5
 wrksrc="progress-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b01a9672dbd0ce23653835c280b40a7fd743ca4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:30 -0400
Subject: [PATCH 0979/4088] python3-prctl: rebuild for Python 3.10

---
 srcpkgs/python3-prctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template
index 358d89bc230e..c2c4fc00475a 100644
--- a/srcpkgs/python3-prctl/template
+++ b/srcpkgs/python3-prctl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prctl'
 pkgname=python3-prctl
 version=1.7
-revision=6
+revision=7
 wrksrc=python-prctl-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools libcap-devel"

From 0d49e548dbc3efa877471876af458ea5b6080383 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:30 -0400
Subject: [PATCH 0980/4088] python3-polib: rebuild for Python 3.10

---
 srcpkgs/python3-polib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-polib/template b/srcpkgs/python3-polib/template
index 593cdd9703fd..6a52010be805 100644
--- a/srcpkgs/python3-polib/template
+++ b/srcpkgs/python3-polib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-polib'
 pkgname=python3-polib
 version=1.1.0
-revision=4
+revision=5
 wrksrc="polib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ad5b17682e4c9d47c06c97d401c984457166729b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:29 -0400
Subject: [PATCH 0981/4088] python3-plotly: rebuild for Python 3.10

---
 srcpkgs/python3-plotly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
index dde1b2c25226..69b71ae3bb79 100644
--- a/srcpkgs/python3-plotly/template
+++ b/srcpkgs/python3-plotly/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-plotly'
 pkgname=python3-plotly
 version=4.14.3
-revision=1
+revision=2
 wrksrc="plotly-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bfe0a6f42410b2e5c3c02b6bb4395c06ae4499c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:29 -0400
Subject: [PATCH 0982/4088] python3-pkginfo: rebuild for Python 3.10

---
 srcpkgs/python3-pkginfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pkginfo/template b/srcpkgs/python3-pkginfo/template
index cedc96de269e..aa1d7c1f362b 100644
--- a/srcpkgs/python3-pkginfo/template
+++ b/srcpkgs/python3-pkginfo/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pkginfo'
 pkgname=python3-pkginfo
 version=1.5.0.1
-revision=3
+revision=4
 wrksrc=pkginfo-${version}
 build_style=python3-module
 depends="python3"

From 47af04dd940a8c6897f1211a42eff6ccb5aff125 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:29 -0400
Subject: [PATCH 0983/4088] python3-pipx: rebuild for Python 3.10

---
 srcpkgs/python3-pipx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..c9b4d8eaccee 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
 version=0.16.4
-revision=1
+revision=2
 wrksrc="pipx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6311b4590768e9d4bebcb2ea6c5c2197d41c066e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:28 -0400
Subject: [PATCH 0984/4088] python3-pipenv: rebuild for Python 3.10

---
 srcpkgs/python3-pipenv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 0bad98cbc062..1509cdd1c83c 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
 version=2021.5.29
-revision=1
+revision=2
 wrksrc="pipenv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1f4ab4d483ca3d6f701ac94d9c13f37694065f7f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:28 -0400
Subject: [PATCH 0985/4088] python3-picamera: rebuild for Python 3.10

---
 srcpkgs/python3-picamera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-picamera/template b/srcpkgs/python3-picamera/template
index bfbbfb2b2b2b..1d33101bec5f 100644
--- a/srcpkgs/python3-picamera/template
+++ b/srcpkgs/python3-picamera/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-picamera'
 pkgname=python3-picamera
 version=1.13
-revision=4
+revision=5
 wrksrc="picamera-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bc5e98644c90574d84a5929520be4d32a3f1eb41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:27 -0400
Subject: [PATCH 0986/4088] python3-pgzero: rebuild for Python 3.10

---
 srcpkgs/python3-pgzero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pgzero/template b/srcpkgs/python3-pgzero/template
index b9be3f993aff..d3ec7de01e33 100644
--- a/srcpkgs/python3-pgzero/template
+++ b/srcpkgs/python3-pgzero/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pgzero'
 pkgname=python3-pgzero
 version=1.2.1
-revision=1
+revision=2
 wrksrc="pgzero-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 508a9481630e2bed9e4c67e17757e3e3eeb1dee1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:27 -0400
Subject: [PATCH 0987/4088] python3-pgmigrate: rebuild for Python 3.10

---
 srcpkgs/python3-pgmigrate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pgmigrate/template b/srcpkgs/python3-pgmigrate/template
index 3b459536e8de..ef474cc7167c 100644
--- a/srcpkgs/python3-pgmigrate/template
+++ b/srcpkgs/python3-pgmigrate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pgmigrate'
 pkgname=python3-pgmigrate
 version=1.0.5
-revision=4
+revision=5
 wrksrc="pgmigrate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2755a4667bf48ff1dd5cce0baa0a398a4102d371 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:27 -0400
Subject: [PATCH 0988/4088] python3-perf: rebuild for Python 3.10

---
 srcpkgs/python3-perf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-perf/template b/srcpkgs/python3-perf/template
index 40918d7d97af..670faf249682 100644
--- a/srcpkgs/python3-perf/template
+++ b/srcpkgs/python3-perf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-perf'
 pkgname=python3-perf
 version=1.7.0
-revision=2
+revision=3
 wrksrc="pyperf-${version}"
 build_style=python3-module
 pycompile_module="pyperf"

From 481b928c8e34f02aed5de0305f9d1ddf3708756b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:26 -0400
Subject: [PATCH 0989/4088] python3-pbkdf2: rebuild for Python 3.10

---
 srcpkgs/python3-pbkdf2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pbkdf2/template b/srcpkgs/python3-pbkdf2/template
index 7be3e926b718..58b8cb737808 100644
--- a/srcpkgs/python3-pbkdf2/template
+++ b/srcpkgs/python3-pbkdf2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pbkdf2'
 pkgname=python3-pbkdf2
 version=1.3
-revision=6
+revision=7
 wrksrc="pbkdf2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 246fc498af1f78a04398bde19fe56e98ad240014 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:25 -0400
Subject: [PATCH 0990/4088] python3-parameterized: rebuild for Python 3.10

---
 srcpkgs/python3-parameterized/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-parameterized/template b/srcpkgs/python3-parameterized/template
index 28d978fa18d2..0d3ae2f34499 100644
--- a/srcpkgs/python3-parameterized/template
+++ b/srcpkgs/python3-parameterized/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-parameterized'
 pkgname=python3-parameterized
 version=0.8.1
-revision=1
+revision=2
 wrksrc="parameterized-${version}"
 build_style=python3-module
 make_check_target=nosetests

From 668aeca8903b576efca8d42b1179522250fb5629 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:24 -0400
Subject: [PATCH 0991/4088] python3-pandas-msgpack: rebuild for Python 3.10

---
 srcpkgs/python3-pandas-msgpack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pandas-msgpack/template b/srcpkgs/python3-pandas-msgpack/template
index f084c711e78f..e343d1801f21 100644
--- a/srcpkgs/python3-pandas-msgpack/template
+++ b/srcpkgs/python3-pandas-msgpack/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandas-msgpack'
 pkgname=python3-pandas-msgpack
 version=0.1.5
-revision=2
+revision=3
 wrksrc="pandas-msgpack"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From e233e513c0629a8babb72bc36c4cc71a4231a4d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:23 -0400
Subject: [PATCH 0992/4088] python3-owm: rebuild for Python 3.10

---
 srcpkgs/python3-owm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-owm/template b/srcpkgs/python3-owm/template
index 3ee67ad0b481..508235eca23e 100644
--- a/srcpkgs/python3-owm/template
+++ b/srcpkgs/python3-owm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-owm'
 pkgname=python3-owm
 version=2.10
-revision=3
+revision=4
 wrksrc="pyowm-${version}"
 build_style=python3-module
 pycompile_module="pyowm"

From d6766f0f8afa51ba9f9cd1d08a4a1a563d7b5fe7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:23 -0400
Subject: [PATCH 0993/4088] python3-orocos-kdl: rebuild for Python 3.10

---
 srcpkgs/python3-orocos-kdl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-orocos-kdl/template b/srcpkgs/python3-orocos-kdl/template
index 281ea8978c5f..1c4f9d92ed89 100644
--- a/srcpkgs/python3-orocos-kdl/template
+++ b/srcpkgs/python3-orocos-kdl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-orocos-kdl'
 pkgname=python3-orocos-kdl
 version=1.4.0
-revision=3
+revision=4
 wrksrc=orocos_kinematics_dynamics-${version}
 build_wrksrc=python_orocos_kdl
 build_style=cmake

From 40f9933248ab32fa8a1ea56b253065749f28f42f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:23 -0400
Subject: [PATCH 0994/4088] python3-opcua: rebuild for Python 3.10

---
 srcpkgs/python3-opcua/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-opcua/template b/srcpkgs/python3-opcua/template
index f31b9971db66..e91465e4a7aa 100644
--- a/srcpkgs/python3-opcua/template
+++ b/srcpkgs/python3-opcua/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-opcua'
 pkgname=python3-opcua
 version=0.98.13
-revision=1
+revision=2
 wrksrc="opcua-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cd7d7b55f5070e7be1fe9ec18b820714a282f143 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:22 -0400
Subject: [PATCH 0995/4088] python3-occ: rebuild for Python 3.10

---
 srcpkgs/python3-occ/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 3ea0ef5e6387..ce12d2c06656 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-occ'
 pkgname=python3-occ
 version=7.4.1
-revision=1
+revision=2
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 wrksrc="pythonocc-core-${version}"
 build_style=cmake

From 84e5a1451dd9b45dafcbd0aab3d189db219f11e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:21 -0400
Subject: [PATCH 0996/4088] python3-ntplib: rebuild for Python 3.10

---
 srcpkgs/python3-ntplib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ntplib/template b/srcpkgs/python3-ntplib/template
index 6de96f22702f..6947b4c93079 100644
--- a/srcpkgs/python3-ntplib/template
+++ b/srcpkgs/python3-ntplib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ntplib'
 pkgname=python3-ntplib
 version=0.3.4
-revision=2
+revision=3
 wrksrc="ntplib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 62702075d9985757dc87c8a377ba2064dfa9f23d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:21 -0400
Subject: [PATCH 0997/4088] python3-npyscreen: rebuild for Python 3.10

---
 srcpkgs/python3-npyscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-npyscreen/template b/srcpkgs/python3-npyscreen/template
index 1ecfe7c3bda8..213b843c9b9c 100644
--- a/srcpkgs/python3-npyscreen/template
+++ b/srcpkgs/python3-npyscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-npyscreen'
 pkgname=python3-npyscreen
 version=4.10.5.1
-revision=4
+revision=5
 wrksrc="npyscreen-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4937fda5e028a1bc4ac7b6d6495ab59d10123894 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:21 -0400
Subject: [PATCH 0998/4088] python3-nose-random: rebuild for Python 3.10

---
 srcpkgs/python3-nose-random/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-nose-random/template b/srcpkgs/python3-nose-random/template
index 5cace38cb89c..83bd101cc6e1 100644
--- a/srcpkgs/python3-nose-random/template
+++ b/srcpkgs/python3-nose-random/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nose-random'
 pkgname=python3-nose-random
 version=1.0.0
-revision=3
+revision=4
 wrksrc="nose-random-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7391f5cce7498495501e0479c2969cca31ecd263 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:20 -0400
Subject: [PATCH 0999/4088] python3-ndg_httpsclient: rebuild for Python 3.10

---
 srcpkgs/python3-ndg_httpsclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ndg_httpsclient/template b/srcpkgs/python3-ndg_httpsclient/template
index 03c0861f8d9b..d0c5563a6799 100644
--- a/srcpkgs/python3-ndg_httpsclient/template
+++ b/srcpkgs/python3-ndg_httpsclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ndg_httpsclient'
 pkgname=python3-ndg_httpsclient
 version=0.5.1
-revision=4
+revision=5
 wrksrc="ndg_httpsclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8ab9bc186c2c27d937309e630510166ede49a2e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:19 -0400
Subject: [PATCH 1000/4088] python3-namedlist: rebuild for Python 3.10

---
 srcpkgs/python3-namedlist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-namedlist/template b/srcpkgs/python3-namedlist/template
index 0ecdcafe8735..d113a3fea036 100644
--- a/srcpkgs/python3-namedlist/template
+++ b/srcpkgs/python3-namedlist/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-namedlist'
 pkgname=python3-namedlist
 version=1.8
-revision=3
+revision=4
 wrksrc="namedlist-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5ccd7ca1ce909472b66b1b8ee04cee98fedf5b25 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:19 -0400
Subject: [PATCH 1001/4088] python3-mysqlclient: rebuild for Python 3.10

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 14d7c703a49e..2bdab21f9a41 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=6
+revision=7
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d624bdb1e27ba1decedcb22718e69dd5574a614c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:19 -0400
Subject: [PATCH 1002/4088] python3-mypy: rebuild for Python 3.10

---
 srcpkgs/python3-mypy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 185f9d93e708..2464bbe3825c 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
 version=0.910
-revision=1
+revision=2
 wrksrc="mypy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From a59cc49d8ad5e52f8448b89fa9c62962c9df397b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:18 -0400
Subject: [PATCH 1003/4088] python3-mtranslate: rebuild for Python 3.10

---
 srcpkgs/python3-mtranslate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mtranslate/template b/srcpkgs/python3-mtranslate/template
index fe4beff74874..f451586449fc 100644
--- a/srcpkgs/python3-mtranslate/template
+++ b/srcpkgs/python3-mtranslate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mtranslate'
 pkgname=python3-mtranslate
 version=1.8
-revision=1
+revision=2
 wrksrc="mtranslate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1accaa0724018f3d0650f517945fd0e581600adb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:17 -0400
Subject: [PATCH 1004/4088] python3-mpi4py: rebuild for Python 3.10

---
 srcpkgs/python3-mpi4py/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mpi4py/template b/srcpkgs/python3-mpi4py/template
index 200b41358511..de6c347721a4 100644
--- a/srcpkgs/python3-mpi4py/template
+++ b/srcpkgs/python3-mpi4py/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpi4py'
 pkgname=python3-mpi4py
 version=3.0.3
-revision=2
+revision=3
 wrksrc="mpi4py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran openmpi"

From 2217e920ec14332a844a3d7fce21ce1bbf434ef1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:17 -0400
Subject: [PATCH 1005/4088] python3-mpdnotify: rebuild for Python 3.10

---
 srcpkgs/python3-mpdnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mpdnotify/template b/srcpkgs/python3-mpdnotify/template
index 4943cecd06ea..c8ed179dff7a 100644
--- a/srcpkgs/python3-mpdnotify/template
+++ b/srcpkgs/python3-mpdnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpdnotify'
 pkgname=python3-mpdnotify
 version=1.0
-revision=2
+revision=3
 wrksrc=mpdnotify-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Pillow python3-mpd2"

From ed2d085f8322d375d00080155fb73e97e07de349 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:17 -0400
Subject: [PATCH 1006/4088] python3-mock: rebuild for Python 3.10

---
 srcpkgs/python3-mock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mock/template b/srcpkgs/python3-mock/template
index 4c86c018bb1d..3f1939070f9a 100644
--- a/srcpkgs/python3-mock/template
+++ b/srcpkgs/python3-mock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mock'
 pkgname=python3-mock
 version=4.0.3
-revision=1
+revision=2
 wrksrc="mock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 420038af05d7aac4c96c37683356ea0bfc408c25 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:16 -0400
Subject: [PATCH 1007/4088] python3-misaka: rebuild for Python 3.10

---
 srcpkgs/python3-misaka/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-misaka/template b/srcpkgs/python3-misaka/template
index 05530b99c466..cc1f2ef1f4ff 100644
--- a/srcpkgs/python3-misaka/template
+++ b/srcpkgs/python3-misaka/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-misaka'
 pkgname=python3-misaka
 version=2.1.1
-revision=2
+revision=3
 wrksrc=misaka-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"

From 9ffe54d5a2765b765d0488646877a5c9002e4575 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:16 -0400
Subject: [PATCH 1008/4088] python3-miniupnpc: rebuild for Python 3.10

---
 srcpkgs/python3-miniupnpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-miniupnpc/template b/srcpkgs/python3-miniupnpc/template
index e048910b4e5a..2a008ff2a5ee 100644
--- a/srcpkgs/python3-miniupnpc/template
+++ b/srcpkgs/python3-miniupnpc/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-miniupnpc'
 pkgname=python3-miniupnpc
 version=2.0.2
-revision=5
+revision=6
 wrksrc="miniupnpc-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5e5cf2f4efad00d1ef34c5b48ea4403e2d05c0e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:15 -0400
Subject: [PATCH 1009/4088] python3-marisa-trie: rebuild for Python 3.10

---
 srcpkgs/python3-marisa-trie/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
index 9b4d15dbffa0..4a8b814b2338 100644
--- a/srcpkgs/python3-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-marisa-trie'
 pkgname=python3-marisa-trie
 version=0.7.5
-revision=6
+revision=7
 wrksrc="marisa-trie-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From d377fa8092aa1d640446ab9ed0a26f21c12b5e22 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:15 -0400
Subject: [PATCH 1010/4088] python3-makefun: rebuild for Python 3.10

---
 srcpkgs/python3-makefun/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-makefun/template b/srcpkgs/python3-makefun/template
index 53aadca57ec3..c75274813b31 100644
--- a/srcpkgs/python3-makefun/template
+++ b/srcpkgs/python3-makefun/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-makefun'
 pkgname=python3-makefun
 version=1.11.3
-revision=1
+revision=2
 wrksrc=makefun-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 9f516320964c629f04a2fabbf918a7ff86394211 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:14 -0400
Subject: [PATCH 1011/4088] python3-macholib: rebuild for Python 3.10

---
 srcpkgs/python3-macholib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-macholib/template b/srcpkgs/python3-macholib/template
index 03ac5ff6dc62..a498465cb3d4 100644
--- a/srcpkgs/python3-macholib/template
+++ b/srcpkgs/python3-macholib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-macholib'
 pkgname=python3-macholib
 version=1.14
-revision=2
+revision=3
 wrksrc="macholib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2a0ea0d09c55ba1f01752526a0d5c9b142344996 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:13 -0400
Subject: [PATCH 1012/4088] python3-libevdev: rebuild for Python 3.10

---
 srcpkgs/python3-libevdev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-libevdev/template b/srcpkgs/python3-libevdev/template
index db27d9d67b8c..6b0a293015c2 100644
--- a/srcpkgs/python3-libevdev/template
+++ b/srcpkgs/python3-libevdev/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-libevdev'
 pkgname=python3-libevdev
 version=0.9
-revision=2
+revision=3
 _githash=5cc6bd17be733f87c77726fee2a6fa760f413a3e
 wrksrc="python-libevdev-${version}-${_githash}"
 build_style=python3-module

From 062e0fb401cb5f71c32a7ed8a557cf5492069884 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:13 -0400
Subject: [PATCH 1013/4088] python3-ldap: rebuild for Python 3.10

---
 srcpkgs/python3-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index eae718b30d34..a9cc4feab12d 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -2,7 +2,7 @@
 pkgname=python3-ldap
 _pkgname=python-ldap
 version=3.2.0
-revision=3
+revision=4
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8fafd864653cff318a0d52fa89d51f7366f91f25 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:12 -0400
Subject: [PATCH 1014/4088] python3-language-server: rebuild for Python 3.10

---
 srcpkgs/python3-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template
index 355a49e1f5fc..83332ba10f94 100644
--- a/srcpkgs/python3-language-server/template
+++ b/srcpkgs/python3-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-language-server'
 pkgname=python3-language-server
 version=0.36.1
-revision=2
+revision=3
 wrksrc="${pkgname/3}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 763d05680698573e828fd7ac1e657d835d61f044 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:12 -0400
Subject: [PATCH 1015/4088] python3-keyrings-alt: rebuild for Python 3.10

---
 srcpkgs/python3-keyrings-alt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-keyrings-alt/template b/srcpkgs/python3-keyrings-alt/template
index 4b095f436d78..284df047988d 100644
--- a/srcpkgs/python3-keyrings-alt/template
+++ b/srcpkgs/python3-keyrings-alt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-keyrings-alt'
 pkgname=python3-keyrings-alt
 version=4.1.0
-revision=1
+revision=2
 wrksrc="keyrings.alt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From 8316d650e828686b6ead23ab98a13c2699e5cb4d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:11 -0400
Subject: [PATCH 1016/4088] python3-jupyter_qtconsole: rebuild for Python 3.10

---
 srcpkgs/python3-jupyter_qtconsole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jupyter_qtconsole/template b/srcpkgs/python3-jupyter_qtconsole/template
index e7c63cc20218..d9b3198dbcf3 100644
--- a/srcpkgs/python3-jupyter_qtconsole/template
+++ b/srcpkgs/python3-jupyter_qtconsole/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_qtconsole'
 pkgname=python3-jupyter_qtconsole
 version=4.7.1
-revision=2
+revision=3
 wrksrc="qtconsole-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9bcd079704cc982f157026af49d955d89eba0d1e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:10 -0400
Subject: [PATCH 1017/4088] python3-jupyter: rebuild for Python 3.10

---
 srcpkgs/python3-jupyter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jupyter/template b/srcpkgs/python3-jupyter/template
index b17bd1020c9b..d5e70b38a3f4 100644
--- a/srcpkgs/python3-jupyter/template
+++ b/srcpkgs/python3-jupyter/template
@@ -3,7 +3,7 @@
 # THIS PACKAGE WAS SPLIT FROM python3-jupyter_core TO AVOID A DEPENDENCY CYCLE
 pkgname=python3-jupyter
 version=4.7.1
-revision=1
+revision=2
 build_style=meta
 depends="python3-jupyter_notebook python3-jupyter_console python3-jupyter_ipywidgets"
 short_desc="Jupyter metapackage for Void Linux"

From f9a38e8361d7d0bcd0f3b1cfd2509a9cc8d3a584 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:09 -0400
Subject: [PATCH 1018/4088] python3-jsonpointer: rebuild for Python 3.10

---
 srcpkgs/python3-jsonpointer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template
index 0b88878f6907..a0797a11d48e 100644
--- a/srcpkgs/python3-jsonpointer/template
+++ b/srcpkgs/python3-jsonpointer/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsonpointer'
 pkgname=python3-jsonpointer
 version=2.0
-revision=4
+revision=5
 wrksrc="jsonpointer-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2ce831b6a1fc425193cddb7d2fee95fefd973f16 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:07 -0400
Subject: [PATCH 1019/4088] python3-iwlib: rebuild for Python 3.10

---
 srcpkgs/python3-iwlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-iwlib/template b/srcpkgs/python3-iwlib/template
index d917c972e789..19999bb33917 100644
--- a/srcpkgs/python3-iwlib/template
+++ b/srcpkgs/python3-iwlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-iwlib'
 pkgname=python3-iwlib
 version=1.7.0
-revision=5
+revision=6
 wrksrc="iwlib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"

From 22ec24f2ef1a34dd304ae1963683afd2eeded223 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:06 -0400
Subject: [PATCH 1020/4088] python3-irc: rebuild for Python 3.10

---
 srcpkgs/python3-irc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-irc/template b/srcpkgs/python3-irc/template
index 2acc061017f0..053010a62b7c 100644
--- a/srcpkgs/python3-irc/template
+++ b/srcpkgs/python3-irc/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-irc'
 pkgname=python3-irc
 version=17.1
-revision=4
+revision=5
 wrksrc="irc-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From c568baa7df2e3e1b1869f0a71d1669bcb4fb8f06 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:06 -0400
Subject: [PATCH 1021/4088] python3-iptools: rebuild for Python 3.10

---
 srcpkgs/python3-iptools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-iptools/template b/srcpkgs/python3-iptools/template
index 4ea709ead322..2b6bd09af4b7 100644
--- a/srcpkgs/python3-iptools/template
+++ b/srcpkgs/python3-iptools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-iptools'
 pkgname=python3-iptools
 version=0.7.0
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a6830b1d4923d805849b4e9baaedf66cfe754578 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:05 -0400
Subject: [PATCH 1022/4088] python3-influxdb: rebuild for Python 3.10

---
 srcpkgs/python3-influxdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-influxdb/template b/srcpkgs/python3-influxdb/template
index 39f3a8836531..2ce98b09f3bc 100644
--- a/srcpkgs/python3-influxdb/template
+++ b/srcpkgs/python3-influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-influxdb'
 pkgname=python3-influxdb
 version=5.3.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python-setuptools"

From 83c81b814634e0fc993ac681629022270bed879a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:04 -0400
Subject: [PATCH 1023/4088] python3-hypothesis: rebuild for Python 3.10, update
 to 6.23.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index db3612524cda..a47c101a28d1 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.21.0
+version=6.23.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=a6365d1af624a58edadd02817a29c3d4081f71741a1256de3520fa5b364b6cc7
+checksum=cc332ce3953e7d0e4a9d1d0da64ea5b53d3ce712c05aaaccacbafa7f865b4269
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 245c5f4fb5b183d00e0a30e7c2e2be8837c84d83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:03 -0400
Subject: [PATCH 1024/4088] python3-httmock: rebuild for Python 3.10

---
 srcpkgs/python3-httmock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-httmock/template b/srcpkgs/python3-httmock/template
index 1ae09446ee7f..9ee90be1b226 100644
--- a/srcpkgs/python3-httmock/template
+++ b/srcpkgs/python3-httmock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-httmock'
 pkgname=python3-httmock
 version=1.4.0
-revision=1
+revision=2
 wrksrc="httmock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 128b059c7012faa12fcbda1243dd7171f571778a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:02 -0400
Subject: [PATCH 1025/4088] python3-hoedown: rebuild for Python 3.10

---
 srcpkgs/python3-hoedown/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-hoedown/template b/srcpkgs/python3-hoedown/template
index 95843689b5b3..da738f039183 100644
--- a/srcpkgs/python3-hoedown/template
+++ b/srcpkgs/python3-hoedown/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hoedown'
 pkgname=python3-hoedown
 version=0.3.0
-revision=5
+revision=6
 wrksrc="hoedown-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From dad74ce4218a6f4b073a57e135fe437a9a8654db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:01 -0400
Subject: [PATCH 1026/4088] python3-grpcio-tools: rebuild for Python 3.10

---
 srcpkgs/python3-grpcio-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index d2e95679c4af..19db527a7a2a 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
 version=1.39.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b4dd82eda76b67a716d6e24d5daabdf8cee64509 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:01 -0400
Subject: [PATCH 1027/4088] python3-graphviz: rebuild for Python 3.10

---
 srcpkgs/python3-graphviz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-graphviz/template b/srcpkgs/python3-graphviz/template
index f5a0cf206526..b429292f1828 100644
--- a/srcpkgs/python3-graphviz/template
+++ b/srcpkgs/python3-graphviz/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-graphviz'
 pkgname=python3-graphviz
 version=0.13.2
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 pycompile_module="graphviz"

From 78ea09ca576deb7216490435ebb7634c590fae76 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:59 -0400
Subject: [PATCH 1028/4088] python3-gogs-client: rebuild for Python 3.10

---
 srcpkgs/python3-gogs-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gogs-client/template b/srcpkgs/python3-gogs-client/template
index 5520cf06d63a..dd91bd7a55b2 100644
--- a/srcpkgs/python3-gogs-client/template
+++ b/srcpkgs/python3-gogs-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gogs-client'
 pkgname=python3-gogs-client
 version=1.0.6
-revision=6
+revision=7
 wrksrc="gogs_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dd9857cb0922dd4a203fcbce887d724e845e052f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:59 -0400
Subject: [PATCH 1029/4088] python3-gnupg: rebuild for Python 3.10

---
 srcpkgs/python3-gnupg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
index fcf3734f5059..4470b8bed028 100644
--- a/srcpkgs/python3-gnupg/template
+++ b/srcpkgs/python3-gnupg/template
@@ -2,7 +2,7 @@
 pkgname=python3-gnupg
 _pkgname=python-gnupg
 version=0.4.6
-revision=3
+revision=4
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c5b6af12613461cdeb466b3916ade1dc032a695a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:59 -0400
Subject: [PATCH 1030/4088] python3-gntp: rebuild for Python 3.10

---
 srcpkgs/python3-gntp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gntp/template b/srcpkgs/python3-gntp/template
index db2fa5e0b6de..26d72f91d78f 100644
--- a/srcpkgs/python3-gntp/template
+++ b/srcpkgs/python3-gntp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gntp'
 pkgname=python3-gntp
 version=1.0.3
-revision=8
+revision=9
 wrksrc="gntp-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 09b8c1ae65033093e3e2fffcef89927ee8bb898b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:59 -0400
Subject: [PATCH 1031/4088] python3-gitlab: rebuild for Python 3.10

---
 srcpkgs/python3-gitlab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gitlab/template b/srcpkgs/python3-gitlab/template
index 8ef62b2570e5..51b23ee5e8b7 100644
--- a/srcpkgs/python3-gitlab/template
+++ b/srcpkgs/python3-gitlab/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gitlab'
 pkgname=python3-gitlab
 version=1.12.1
-revision=4
+revision=5
 wrksrc=python-gitlab-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3b92747448b4221ecb2592223c7e69a4892ef9b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:59 -0400
Subject: [PATCH 1032/4088] python3-github3: rebuild for Python 3.10

---
 srcpkgs/python3-github3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-github3/template b/srcpkgs/python3-github3/template
index 53c0b2b5f965..70842cbc2f9e 100644
--- a/srcpkgs/python3-github3/template
+++ b/srcpkgs/python3-github3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-github3'
 pkgname=python3-github3
 version=1.3.0
-revision=4
+revision=5
 wrksrc="github3.py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0d1c1eeb9bfcaac674623be63bef7c0626350538 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:58 -0400
Subject: [PATCH 1033/4088] python3-fuzzyfinder: rebuild for Python 3.10

---
 srcpkgs/python3-fuzzyfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fuzzyfinder/template b/srcpkgs/python3-fuzzyfinder/template
index 36ccf7bb8af6..6526b7a52ca5 100644
--- a/srcpkgs/python3-fuzzyfinder/template
+++ b/srcpkgs/python3-fuzzyfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fuzzyfinder'
 pkgname=python3-fuzzyfinder
 version=2.1.0
-revision=2
+revision=3
 wrksrc=fuzzyfinder-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 860c64291f59f176faf966f93779c1b4d413c1e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:58 -0400
Subject: [PATCH 1034/4088] python3-fuse: rebuild for Python 3.10

---
 srcpkgs/python3-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fuse/template b/srcpkgs/python3-fuse/template
index 7147b39d7ae8..6fc6ce97c4ef 100644
--- a/srcpkgs/python3-fuse/template
+++ b/srcpkgs/python3-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fuse'
 pkgname=python3-fuse
 version=1.0.0
-revision=1
+revision=2
 wrksrc=python-fuse-$version
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"

From d4d9cda950521fcb0a19786120875748650960f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:57 -0400
Subject: [PATCH 1035/4088] python3-freezegun: rebuild for Python 3.10

---
 srcpkgs/python3-freezegun/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-freezegun/template b/srcpkgs/python3-freezegun/template
index 9051f9e3b646..1b414a7860d3 100644
--- a/srcpkgs/python3-freezegun/template
+++ b/srcpkgs/python3-freezegun/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-freezegun'
 pkgname=python3-freezegun
 version=0.3.15
-revision=2
+revision=3
 wrksrc="freezegun-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5b4d3bd600dbdebaab6e02d87e1f6ac20e1f0ef2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:57 -0400
Subject: [PATCH 1036/4088] python3-flexmock: rebuild for Python 3.10

---
 srcpkgs/python3-flexmock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-flexmock/template b/srcpkgs/python3-flexmock/template
index 84d35597aac8..d2e196bdd2b5 100644
--- a/srcpkgs/python3-flexmock/template
+++ b/srcpkgs/python3-flexmock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-flexmock'
 pkgname=python3-flexmock
 version=0.10.4
-revision=3
+revision=4
 wrksrc="flexmock-${version}"
 build_style=python3-module
 pycompile_module="flexmock.py"

From bf8f517c94deeb21715a4738ad0be5384250eaf9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:57 -0400
Subject: [PATCH 1037/4088] python3-flaky: rebuild for Python 3.10

---
 srcpkgs/python3-flaky/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-flaky/template b/srcpkgs/python3-flaky/template
index bc460f455faa..08a0d44aedd5 100644
--- a/srcpkgs/python3-flaky/template
+++ b/srcpkgs/python3-flaky/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-flaky'
 pkgname=python3-flaky
 version=3.6.1
-revision=4
+revision=5
 wrksrc="flaky-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3d26474792497f843a83ec2a6ddd64f3e1900a33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:57 -0400
Subject: [PATCH 1038/4088] python3-fishnet: rebuild for Python 3.10

---
 srcpkgs/python3-fishnet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fishnet/template b/srcpkgs/python3-fishnet/template
index 8c802e94d868..ebf13ee84f92 100644
--- a/srcpkgs/python3-fishnet/template
+++ b/srcpkgs/python3-fishnet/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fishnet'
 pkgname=python3-fishnet
 version=1.15.18
-revision=3
+revision=4
 wrksrc="fishnet-${version}"
 build_style=python3-module
 pycompile_module="fishnet.py"

From 503167c64deabc4cb28c3d2c78dd4bd5e4a77216 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:56 -0400
Subject: [PATCH 1039/4088] python3-exifread: rebuild for Python 3.10

---
 srcpkgs/python3-exifread/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-exifread/template b/srcpkgs/python3-exifread/template
index f90e837d1c05..43fa22722bc5 100644
--- a/srcpkgs/python3-exifread/template
+++ b/srcpkgs/python3-exifread/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-exifread'
 pkgname=python3-exifread
 version=2.3.2
-revision=1
+revision=2
 wrksrc="exif-py-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From b456784029b316f9b4f0cb5956e2d59a21cc043c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:55 -0400
Subject: [PATCH 1040/4088] python3-esprima: rebuild for Python 3.10

---
 srcpkgs/python3-esprima/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-esprima/template b/srcpkgs/python3-esprima/template
index d8c6b016f422..da9de4797b0a 100644
--- a/srcpkgs/python3-esprima/template
+++ b/srcpkgs/python3-esprima/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-esprima'
 pkgname=python3-esprima
 version=4.0.1
-revision=4
+revision=5
 create_wrksrc=yes
 build_wrksrc="esprima-${version}"
 build_style=python3-module

From 64a0fb0510a223a03ddc1bf18d65f67d22c8abc9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:55 -0400
Subject: [PATCH 1041/4088] python3-envdir: rebuild for Python 3.10

---
 srcpkgs/python3-envdir/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-envdir/template b/srcpkgs/python3-envdir/template
index c1d3e3925871..8aefb1a9d878 100644
--- a/srcpkgs/python3-envdir/template
+++ b/srcpkgs/python3-envdir/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-envdir'
 pkgname=python3-envdir
 version=1.0.1
-revision=5
+revision=6
 wrksrc="envdir-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fc5f4531cf3d734ebff74e79d766f0019bbacf31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:54 -0400
Subject: [PATCH 1042/4088] python3-empy: rebuild for Python 3.10

---
 srcpkgs/python3-empy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-empy/template b/srcpkgs/python3-empy/template
index 7cbd77f52f2e..cf1152c66cc8 100644
--- a/srcpkgs/python3-empy/template
+++ b/srcpkgs/python3-empy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-empy'
 pkgname=python3-empy
 version=3.3.4
-revision=4
+revision=5
 wrksrc="empy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c6651904cd1f09b437118b1432f2a80904575e79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:54 -0400
Subject: [PATCH 1043/4088] python3-efl: rebuild for Python 3.10

---
 srcpkgs/python3-efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-efl/template b/srcpkgs/python3-efl/template
index ea9bbcd7b54e..f0655af6bc72 100644
--- a/srcpkgs/python3-efl/template
+++ b/srcpkgs/python3-efl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-efl'
 pkgname=python3-efl
 version=1.23.0
-revision=4
+revision=5
 wrksrc=python-efl-${version}
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel python3-Cython"

From 906bde05f58acf0ac17734f5686a87baa5ae0f03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:53 -0400
Subject: [PATCH 1044/4088] python3-dpkt: rebuild for Python 3.10

---
 srcpkgs/python3-dpkt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dpkt/template b/srcpkgs/python3-dpkt/template
index ac800e211c5a..10a2ee030068 100644
--- a/srcpkgs/python3-dpkt/template
+++ b/srcpkgs/python3-dpkt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dpkt'
 pkgname=python3-dpkt
 version=1.9.7.2
-revision=1
+revision=2
 wrksrc="dpkt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 471fa1b18b6a7c685aaed792ce8efaa4356c3628 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:53 -0400
Subject: [PATCH 1045/4088] python3-dominate: rebuild for Python 3.10

---
 srcpkgs/python3-dominate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dominate/template b/srcpkgs/python3-dominate/template
index c657ad71112e..92b12faaf2bc 100644
--- a/srcpkgs/python3-dominate/template
+++ b/srcpkgs/python3-dominate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dominate'
 pkgname=python3-dominate
 version=2.6.0
-revision=1
+revision=2
 wrksrc="dominate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ed66593ba14cd0fd20f520f1afe7ca7b331390a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:51 -0400
Subject: [PATCH 1046/4088] python3-discogs_client: rebuild for Python 3.10

---
 srcpkgs/python3-discogs_client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-discogs_client/template b/srcpkgs/python3-discogs_client/template
index 99a198d18bdb..31f077048b04 100644
--- a/srcpkgs/python3-discogs_client/template
+++ b/srcpkgs/python3-discogs_client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-discogs_client'
 pkgname=python3-discogs_client
 version=2.2.2
-revision=4
+revision=5
 wrksrc="discogs-client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cd662acc238c0ab62c0e6f80b5ba685ada0ae9b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:51 -0400
Subject: [PATCH 1047/4088] python3-dbusmock: rebuild for Python 3.10

---
 srcpkgs/python3-dbusmock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dbusmock/template b/srcpkgs/python3-dbusmock/template
index fec8c097526b..894cceecf7c5 100644
--- a/srcpkgs/python3-dbusmock/template
+++ b/srcpkgs/python3-dbusmock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dbusmock'
 pkgname=python3-dbusmock
 version=0.19
-revision=2
+revision=3
 wrksrc="python-dbusmock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e57ff78b3f39346c7770c9a7d6a370149950b6c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:50 -0400
Subject: [PATCH 1048/4088] python3-curtsies: rebuild for Python 3.10

---
 srcpkgs/python3-curtsies/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-curtsies/template b/srcpkgs/python3-curtsies/template
index 0d03da5b9b3d..3488d66ab5e0 100644
--- a/srcpkgs/python3-curtsies/template
+++ b/srcpkgs/python3-curtsies/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-curtsies'
 pkgname=python3-curtsies
 version=0.3.0
-revision=4
+revision=5
 wrksrc="curtsies-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bbca00f7f12dbbc4102b90eca98b2b534a37cb19 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:50 -0400
Subject: [PATCH 1049/4088] python3-curio: rebuild for Python 3.10

---
 srcpkgs/python3-curio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-curio/template b/srcpkgs/python3-curio/template
index e7265f42fdda..51c7d9a11f98 100644
--- a/srcpkgs/python3-curio/template
+++ b/srcpkgs/python3-curio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-curio'
 pkgname=python3-curio
 version=1.5
-revision=1
+revision=2
 wrksrc="curio-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 90a9e48d31c178b7b681195b72ef38a3db911fce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:49 -0400
Subject: [PATCH 1050/4088] python3-cryptography_vectors: rebuild for Python
 3.10

---
 srcpkgs/python3-cryptography_vectors/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 9b1f95b65d81..3db092e596d6 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
 version=3.4.8
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5ceaae8fbedeba1ae2db34f3f2c7f3c0499a29f7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:49 -0400
Subject: [PATCH 1051/4088] python3-crcmod: rebuild for Python 3.10

---
 srcpkgs/python3-crcmod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-crcmod/template b/srcpkgs/python3-crcmod/template
index e7cd5f22f48e..c043a198e506 100644
--- a/srcpkgs/python3-crcmod/template
+++ b/srcpkgs/python3-crcmod/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-crcmod'
 pkgname=python3-crcmod
 version=1.7
-revision=3
+revision=4
 wrksrc="crcmod-${version}"
 build_style=python3-module
 pycompile_module="crcmod"

From 2226b95e580512237a84aeb30ff4a5234f439099 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:49 -0400
Subject: [PATCH 1052/4088] python3-crccheck: rebuild for Python 3.10

---
 srcpkgs/python3-crccheck/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-crccheck/template b/srcpkgs/python3-crccheck/template
index 3ed3234a97f9..f8088e83e6a2 100644
--- a/srcpkgs/python3-crccheck/template
+++ b/srcpkgs/python3-crccheck/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-crccheck'
 pkgname=python3-crccheck
 version=1.0
-revision=2
+revision=3
 wrksrc="crccheck-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From caed1b1733dc739036b6c549a057659b9369199a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:48 -0400
Subject: [PATCH 1053/4088] python3-cram: rebuild for Python 3.10

---
 srcpkgs/python3-cram/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cram/template b/srcpkgs/python3-cram/template
index c66a8e667830..f13bb1f99dd2 100644
--- a/srcpkgs/python3-cram/template
+++ b/srcpkgs/python3-cram/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cram'
 pkgname=python3-cram
 version=0.7
-revision=5
+revision=6
 wrksrc="cram-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1afc7fa6cf0ef7294737e4ad54a6bb0a272163dc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:48 -0400
Subject: [PATCH 1054/4088] python3-coveralls: rebuild for Python 3.10

---
 srcpkgs/python3-coveralls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-coveralls/template b/srcpkgs/python3-coveralls/template
index 36f22c017398..f94ac92c6ca0 100644
--- a/srcpkgs/python3-coveralls/template
+++ b/srcpkgs/python3-coveralls/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-coveralls'
 pkgname=python3-coveralls
 version=2.9.2
-revision=1
+revision=2
 wrksrc="python-coveralls-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-coverage"

From 83a793dc723cb331ab6b962af5b08556ef66cc97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:48 -0400
Subject: [PATCH 1055/4088] python3-codespell: rebuild for Python 3.10

---
 srcpkgs/python3-codespell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template
index 79ac70eb90b3..c2f5a9931b7e 100644
--- a/srcpkgs/python3-codespell/template
+++ b/srcpkgs/python3-codespell/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-codespell'
 pkgname=python3-codespell
 version=1.17.1
-revision=1
+revision=2
 wrksrc="codespell-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 25474a8b9e19f1cdf9f7d581c30674a0d90a7977 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:47 -0400
Subject: [PATCH 1056/4088] python3-cmdln: rebuild for Python 3.10

---
 srcpkgs/python3-cmdln/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cmdln/template b/srcpkgs/python3-cmdln/template
index 2f19f24ac978..62aed6060ef9 100644
--- a/srcpkgs/python3-cmdln/template
+++ b/srcpkgs/python3-cmdln/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cmdln'
 pkgname=python3-cmdln
 version=2.0.0
-revision=3
+revision=4
 wrksrc="cmdln-${version}"
 build_style=python3-module
 pycompile_module="cmdln.py"

From 00588e7b2394f6c70eee754fdb6103c341186bac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:46 -0400
Subject: [PATCH 1057/4088] python3-cli-ui: rebuild for Python 3.10

---
 srcpkgs/python3-cli-ui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cli-ui/template b/srcpkgs/python3-cli-ui/template
index 31f35ff254b0..baf4d1d6a424 100644
--- a/srcpkgs/python3-cli-ui/template
+++ b/srcpkgs/python3-cli-ui/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cli-ui'
 pkgname=python3-cli-ui
 version=0.11.0
-revision=1
+revision=2
 wrksrc="cli-ui-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 754c966637b2c15942df9f2d7fb4d66ebf394ee3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:46 -0400
Subject: [PATCH 1058/4088] python3-chroot: rebuild for Python 3.10

---
 srcpkgs/python3-chroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-chroot/template b/srcpkgs/python3-chroot/template
index 0698fd872c3b..d4a8cd59b669 100644
--- a/srcpkgs/python3-chroot/template
+++ b/srcpkgs/python3-chroot/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-chroot'
 pkgname=python3-chroot
 version=0.10.1
-revision=1
+revision=2
 wrksrc="pychroot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-snakeoil"

From 1f83da22f1e227a602071f9e851705b393ad7543 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:46 -0400
Subject: [PATCH 1059/4088] python3-chess: rebuild for Python 3.10

---
 srcpkgs/python3-chess/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-chess/template b/srcpkgs/python3-chess/template
index f84b994f37b6..b5e5158b896c 100644
--- a/srcpkgs/python3-chess/template
+++ b/srcpkgs/python3-chess/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-chess'
 pkgname=python3-chess
 version=0.30.1
-revision=2
+revision=3
 wrksrc="python-chess-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9e0e7857b77e2b900a46055e660f47b276678ec1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:45 -0400
Subject: [PATCH 1060/4088] python3-changelogs: rebuild for Python 3.10

---
 srcpkgs/python3-changelogs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-changelogs/template b/srcpkgs/python3-changelogs/template
index 6893d6f8d974..cca78cb035c5 100644
--- a/srcpkgs/python3-changelogs/template
+++ b/srcpkgs/python3-changelogs/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-changelogs'
 pkgname=python3-changelogs
 version=0.15.0
-revision=1
+revision=2
 wrksrc="changelogs-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c4d5168dbe6a6de9aedb638e87d403ffad692f19 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:45 -0400
Subject: [PATCH 1061/4088] python3-cairocffi: rebuild for Python 3.10

---
 srcpkgs/python3-cairocffi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cairocffi/template b/srcpkgs/python3-cairocffi/template
index 6d1c9db6e180..f27d35907eb0 100644
--- a/srcpkgs/python3-cairocffi/template
+++ b/srcpkgs/python3-cairocffi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cairocffi'
 pkgname=python3-cairocffi
 version=1.2.0
-revision=1
+revision=2
 wrksrc="cairocffi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi python3-wheel"

From c3297cec5c155c4152095bfaf167fdf975b3f4e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:43 -0400
Subject: [PATCH 1062/4088] python3-bokeh: rebuild for Python 3.10

---
 srcpkgs/python3-bokeh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index ec63aa3a224c..dc00df55ca0b 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
 version=2.4.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 make_build_args="--build-js"

From e97e0856587783957c2fac4d75184aa9fc07649d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:42 -0400
Subject: [PATCH 1063/4088] python3-bitbucket-api: rebuild for Python 3.10

---
 srcpkgs/python3-bitbucket-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bitbucket-api/template b/srcpkgs/python3-bitbucket-api/template
index e725d60808e1..784664aaa6b9 100644
--- a/srcpkgs/python3-bitbucket-api/template
+++ b/srcpkgs/python3-bitbucket-api/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bitbucket-api'
 pkgname=python3-bitbucket-api
 version=0.5.0
-revision=6
+revision=7
 wrksrc="bitbucket-api-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0435241509c8d5358274afeb840ca7eabb7e8ca4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:42 -0400
Subject: [PATCH 1064/4088] python3-bitarray: rebuild for Python 3.10

---
 srcpkgs/python3-bitarray/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bitarray/template b/srcpkgs/python3-bitarray/template
index cf98978d288d..3490d6ee0687 100644
--- a/srcpkgs/python3-bitarray/template
+++ b/srcpkgs/python3-bitarray/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bitarray'
 pkgname=python3-bitarray
 version=1.0.1
-revision=4
+revision=5
 wrksrc="bitarray-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1d72e84e77b4b52afb51cc0c0afa941ea5ac4296 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:40 -0400
Subject: [PATCH 1065/4088] python3-astral: rebuild for Python 3.10

---
 srcpkgs/python3-astral/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-astral/template b/srcpkgs/python3-astral/template
index e9fcd0dfbe63..f7ace74a4350 100644
--- a/srcpkgs/python3-astral/template
+++ b/srcpkgs/python3-astral/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-astral'
 pkgname=python3-astral
 version=2.2
-revision=2
+revision=3
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From 4a200b776d74de90725a1981a839f663f88e4eea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:39 -0400
Subject: [PATCH 1066/4088] python3-applib: rebuild for Python 3.10

---
 srcpkgs/python3-applib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-applib/template b/srcpkgs/python3-applib/template
index 50ba75041fcd..f66ce2c04b50 100644
--- a/srcpkgs/python3-applib/template
+++ b/srcpkgs/python3-applib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-applib'
 pkgname=python3-applib
 version=1.2
-revision=4
+revision=5
 create_wrksrc=yes
 build_wrksrc="applib-${version}"
 build_style=python3-module

From aab46b713bb24c0d5455702ac862f2c855e49419 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:38 -0400
Subject: [PATCH 1067/4088] python3-ansible-lint: rebuild for Python 3.10

---
 srcpkgs/python3-ansible-lint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 80fa8dbe130c..bc8b03fcd823 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
 version=4.3.5
-revision=2
+revision=3
 wrksrc="ansible-lint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3eee1d890ca277576510141c124cc329df96a86d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:38 -0400
Subject: [PATCH 1068/4088] python3-alsa: rebuild for Python 3.10

---
 .../patches/fix-pytuple-set-item.patch        | 46 +++++++++++++++++++
 srcpkgs/python3-alsa/template                 |  2 +-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-alsa/patches/fix-pytuple-set-item.patch

diff --git a/srcpkgs/python3-alsa/patches/fix-pytuple-set-item.patch b/srcpkgs/python3-alsa/patches/fix-pytuple-set-item.patch
new file mode 100644
index 000000000000..cb2bf7579f43
--- /dev/null
+++ b/srcpkgs/python3-alsa/patches/fix-pytuple-set-item.patch
@@ -0,0 +1,46 @@
+From 5ea2f8709b4d091700750661231f8a3ddce0fc7c Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Thu, 10 Dec 2020 16:00:50 +0100
+Subject: [PATCH] Fix PyTuple_SET_ITEM() usage - no return value
+
+As noted in bpo-30459 (link bellow) the PyTuple_SET_ITEM() macro
+has not a return value. Let's make code compatible with python 3.10.
+
+Link: https://bugs.python.org/issue30459
+BugLink: https://github.com/alsa-project/alsa-python/issues/2
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ pyalsa/alsahcontrol.c | 4 ++--
+ pyalsa/alsamixer.c    | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pyalsa/alsahcontrol.c b/pyalsa/alsahcontrol.c
+index ebee1b7..7c9321f 100644
+--- a/pyalsa/alsahcontrol.c
++++ b/pyalsa/alsahcontrol.c
+@@ -1543,8 +1543,8 @@ static int element_callback(snd_hctl_elem_t *elem, unsigned int mask)
+ 
+ 	t = PyTuple_New(2);
+ 	if (t) {
+-		if (PyTuple_SET_ITEM(t, 0, (PyObject *)pyhelem))
+-			Py_INCREF(pyhelem);
++		PyTuple_SET_ITEM(t, 0, (PyObject *)pyhelem);
++		Py_INCREF(pyhelem);
+ 		PyTuple_SET_ITEM(t, 1, PyInt_FromLong(mask));
+ 		r = PyObject_CallObject(o, t);
+ 		Py_DECREF(t);
+diff --git a/pyalsa/alsamixer.c b/pyalsa/alsamixer.c
+index 39d7387..91fe198 100644
+--- a/pyalsa/alsamixer.c
++++ b/pyalsa/alsamixer.c
+@@ -1348,8 +1348,8 @@ static int element_callback(snd_mixer_elem_t *elem, unsigned int mask)
+ 
+ 	t = PyTuple_New(2);
+ 	if (t) {
+-		if (PyTuple_SET_ITEM(t, 0, (PyObject *)pyelem))
+-			Py_INCREF(pyelem);
++		PyTuple_SET_ITEM(t, 0, (PyObject *)pyelem);
++		Py_INCREF(pyelem);
+ 		PyTuple_SET_ITEM(t, 1, PyInt_FromLong(mask));
+ 		r = PyObject_CallObject(o, t);
+ 		Py_DECREF(t);
diff --git a/srcpkgs/python3-alsa/template b/srcpkgs/python3-alsa/template
index eb7bbd479c2c..aa522cebc575 100644
--- a/srcpkgs/python3-alsa/template
+++ b/srcpkgs/python3-alsa/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-alsa'
 pkgname=python3-alsa
 version=1.1.6
-revision=3
+revision=4
 wrksrc="pyalsa-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 56927e0afb2f3f683ebef3e0d012ca919820f2df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:37 -0400
Subject: [PATCH 1069/4088] python3-aioredis: rebuild for Python 3.10

---
 srcpkgs/python3-aioredis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..2d2f586f336e 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
 version=2.0.0
-revision=1
+revision=2
 wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 54478b61742417f0c53c0d92433015172002b24f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:37 -0400
Subject: [PATCH 1070/4088] python3-aioinflux: rebuild for Python 3.10

---
 srcpkgs/python3-aioinflux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aioinflux/template b/srcpkgs/python3-aioinflux/template
index 612ab7076b31..1ef519496ecc 100644
--- a/srcpkgs/python3-aioinflux/template
+++ b/srcpkgs/python3-aioinflux/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aioinflux'
 pkgname=python3-aioinflux
 version=0.9.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 599fd4c212ce7e10d1da8366c2eb5fea7eddf574 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:37 -0400
Subject: [PATCH 1071/4088] python3-aiohttp-sse-client: rebuild for Python 3.10

---
 srcpkgs/python3-aiohttp-sse-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aiohttp-sse-client/template b/srcpkgs/python3-aiohttp-sse-client/template
index 1c876b6703fc..73b4ba5ad03f 100644
--- a/srcpkgs/python3-aiohttp-sse-client/template
+++ b/srcpkgs/python3-aiohttp-sse-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiohttp-sse-client'
 pkgname=python3-aiohttp-sse-client
 version=0.2.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cb6a67ab01ad513e06f30d9f03fd10e6ac0a83ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:36 -0400
Subject: [PATCH 1072/4088] python3-aioamqp: rebuild for Python 3.10

---
 srcpkgs/python3-aioamqp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aioamqp/template b/srcpkgs/python3-aioamqp/template
index 13bb48d1a033..f61a08208d2b 100644
--- a/srcpkgs/python3-aioamqp/template
+++ b/srcpkgs/python3-aioamqp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aioamqp'
 pkgname=python3-aioamqp
 version=0.14.0
-revision=2
+revision=3
 wrksrc="aioamqp-aioamqp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 74c9f29e315bf67a6a296b96d8de8d17e72220eb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:36 -0400
Subject: [PATCH 1073/4088] python3-adblock: rebuild for Python 3.10

---
 srcpkgs/python3-adblock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index 17e352466c4d..0d8832be8111 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.5.0
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"

From d5af6d94f2c84fbdff8de985f42bbd35cbc9aff0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:35 -0400
Subject: [PATCH 1074/4088] python3-aalib: rebuild for Python 3.10

---
 srcpkgs/python3-aalib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aalib/template b/srcpkgs/python3-aalib/template
index edc004b1543e..eac83d1f4885 100644
--- a/srcpkgs/python3-aalib/template
+++ b/srcpkgs/python3-aalib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aalib'
 pkgname=python3-aalib
 version=0.3.2
-revision=4
+revision=5
 wrksrc=python-aalib-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b8c07ba933e07a012716a00e6a6ddfe8bdbda3e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:35 -0400
Subject: [PATCH 1075/4088] python3-Yapsy: rebuild for Python 3.10

---
 srcpkgs/python3-Yapsy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Yapsy/template b/srcpkgs/python3-Yapsy/template
index 634e59282a40..2414cad0a9b7 100644
--- a/srcpkgs/python3-Yapsy/template
+++ b/srcpkgs/python3-Yapsy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Yapsy'
 pkgname=python3-Yapsy
 version=1.12.2
-revision=4
+revision=5
 wrksrc="Yapsy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 672c143ee1fe0f533e274913ea500d908d5bf355 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:35 -0400
Subject: [PATCH 1076/4088] python3-Whoosh: rebuild for Python 3.10

---
 srcpkgs/python3-Whoosh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Whoosh/template b/srcpkgs/python3-Whoosh/template
index 229ff8ac9020..0a81d4ace717 100644
--- a/srcpkgs/python3-Whoosh/template
+++ b/srcpkgs/python3-Whoosh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Whoosh'
 pkgname=python3-Whoosh
 version=2.7.4
-revision=4
+revision=5
 wrksrc="Whoosh-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"

From 0d14d60f16569e2787f0ddaceb8dad1fea024b85 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:34 -0400
Subject: [PATCH 1077/4088] python3-Telethon: rebuild for Python 3.10

---
 srcpkgs/python3-Telethon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template
index 398da17d1f38..bc5e7c28d857 100644
--- a/srcpkgs/python3-Telethon/template
+++ b/srcpkgs/python3-Telethon/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Telethon'
 pkgname=python3-Telethon
 version=1.21.1
-revision=1
+revision=2
 wrksrc="Telethon-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e3705dde1f86374498054175f3ac77c196b44f22 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:33 -0400
Subject: [PATCH 1078/4088] python3-RPi.GPIO: rebuild for Python 3.10

---
 srcpkgs/python3-RPi.GPIO/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
index 204eba16181f..e855ad7fc048 100644
--- a/srcpkgs/python3-RPi.GPIO/template
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-RPi.GPIO'
 pkgname=python3-RPi.GPIO
 version=0.7.0
-revision=1
+revision=2
 archs="armv[67]l* aarch64*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module

From e6a29c8aead133ff3a9815a48683be6af15409b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:32 -0400
Subject: [PATCH 1079/4088] python3-PyQt5-networkauth: rebuild for Python 3.10

---
 srcpkgs/python3-PyQt5-networkauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template
index 291dbb0cc249..66930f6868d1 100644
--- a/srcpkgs/python3-PyQt5-networkauth/template
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt5-networkauth'
 pkgname=python3-PyQt5-networkauth
 version=5.15.4
-revision=1
+revision=2
 wrksrc=PyQtNetworkAuth-$version
 build_helper="qmake"
 hostmakedepends="qt5-qmake python3-PyQt5-devel pkg-config sip

From 270a4f8066e18ab2b11a47f3cc64a23e97458005 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:32 -0400
Subject: [PATCH 1080/4088] python3-PyJWT: rebuild for Python 3.10

---
 srcpkgs/python3-PyJWT/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
index ad1703121e2d..5fe1a162b370 100644
--- a/srcpkgs/python3-PyJWT/template
+++ b/srcpkgs/python3-PyJWT/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyJWT'
 pkgname=python3-PyJWT
 version=2.1.0
-revision=1
+revision=2
 wrksrc="pyjwt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d7e500595cea1505086a15195864ce938b3af9f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:31 -0400
Subject: [PATCH 1081/4088] python3-PyICU: rebuild for Python 3.10

---
 srcpkgs/python3-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..f466e34bfb02 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=3
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 72e21475ffcc03e2ad081368e7b357802f970ef7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:31 -0400
Subject: [PATCH 1082/4088] python3-PyAudio: rebuild for Python 3.10

---
 srcpkgs/python3-PyAudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyAudio/template b/srcpkgs/python3-PyAudio/template
index 9d0f850bd24f..8f9de6cbbacf 100644
--- a/srcpkgs/python3-PyAudio/template
+++ b/srcpkgs/python3-PyAudio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyAudio'
 pkgname=python3-PyAudio
 version=0.2.11
-revision=5
+revision=6
 wrksrc="PyAudio-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1ccf6789852395c931abc89388c722367c425270 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:31 -0400
Subject: [PATCH 1083/4088] python3-Pebble: rebuild for Python 3.10

---
 srcpkgs/python3-Pebble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Pebble/template b/srcpkgs/python3-Pebble/template
index e834d8478dc9..db663d5f6959 100644
--- a/srcpkgs/python3-Pebble/template
+++ b/srcpkgs/python3-Pebble/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Pebble'
 pkgname=python3-Pebble
 version=4.6.1
-revision=1
+revision=2
 wrksrc=Pebble-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 50583d434dbff772790e10777e7ab6a961e51689 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:31 -0400
Subject: [PATCH 1084/4088] python3-PGPy: rebuild for Python 3.10

---
 srcpkgs/python3-PGPy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PGPy/template b/srcpkgs/python3-PGPy/template
index 6450ed628736..fa73d46876ce 100644
--- a/srcpkgs/python3-PGPy/template
+++ b/srcpkgs/python3-PGPy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PGPy'
 pkgname=python3-PGPy
 version=0.5.3
-revision=2
+revision=3
 wrksrc=PGPy-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-wheel"

From d1a183fd0a9c23d70811f5ddd8421917daa1429f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:30 -0400
Subject: [PATCH 1085/4088] python3-MiniMock: rebuild for Python 3.10

---
 srcpkgs/python3-MiniMock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-MiniMock/template b/srcpkgs/python3-MiniMock/template
index ccfea275e982..851733cdc1b1 100644
--- a/srcpkgs/python3-MiniMock/template
+++ b/srcpkgs/python3-MiniMock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-MiniMock'
 pkgname=python3-MiniMock
 version=1.2.8
-revision=5
+revision=6
 wrksrc="MiniMock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 622741ed7d2db1acb113b41abaf95e0ce876da0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:30 -0400
Subject: [PATCH 1086/4088] python3-Inflector: rebuild for Python 3.10

---
 srcpkgs/python3-Inflector/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Inflector/template b/srcpkgs/python3-Inflector/template
index ec4da0d4c030..072977ee0ce3 100644
--- a/srcpkgs/python3-Inflector/template
+++ b/srcpkgs/python3-Inflector/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Inflector'
 pkgname=python3-Inflector
 version=3.0.1
-revision=2
+revision=3
 wrksrc="Inflector-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f3092bfc21d40ad751db819dd6abeccdf6c313b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:29 -0400
Subject: [PATCH 1087/4088] python3-GitPython: rebuild for Python 3.10

---
 srcpkgs/python3-GitPython/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-GitPython/template b/srcpkgs/python3-GitPython/template
index 2a489e12a119..0f40f6742488 100644
--- a/srcpkgs/python3-GitPython/template
+++ b/srcpkgs/python3-GitPython/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-GitPython'
 pkgname=python3-GitPython
 version=2.1.11
-revision=4
+revision=5
 wrksrc="GitPython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f71d8cf59e4750f69f8d65afa1c7adce6b6a7e67 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:29 -0400
Subject: [PATCH 1088/4088] python3-Flask-User: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-User/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Flask-User/template b/srcpkgs/python3-Flask-User/template
index cdd74414e78a..d3b88b726298 100644
--- a/srcpkgs/python3-Flask-User/template
+++ b/srcpkgs/python3-Flask-User/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-Flask-User'
 pkgname=python3-Flask-User
 version=1.0.2.2
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-Flask-Login"
+hostmakedepends="python3-setuptools python3-Flask-Login python3-wheel"
 depends="python3-Flask python3-Flask-Login python3-Flask-WTF
  python3-Flask-SQLAlchemy python3-Flask-Mail python3-Flask-Babel"
 short_desc="User session management for Flask (Python3)"

From 0492388278f8eaa6c7113d97ef6a783828d7ab09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:29 -0400
Subject: [PATCH 1089/4088] python3-Flask-Script: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-Script/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Script/template b/srcpkgs/python3-Flask-Script/template
index b91928786f0b..7121d6bd05c7 100644
--- a/srcpkgs/python3-Flask-Script/template
+++ b/srcpkgs/python3-Flask-Script/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Script'
 pkgname=python3-Flask-Script
 version=2.0.6
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d1faf6a552cbed4b7e697b19945530b5c35fbfdd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:28 -0400
Subject: [PATCH 1090/4088] python3-Flask-OAuthlib: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-OAuthlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-OAuthlib/template b/srcpkgs/python3-Flask-OAuthlib/template
index a92b7a793ed3..b0c144b28700 100644
--- a/srcpkgs/python3-Flask-OAuthlib/template
+++ b/srcpkgs/python3-Flask-OAuthlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-OAuthlib'
 pkgname=python3-Flask-OAuthlib
 version=0.9.6
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9d391218ad71aef19d79e9d9df723e13c3edf01c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:28 -0400
Subject: [PATCH 1091/4088] python3-Flask-HTTPAuth: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-HTTPAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-HTTPAuth/template b/srcpkgs/python3-Flask-HTTPAuth/template
index 5f2f82cec657..8245bda8dcec 100644
--- a/srcpkgs/python3-Flask-HTTPAuth/template
+++ b/srcpkgs/python3-Flask-HTTPAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-HTTPAuth'
 pkgname=python3-Flask-HTTPAuth
 version=4.4.0
-revision=1
+revision=2
 wrksrc=Flask-HTTPAuth-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 46fa5aa49feb65f0832346c3a4d4b45e1a0e62df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:28 -0400
Subject: [PATCH 1092/4088] python3-Flask-Assets: rebuild for Python 3.10

---
 srcpkgs/python3-Flask-Assets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Assets/template b/srcpkgs/python3-Flask-Assets/template
index ae1ff9504539..984b36ec4bd9 100644
--- a/srcpkgs/python3-Flask-Assets/template
+++ b/srcpkgs/python3-Flask-Assets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Assets'
 pkgname=python3-Flask-Assets
 version=0.12
-revision=6
+revision=7
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 166a1835b8110489c5c95d496f935c73ac0ce517 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:27 -0400
Subject: [PATCH 1093/4088] python3-Bottleneck: rebuild for Python 3.10

---
 srcpkgs/python3-Bottleneck/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Bottleneck/template b/srcpkgs/python3-Bottleneck/template
index ffd668d28623..00263d13fcad 100644
--- a/srcpkgs/python3-Bottleneck/template
+++ b/srcpkgs/python3-Bottleneck/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Bottleneck'
 pkgname=python3-Bottleneck
 version=1.3.2
-revision=3
+revision=4
 wrksrc="Bottleneck-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-numpy"

From f33223617f294828cee4d2759041a6e08dbcc964 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:27 -0400
Subject: [PATCH 1094/4088] python3-3to2: rebuild for Python 3.10

---
 srcpkgs/python3-3to2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-3to2/template b/srcpkgs/python3-3to2/template
index ddbef4191788..7d0452c6fda2 100644
--- a/srcpkgs/python3-3to2/template
+++ b/srcpkgs/python3-3to2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-3to2'
 pkgname=python3-3to2
 version=1.1.1
-revision=3
+revision=4
 wrksrc="3to2-${version}"
 build_style=python3-module
 pycompile_module="lib3to2"

From e6f1bdca3a6c05c490e7e8fe058e902aedc4ff2c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:25 -0400
Subject: [PATCH 1095/4088] python-sqlalchemy-migrate: rebuild for Python 3.10

---
 srcpkgs/python-sqlalchemy-migrate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
index 8f94329759be..9f8db8ae448e 100644
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ b/srcpkgs/python-sqlalchemy-migrate/template
@@ -1,7 +1,7 @@
 # Template file for 'python-sqlalchemy-migrate'
 pkgname=python-sqlalchemy-migrate
 version=0.12.0
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 pycompile_module="migrate"

From 9f9e9db8fd3226e8b14f4e298aed89281ddee519 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:25 -0400
Subject: [PATCH 1096/4088] python-rfc6555: rebuild for Python 3.10

---
 srcpkgs/python-rfc6555/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-rfc6555/template b/srcpkgs/python-rfc6555/template
index 8ff1b98c08d2..c55e56a71b76 100644
--- a/srcpkgs/python-rfc6555/template
+++ b/srcpkgs/python-rfc6555/template
@@ -1,7 +1,7 @@
 # Template file for 'python-rfc6555'
 pkgname=python-rfc6555
 version=0.0.0
-revision=4
+revision=5
 wrksrc="rfc6555-${version}"
 build_style=python-module
 pycompile_module="rfc6555"

From 65908ee9f9c6f76577fb1fe804ff7d15487e9ef1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:23 -0400
Subject: [PATCH 1097/4088] python-pretend: rebuild for Python 3.10

---
 srcpkgs/python-pretend/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pretend/template b/srcpkgs/python-pretend/template
index 8703c32f4211..be9054c5c481 100644
--- a/srcpkgs/python-pretend/template
+++ b/srcpkgs/python-pretend/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pretend'
 pkgname=python-pretend
 version=1.0.9
-revision=4
+revision=5
 wrksrc="pretend-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 19c08577b9d4b86d2867f5bc661e0e2947d0370f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:23 -0400
Subject: [PATCH 1098/4088] python-pgpdump: rebuild for Python 3.10

---
 srcpkgs/python-pgpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pgpdump/template b/srcpkgs/python-pgpdump/template
index f43a49156374..02372035bf63 100644
--- a/srcpkgs/python-pgpdump/template
+++ b/srcpkgs/python-pgpdump/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pgpdump'
 pkgname=python-pgpdump
 version=1.5
-revision=9
+revision=10
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"

From 4decd980e1da7a4664fb9c3a71e6c99cee5220b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:22 -0400
Subject: [PATCH 1099/4088] python-lockfile: rebuild for Python 3.10

---
 srcpkgs/python-lockfile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-lockfile/template b/srcpkgs/python-lockfile/template
index 8b01b42bb959..c7edf44832d2 100644
--- a/srcpkgs/python-lockfile/template
+++ b/srcpkgs/python-lockfile/template
@@ -1,7 +1,7 @@
 # Template file for 'python-lockfile'
 pkgname=python-lockfile
 version=0.12.2
-revision=6
+revision=7
 wrksrc="lockfile-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr"

From 02cde43a603eaf702b33f6084f5f2aef74804590 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:22 -0400
Subject: [PATCH 1100/4088] python-iso8601: rebuild for Python 3.10

---
 srcpkgs/python-iso8601/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-iso8601/template b/srcpkgs/python-iso8601/template
index 2bc49b02b661..c397a2310fb6 100644
--- a/srcpkgs/python-iso8601/template
+++ b/srcpkgs/python-iso8601/template
@@ -1,7 +1,7 @@
 # Template file for 'python-iso8601'
 pkgname=python-iso8601
 version=0.1.16
-revision=1
+revision=2
 wrksrc="iso8601-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From ed2d1d0d77fc4071e476b9f6e66355093ef6768d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:20 -0400
Subject: [PATCH 1101/4088] python-boto: rebuild for Python 3.10

---
 srcpkgs/python-boto/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-boto/template b/srcpkgs/python-boto/template
index 732c14f8d9ee..354b4d3af547 100644
--- a/srcpkgs/python-boto/template
+++ b/srcpkgs/python-boto/template
@@ -1,7 +1,7 @@
 # Template file for 'python-boto'
 pkgname=python-boto
 version=2.49.0
-revision=4
+revision=5
 wrksrc="boto-${version}"
 build_style=python-module
 pycompile_module="boto"

From 87781a3e60d2a155c378076108792970e5bb4741 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:18 -0400
Subject: [PATCH 1102/4088] pysolfc: rebuild for Python 3.10

---
 srcpkgs/pysolfc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template
index 1316a64d0ff8..2f76aaa65889 100644
--- a/srcpkgs/pysolfc/template
+++ b/srcpkgs/pysolfc/template
@@ -1,7 +1,7 @@
 # Template file for 'pysolfc'
 pkgname=pysolfc
 version=2.14.0
-revision=1
+revision=2
 wrksrc="PySolFC-${pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-pygame python3-random2 python3-six

From 4b1af890a6a86933a8c06cef2385cf931ed3d00e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:18 -0400
Subject: [PATCH 1103/4088] pyradio: rebuild for Python 3.10

---
 srcpkgs/pyradio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 2acc624db61d..883bf4db696e 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,7 +1,7 @@
 # Template file for 'pyradio'
 pkgname=pyradio
 version=0.8.9.9
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-dnspython"

From 786cf84ec72661233cfe11e748230a6ade1199a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:18 -0400
Subject: [PATCH 1104/4088] pymol: rebuild for Python 3.10

---
 srcpkgs/pymol/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pymol/template b/srcpkgs/pymol/template
index dfb9441f22a1..75b78380572c 100644
--- a/srcpkgs/pymol/template
+++ b/srcpkgs/pymol/template
@@ -1,7 +1,7 @@
 # Template file for 'pymol'
 pkgname=pymol
 version=2.4.0
-revision=2
+revision=3
 wrksrc=${pkgname}-open-source-${version}
 build_style="python3-module"
 build_helper="numpy"

From 906ee8cb1b08261197c0b549fb58849defcbc378 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:18 -0400
Subject: [PATCH 1105/4088] pylint: rebuild for Python 3.10

---
 srcpkgs/pylint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index f9dce1f3fee7..a28415cd17c4 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,7 +1,7 @@
 # Template file for 'pylint'
 pkgname=pylint
 version=2.11.1
-revision=1
+revision=2
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"

From 00fd72b13f35add38cf7dbb4751d384035872614 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:18 -0400
Subject: [PATCH 1106/4088] pycp: rebuild for Python 3.10

---
 srcpkgs/pycp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pycp/template b/srcpkgs/pycp/template
index 003f2e9724fa..d9561953e18b 100644
--- a/srcpkgs/pycp/template
+++ b/srcpkgs/pycp/template
@@ -1,7 +1,7 @@
 # Template file for 'pycp'
 pkgname=pycp
 version=8.0.8
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="pycp"
 hostmakedepends="help2man python3-setuptools"

From d41ba613bc16c94ac2f227cb2c68a331129b892a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:18 -0400
Subject: [PATCH 1107/4088] pychess: rebuild for Python 3.10

---
 srcpkgs/pychess/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pychess/template b/srcpkgs/pychess/template
index 622e5ff451c7..af30be49f18d 100644
--- a/srcpkgs/pychess/template
+++ b/srcpkgs/pychess/template
@@ -1,7 +1,7 @@
 # Template file for 'pychess'
 pkgname=pychess
 version=1.0.2
-revision=1
+revision=2
 build_style=python3-module
 pycompile_module="pychess"
 _commondeps="python3-gobject python3-pexpect python3-SQLAlchemy

From dd4b4aaf8de250e3f4a18ff6b1f3ef40de29a32d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:17 -0400
Subject: [PATCH 1108/4088] py3status: rebuild for Python 3.10

---
 srcpkgs/py3status/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 02d9a83f8c67..5267fd63fdbe 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,7 +1,7 @@
 # Template file for 'py3status'
 pkgname=py3status
 version=3.39
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-pyudev"

From 00b33ab4881c0de7aa3eab2d11558907d2e357f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:17 -0400
Subject: [PATCH 1109/4088] pulseaudio-equalizer-ladspa: rebuild for Python
 3.10

---
 srcpkgs/pulseaudio-equalizer-ladspa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pulseaudio-equalizer-ladspa/template b/srcpkgs/pulseaudio-equalizer-ladspa/template
index 01a5416901ff..390bce00c566 100644
--- a/srcpkgs/pulseaudio-equalizer-ladspa/template
+++ b/srcpkgs/pulseaudio-equalizer-ladspa/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio-equalizer-ladspa'
 pkgname=pulseaudio-equalizer-ladspa
 version=3.0.2
-revision=3
+revision=4
 wrksrc="equalizer-${version}"
 build_style=meson
 pycompile_module="pulseeq"

From d7debd7e5b5c62e1b9c04a365826243d86d9b496 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:17 -0400
Subject: [PATCH 1110/4088] puddletag: rebuild for Python 3.10

---
 srcpkgs/puddletag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/puddletag/template b/srcpkgs/puddletag/template
index 7a55df56b100..463b47440c5d 100644
--- a/srcpkgs/puddletag/template
+++ b/srcpkgs/puddletag/template
@@ -1,7 +1,7 @@
 # Template file for 'puddletag'
 pkgname=puddletag
 version=2.0.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-configobj python3-mutagen python3-parsing python3-PyQt5 python3-PyQt5-svg"

From 22e45d3a296cb62f3c0b5a4f5db550d93c0081a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:17 -0400
Subject: [PATCH 1111/4088] protonvpn-cli: rebuild for Python 3.10

---
 srcpkgs/protonvpn-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..de1d3c12bde4 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
 version=2.2.11
-revision=2
+revision=3
 wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 986b7cc31a5fbfb8f62abd143dd2757beb218706 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:17 -0400
Subject: [PATCH 1112/4088] protontricks: rebuild for Python 3.10

---
 srcpkgs/protontricks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..63065a6bf878 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,7 +1,7 @@
 # Template file for 'protontricks'
 pkgname=protontricks
 version=1.6.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-vdf winetricks"

From 6c7285c2b16f570ef2f1e91cf503c60fa03a61a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:17 -0400
Subject: [PATCH 1113/4088] profanity: rebuild for Python 3.10

---
 srcpkgs/profanity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index afa47b8495ac..ebda58656130 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,7 +1,7 @@
 # Template file for 'profanity'
 pkgname=profanity
 version=0.11.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
  $(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins)

From 0f18c82986aeab56bdf25cdf90e05df5cbc7764b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:16 -0400
Subject: [PATCH 1114/4088] postgresql12: rebuild for Python 3.10

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..1ea2e8299f1f 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.8
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world

From ce42914670454c4e6533fd39615ef9e83284219a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:16 -0400
Subject: [PATCH 1115/4088] portage: rebuild for Python 3.10

---
 srcpkgs/portage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 2362d64648bf..fdf5518cda6e 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,7 +1,7 @@
 # Template file for 'portage'
 pkgname=portage
 version=3.0.28
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
 make_install_args="--sbindir=/usr/bin"

From 65c1107930ffd07aa6a9765dd750c10bbf7c418b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:16 -0400
Subject: [PATCH 1116/4088] polysh: rebuild for Python 3.10

---
 srcpkgs/polysh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/polysh/template b/srcpkgs/polysh/template
index a173088a5303..93d84b621177 100644
--- a/srcpkgs/polysh/template
+++ b/srcpkgs/polysh/template
@@ -1,7 +1,7 @@
 # Template file for 'polysh'
 pkgname=polysh
 version=0.13
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 openssh"

From 18b52b8bd93a7511c62c3db5dc71d0d12af3be97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:16 -0400
Subject: [PATCH 1117/4088] poezio: rebuild for Python 3.10

---
 srcpkgs/poezio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poezio/template b/srcpkgs/poezio/template
index 9392f6d8e2b1..cc778aa4746c 100644
--- a/srcpkgs/poezio/template
+++ b/srcpkgs/poezio/template
@@ -1,7 +1,7 @@
 # Template file for 'poezio'
 pkgname=poezio
 version=0.13.1
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"
 makedepends="python3-devel"

From 62e17025bfd76a6cfd69c671da3349c53f1c21ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:16 -0400
Subject: [PATCH 1118/4088] podman-compose: rebuild for Python 3.10

---
 srcpkgs/podman-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index 6a994ae7e8fd..d716fa148396 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-compose'
 pkgname=podman-compose
 version=0.1.5
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-yaml"
 depends="${hostmakedepends} podman"

From 7883ef994d1cbe52188a7950e61cca59c8816eee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:16 -0400
Subject: [PATCH 1119/4088] pockyt: rebuild for Python 3.10

---
 srcpkgs/pockyt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pockyt/template b/srcpkgs/pockyt/template
index b427272e7d52..205d4878ce4a 100644
--- a/srcpkgs/pockyt/template
+++ b/srcpkgs/pockyt/template
@@ -1,7 +1,7 @@
 # Template file for 'pockyt'
 pkgname=pockyt
 version=1.4.6
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-parse"

From d4352637313c0eaf0213fad1ca802021a46b01fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:16 -0400
Subject: [PATCH 1120/4088] pmbootstrap: rebuild for Python 3.10

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index b83c1350ded9..f22348e054fe 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.37.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools openssl git"

From 9013bf2422739ccc85e9d7ceabefbf0bb6ba8b94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Oct 2021 09:32:50 -0400
Subject: [PATCH 1121/4088] plplot: rebuild for Python 3.10

---
 srcpkgs/plplot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plplot/template b/srcpkgs/plplot/template
index 0605830f430a..109fca355120 100644
--- a/srcpkgs/plplot/template
+++ b/srcpkgs/plplot/template
@@ -1,7 +1,7 @@
 # Template file for 'plplot'
 pkgname=plplot
 version=5.15.0
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DPL_FREETYPE_FONT_PATH=/usr/share/fonts/TTF

From 0fb06603998cacd0a3e3dbdb50a19df8c3e9c3b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:15 -0400
Subject: [PATCH 1122/4088] playitslowly: rebuild for Python 3.10

---
 srcpkgs/playitslowly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/playitslowly/template b/srcpkgs/playitslowly/template
index d898db8aa100..ba717f398bf0 100644
--- a/srcpkgs/playitslowly/template
+++ b/srcpkgs/playitslowly/template
@@ -1,7 +1,7 @@
 # Template file for 'playitslowly'
 pkgname=playitslowly
 version=1.5.1
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3"
 depends="python3 python3-gobject gtk+3 gstreamer1 gst-plugins-base1 gst-plugins-good1

From 04fcfa581dcfdc4eeca53c33747eb686319b7ccc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:15 -0400
Subject: [PATCH 1123/4088] platformio: rebuild for Python 3.10

---
 srcpkgs/platformio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template
index f338639c7d3a..4aec9f82cc5a 100644
--- a/srcpkgs/platformio/template
+++ b/srcpkgs/platformio/template
@@ -1,7 +1,7 @@
 # Template file for 'platformio'
 pkgname=platformio
 version=5.1.1
-revision=1
+revision=2
 wrksrc="platformio-core-${version}"
 build_style=python3-module
 # According to https://github.com/platformio/platformio-core/blob/9c20ab81cb68f1ffb7a8cac22ce95c4c797643ec/Makefile#L13

From 695899b03dc150ff95d6fefb532a88518f6b01a1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:15 -0400
Subject: [PATCH 1124/4088] piper: rebuild for Python 3.10

---
 srcpkgs/piper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..5811b88444b8 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,7 +1,7 @@
 # Template file for 'piper'
 pkgname=piper
 version=0.6
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"

From 0bc90f17176b8ac6e25c190ba58e193fd34d9f7a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:15 -0400
Subject: [PATCH 1125/4088] picard: rebuild for Python 3.10

---
 srcpkgs/picard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index 7611fa3ad41a..9692fc33773e 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,7 +1,7 @@
 # Template file for 'picard'
 pkgname=picard
 version=2.5
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 make_install_args="--disable-autoupdate"

From 58e8c508782c6c14d397a6ef3306173da98184ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:15 -0400
Subject: [PATCH 1126/4088] pgcli: rebuild for Python 3.10

---
 srcpkgs/pgcli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index d8def4ae0c07..29e4fb5fe0f5 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,7 +1,7 @@
 # Template file for 'pgcli'
 pkgname=pgcli
 version=3.0.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit

From 42aa77e8de0f63ffca5723c6564a10a5a4b011f7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:15 -0400
Subject: [PATCH 1127/4088] pex: rebuild for Python 3.10

---
 srcpkgs/pex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template
index b6a71768c892..340ecb6260e0 100644
--- a/srcpkgs/pex/template
+++ b/srcpkgs/pex/template
@@ -1,7 +1,7 @@
 # Template file for 'pex'
 pkgname=pex
 version=2.1.15
-revision=2
+revision=3
 wrksrc="pex-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From 4e4c30f7db22f2b4d52a7d2440148f412caf28f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:15 -0400
Subject: [PATCH 1128/4088] peru: rebuild for Python 3.10

---
 srcpkgs/peru/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peru/template b/srcpkgs/peru/template
index edb0122f1928..7f77496c6fa4 100644
--- a/srcpkgs/peru/template
+++ b/srcpkgs/peru/template
@@ -1,7 +1,7 @@
 # Template file for 'peru'
 pkgname=peru
 version=1.2.0
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="peru"
 hostmakedepends="python3-setuptools"

From 9578bd32d4b764a7c4b95dbf7799e17683516b8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:15 -0400
Subject: [PATCH 1129/4088] persepolis: rebuild for Python 3.10

---
 srcpkgs/persepolis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/persepolis/template b/srcpkgs/persepolis/template
index f1066b3631b6..fdb5309f0c93 100644
--- a/srcpkgs/persepolis/template
+++ b/srcpkgs/persepolis/template
@@ -1,7 +1,7 @@
 # Template file for 'persepolis'
 pkgname=persepolis
 version=3.2.0
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-setproctitle python3-requests
 	python3-psutil aria2 ffmpeg libnotify pulseaudio youtube-dl

From c90e6c40eb8e98ace62c13c9b04a3d691d478743 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:14 -0400
Subject: [PATCH 1130/4088] pelican: rebuild for Python 3.10

---
 srcpkgs/pelican/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 9ec36fe8c05a..5ad27d5b8cb4 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -1,7 +1,7 @@
 # Template file for 'pelican'
 pkgname=pelican
 version=4.5.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-feedgenerator python3-Jinja2 python3-Pygments

From f7f497f8fc8190a068b4c8ec296d8ab30a1ec2c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:14 -0400
Subject: [PATCH 1131/4088] peframe: rebuild for Python 3.10

---
 srcpkgs/peframe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peframe/template b/srcpkgs/peframe/template
index c8ee506466b3..61123e4a0993 100644
--- a/srcpkgs/peframe/template
+++ b/srcpkgs/peframe/template
@@ -1,7 +1,7 @@
 # Template file for 'peframe'
 pkgname=peframe
 version=6.0.3
-revision=3
+revision=4
 build_style="python3-module"
 pycompile_module="peframe"
 hostmakedepends="python3-setuptools"

From 614ab534095acd0e18b96ca8f4899b4bc3587069 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:14 -0400
Subject: [PATCH 1132/4088] pass-import: rebuild for Python 3.10

---
 srcpkgs/pass-import/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..3f24c84a8f82 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,7 +1,7 @@
 # Template file for 'pass-import'
 pkgname=pass-import
 version=3.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="python3-setuptools python3-yaml"
 depends="pass>=1.7.0 python3-defusedxml python3-magic

From fdc7bdf0eceeb11ea5437b4c7703b999e34d1fb1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:14 -0400
Subject: [PATCH 1133/4088] pass-git-helper: rebuild for Python 3.10

---
 srcpkgs/pass-git-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index d799acdc189f..eaf7d1f49ab0 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'pass-git-helper'
 pkgname=pass-git-helper
 version=1.1.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pass python3-xdg"

From cfc9baeb644d325e840fd9263ce9925ee7d4ff04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:14 -0400
Subject: [PATCH 1134/4088] papis: rebuild for Python 3.10

---
 srcpkgs/papis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index e63cc28ffa64..c97d9c49ddcb 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,7 +1,7 @@
 # Template file for 'papis'
 pkgname=papis
 version=0.11.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4

From a9bdf85eb1c2178b553468a3176eea45b0e4029c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:14 -0400
Subject: [PATCH 1135/4088] pantalaimon: rebuild for Python 3.10

---
 srcpkgs/pantalaimon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template
index 9e5b5b3d7d2d..78970b22f632 100644
--- a/srcpkgs/pantalaimon/template
+++ b/srcpkgs/pantalaimon/template
@@ -1,7 +1,7 @@
 # Template file for 'pantalaimon'
 pkgname=pantalaimon
 version=0.8.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-attrs python3-aiohttp python3-appdirs python3-click

From b506577cc38737b22295eeb4783f1aa49214e08f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:14 -0400
Subject: [PATCH 1136/4088] pam_wrapper: rebuild for Python 3.10

---
 srcpkgs/pam_wrapper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_wrapper/template b/srcpkgs/pam_wrapper/template
index ff5d9df688e8..e7c7c1f97d9f 100644
--- a/srcpkgs/pam_wrapper/template
+++ b/srcpkgs/pam_wrapper/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_wrapper'
 pkgname=pam_wrapper
 version=1.1.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None -DUNIT_TESTING=ON"
 hostmakedepends="cmake python3"

From 5d15a487b245b35705d0e586b1c23bc79f4e5964 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:13 -0400
Subject: [PATCH 1137/4088] othman: rebuild for Python 3.10

---
 srcpkgs/othman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/othman/template b/srcpkgs/othman/template
index 5bb7964fafb1..ef2fd1baca68 100644
--- a/srcpkgs/othman/template
+++ b/srcpkgs/othman/template
@@ -1,7 +1,7 @@
 # Template file for 'othman'
 pkgname=othman
 version=0.6.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3 ImageMagick sqlite intltool"
 depends="gtk+3 python3-gobject amiri-font"

From 9bdaffa923cf07afbb2740f9fceb3d70a9102f5a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:13 -0400
Subject: [PATCH 1138/4088] orca: rebuild for Python 3.10

---
 srcpkgs/orca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 58c745b3d803..b2df76b8446f 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
 # Template file for 'orca'
 pkgname=orca
 version=40.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"

From f4e76376042028e55ef10865bc9dccb320c94daf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:13 -0400
Subject: [PATCH 1139/4088] openvswitch: rebuild for Python 3.10

---
 srcpkgs/openvswitch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 145a0b52e8fc..b8a8acb0265b 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,7 +1,7 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=2
+revision=3
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"

From 42933f7c33444c78dfdbf661ce74f3507f6032e1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 26 Sep 2021 09:53:29 -0400
Subject: [PATCH 1140/4088] opentoonz: rebuild for opencv4

---
 srcpkgs/opentoonz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index bcb9e96a69d8..540a66afc6bc 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.5.0
-revision=1
+revision=2
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From c90dc8f96a0e3ea8024509580e44ef01076a36ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:13 -0400
Subject: [PATCH 1141/4088] openshot: rebuild for Python 3.10

---
 srcpkgs/openshot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openshot/template b/srcpkgs/openshot/template
index e410aa1eaa40..d16ea925d223 100644
--- a/srcpkgs/openshot/template
+++ b/srcpkgs/openshot/template
@@ -1,7 +1,7 @@
 # Template file for 'openshot'
 pkgname=openshot
 version=2.5.1
-revision=2
+revision=3
 archs="i686 x86_64 ppc64le"
 wrksrc="${pkgname}-qt-${version}"
 build_style=python3-module

From ca4073c39f1dc01d19b0769454cae7212b89cc74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:13 -0400
Subject: [PATCH 1142/4088] openrazer-meta: rebuild for Python 3.10

---
 srcpkgs/openrazer-meta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index 8a3f15ff6f6a..5713a84bbd15 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,7 +1,7 @@
 # Template file for 'openrazer-meta'
 pkgname=openrazer-meta
 version=3.0.1
-revision=1
+revision=2
 wrksrc="openrazer-${version}"
 build_style=gnu-makefile
 make_install_target="setup_dkms udev_install daemon_install xdg_install

From c89e18944d6b7fe4c3b48e12980517ea561f6552 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:12 -0400
Subject: [PATCH 1143/4088] opencamlib: rebuild for Python 3.10

---
 srcpkgs/opencamlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 38cf6d7d8eb5..f837b50c5556 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
 # Template file for 'opencamlib'
 pkgname=opencamlib
 version=2019.07
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
 hostmakedepends="python3"

From 34df340553a2b050f4024f66f089e51044c54dd2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:12 -0400
Subject: [PATCH 1144/4088] onboard: rebuild for Python 3.10

---
 srcpkgs/onboard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template
index 38b447de275e..c147bf58a65c 100644
--- a/srcpkgs/onboard/template
+++ b/srcpkgs/onboard/template
@@ -1,7 +1,7 @@
 # Template file for 'onboard'
 pkgname=onboard
 version=1.4.1
-revision=8
+revision=9
 build_style=python3-module
 hostmakedepends="intltool pkg-config python3-distutils-extra"
 makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel

From db51a0c7a4c08b042417e38afa80919bc51d3d8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:12 -0400
Subject: [PATCH 1145/4088] obs: rebuild for Python 3.10

---
 srcpkgs/obs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 9d1487743d07..aea77d44cd0c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
 # Template file for 'obs'
 pkgname=obs
 version=27.1.3
-revision=1
+revision=2
 archs="i686* x86_64* ppc64le* aarch64*"
 wrksrc="obs-studio-${version}"
 build_style=cmake

From 53966580f36976d244c65b088ccd761fdb8d992f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:12 -0400
Subject: [PATCH 1146/4088] nyx: rebuild for Python 3.10

---
 srcpkgs/nyx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nyx/template b/srcpkgs/nyx/template
index d961d945e74e..013ae3c51be1 100644
--- a/srcpkgs/nyx/template
+++ b/srcpkgs/nyx/template
@@ -1,7 +1,7 @@
 # Template file for 'nyx'
 pkgname=nyx
 version=2.1.0
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="nyx"
 hostmakedepends="python3-setuptools"

From 75cd1672800218bdba059b5a84d0e57c4f0b2162 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:12 -0400
Subject: [PATCH 1147/4088] nicotine+: rebuild for Python 3.10

---
 srcpkgs/nicotine+/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index d80262f2744c..c58275328a60 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,7 +1,7 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
 version=3.0.6
-revision=1
+revision=2
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
 hostmakedepends="python3 gettext"

From 3d7ff4c82a8fed9629063e25a2a0155024825f60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:11 -0400
Subject: [PATCH 1148/4088] nftables: rebuild for Python 3.10

---
 srcpkgs/nftables/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template
index 17a835cac752..78e4f3811b0c 100644
--- a/srcpkgs/nftables/template
+++ b/srcpkgs/nftables/template
@@ -1,7 +1,7 @@
 # Template file for 'nftables'
 pkgname=nftables
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3"
 hostmakedepends="python3 asciidoc docbook2x flex pkg-config"

From da599beae4df823a5ea212b2eee99bcda280c0db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:11 -0400
Subject: [PATCH 1149/4088] newt: rebuild for Python 3.10

---
 srcpkgs/newt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/newt/template b/srcpkgs/newt/template
index 204f714be185..24d19e46add8 100644
--- a/srcpkgs/newt/template
+++ b/srcpkgs/newt/template
@@ -1,7 +1,7 @@
 # Template file for 'newt'
 pkgname=newt
 version=0.52.21
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="python-devel python3-devel"
 makedepends="slang-devel popt-devel python3-devel python-devel"

From 1c9e4ea275d5a151fac62ddb081fa7b3db41840f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:11 -0400
Subject: [PATCH 1150/4088] neovim-remote: rebuild for Python 3.10

---
 srcpkgs/neovim-remote/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/neovim-remote/template b/srcpkgs/neovim-remote/template
index 0353bfd4ab94..ffe271e263e3 100644
--- a/srcpkgs/neovim-remote/template
+++ b/srcpkgs/neovim-remote/template
@@ -1,7 +1,7 @@
 # Template file for 'neovim-remote'
 pkgname=neovim-remote
 version=2.4.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-neovim python3-psutil"

From 089c69c95862ff6bae466d87ccee1dfbe52d8986 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:11 -0400
Subject: [PATCH 1151/4088] navit: rebuild for Python 3.10

---
 srcpkgs/navit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 96e17b3b3689..d59e0146f3a2 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
 # Template file for 'navit'
 pkgname=navit
 version=0.5.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"

From 51078c3b89d9adf9cefff66a6d1f7d5e546fcf84 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:11 -0400
Subject: [PATCH 1152/4088] nautilus-python: rebuild for Python 3.10

---
 srcpkgs/nautilus-python/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
index 105784436b00..0b4ef4d77418 100644
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@@ -1,7 +1,7 @@
 # Template file for 'nautilus-python'
 pkgname=nautilus-python
 version=1.2.3
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
  PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}

From 8a82380da8b14ed391f3d162c3eb3200ea21f901 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:11 -0400
Subject: [PATCH 1153/4088] nagstamon: rebuild for Python 3.10, update to
 3.6.0.

---
 srcpkgs/nagstamon/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template
index a3e92bfa761d..d59b2bd4cfba 100644
--- a/srcpkgs/nagstamon/template
+++ b/srcpkgs/nagstamon/template
@@ -1,8 +1,8 @@
 # Template file for 'nagstamon'
 pkgname=nagstamon
-version=3.4.1
-revision=2
-wrksrc=Nagstamon
+version=3.6.0
+revision=1
+wrksrc="Nagstamon-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-keyring python3-psutil"
 depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
@@ -10,9 +10,11 @@ depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
 short_desc="Nagios status monitor for the desktop"
 maintainer="Laszlo Dvornik <laulicus@zoho.com>"
 license="GPL-2.0-or-later"
-homepage="https://nagstamon.ifw-dresden.de"
-distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"
-checksum=7a9611f40b08269bba4100ab2598ee089c7d0ebc6c4e9d7132689342f71150ec
+homepage="https://nagstamon.de"
+distfiles="https://github.com/HenriWahl/Nagstamon/archive/v${version}.tar.gz"
+checksum=5ec74c50367ba75af417e04c8192b6f598a1db9e55e2db52a8dc540ac707d904
+# Tarball includes no tests
+make_check=no
 
 post_patch() {
 	# This relies on /etc/os-release, which doesn't exist without

From 4392dae09e71247f5764c83570a3f7dcff710163 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:10 -0400
Subject: [PATCH 1154/4088] mypaint: rebuild for Python 3.10

---
 srcpkgs/mypaint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index efb295af98d5..2b39d66c42bd 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,7 +1,7 @@
 # Template file for 'mypaint'
 pkgname=mypaint
 version=2.0.1
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3"

From 11b28346ed1476b9aec4848f3eb983fff5863cf0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:10 -0400
Subject: [PATCH 1155/4088] mymcplus: rebuild for Python 3.10, update to 3.0.5.

---
 srcpkgs/mymcplus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mymcplus/template b/srcpkgs/mymcplus/template
index ebcb44ffc8f2..230950c1589d 100644
--- a/srcpkgs/mymcplus/template
+++ b/srcpkgs/mymcplus/template
@@ -1,6 +1,6 @@
 # Template file for 'mymcplus'
 pkgname=mymcplus
-version=3.0.4
+version=3.0.5
 revision=1
 wrksrc=${pkgname}-v${version}
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://git.sr.ht/~thestr4ng3r/mymcplus"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f94b485f83590b59b87fa5fbe8311d1eb0f03490edb60fd64aadbdbea0588472
+checksum=95dfcce7e58a3f4209f89a66e7017368150e6927b91b1e4bb0a7990bef16ccac

From e56242aa85f822497a59c552b38cf13d01efe8da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:10 -0400
Subject: [PATCH 1156/4088] muse: rebuild for Python 3.10

---
 srcpkgs/muse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/muse/template b/srcpkgs/muse/template
index 51f5b4c37437..c1289802a6b6 100644
--- a/srcpkgs/muse/template
+++ b/srcpkgs/muse/template
@@ -1,7 +1,7 @@
 # Template file for 'muse'
 pkgname=muse
 version=4.0.0
-revision=1
+revision=2
 wrksrc="muse-${version}"
 build_wrksrc=src
 build_style=cmake

From 9703945062eb826bb020f30515c2bc097b5394fa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:10 -0400
Subject: [PATCH 1157/4088] multibootusb: rebuild for Python 3.10

---
 srcpkgs/multibootusb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/multibootusb/template b/srcpkgs/multibootusb/template
index 343160b1fcfc..d6dc80a33902 100644
--- a/srcpkgs/multibootusb/template
+++ b/srcpkgs/multibootusb/template
@@ -1,7 +1,7 @@
 # Template file for 'multibootusb'
 pkgname=multibootusb
 version=9.2.0
-revision=4
+revision=5
 build_style=python3-module
 pycompile_module="scripts"
 hostmakedepends="python3-setuptools"

From 4ae4f07e474ffb9cc5567cecd8a121885fcbd588 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:10 -0400
Subject: [PATCH 1158/4088] mugshot: rebuild for Python 3.10

---
 srcpkgs/mugshot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mugshot/template b/srcpkgs/mugshot/template
index b418ce9224be..51117b132007 100644
--- a/srcpkgs/mugshot/template
+++ b/srcpkgs/mugshot/template
@@ -1,7 +1,7 @@
 # Template file for 'mugshot'
 pkgname=mugshot
 version=0.4.3
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra"

From a56c51ae9924aa975d108df87101e72d5f80e197 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:10 -0400
Subject: [PATCH 1159/4088] mps-youtube: rebuild for Python 3.10

---
 srcpkgs/mps-youtube/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mps-youtube/template b/srcpkgs/mps-youtube/template
index dd522974e07b..8a7aa1911359 100644
--- a/srcpkgs/mps-youtube/template
+++ b/srcpkgs/mps-youtube/template
@@ -1,7 +1,7 @@
 # Template file for 'mps-youtube'
 pkgname=mps-youtube
 version=0.2.8
-revision=4
+revision=5
 build_style=python3-module
 pycompile_module="mps_youtube"
 hostmakedepends="python3-setuptools"

From c271c18cbd736e3c79d75ecc1e71dabb4c2f1ba2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:10 -0400
Subject: [PATCH 1160/4088] mpdevil: rebuild for Python 3.10

---
 srcpkgs/mpdevil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpdevil/template b/srcpkgs/mpdevil/template
index 086c5cd94a78..59337f616d13 100644
--- a/srcpkgs/mpdevil/template
+++ b/srcpkgs/mpdevil/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdevil'
 pkgname=mpdevil
 version=1.2.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-BeautifulSoup4 python3-mpd2 python3-requests python3-gobject intltool python3-distutils-extra"
 depends="python3-BeautifulSoup4 python3-mpd2 python3-requests python3-gobject"

From bba5134c2160e6be8ef28f1fb5dc78ed3b135a09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:10 -0400
Subject: [PATCH 1161/4088] mpd-sima: rebuild for Python 3.10

---
 srcpkgs/mpd-sima/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpd-sima/template b/srcpkgs/mpd-sima/template
index 9ebd2671d058..8785e7fd2e60 100644
--- a/srcpkgs/mpd-sima/template
+++ b/srcpkgs/mpd-sima/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd-sima'
 pkgname=mpd-sima
 version=0.15.1
-revision=3
+revision=4
 wrksrc="MPD_sima-${version}"
 build_style=python3-module
 pycompile_module="sima"

From 01474fd649a1f153590835a3d4d0a263b9fde940 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:09 -0400
Subject: [PATCH 1162/4088] mozo: rebuild for Python 3.10

---
 srcpkgs/mozo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template
index 3f6ab9cb745a..9a2daf9294cb 100644
--- a/srcpkgs/mozo/template
+++ b/srcpkgs/mozo/template
@@ -1,7 +1,7 @@
 # Template file for 'mozo'
 pkgname=mozo
 version=1.24.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 makedepends="glib-devel mate-menus-devel python3-gobject-devel"

From 5ed35d7a9a28baa16a0cb25aa9292680ef3573d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:09 -0400
Subject: [PATCH 1163/4088] mopidy-spotify: rebuild for Python 3.10

---
 srcpkgs/mopidy-spotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mopidy-spotify/template b/srcpkgs/mopidy-spotify/template
index c7c21380c8b2..6a643a90eaec 100644
--- a/srcpkgs/mopidy-spotify/template
+++ b/srcpkgs/mopidy-spotify/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy-spotify'
 pkgname=mopidy-spotify
 version=4.0.1
-revision=2
+revision=3
 wrksrc="Mopidy-Spotify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 41eacf35cd1123d84e17cd0e4304f34dc1632a72 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:09 -0400
Subject: [PATCH 1164/4088] mopidy-podcast: rebuild for Python 3.10

---
 srcpkgs/mopidy-podcast/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mopidy-podcast/template b/srcpkgs/mopidy-podcast/template
index 92a2a5f0f0db..057971c54be8 100644
--- a/srcpkgs/mopidy-podcast/template
+++ b/srcpkgs/mopidy-podcast/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy-podcast'
 pkgname=mopidy-podcast
 version=3.0.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="mopidy python3-cachetools python3-pykka python3-setuptools python3-uritools"

From f27471f8ef2d7344ad15f684b014fb9eca922912 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:09 -0400
Subject: [PATCH 1165/4088] mopidy-multisonic: rebuild for Python 3.10

---
 srcpkgs/mopidy-multisonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mopidy-multisonic/template b/srcpkgs/mopidy-multisonic/template
index 6a7ea1033c51..995c09070d32 100644
--- a/srcpkgs/mopidy-multisonic/template
+++ b/srcpkgs/mopidy-multisonic/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy-multisonic'
 pkgname=mopidy-multisonic
 version=0.4.0
-revision=2
+revision=3
 wrksrc="Mopidy-Multisonic-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b95ff5578005d44579a46a7bfdee62f9f21dc524 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:09 -0400
Subject: [PATCH 1166/4088] mopidy-mpd: rebuild for Python 3.10

---
 srcpkgs/mopidy-mpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mopidy-mpd/template b/srcpkgs/mopidy-mpd/template
index dcc3c166cd7c..e8f172a11b2f 100644
--- a/srcpkgs/mopidy-mpd/template
+++ b/srcpkgs/mopidy-mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy-mpd'
 pkgname=mopidy-mpd
 version=3.0.0
-revision=2
+revision=3
 wrksrc="Mopidy-MPD-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f0790508d701812bfb66cad588ad6a9f536bd56d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:09 -0400
Subject: [PATCH 1167/4088] mopidy-local: rebuild for Python 3.10

---
 srcpkgs/mopidy-local/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mopidy-local/template b/srcpkgs/mopidy-local/template
index 8a7d95c30872..536240671534 100644
--- a/srcpkgs/mopidy-local/template
+++ b/srcpkgs/mopidy-local/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy-local'
 pkgname=mopidy-local
 version=3.1.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="mopidy python3-pykka python3-setuptools"

From 68556e79d859ee4d2054613f631a40e55c2e4628 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:09 -0400
Subject: [PATCH 1168/4088] mlt7: rebuild for Python 3.10

---
 srcpkgs/mlt7/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template
index e7220c736e85..f96f65d41f78 100644
--- a/srcpkgs/mlt7/template
+++ b/srcpkgs/mlt7/template
@@ -1,7 +1,7 @@
 # Template file for 'mlt'
 pkgname=mlt7
 version=7.0.1
-revision=2
+revision=4
 wrksrc="mlt-${version}"
 build_style=cmake
 configure_args="-DSWIG_PYTHON=ON"

From 9e2ca726a0a8a61b382d7a7145c3f8f744235cac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:08 -0400
Subject: [PATCH 1169/4088] mkchromecast: rebuild for Python 3.10

---
 srcpkgs/mkchromecast/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mkchromecast/template b/srcpkgs/mkchromecast/template
index 0aa93e2f4e18..161210796b90 100644
--- a/srcpkgs/mkchromecast/template
+++ b/srcpkgs/mkchromecast/template
@@ -1,7 +1,7 @@
 # Template file for 'mkchromecast'
 pkgname=mkchromecast
 version=0.3.8.1
-revision=3
+revision=4
 pycompile_dirs="/usr/share/mkchromecast/mkchromecast"
 depends="python3-Flask python3-netifaces python3-setuptools python3-requests
  python3-mutagen python3-psutil python3-PyQt5 python3-SoCo python3-chromecast

From afa65eb9eff021f384e7a7f990ca783000331b50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:08 -0400
Subject: [PATCH 1170/4088] minigalaxy: rebuild for Python 3.10

---
 srcpkgs/minigalaxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minigalaxy/template b/srcpkgs/minigalaxy/template
index e55146981e14..9b7d2f6dbc90 100644
--- a/srcpkgs/minigalaxy/template
+++ b/srcpkgs/minigalaxy/template
@@ -1,7 +1,7 @@
 # Template file for 'minigalaxy'
 pkgname=minigalaxy
 version=1.0.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="hicolor-icon-theme webkit2gtk python3-gobject python3-requests"

From 0835421a2e5bcacacfe77a8f0701b69f6c81979a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:08 -0400
Subject: [PATCH 1171/4088] mimeo: rebuild for Python 3.10

---
 srcpkgs/mimeo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mimeo/template b/srcpkgs/mimeo/template
index 6e9eb5283ea2..0162fbcc49e5 100644
--- a/srcpkgs/mimeo/template
+++ b/srcpkgs/mimeo/template
@@ -1,7 +1,7 @@
 # Template file for 'mimeo'
 pkgname=mimeo
 version=2021.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3"
 depends="python3-xdg"

From f52e7682d0fdc327b6dff9af1df7eac9ecab1bbc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:08 -0400
Subject: [PATCH 1172/4088] meson-cmake-wrapper: rebuild for Python 3.10

---
 srcpkgs/meson-cmake-wrapper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/meson-cmake-wrapper/template b/srcpkgs/meson-cmake-wrapper/template
index 0705bb40c5a1..11e1cd50209c 100644
--- a/srcpkgs/meson-cmake-wrapper/template
+++ b/srcpkgs/meson-cmake-wrapper/template
@@ -1,7 +1,7 @@
 # Template file for 'meson-cmake-wrapper'
 pkgname=meson-cmake-wrapper
 version=0.3.4
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="mcw"
 hostmakedepends="python3-setuptools"

From 92845054640b919aef0dbda8993e9a42a48309d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:07 -0400
Subject: [PATCH 1173/4088] menulibre: rebuild for Python 3.10

---
 srcpkgs/menulibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/menulibre/template b/srcpkgs/menulibre/template
index c1529e67d28e..87b7054aba71 100644
--- a/srcpkgs/menulibre/template
+++ b/srcpkgs/menulibre/template
@@ -1,7 +1,7 @@
 # Template file for 'menulibre'
 pkgname=menulibre
 version=2.2.1
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool"
 depends="gnome-menus gobject-introspection gsettings-desktop-schemas gtk+3

From afc23d4f1a7a56bc6bde64230ee3cf769dbbbf1e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:07 -0400
Subject: [PATCH 1174/4088] meld: rebuild for Python 3.10

---
 srcpkgs/meld/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..e37fd1bb7925 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,11 +1,13 @@
 # Template file for 'meld'
 pkgname=meld
 version=3.20.4
-revision=1
+revision=2
 build_style=python3-module
 configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool python3 itstool gtk-update-icon-cache libxml2-python3"
-depends="python3-gobject gsettings-desktop-schemas gtksourceview desktop-file-utils hicolor-icon-theme"
+hostmakedepends="pkg-config intltool python3-distro itstool
+ gtk-update-icon-cache libxml2-python3"
+depends="python3-gobject gsettings-desktop-schemas gtksourceview
+ desktop-file-utils hicolor-icon-theme"
 short_desc="Visual diff and merge tool"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"

From e9c175b782704837ef3b5df5e61925bd3e6b97bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:07 -0400
Subject: [PATCH 1175/4088] mcg: rebuild for Python 3.10

---
 srcpkgs/mcg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mcg/template b/srcpkgs/mcg/template
index bb7eaab7ac0c..643feda78266 100644
--- a/srcpkgs/mcg/template
+++ b/srcpkgs/mcg/template
@@ -1,7 +1,7 @@
 # Template file for 'mcg'
 pkgname=mcg
 version=2.1
-revision=2
+revision=3
 wrksrc=${pkgname}-v${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools glib-devel"

From 6d9c31253de56ca4d1fb4e43cd4bdfae244147e1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:07 -0400
Subject: [PATCH 1176/4088] mate-tweak: rebuild for Python 3.10

---
 srcpkgs/mate-tweak/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template
index 4c67ab572afe..84991ef8aebb 100644
--- a/srcpkgs/mate-tweak/template
+++ b/srcpkgs/mate-tweak/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-tweak'
 pkgname=mate-tweak
 version=21.04.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools"
 depends="mate-panel python3-gobject python3-psutil python3-setproctitle

From 207f411f0e65cd4ffbde84f021b0b56a1642af8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:07 -0400
Subject: [PATCH 1177/4088] mate-menu: rebuild for Python 3.10

---
 srcpkgs/mate-menu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mate-menu/template b/srcpkgs/mate-menu/template
index 492e1b84e062..bf85817b7717 100644
--- a/srcpkgs/mate-menu/template
+++ b/srcpkgs/mate-menu/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-menu'
 pkgname=mate-menu
 version=20.04.3
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-setuptools"
 depends="mate-panel python3-gobject python3-setproctitle python3-xdg python3-xlib"

From 1816649899f132c5ad980148b13e1df5ce64172a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:07 -0400
Subject: [PATCH 1178/4088] manuskript: rebuild for Python 3.10

---
 srcpkgs/manuskript/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/manuskript/template b/srcpkgs/manuskript/template
index 29fd1de41353..e23defe7fbfa 100644
--- a/srcpkgs/manuskript/template
+++ b/srcpkgs/manuskript/template
@@ -1,7 +1,7 @@
 # Template file for 'manuskript'
 pkgname=manuskript
 version=0.12.0
-revision=2
+revision=3
 pycompile_dirs="usr/share/${pkgname}"
 hostmakedepends="python3-setuptools"
 depends="python3-enchant python3-lxml python3-Markdown python3-PyQt5 qt5-svg"

From 13384184333922e5c6d9394b75e2c3e0623e9256 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:06 -0400
Subject: [PATCH 1179/4088] mailnag-goa-plugin: rebuild for Python 3.10

---
 srcpkgs/mailnag-goa-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mailnag-goa-plugin/template b/srcpkgs/mailnag-goa-plugin/template
index 11549f9f8cc3..c463d27970a2 100644
--- a/srcpkgs/mailnag-goa-plugin/template
+++ b/srcpkgs/mailnag-goa-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'mailnag-goa-plugin'
 pkgname=mailnag-goa-plugin
 version=2.0.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3"
 depends="mailnag gnome-online-accounts"

From 5931b307b3b930dfcbb7a44e84bbf5daa31885fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:06 -0400
Subject: [PATCH 1180/4088] magic-wormhole: rebuild for Python 3.10

---
 srcpkgs/magic-wormhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/magic-wormhole/template b/srcpkgs/magic-wormhole/template
index 755fb7affbca..ce862ddae80b 100644
--- a/srcpkgs/magic-wormhole/template
+++ b/srcpkgs/magic-wormhole/template
@@ -1,7 +1,7 @@
 # Template file for 'magic-wormhole'
 pkgname=magic-wormhole
 version=0.12.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="python3-autobahn python3-cffi python3-click python3-humanize

From 4a8c0a0086adad3a104d66567dbf54388b0225ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:06 -0400
Subject: [PATCH 1181/4088] lutris: rebuild for Python 3.10

---
 srcpkgs/lutris/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 05b40bb96899..7cab63f5bae9 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,7 +1,7 @@
 # Template file for 'lutris'
 pkgname=lutris
 version=0.5.8.4
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
 depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow

From fb59bc0e66b63ea6a7dd176559b4117ecd355872 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:06 -0400
Subject: [PATCH 1182/4088] lollypop: rebuild for Python 3.10

---
 srcpkgs/lollypop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 99da6e1cf126..094566ae5cf7 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,7 +1,7 @@
 # Template file for 'lollypop'
 pkgname=lollypop
 version=1.4.22
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
 makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel"

From 2d9d3bcdb9c3f0ed578db4e456edb6e784a4eb23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:06 -0400
Subject: [PATCH 1183/4088] linux-tools: rebuild for Python 3.10

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index aadf9f1abfcb..f722ee213bc5 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
 version=5.10.4
-revision=5
+revision=6
 wrksrc="linux-${version}"
 build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3

From e278fa2e51f27366d6b423618889e558592c779a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:05 -0400
Subject: [PATCH 1184/4088] lightdm-gtk-greeter-settings: rebuild for Python
 3.10

---
 srcpkgs/lightdm-gtk-greeter-settings/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lightdm-gtk-greeter-settings/template b/srcpkgs/lightdm-gtk-greeter-settings/template
index 1f8e22baad14..30f2c3811f00 100644
--- a/srcpkgs/lightdm-gtk-greeter-settings/template
+++ b/srcpkgs/lightdm-gtk-greeter-settings/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk-greeter-settings'
 pkgname=lightdm-gtk-greeter-settings
 version=1.2.2
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="lightdm_gtk_greeter_settings"
 hostmakedepends="python3-distutils-extra intltool"

From d4572eead1e598dcf73e93873ad594e92a63c37e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:05 -0400
Subject: [PATCH 1185/4088] libvoikko: rebuild for Python 3.10

---
 srcpkgs/libvoikko/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvoikko/template b/srcpkgs/libvoikko/template
index 79a6956a5369..bfe4170c168f 100644
--- a/srcpkgs/libvoikko/template
+++ b/srcpkgs/libvoikko/template
@@ -1,7 +1,7 @@
 # Template file for 'libvoikko'
 pkgname=libvoikko
 version=4.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-hfst=false --with-dictionary-path=/usr/share/voikko"
 pycompile_module="libvoikko.py"

From 2ca083efad4f1fbd882b06df7618b1384c30e402 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:05 -0400
Subject: [PATCH 1186/4088] libsmbios: rebuild for Python 3.10

---
 srcpkgs/libsmbios/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template
index 998437288504..2db17e7b87a6 100644
--- a/srcpkgs/libsmbios/template
+++ b/srcpkgs/libsmbios/template
@@ -1,7 +1,7 @@
 # Template file for 'libsmbios'
 pkgname=libsmbios
 version=2.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-static"
 hostmakedepends="automake doxygen gettext gettext-devel help2man libtool pkg-config"

From a3d85f598bdc65228bb28fb807f89bede3693f3a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:05 -0400
Subject: [PATCH 1187/4088] libsigrokdecode: rebuild for Python 3.10

---
 srcpkgs/libsigrokdecode/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsigrokdecode/template b/srcpkgs/libsigrokdecode/template
index 8be3b7363730..9b15bdced467 100644
--- a/srcpkgs/libsigrokdecode/template
+++ b/srcpkgs/libsigrokdecode/template
@@ -1,7 +1,7 @@
 # Template file for 'libsigrokdecode'
 pkgname=libsigrokdecode
 version=0.5.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config python3 autoconf automake"
 makedepends="glib-devel python3-devel"

From 7015904e4bacd4db1934ecd680ce4fbd6f9b05fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:04 -0400
Subject: [PATCH 1188/4088] libreoffice: rebuild for Python 3.10

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..840077229cfd 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=3
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From e14ef0dd2cbcafd9725361f80545203824e77c28 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:03 -0400
Subject: [PATCH 1189/4088] libimobiledevice: rebuild for Python 3.10

---
 srcpkgs/libimobiledevice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index a8bb2d08e09a..aeb259d8da98 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,7 +1,7 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
 makedepends="python3-devel libglib-devel openssl-devel

From c4c63dcf690b4a71b941195bf8a8a4eec4b3207d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:03 -0400
Subject: [PATCH 1190/4088] libffado: rebuild for Python 3.10

---
 srcpkgs/libffado/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template
index cadd335b30e3..59c5fee76145 100644
--- a/srcpkgs/libffado/template
+++ b/srcpkgs/libffado/template
@@ -1,7 +1,7 @@
 # Template file for 'libffado'
 pkgname=libffado
 version=2.4.4
-revision=3
+revision=4
 build_style=scons
 make_build_args="PREFIX=/usr MANDIR=/usr/share/man
  UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0

From bdadb84f25c2daabb99d957bcd76f347bc09e8ee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:03 -0400
Subject: [PATCH 1191/4088] libcaca: rebuild for Python 3.10

---
 srcpkgs/libcaca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template
index d75d64820327..6bf452268258 100644
--- a/srcpkgs/libcaca/template
+++ b/srcpkgs/libcaca/template
@@ -1,7 +1,7 @@
 # Template file for 'libcaca'
 pkgname=libcaca
 version=0.99.beta19
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="$(vopt_enable x11)"
 hostmakedepends="libtool automake pkg-config"

From 2ba386cc01596268c23801b96f0bd5a18b2818d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:02 -0400
Subject: [PATCH 1192/4088] libblockdev: rebuild for Python 3.10, update to
 2.26.

---
 srcpkgs/libblockdev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template
index 761668125905..321736e4f059 100644
--- a/srcpkgs/libblockdev/template
+++ b/srcpkgs/libblockdev/template
@@ -1,6 +1,6 @@
 # Template file for 'libblockdev'
 pkgname=libblockdev
-version=2.25
+version=2.26
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libblockdev"
 changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/master/NEWS.rst"
 distfiles="https://github.com/storaged-project/libblockdev/releases/download/${version}-1/libblockdev-${version}.tar.gz"
-checksum=555aa42a2db39649ad83253bdc902ab5bd63d39c123e0c8055c4de7fe7571668
+checksum=c4c0e10b35ac632bda8ce6d200b5601184984dec387fe59185921eb42432e069
 conf_files="/etc/libblockdev/conf.d/10-lvm-dbus.cfg
  /etc/libblockdev/conf.d/00-default.cfg"
 

From 66d4d7062ddde3d24a6c61911f8e7c7fbc97232c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:02 -0400
Subject: [PATCH 1193/4088] libaccounts-glib: rebuild for Python 3.10

---
 srcpkgs/libaccounts-glib/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index 465a3f96f50c..ad3a6e0621a9 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -1,19 +1,18 @@
 # Template file for 'libaccounts-glib'
 pkgname=libaccounts-glib
 version=1.24
-revision=4
-wrksrc="${pkgname}-VERSION_${version}-8948717702424ce15f4e23e5db2c8ce0799ec120"
+revision=5
 build_style=meson
 build_helper="gir"
-hostmakedepends="gtk-doc pkg-config python3-gobject-devel glib-devel gobject-introspection
- vala"
+hostmakedepends="gtk-doc pkg-config python3-gobject-devel
+ glib-devel gobject-introspection vala"
 makedepends="sqlite-devel libxml2-devel libglib-devel python3-gobject-devel check-devel"
 short_desc="GLib-based client library for the accounts database"
 maintainer="John Rowley <enterthevoid@codesector.co>"
 license="LGPL-2.1-only"
 homepage="https://gitlab.com/accounts-sso/libaccounts-glib"
-distfiles="https://gitlab.com/accounts-sso/${pkgname}/repository/archive.tar.gz?ref=VERSION_${version}>${pkgname}-${version}.tar.gz"
-checksum=b0c52ddbd0305a37395890c61ec9ca9b389a3ee923a4364640205cf798a92f56
+distfiles="https://gitlab.com/accounts-sso/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
 
 if [ "$CROSS_BUILD" ]; then
 	# Remove docs. During install of package, it will try

From 780c5a7f9c5b6669d714a8885ecf7aa7135d5901 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:02 -0400
Subject: [PATCH 1194/4088] lfm: rebuild for Python 3.10

---
 srcpkgs/lfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lfm/template b/srcpkgs/lfm/template
index 7d909bf84916..aaaf6f3e344c 100644
--- a/srcpkgs/lfm/template
+++ b/srcpkgs/lfm/template
@@ -1,7 +1,7 @@
 # Template file for 'lfm'
 pkgname=lfm
 version=3.1
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"

From 428b192bd03e3f8716f447d373f858236ec2176b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:02 -0400
Subject: [PATCH 1195/4088] legendary: rebuild for Python 3.10

---
 srcpkgs/legendary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/legendary/template b/srcpkgs/legendary/template
index cae2bbbc415d..e19b04603006 100644
--- a/srcpkgs/legendary/template
+++ b/srcpkgs/legendary/template
@@ -1,7 +1,7 @@
 # Template file for 'legendary'
 pkgname=legendary
 version=0.20.12
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-wheel"

From fce3e483a355cc18be40495e176fac579f530c8f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:01 -0400
Subject: [PATCH 1196/4088] kupfer: rebuild for Python 3.10

---
 srcpkgs/kupfer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template
index 02eaefea8b3b..61f4e119c18c 100644
--- a/srcpkgs/kupfer/template
+++ b/srcpkgs/kupfer/template
@@ -1,7 +1,7 @@
 # Template file for 'kupfer'
 pkgname=kupfer
 version=321
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=waf3
 pycompile_dirs="usr/share/kupfer/kupfer"

From c2664d4562072e5347ee16502159c10cdbeb7118 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:01 -0400
Subject: [PATCH 1197/4088] krita: rebuild for Python 3.10

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index bca330f75ece..1e3ec253c1db 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=4.4.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From ada23f17609a63fdcfb84d1b1e4152c6a0475f7a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:01 -0400
Subject: [PATCH 1198/4088] kodi: rebuild for Python 3.10

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..a31240ff2766 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=4
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From 23514d727bf6581aa20dd194fb2b6218be03285f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:01 -0400
Subject: [PATCH 1199/4088] kmymoney: rebuild for Python 3.10

---
 srcpkgs/kmymoney/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kmymoney/template b/srcpkgs/kmymoney/template
index 2146ae3ae771..218ca869da6c 100644
--- a/srcpkgs/kmymoney/template
+++ b/srcpkgs/kmymoney/template
@@ -1,7 +1,7 @@
 # Template file for 'kmymoney'
 pkgname=kmymoney
 version=5.1.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DBUILD_TESTING=OFF"

From 18b83790318faa2e982871804ecc3609c886c753 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:01 -0400
Subject: [PATCH 1200/4088] kitty: rebuild for Python 3.10

---
 srcpkgs/kitty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..21624d892634 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
 # Template file for 'kitty'
 pkgname=kitty
 version=0.23.1
-revision=1
+revision=2
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
 makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel

From 17e6e19bdad71fd5ae3491fd7be0fed3c4704a92 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:01 -0400
Subject: [PATCH 1201/4088] kicad: rebuild for Python 3.10

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 850b573e6547..41c5ce3c48d6 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.10
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON

From a6615d5d1f6a1b1f83ff210959fc40c850897e21 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:01 -0400
Subject: [PATCH 1202/4088] khard: rebuild for Python 3.10

---
 srcpkgs/khard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/khard/template b/srcpkgs/khard/template
index cdbaa5b0b6f1..0908934ef0b1 100644
--- a/srcpkgs/khard/template
+++ b/srcpkgs/khard/template
@@ -1,7 +1,7 @@
 # Template file for 'khard'
 pkgname=khard
 version=0.17.0
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-setuptools python3-atomicwrites python3-configobj

From 587229859fc8943530a318ed651c6dfcd9963b85 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:00 -0400
Subject: [PATCH 1203/4088] khal: rebuild for Python 3.10

---
 srcpkgs/khal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..91143e91002c 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,7 +1,7 @@
 # Template file for 'khal'
 pkgname=khal
 version=0.10.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-click python3-click-log python3-configobj

From 8c8900ba01dafe6f3b5a6f11e4145df862431a6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:00 -0400
Subject: [PATCH 1204/4088] kdevelop-python: broken for now; no upstream
 support for Python 3.10

---
 srcpkgs/kdevelop-python/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template
index 6d2f53fd0e60..7032a51085fb 100644
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@@ -18,6 +18,7 @@ homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-python-${version}.tar.xz"
 checksum=20f9b771b961262ded986a4f32b8d259ad9f7bc48bb29eac0a5d5853be1d917f
 python_version=3
+broken="relies on parser headers removed in python 3.10, no upstream fix yet"
 
 post_install() {
 	# don't install this python2 script: generates documentation_files, useless at runtime

From f901c8f1e5ee11192ba57386eb12984ad3620bd6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:00 -0400
Subject: [PATCH 1205/4088] kapidox: rebuild for Python 3.10

---
 srcpkgs/kapidox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 467ce72d8219..5c5378e4415a 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,7 +1,7 @@
 # Template file for 'kapidox'
 pkgname=kapidox
 version=5.86.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
 makedepends="python3-Jinja2 python3-yaml"

From 1108c06de45d10760fe2b6feda95f2cb17df6153 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:00 -0400
Subject: [PATCH 1206/4088] jupyterlab: rebuild for Python 3.10

---
 srcpkgs/jupyterlab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index cd21f1e8463f..8914dca25600 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,7 +1,7 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
 version=3.1.11
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket

From 8e560bb2790e2e08abf5d010a255c0c09f80fd23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:00 -0400
Subject: [PATCH 1207/4088] jrnl: rebuild for Python 3.10

---
 srcpkgs/jrnl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..b6ea40ee345e 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,7 +1,7 @@
 # Template file for 'jrnl'
 pkgname=jrnl
 version=2.8.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ansiwrap python3-asteval python3-colorama python3-cryptography

From cb77edf0b0d2eb414667ae8291632ed3ef227dd6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:00 -0400
Subject: [PATCH 1208/4088] iotop: rebuild for Python 3.10

---
 srcpkgs/iotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 84a9f7886162..91eb75cffa62 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -1,7 +1,7 @@
 # Template file for 'iotop'
 pkgname=iotop
 version=0.6
-revision=8
+revision=9
 build_style=python3-module
 hostmakedepends="python3"
 depends="${hostmakedepends}"

From 58a691e29a1c0fadc2f808feaa8bce68586cac5d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:59 -0400
Subject: [PATCH 1209/4088] instaloader: rebuild for Python 3.10

---
 srcpkgs/instaloader/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..fe0117bb2aff 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,7 +1,7 @@
 # Template file for 'instaloader'
 pkgname=instaloader
 version=4.8
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests"

From c88ff448e8692462598330eb532aa2814b1cd77d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:59 -0400
Subject: [PATCH 1210/4088] impacket: rebuild for Python 3.10

---
 srcpkgs/impacket/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/impacket/template b/srcpkgs/impacket/template
index 3a94d0339ec4..9e968e0a7975 100644
--- a/srcpkgs/impacket/template
+++ b/srcpkgs/impacket/template
@@ -1,7 +1,7 @@
 # Template file for 'impacket'
 pkgname=impacket
 version=0.9.23
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-six python3-chardet python3-pyasn1

From be00b0409c393e215eaeab645a0c8cbc1b2f3fb7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:59 -0400
Subject: [PATCH 1211/4088] img2pdf: rebuild for Python 3.10

---
 srcpkgs/img2pdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..4d285b15e821 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -1,7 +1,7 @@
 # Template file for 'img2pdf'
 pkgname=img2pdf
 version=0.4.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"

From 38965d8003513c2874000e20c3fabd334b4eb9ee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:59 -0400
Subject: [PATCH 1212/4088] idjc: rebuild for Python 3.10

---
 srcpkgs/idjc/patches/python310.patch | 11 +++++++++++
 srcpkgs/idjc/template                | 17 ++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/idjc/patches/python310.patch

diff --git a/srcpkgs/idjc/patches/python310.patch b/srcpkgs/idjc/patches/python310.patch
new file mode 100644
index 000000000000..ea4ab9679de6
--- /dev/null
+++ b/srcpkgs/idjc/patches/python310.patch
@@ -0,0 +1,11 @@
+--- ./configure.ac.orig	2021-09-26 14:46:32.840552276 -0400
++++ ./configure.ac	2021-09-26 14:46:41.313573652 -0400
+@@ -10,7 +10,7 @@
+ AM_CONFIG_HEADER([config.h])
+ 
+ # Generate python installation stuff
+-m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3.8 python3.7 python3.9])
++m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3.8 python3.7 python3.9 python3.10])
+ AM_PATH_PYTHON([3.7])
+ AC_SUBST([idjcpythondir], [\${pkglibdir}/site-packages])
+ AC_SUBST([idjcpkgpythondir], [\${pkglibdir}/site-packages/idjc])
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index 45cf97545ef7..ddabff2a4e74 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -1,14 +1,13 @@
 # Template file for 'idjc'
 pkgname=idjc
 version=0.9.1
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config git python3-devel"
-makedepends="
- libvorbis-devel libogg-devel jack-devel libsamplerate-devel
- libflac-devel libsndfile-devel mpg123-devel ffmpeg-devel
- speex-devel glib-devel pixman-devel lame-devel python3-gobject-devel
- libshout-idjc-devel opus-devel twolame-devel python3-mutagen"
+hostmakedepends="pkg-config git python3 automake gettext-devel libtool"
+makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel
+ libflac-devel libsndfile-devel mpg123-devel ffmpeg-devel speex-devel
+ glib-devel pixman-devel lame-devel python3-gobject-devel libshout-idjc-devel
+ opus-devel twolame-devel python3-mutagen python3-devel"
 depends="python3-gobject python3-mutagen desktop-file-utils shared-mime-info python3-dbus jack"
 short_desc="Internet DJ Console"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://idjc.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=78106e9d9e82a08269e5ece45c7cbf0a38c3f931d7341df05e7fee002b872224
+
+pre_configure() {
+	autoreconf -fi
+}

From db599a6ef61144636536a757ab91d311928cf584 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:59 -0400
Subject: [PATCH 1213/4088] icdiff: rebuild for Python 3.10

---
 srcpkgs/icdiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..35e1d87c683c 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'icdiff'
 pkgname=icdiff
 version=2.0.4
-revision=1
+revision=2
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5c7420625e0ff19876e86fd55c1a35cf406f1f4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 26 Sep 2021 15:11:22 -0400
Subject: [PATCH 1214/4088] ibus: rebuild for Python 3.10

---
 srcpkgs/ibus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 2145f5d0e41c..49675ff3d6a5 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus'
 pkgname=ibus
 version=1.5.23
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-ui --enable-gtk3 --disable-tests

From 1a33574893edb0a687a070829ecb6505360b790c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:59 -0400
Subject: [PATCH 1215/4088] hugin: rebuild for Python 3.10

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 451e75fe6825..b8af1fcbd260 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2020.0.0
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3

From 3e7d049ff92b60edf73183494dd8fc35832f576e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:59 -0400
Subject: [PATCH 1216/4088] httpie: rebuild for Python 3.10

---
 srcpkgs/httpie/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template
index 1a9a418a42b0..28847684d9d2 100644
--- a/srcpkgs/httpie/template
+++ b/srcpkgs/httpie/template
@@ -1,7 +1,7 @@
 # Template file for 'httpie'
 pkgname=httpie
 version=2.5.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests python3-requests-toolbelt

From 1d19f223802eaaeea5d6d77a2edc1e34ab28f749 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:58 -0400
Subject: [PATCH 1217/4088] hplip: rebuild for Python 3.10

---
 srcpkgs/hplip/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 397508c55a3f..c6bc1a9b0df2 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,9 +1,11 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=5
+revision=6
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
+# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
+# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -17,7 +19,8 @@ configure_args="
  --enable-hpijs-install
  --enable-foomatic-drv-install
  --enable-pp-build
- --with-mimedir=/usr/share/cups/mime"
+ --with-mimedir=/usr/share/cups/mime
+ am_cv_python_version=${py3_ver}"
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"

From 1643753a929cfa9be495bc57b07aceef6ece5c78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 3 Oct 2021 22:32:53 -0400
Subject: [PATCH 1218/4088] hivex: rebuild for Python 3.10

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 3ac29c532c64..613e708f1fa3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.21
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From 2b979ca88ef6787d15426c9f24468567597a8b74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:58 -0400
Subject: [PATCH 1219/4088] hg-git: rebuild for Python 3.10

---
 srcpkgs/hg-git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index ded693e7942d..37ef7e6b91ee 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,7 +1,7 @@
 # Template file for 'hg-git'
 pkgname=hg-git
 version=0.9.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-dulwich mercurial"

From c133a5215cd43305959837c38f0848c95747ab27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Oct 2021 09:32:50 -0400
Subject: [PATCH 1220/4088] hexchat: rebuild for Python 3.10

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index f2e356f54736..9f11a75d3adc 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,7 +1,7 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.16.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3

From dd9c65cae0ecee493735f19409af76593653cae5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:58 -0400
Subject: [PATCH 1221/4088] hangups: rebuild for Python 3.10

---
 srcpkgs/hangups/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hangups/template b/srcpkgs/hangups/template
index e978dda8a68f..87be11616e9b 100644
--- a/srcpkgs/hangups/template
+++ b/srcpkgs/hangups/template
@@ -1,7 +1,7 @@
 # Template file for 'hangups'
 pkgname=hangups
 version=0.4.14
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-MechanicalSoup python3-readlike python3-ReParser

From 39c13ed944fef75fa4276774dd40966b7d239f05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:58 -0400
Subject: [PATCH 1222/4088] hamlib: rebuild for Python 3.10

---
 srcpkgs/hamlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 086b6c614c1f..1296fad6081d 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
 # Template file for 'hamlib'
 pkgname=hamlib
 version=4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-perl-binding --with-python-binding
  --with-tcl-binding --with-xml-support"

From ba4069dbec52ab9ffb08f1927f64dc32fd514bfb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:58 -0400
Subject: [PATCH 1223/4088] gwe: rebuild for Python 3.10

---
 srcpkgs/gwe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index 6a64fd01e6ce..1bb258ebecdd 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,7 +1,7 @@
 # Template file for 'gwe'
 pkgname=gwe
 version=0.15.2
-revision=1
+revision=2
 wrksrc="gwe-${version}"
 build_style=meson
 hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel

From 97690369a0a269a57ca1a06224f6a845f62924bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:58 -0400
Subject: [PATCH 1224/4088] gufw: rebuild for Python 3.10

---
 srcpkgs/gufw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gufw/template b/srcpkgs/gufw/template
index 6495bd7b1488..9f658f58c0a7 100644
--- a/srcpkgs/gufw/template
+++ b/srcpkgs/gufw/template
@@ -1,7 +1,7 @@
 # Template file for 'gufw'
 pkgname=gufw
 version=21.04.0
-revision=2
+revision=3
 wrksrc="gufw-${version}"
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool"

From b090d9019c07da83e3754d79a887d41a16477c36 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:57 -0400
Subject: [PATCH 1225/4088] guake: rebuild for Python 3.10

---
 srcpkgs/guake/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template
index 9fbc1895da95..940564e72324 100644
--- a/srcpkgs/guake/template
+++ b/srcpkgs/guake/template
@@ -1,7 +1,7 @@
 # Template file for 'guake'
 pkgname=guake
 version=3.7.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools python3-pbr"
 makedepends="python3-devel python3-pbr"

From d64d6328d7f84548c50e282530570d90b8523f47 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:57 -0400
Subject: [PATCH 1226/4088] gscreenshot: rebuild for Python 3.10

---
 srcpkgs/gscreenshot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template
index c226f70829d2..23c381d5df4c 100644
--- a/srcpkgs/gscreenshot/template
+++ b/srcpkgs/gscreenshot/template
@@ -1,7 +1,7 @@
 # Template file for 'gscreenshot'
 pkgname=gscreenshot
 version=2.15.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools gettext"
 depends="gtk+3 python3-setuptools python3-Pillow python3-gobject scrot"

From 04dbc2b357994d49914a62eefa071b1dc4bce0fa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:57 -0400
Subject: [PATCH 1227/4088] grip: rebuild for Python 3.10

---
 srcpkgs/grip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grip/template b/srcpkgs/grip/template
index d305add95a92..9f463998c276 100644
--- a/srcpkgs/grip/template
+++ b/srcpkgs/grip/template
@@ -1,7 +1,7 @@
 # Template file for 'grip'
 pkgname=grip
 version=4.5.2
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-docopt python3-Flask python3-Markdown python3-path-and-address python3-Pygments python3-requests"

From 9677fe938d549671c37639a183aa59f81fb84cfc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:57 -0400
Subject: [PATCH 1228/4088] greg: rebuild for Python 3.10

---
 srcpkgs/greg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/greg/template b/srcpkgs/greg/template
index 4900eb028771..cc5b632ff166 100644
--- a/srcpkgs/greg/template
+++ b/srcpkgs/greg/template
@@ -1,7 +1,7 @@
 # Template file for 'greg'
 pkgname=greg
 version=0.4.7
-revision=7
+revision=8
 build_style=python3-module
 pycompile_module="greg"
 hostmakedepends="python3-setuptools"

From 88497c03dad870de0a54c343caadb9628ff74007 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:57 -0400
Subject: [PATCH 1229/4088] gramps: rebuild for Python 3.10

---
 srcpkgs/gramps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gramps/template b/srcpkgs/gramps/template
index 41de027b114f..b4b786cfef88 100644
--- a/srcpkgs/gramps/template
+++ b/srcpkgs/gramps/template
@@ -1,7 +1,7 @@
 # Template file for 'gramps'
 pkgname=gramps
 version=5.1.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config intltool python3"
 depends="gtk+3 python3-gobject python3-bsddb3"

From ee6c86c672672add5a2bcf7d119404a37b39f4d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Sep 2021 23:14:46 -0400
Subject: [PATCH 1230/4088] gqrx: rebuild for volk

---
 srcpkgs/gqrx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index b1b6597b1ef9..9cab32fcf3ee 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
 # Template file for 'gqrx'
 pkgname=gqrx
 version=2.14.4
-revision=2
+revision=3
 build_style=cmake
 configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
  $(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"

From da1462b96721181ed87555b23a628db05b9e4019 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:56 -0400
Subject: [PATCH 1231/4088] gpodder: rebuild for Python 3.10

---
 srcpkgs/gpodder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..738464c61ca0 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,7 +1,7 @@
 # Template file for 'gpodder'
 pkgname=gpodder
 version=3.10.21
-revision=1
+revision=2
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
  python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen

From 025619dbe0f7b6b7a51eb5ef273a5f9532766e96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:56 -0400
Subject: [PATCH 1232/4088] gom: rebuild for Python 3.10

---
 srcpkgs/gom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gom/template b/srcpkgs/gom/template
index b940415f40f5..dd323bde4252 100644
--- a/srcpkgs/gom/template
+++ b/srcpkgs/gom/template
@@ -1,7 +1,7 @@
 # Template file for 'gom'
 pkgname=gom
 version=0.4
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-introspection=$(vopt_if gir true false)

From 261b95c367bc115769cd0a322b959e5854bf0104 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:56 -0400
Subject: [PATCH 1233/4088] gnuradio-rds: rebuild for Python 3.10

---
 srcpkgs/gnuradio-rds/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 4ffd643d2726..4da5c54e812e 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-rds'
 pkgname=gnuradio-rds
 version=3.8.0
-revision=2
+revision=3
 wrksrc="gr-rds-${version}"
 build_style=cmake
 hostmakedepends="pkg-config gnuradio swig"

From 46431b709b6e3866e0700a0362be958d50213076 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:56 -0400
Subject: [PATCH 1234/4088] gnuradio-nrsc5: rebuild for Python 3.10

---
 srcpkgs/gnuradio-nrsc5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 6299e7c90b02..f0d91aa1c8d2 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-nrsc5'
 pkgname=gnuradio-nrsc5
 version=1.0.0
-revision=4
+revision=5
 wrksrc="gr-nrsc5-${version}"
 build_style=cmake
 make_cmd=make

From ce7877ef9c336e83044fe9d01fef0dd1b26ed9b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:55 -0400
Subject: [PATCH 1235/4088] gnucash: rebuild for Python 3.10

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index a27deb2b931e..a071fbd957ce 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.8
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check

From dca84bb589f0091f83456be1f73febede373a7b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:55 -0400
Subject: [PATCH 1236/4088] gns3-server: rebuild for Python 3.10

---
 srcpkgs/gns3-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 6e06a4d09423..040a420f23f1 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
 version=2.2.25
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl

From 48d4c5e2c2e160e9a0eb48a3f5122af75bf6541d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:55 -0400
Subject: [PATCH 1237/4088] gns3-gui: rebuild for Python 3.10

---
 srcpkgs/gns3-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 4dd514ad4614..269b0c64beac 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.25
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema

From cc00eeb9ba526151896b198579a17fff47415dec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:55 -0400
Subject: [PATCH 1238/4088] gnome-tweaks: rebuild for Python 3.10

---
 srcpkgs/gnome-tweaks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index 10e7a38cf566..8f7a3eda15d2 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
 version=40.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext"
 depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy"

From a166a974dfeab3fe8b67fb60ba06ce2dd26a181c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:55 -0400
Subject: [PATCH 1239/4088] gnome-passwordsafe: rebuild for Python 3.10

---
 srcpkgs/gnome-passwordsafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index 557d99219750..fe91bcd9ed23 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-passwordsafe'
 pkgname=gnome-passwordsafe
 version=5.0
-revision=1
+revision=2
 wrksrc="PasswordSafe-${version}"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection

From 93db6730912001afc231be0d3f8c5e4b7e5f78bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:55 -0400
Subject: [PATCH 1240/4088] gnome-passbook: rebuild for Python 3.10

---
 srcpkgs/gnome-passbook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index c0adaedb4d99..7a53e1d218ad 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-passbook'
 pkgname=gnome-passbook
 version=0.8
-revision=1
+revision=2
 _release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
 wrksrc="passbook-${version}"
 build_style=meson

From ee7e9a519c0d4112e5aec62ce27ebe2f9236be0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:55 -0400
Subject: [PATCH 1241/4088] gnome-music: rebuild for Python 3.10

---
 srcpkgs/gnome-music/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index f704e3e08049..b9674abfac2c 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
 version=40.1.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"

From 98a5b23386c5fb845f5fe83e6a2c149fdbae4a29 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:54 -0400
Subject: [PATCH 1242/4088] gnome-doc-utils: rebuild for Python 3.10

---
 srcpkgs/gnome-doc-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index 8c55060aa4ae..f63c6106f6c1 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt

From dc11218501fda86577420f7be4b5b63b0448224a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:54 -0400
Subject: [PATCH 1243/4088] gnome-builder: rebuild for Python 3.10

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index ad0cc8cc6f20..a3ce20126d78 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=3.40.2
-revision=2
+revision=3
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"

From 04189f65c6aff7ed314c4e7da2a3c8329ebaa4f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:54 -0400
Subject: [PATCH 1244/4088] gnome-authenticator: rebuild for Python 3.10

---
 srcpkgs/gnome-authenticator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-authenticator/template b/srcpkgs/gnome-authenticator/template
index e1bd1ee9e443..415bc5355576 100644
--- a/srcpkgs/gnome-authenticator/template
+++ b/srcpkgs/gnome-authenticator/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-authenticator'
 pkgname=gnome-authenticator
 version=3.32.2
-revision=3
+revision=4
 wrksrc="Authenticator-${version}"
 build_style=meson
 build_helper="gir"

From 49e03700a2a603ef19d6a33ea6e5625c369c8734 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:54 -0400
Subject: [PATCH 1245/4088] glances: rebuild for Python 3.10

---
 srcpkgs/glances/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index abeffef69647..f7814f03d996 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,7 +1,7 @@
 # Template file for 'glances'
 pkgname=glances
 version=3.2.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-psutil python3-defusedxml"

From 99eda9e830afd781623b3e13a1fc3356d6d98ae3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:53 -0400
Subject: [PATCH 1246/4088] gitg: rebuild for Python 3.10

---
 srcpkgs/gitg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index e309a6a1462f..2f8f671038da 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -1,7 +1,7 @@
 # Template file for 'gitg'
 pkgname=gitg
 version=3.32.1
-revision=4
+revision=5
 build_style=meson
 build_helper="qemu"
 hostmakedepends="intltool gettext glib-devel gobject-introspection pkg-config vala"

From fce57e817af3088581890317aed5af3ded59f126 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:53 -0400
Subject: [PATCH 1247/4088] git-revise: rebuild for Python 3.10

---
 srcpkgs/git-revise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-revise/template b/srcpkgs/git-revise/template
index 7dcf2bd5615c..2b49ac622aa6 100644
--- a/srcpkgs/git-revise/template
+++ b/srcpkgs/git-revise/template
@@ -1,7 +1,7 @@
 # Template file for 'git-revise'
 pkgname=git-revise
 version=0.6.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="git python3-setuptools"

From 6036c6c3e76ffe310daa098b84d018192a8ae8e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:53 -0400
Subject: [PATCH 1248/4088] git-review: rebuild for Python 3.10

---
 srcpkgs/git-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template
index 5993feca1024..8f97599d2408 100644
--- a/srcpkgs/git-review/template
+++ b/srcpkgs/git-review/template
@@ -1,7 +1,7 @@
 # Template file for 'git-review'
 pkgname=git-review
 version=1.28.0
-revision=5
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-requests"

From 5a0f4e847f7a34de4c577f594d9140ec4d5df150 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:53 -0400
Subject: [PATCH 1249/4088] git-filter-repo: rebuild for Python 3.10

---
 srcpkgs/git-filter-repo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-filter-repo/template b/srcpkgs/git-filter-repo/template
index 7755fee8bb20..073dd6f75fe1 100644
--- a/srcpkgs/git-filter-repo/template
+++ b/srcpkgs/git-filter-repo/template
@@ -1,7 +1,7 @@
 # Template file for 'git-filter-repo'
 pkgname=git-filter-repo
 version=2.33.0
-revision=1
+revision=2
 depends="git python3"
 checkdepends="git python3 perl rsync dos2unix"
 short_desc="Versatile tool for rewriting git history"

From c7e2fc05e0e9486b815674782558fc7da81c473a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:53 -0400
Subject: [PATCH 1250/4088] git-cola: rebuild for Python 3.10

---
 srcpkgs/git-cola/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index 2716e0272b6a..29a7e26276e6 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.10.1
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="usr/share/git-cola/lib"
 hostmakedepends="python3"

From 0fa89d73f1f326dbffa884ba5e11382e3de4997d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:53 -0400
Subject: [PATCH 1251/4088] gi-docgen: rebuild for Python 3.10

---
 srcpkgs/gi-docgen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
index fdb4d4b14e60..046960af9469 100644
--- a/srcpkgs/gi-docgen/template
+++ b/srcpkgs/gi-docgen/template
@@ -1,7 +1,7 @@
 # Template file for 'gi-docgen'
 pkgname=gi-docgen
 version=2021.7
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml

From ec69470ff53c1f7a13885a818f320143fd0afadc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:53 -0400
Subject: [PATCH 1252/4088] geis: rebuild for Python 3.10

---
 srcpkgs/geis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template
index ddad320d93a7..9f4fdba8dd38 100644
--- a/srcpkgs/geis/template
+++ b/srcpkgs/geis/template
@@ -1,7 +1,7 @@
 # Template file for 'geis'
 pkgname=geis
 version=2.2.17
-revision=8
+revision=9
 build_style="gnu-configure"
 configure_args="--disable-static"
 hostmakedepends="pkg-config python3-devel"

From 3df4260d8e2d709c718d261dea9ee99966995a3c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:52 -0400
Subject: [PATCH 1253/4088] gef: rebuild for Python 3.10

---
 srcpkgs/gef/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index 176f42ef6d5d..fdbd5eeeb831 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,7 +1,7 @@
 # Template file for 'gef'
 pkgname=gef
 version=2021.07
-revision=1
+revision=2
 pycompile_dirs="usr/share/gef"
 depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
 short_desc="GDB Enhanced Features for exploit devs & reversers"

From 55cc47d73b60dda5d3fd7269250f23972ec08d86 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:52 -0400
Subject: [PATCH 1254/4088] gedit-plugins: rebuild for Python 3.10

---
 srcpkgs/gedit-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index ed5f8f388b66..c7c4d159723b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
 version=40.1
-revision=1
+revision=2
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
 hostmakedepends="gettext glib-devel itstool pkg-config vala appstream-glib

From 6d0580c140db608448aa5f81323864bff8917cfd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:52 -0400
Subject: [PATCH 1255/4088] gdown: rebuild for Python 3.10

---
 srcpkgs/gdown/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gdown/template b/srcpkgs/gdown/template
index e2b19518da59..bc9cc3b8b69f 100644
--- a/srcpkgs/gdown/template
+++ b/srcpkgs/gdown/template
@@ -1,7 +1,7 @@
 # Template file for 'gdown'
 pkgname=gdown
 version=3.13.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="python3-filelock python3-requests python3-six python3-tqdm

From a4c4be87e05f267a72293e3c196de7f8bfd199a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:52 -0400
Subject: [PATCH 1256/4088] gcovr: rebuild for Python 3.10

---
 srcpkgs/gcovr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcovr/template b/srcpkgs/gcovr/template
index 0f3e294b827a..cb13a9d12628 100644
--- a/srcpkgs/gcovr/template
+++ b/srcpkgs/gcovr/template
@@ -1,7 +1,7 @@
 # Template file for 'gcovr'
 pkgname=gcovr
 version=4.2
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-Jinja2 python3-lxml python3-Pygments"

From 73233b76ef85d99fe5f9dab584339d4f1ddca97e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:52 -0400
Subject: [PATCH 1257/4088] gandi-cli: rebuild for Python 3.10

---
 srcpkgs/gandi-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gandi-cli/template b/srcpkgs/gandi-cli/template
index 1350627bba16..71cbc44cc7d7 100644
--- a/srcpkgs/gandi-cli/template
+++ b/srcpkgs/gandi-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gandi-cli'
 pkgname=gandi-cli
 version=1.6
-revision=1
+revision=2
 wrksrc="gandi.cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-docutils python3-setuptools"

From 7afc5ff645d7f759e9978b9664f04296c2da5b8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:52 -0400
Subject: [PATCH 1258/4088] gammastep: rebuild for Python 3.10

---
 srcpkgs/gammastep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template
index b03e346a9b5a..1a12e16e3a97 100644
--- a/srcpkgs/gammastep/template
+++ b/srcpkgs/gammastep/template
@@ -1,7 +1,7 @@
 # Template file for 'gammastep'
 pkgname=gammastep
 version=2.0.7
-revision=1
+revision=2
 wrksrc="${pkgname}-v$version"
 build_style=gnu-configure
 configure_args="--enable-gui --enable-drm --enable-vidmode --enable-randr

From 0fe947712b7040f34f16a7034d7cb1a2ba75f67d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:51 -0400
Subject: [PATCH 1259/4088] gallery-dl: rebuild for Python 3.10

---
 srcpkgs/gallery-dl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index cdb450c220e2..a55ead4d37c8 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,7 +1,7 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
 version=1.19.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests"

From 632237bd6f8d4aa03810f36d884108d6fdf0a89c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:51 -0400
Subject: [PATCH 1260/4088] gajim-omemo: rebuild for Python 3.10

---
 srcpkgs/gajim-omemo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gajim-omemo/template b/srcpkgs/gajim-omemo/template
index 9c0c2abdd3cd..531f7be7545d 100644
--- a/srcpkgs/gajim-omemo/template
+++ b/srcpkgs/gajim-omemo/template
@@ -1,7 +1,7 @@
 # Template file for 'gajim-omemo'
 pkgname=gajim-omemo
 version=2.7.15
-revision=1
+revision=2
 wrksrc="omemo"
 hostmakedepends="unzip"
 depends="python3 python3-setuptools python3-cryptography python3-axolotl

From f45426334ead71a8c9b0b2dfd53f3e96922a5303 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:51 -0400
Subject: [PATCH 1261/4088] frr: rebuild for Python 3.10

---
 srcpkgs/frr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index 808601ff4973..664313adf10e 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
 # Template file for 'frr'
 pkgname=frr
 version=7.5
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 # chroot-texinfo is not able to build frr's docs

From 35da40a390ccff05c37937a8a25c6283e8c1aaa8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:51 -0400
Subject: [PATCH 1262/4088] freeorion: rebuild for Python 3.10, update to
 0.4.10.2.

---
 srcpkgs/freeorion/template | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 37bfc09176c4..20fd819e49b0 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,31 +1,24 @@
 # Template file for 'freeorion'
 pkgname=freeorion
-version=0.4.10
-revision=2
-_release=${version}_2020-07-10.f3d403e
+version=0.4.10.2
+revision=1
+_release=${version}_2021-08-01.f663dad
 wrksrc=src-tarball
 build_style=cmake
 hostmakedepends="cppcheck doxygen python3-pycodestyle"
 makedepends="boost-devel libvorbis-devel
  freetype-devel glew-devel libopenal-devel python3-devel SDL2-devel"
-depends="${pkgname}-data desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Turn-based space empire and galactic conquest (4X) computer game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freeorion.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/freeorion/freeorion/master/ChangeLog.md"
 distfiles="https://github.com/freeorion/freeorion/releases/download/v${version}/FreeOrion_v${_release}_Source.tar.gz"
-checksum=e72ab42cba1ee8842507340931ef389e64011e040a4adc74add5f4997bbcba8b
+checksum=f6056ee97edd46dee8076cc1cdb11c711652f1e26f03cec1244a01a3cd5b0d70
+replaces="freeorion-data>=0"
 
 post_extract() {
 	_build_no=${_release/*_/}
 	sed -i -e "s|\${FreeOrion_BUILD_NO}|$_build_no|" util/Version.cpp.in
 }
-
-freeorion-data_package() {
-	short_desc+=" - data files"
-	license="GPL-2.0-or-later, CC-BY-SA-3.0"
-	pkg_install() {
-		vmove usr/share/freeorion
-	}
-}

From c97a857cd0162cad5d07db1e501bbb8496c05336 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:51 -0400
Subject: [PATCH 1263/4088] freecad: rebuild for Python 3.10

---
 srcpkgs/freecad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index a11272680797..baa80234b2f1 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.19.2
-revision=1
+revision=2
 wrksrc="FreeCAD-${version}"
 build_style=cmake
 

From ada09b107dc538c99217cf9f397d23e5497e9ed2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:51 -0400
Subject: [PATCH 1264/4088] fonttools: rebuild for Python 3.10

---
 srcpkgs/fonttools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index 4146889c9d45..a0237d4fe6e0 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,7 +1,7 @@
 # Template file for 'fonttools'
 pkgname=fonttools
 version=4.18.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"

From 3e4d70c2def011176877490fe240baf478ea9b48 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:50 -0400
Subject: [PATCH 1265/4088] flinks: rebuild for Python 3.10

---
 srcpkgs/flinks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flinks/template b/srcpkgs/flinks/template
index e4fac93a22e0..cf92b29b69e2 100644
--- a/srcpkgs/flinks/template
+++ b/srcpkgs/flinks/template
@@ -1,7 +1,7 @@
 # Template file for 'flinks'
 pkgname=flinks
 version=0.5.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="lynx python3"

From 3772800280b513e6fbe4e7ec32cc45ff5c716a70 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:50 -0400
Subject: [PATCH 1266/4088] fierce: rebuild for Python 3.10

---
 srcpkgs/fierce/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fierce/template b/srcpkgs/fierce/template
index 31e4741929e5..eec2e71b290a 100644
--- a/srcpkgs/fierce/template
+++ b/srcpkgs/fierce/template
@@ -1,7 +1,7 @@
 # Template file for 'fierce'
 pkgname=fierce
 version=1.4.0
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="fierce"
 hostmakedepends="python3-setuptools"

From f60e20dc1446bed64f4af2d54d34331309fdf169 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:50 -0400
Subject: [PATCH 1267/4088] fetchmail: rebuild for Python 3.10, update to
 6.4.22.

---
 srcpkgs/fetchmail/template | 6 +++---
 srcpkgs/fetchmail/update   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..91fa37c38b41 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,10 +1,10 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.22
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="python3"
+hostmakedepends="python3 pkg-config"
 makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cc6818bd59435602169fa292d6d163d56b21c7f53112829470a3aceabe612c84
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/fetchmail/update b/srcpkgs/fetchmail/update
index f3966b2d3e13..2e4fc10d2079 100644
--- a/srcpkgs/fetchmail/update
+++ b/srcpkgs/fetchmail/update
@@ -1 +1 @@
-ignore="*.*.*.beta*"
+ignore="*beta* *rc*"

From ccc01b5c981e42463c59a1e6bdab0b1d9017dc13 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:50 -0400
Subject: [PATCH 1268/4088] fava: rebuild for Python 3.10

---
 srcpkgs/fava/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index d14e25c39974..9b0f83e540b9 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,7 +1,7 @@
 # Template file for 'fava'
 pkgname=fava
 version=1.18
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask

From 8c5146d2e3ac33c48cf72aa181d234206b9e5a32 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:50 -0400
Subject: [PATCH 1269/4088] fail2ban: rebuild for Python 3.10

---
 srcpkgs/fail2ban/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..0498ef9672af 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
 version=0.11.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"

From acc1710ab180b9c50b0dd564ad72bfe3a3125856 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:49 -0400
Subject: [PATCH 1270/4088] evemu: rebuild for Python 3.10

---
 srcpkgs/evemu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evemu/template b/srcpkgs/evemu/template
index e65f2f63ac98..08543bff0fae 100644
--- a/srcpkgs/evemu/template
+++ b/srcpkgs/evemu/template
@@ -1,7 +1,7 @@
 # Template file for 'evemu'
 pkgname=evemu
 version=2.7.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3 asciidoc xmlto"
 makedepends="libevdev-devel"

From 9f270153986f16807f1783b36f9607010c946c52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:49 -0400
Subject: [PATCH 1271/4088] etesync-dav: rebuild for Python 3.10

---
 srcpkgs/etesync-dav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template
index f0fc6cd756d7..61f80e57df96 100644
--- a/srcpkgs/etesync-dav/template
+++ b/srcpkgs/etesync-dav/template
@@ -1,7 +1,7 @@
 # Template file for 'etesync-dav'
 pkgname=etesync-dav
 version=0.20.4
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-etesync radicale2 python3-Flask python3-Flask-WTF"

From 7b2ae49fdc52afea3bb3aed2d5a4f54b12472131 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:49 -0400
Subject: [PATCH 1272/4088] etcetera: rebuild for Python 3.10

---
 srcpkgs/etcetera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template
index 0d305be48b63..02983edebec0 100644
--- a/srcpkgs/etcetera/template
+++ b/srcpkgs/etcetera/template
@@ -1,7 +1,7 @@
 # Template file for 'etcetera'
 pkgname=etcetera
 version=1.0
-revision=2
+revision=3
 pycompile_dirs="usr/lib/etcetera"
 depends="python3"
 short_desc="Config file management with a touch of wisdom"

From d824b2e458326cbf9f961736d04745a40f5b5c27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:49 -0400
Subject: [PATCH 1273/4088] eolie: rebuild for Python 3.10

---
 srcpkgs/eolie/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 4249e3426296..52c0f08d2f45 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -1,7 +1,7 @@
 # Template file for 'eolie'
 pkgname=eolie
 version=0.9.62
-revision=3
+revision=4
 _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
 build_style=meson
 pycompile_module="eolie"

From ebcc8f0da3d657b17748c54a4c6168f745667e19 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:49 -0400
Subject: [PATCH 1274/4088] eog-plugins: rebuild for Python 3.10

---
 srcpkgs/eog-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 694564da7121..dd9e0f1fc44c 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
 version=3.26.7
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
 hostmakedepends="glib-devel pkg-config intltool"

From 6e88de2008dbfe668bd9138d3c6a21965304be0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:49 -0400
Subject: [PATCH 1275/4088] electrum-ltc: rebuild for Python 3.10

---
 srcpkgs/electrum-ltc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/electrum-ltc/template b/srcpkgs/electrum-ltc/template
index d62c43b5fa14..c679e5a4d8cb 100644
--- a/srcpkgs/electrum-ltc/template
+++ b/srcpkgs/electrum-ltc/template
@@ -1,7 +1,7 @@
 # Template file for 'electrum-ltc'
 pkgname=electrum-ltc
 version=3.3.8.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
 depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx

From 34ae7351e73348554b1ff6ce7814286fdd439470 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:49 -0400
Subject: [PATCH 1276/4088] electrum: rebuild for Python 3.10

---
 srcpkgs/electrum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..59575350f955 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,7 +1,7 @@
 # Template file for 'electrum'
 pkgname=electrum
 version=4.1.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
 depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx

From f291360e7eb994ee680f4cf1a908cee1f8359fee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:48 -0400
Subject: [PATCH 1277/4088] edx-dl: rebuild for Python 3.10

---
 srcpkgs/edx-dl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/edx-dl/template b/srcpkgs/edx-dl/template
index 5e1f8b2c2da1..ae797a42f10f 100644
--- a/srcpkgs/edx-dl/template
+++ b/srcpkgs/edx-dl/template
@@ -1,7 +1,7 @@
 # Template file for 'edx-dl'
 pkgname=edx-dl
 version=0.1.13
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-html5lib python3-setuptools

From 0eb9e1ce2f645efcc7bee4b48a74f7313fdf9fff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:48 -0400
Subject: [PATCH 1278/4088] duplicity: rebuild for Python 3.10

---
 srcpkgs/duplicity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index 40e5f8efa056..7098a587a79d 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,7 +1,7 @@
 # Template file for 'duplicity'
 pkgname=duplicity
 version=0.8.20
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools_scm"
 makedepends="python3-devel librsync-devel"

From de6486892b89c40cab0bebe487fd7a1002bb7a13 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:48 -0400
Subject: [PATCH 1279/4088] duiadns: rebuild for Python 3.10

---
 srcpkgs/duiadns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duiadns/template b/srcpkgs/duiadns/template
index 83bc4bb45d43..f9fc5ab5e0b9 100644
--- a/srcpkgs/duiadns/template
+++ b/srcpkgs/duiadns/template
@@ -1,7 +1,7 @@
 # Template file for 'duiadns'
 pkgname=duiadns
 version=1.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-netaddr python3-requests"

From 582b0b5638aa918474e5d6658cac06aabbafb57f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:48 -0400
Subject: [PATCH 1280/4088] docker-compose: rebuild for Python 3.10

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index ddbef482d17a..c5867ba38588 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=1.29.2
-revision=1
+revision=2
 wrksrc="compose-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2f39fb9cd2fa4550810fcaf54d450252255aa9ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:48 -0400
Subject: [PATCH 1281/4088] distcc: rebuild for Python 3.10

---
 srcpkgs/distcc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 31b4f58e84bc..4766512fa501 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,7 +1,7 @@
 # Template file for 'distcc'
 pkgname=distcc
 version=3.3.3
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-Werror --with-gtk"
 conf_files="

From 0fb0dfd7630f89aac84f17b2b848e4f4ff6c903b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:48 -0400
Subject: [PATCH 1282/4088] diffoscope: rebuild for Python 3.10

---
 srcpkgs/diffoscope/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 4f4d0ad1041c..3b740e30b456 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,7 +1,7 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
 version=185
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-magic python3-libarchive-c python3-setuptools

From bdb3b724cd9ca28ff165a9fbdefa0535c5784f49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:47 -0400
Subject: [PATCH 1283/4088] devedeng: rebuild for Python 3.10

---
 srcpkgs/devedeng/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template
index 685ac7435442..f3229ed60680 100644
--- a/srcpkgs/devedeng/template
+++ b/srcpkgs/devedeng/template
@@ -1,7 +1,7 @@
 # Template file for 'devedeng'
 pkgname=devedeng
 version=4.16.0
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="devedeng"
 hostmakedepends="gettext python3"

From e05cfaf56b695c349162c8b7438e150663e301d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:47 -0400
Subject: [PATCH 1284/4088] deluge: rebuild for Python 3.10

---
 srcpkgs/deluge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 7deb5f64686c..c4a4b18fa633 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=13
+revision=14
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"

From e4caec0be98af59e17b1ca273a765bd9c5a444f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:47 -0400
Subject: [PATCH 1285/4088] d-feet: rebuild for Python 3.10

---
 srcpkgs/d-feet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/d-feet/template b/srcpkgs/d-feet/template
index 321b41b8b767..5d924c7ab3a4 100644
--- a/srcpkgs/d-feet/template
+++ b/srcpkgs/d-feet/template
@@ -1,7 +1,7 @@
 # Template file for 'd-feet'
 pkgname=d-feet
 version=0.3.16
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool itstool python3-pycodestyle"
 makedepends="gtk+3-devel gobject-introspection"

From 0252863ae17ec5cabb1301e778a33398a9369f98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:47 -0400
Subject: [PATCH 1286/4088] curseradio: rebuild for Python 3.10

---
 srcpkgs/curseradio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/curseradio/template b/srcpkgs/curseradio/template
index d3f05ee1d5f8..a938acfca0bc 100644
--- a/srcpkgs/curseradio/template
+++ b/srcpkgs/curseradio/template
@@ -1,7 +1,7 @@
 # Template file for 'curseradio'
 pkgname=curseradio
 version=0.0.20171017
-revision=5
+revision=6
 _commit=1bd4bd0faeec675e0647bac9a100b526cba19f8d
 wrksrc="curseradio-${_commit}"
 build_style=python3-module

From 7da34d609b7d6e275e0a8388526439e69af13e6a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:47 -0400
Subject: [PATCH 1287/4088] cura: rebuild for Python 3.10

---
 srcpkgs/cura/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index e721c7a705fd..7a143a8b69a8 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
 version=4.11.0
-revision=1
+revision=2
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}

From 801e69ced1c63b403035dde84beb91bdd7678c81 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:47 -0400
Subject: [PATCH 1288/4088] ctop: rebuild for Python 3.10

---
 srcpkgs/ctop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ctop/template b/srcpkgs/ctop/template
index 9646c772b766..9ce405632116 100644
--- a/srcpkgs/ctop/template
+++ b/srcpkgs/ctop/template
@@ -1,7 +1,7 @@
 # Template file for 'ctop'
 pkgname=ctop
 version=1.0.0
-revision=5
+revision=6
 build_style=python3-module
 pycompile_module="cgroup_top.py"
 hostmakedepends="python3-setuptools"

From 6ba0f29e2a844ec43458c1781af9366f17daa036 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:47 -0400
Subject: [PATCH 1289/4088] csound: rebuild for Python 3.10

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 40173d4608a4..56d44d714105 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.16.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From ba1d38b073683650115124f10ae8b0afd55ec0d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Oct 2021 09:32:50 -0400
Subject: [PATCH 1290/4088] cross-arm-none-eabi-gdb: rebuild for Python 3.10

---
 srcpkgs/cross-arm-none-eabi-gdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template
index 8d9085a5ed6d..0518fa371306 100644
--- a/srcpkgs/cross-arm-none-eabi-gdb/template
+++ b/srcpkgs/cross-arm-none-eabi-gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'cross-arm-none-eabi-gdb'
 pkgname=cross-arm-none-eabi-gdb
 version=11.1
-revision=1
+revision=2
 wrksrc=gdb-${version}
 build_style=gnu-configure
 configure_args="--target=arm-none-eabi --disable-werror --disable-nls --with-system-readline

From 247b7433169eac64b9bf38c5077f7eee7f4d4dee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:47 -0400
Subject: [PATCH 1291/4088] cropgui: rebuild for Python 3.10

---
 srcpkgs/cropgui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template
index 7fcf83644d13..918b5ae132f9 100644
--- a/srcpkgs/cropgui/template
+++ b/srcpkgs/cropgui/template
@@ -1,7 +1,7 @@
 # Template file for 'cropgui'
 pkgname=cropgui
 version=0.5
-revision=1
+revision=2
 hostmakedepends="which python3"
 depends="python3 python3-Pillow python3-gobject
  libjpeg-turbo-tools ImageMagick exiftool"

From 3082b95dbeb5de47e20ad258eb47a5d9a335beea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:46 -0400
Subject: [PATCH 1292/4088] criu: rebuild for Python 3.10

---
 srcpkgs/criu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template
index c9f68933e756..1807efc4a43f 100644
--- a/srcpkgs/criu/template
+++ b/srcpkgs/criu/template
@@ -1,7 +1,7 @@
 # Template file for 'criu'
 pkgname=criu
 version=3.14
-revision=3
+revision=4
 # i686 unsupported upstream: https://criu.org/32bit_tasks_C/R#Compatible_applications
 # ppc64 big endian not supported upstream
 archs="x86_64* aarch64* ppc64le* armv7l*"

From e92e0c00a323e948d0cd87700fe5a4d8afb8a2dc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:46 -0400
Subject: [PATCH 1293/4088] cpuset: rebuild for Python 3.10

---
 srcpkgs/cpuset/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cpuset/template b/srcpkgs/cpuset/template
index b1675ff9cda3..7b02b6898bf3 100644
--- a/srcpkgs/cpuset/template
+++ b/srcpkgs/cpuset/template
@@ -1,7 +1,7 @@
 # Template file for 'cpuset'
 pkgname=cpuset
 version=1.6
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="cpuset"
 hostmakedepends="python3-setuptools"

From 19b373b19c99ba03dbe363cdf11e6eacf1fe8907 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:46 -0400
Subject: [PATCH 1294/4088] cozy: rebuild for Python 3.10

---
 srcpkgs/cozy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..011d28c09913 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,7 +1,7 @@
 # Template file for 'cozy'
 pkgname=cozy
 version=1.1.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
  python3-mutagen python3-gobject-devel gettext desktop-file-utils

From a27a8fe7676a95ca67cac38c8ac1b73e8fa6488d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:46 -0400
Subject: [PATCH 1295/4088] coursera-dl: rebuild for Python 3.10

---
 srcpkgs/coursera-dl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coursera-dl/template b/srcpkgs/coursera-dl/template
index a484d1a54a0d..9c569678e49c 100644
--- a/srcpkgs/coursera-dl/template
+++ b/srcpkgs/coursera-dl/template
@@ -1,7 +1,7 @@
 # Template file for 'coursera-dl'
 pkgname=coursera-dl
 version=0.11.5
-revision=2
+revision=3
 build_style=python3-module
 pycompile_module="coursera"
 hostmakedepends="python3-setuptools"

From 264840509ded965b8b6bc1b1f6dd481270e7ee99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:46 -0400
Subject: [PATCH 1296/4088] collectd: rebuild for Python 3.10

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index cd6dd8f57813..d2757dd67af1 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 58131b7af927b310674054ddebbf5e570fa0b525 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:46 -0400
Subject: [PATCH 1297/4088] coccigrep: rebuild for Python 3.10

---
 srcpkgs/coccigrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coccigrep/template b/srcpkgs/coccigrep/template
index 0b4e37bf5903..79b573a82124 100644
--- a/srcpkgs/coccigrep/template
+++ b/srcpkgs/coccigrep/template
@@ -1,7 +1,7 @@
 # Template file for 'coccigrep'
 pkgname=coccigrep
 version=1.20
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="coccinelle python3-Pygments"

From 846ef9508f3c4119d87e5baa3682564781906197 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:45 -0400
Subject: [PATCH 1298/4088] clearine: rebuild for Python 3.10

---
 srcpkgs/clearine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 3fad7126c701..9ab51e8d1d87 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,7 +1,7 @@
 # Template file for 'clearine'
 pkgname=clearine
 version=0.7
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"

From eb45d7ddb49037155aeee74efaec05c8f78aa17f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:45 -0400
Subject: [PATCH 1299/4088] cinnamon: rebuild for Python 3.10

---
 srcpkgs/cinnamon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 165458ac7da5..f9cc54f120f2 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
 version=4.8.6
-revision=1
+revision=2
 build_helper=gir
 build_style=meson
 hostmakedepends="libtool pkg-config gobject-introspection gettext

From ac03c3b6bcc46e2c70a3d327d96fd9163176b714 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:45 -0400
Subject: [PATCH 1300/4088] chrome-gnome-shell: rebuild for Python 3.10

---
 srcpkgs/chrome-gnome-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chrome-gnome-shell/template b/srcpkgs/chrome-gnome-shell/template
index 244f7fa37a71..bdcf87a5b7c7 100644
--- a/srcpkgs/chrome-gnome-shell/template
+++ b/srcpkgs/chrome-gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'chrome-gnome-shell'
 pkgname=chrome-gnome-shell
 version=10.1
-revision=2
+revision=3
 build_style=cmake
 configure_args=" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXTENSION=OFF ../"
 hostmakedepends="python3 jq"

From 1802d75db15d939e3201a7a76b23dd36de1218da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:45 -0400
Subject: [PATCH 1301/4088] certbot-nginx: rebuild for Python 3.10

---
 srcpkgs/certbot-nginx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index c07499208f81..8c28f0475912 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot-nginx'
 pkgname=certbot-nginx
 version=1.19.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="certbot python3-acme python3-parsing python3-zope.interface"

From a2e079573a763328ea3310a0fa208fac78256dff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:45 -0400
Subject: [PATCH 1302/4088] certbot-apache: rebuild for Python 3.10

---
 srcpkgs/certbot-apache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index 760e18cc4671..ac2400bf7141 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot-apache'
 pkgname=certbot-apache
 version=1.19.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="certbot python3-acme python3-augeas python3-zope.interface"

From a36ab9d4ff7b9acb4a188406b1920d6420d8fe1c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:44 -0400
Subject: [PATCH 1303/4088] ccsm: rebuild for Python 3.10

---
 srcpkgs/ccsm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ccsm/template b/srcpkgs/ccsm/template
index 7f27e3317fc4..e67d90b86046 100644
--- a/srcpkgs/ccsm/template
+++ b/srcpkgs/ccsm/template
@@ -1,7 +1,7 @@
 # Template file for 'ccsm'
 pkgname=ccsm
 version=0.8.18
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="automake intltool libtool pkg-config python3"
 makedepends="compiz-core-devel compizconfig-python python3-cairo-devel pygtk-devel"

From a60158db1ad795c2628804e5a579e4f0afcaee35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:44 -0400
Subject: [PATCH 1304/4088] catfish: rebuild for Python 3.10

---
 srcpkgs/catfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 42836d29f985..9c5170152d9c 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,7 +1,7 @@
 # Template file for 'catfish'
 pkgname=catfish
 version=4.16.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
 depends="desktop-file-utils gtk+3 hicolor-icon-theme python3-gobject

From fad2fc0fc63552b0703443146a6df27521b8c144 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:44 -0400
Subject: [PATCH 1305/4088] castero: rebuild for Python 3.10

---
 srcpkgs/castero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/castero/template b/srcpkgs/castero/template
index 11574f87b878..73fa37d1d2b3 100644
--- a/srcpkgs/castero/template
+++ b/srcpkgs/castero/template
@@ -1,7 +1,7 @@
 # Template file for 'castero'
 pkgname=castero
 version=0.9.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 # taken from https://github.com/xgi/castero/blob/master/requirements.txt,

From 8e5e050769b55fc83ac9295e726c7e85ddd7d53d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:44 -0400
Subject: [PATCH 1306/4088] canto-curses: rebuild for Python 3.10

---
 srcpkgs/canto-curses/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/canto-curses/template b/srcpkgs/canto-curses/template
index b67f9f284f5b..c3054b8c02f2 100644
--- a/srcpkgs/canto-curses/template
+++ b/srcpkgs/canto-curses/template
@@ -1,7 +1,7 @@
 # Template file for 'canto-curses'
 pkgname=canto-curses
 version=0.9.9
-revision=7
+revision=8
 build_style=python3-module
 pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"

From 40ca36b73873eee50681f849056e4fc7fb55b2f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:44 -0400
Subject: [PATCH 1307/4088] calibre: rebuild for Python 3.10

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index a6721278a810..dfe669acc496 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.28.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 9e6dd45a9dfeeb787b620f6f36701fa86761b2a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:43 -0400
Subject: [PATCH 1308/4088] cairo-dock-plugins: rebuild for Python 3.10

---
 srcpkgs/cairo-dock-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 32457494a085..62137ba83adc 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=15
+revision=16
 build_style=cmake
 hostmakedepends="gettext pkg-config"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel

From 948ac7aac51d8b18231ee8a9223db2f0117ac532 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:43 -0400
Subject: [PATCH 1309/4088] caffeine-ng: rebuild for Python 3.10

---
 srcpkgs/caffeine-ng/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 3057a24c40c4..ab235226ff32 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'caffeine-ng'
 pkgname=caffeine-ng
 version=3.5.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify

From 37630bd011b40eb5b1ec75a4a8a14f573e15b73c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:43 -0400
Subject: [PATCH 1310/4088] cadence: rebuild for Python 3.10

---
 srcpkgs/cadence/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cadence/template b/srcpkgs/cadence/template
index b429ab1f0fcb..35ec773b9f11 100644
--- a/srcpkgs/cadence/template
+++ b/srcpkgs/cadence/template
@@ -1,7 +1,7 @@
 # Template file for 'cadence'
 pkgname=cadence
 version=0.9.1
-revision=1
+revision=2
 wrksrc="Cadence-${version}"
 build_style=gnu-makefile
 python_version=3

From e5da56b4e3869f1b310aa61afcd57b04aa96c75d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:43 -0400
Subject: [PATCH 1311/4088] bumblebee-status: rebuild for Python 3.10

---
 srcpkgs/bumblebee-status/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template
index 786c1b0663c1..072bbcd1bc84 100644
--- a/srcpkgs/bumblebee-status/template
+++ b/srcpkgs/bumblebee-status/template
@@ -1,7 +1,7 @@
 # Template file for 'bumblebee-status'
 pkgname=bumblebee-status
 version=2.1.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-psutil python3-requests"

From 20522de11b968493a8444cbca89e023584efae71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:43 -0400
Subject: [PATCH 1312/4088] bum: rebuild for Python 3.10

---
 srcpkgs/bum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template
index 5d11f493717d..ba85ad35b747 100644
--- a/srcpkgs/bum/template
+++ b/srcpkgs/bum/template
@@ -1,7 +1,7 @@
 # Template file for 'bum'
 pkgname=bum
 version=0.1.3
-revision=6
+revision=7
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-mpd2 python3-musicbrainzngs python3-mpv"

From f9fd46b5b908d3ac43135366a228dd5a881d1009 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:43 -0400
Subject: [PATCH 1313/4088] btrfs-backup: rebuild for Python 3.10

---
 srcpkgs/btrfs-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/btrfs-backup/template b/srcpkgs/btrfs-backup/template
index 061a8af95c10..a03de8a7d406 100644
--- a/srcpkgs/btrfs-backup/template
+++ b/srcpkgs/btrfs-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-backup'
 pkgname=btrfs-backup
 version=0.3.1
-revision=3
+revision=4
 wrksrc="${pkgname/-/_}-${version}"
 build_style=python3-module
 pycompile_module="${pkgname/-/_}"

From ebe7951b6cf39a83332ff105aa7ab8586686fd72 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:43 -0400
Subject: [PATCH 1314/4088] botan: rebuild for Python 3.10

---
 srcpkgs/botan/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index d2e6ffb9ccda..282bceabd3ce 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=3
+revision=4
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"

From 8e841da4e41cd249fbaf0053d03244ceb91c640d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:42 -0400
Subject: [PATCH 1315/4088] borgmatic: rebuild for Python 3.10

---
 srcpkgs/borgmatic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index c6959be3a8d1..10127a653e8a 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,7 +1,7 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
 version=1.5.18
-revision=1
+revision=2
 build_style=python3-module
 # runs not yet installed self
 make_check_args="--deselect=tests/integration/commands/test_borgmatic.py"

From d5e359bf86ec3eb4acbf9ff47920c08cc192d045 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:42 -0400
Subject: [PATCH 1316/4088] bootchart2: rebuild for Python 3.10

---
 srcpkgs/bootchart2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 62cd9d2116a3..8e8281a9e9f1 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -1,7 +1,7 @@
 # Template file for 'bootchart2'
 pkgname=bootchart2
 version=0.14.9
-revision=1
+revision=2
 wrksrc="bootchart-${version}"
 build_style=gnu-makefile
 make_install_args="EARLY_PREFIX=/usr DOCDIR=/usr/share/doc/bootchart2"

From 7b85661d15426dad8ce5b3dfb1a4797d7b303d45 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:42 -0400
Subject: [PATCH 1317/4088] blueman: rebuild for Python 3.10

---
 srcpkgs/blueman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index 70d3bf1f3c90..36e8644e5bcd 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -1,7 +1,7 @@
 # Template file for 'blueman'
 pkgname=blueman
 version=2.2.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool iproute2 pkg-config python3-Cython"

From 6fbe5e0ee3394bb8c850c3d2f574fd3d91ad14b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:42 -0400
Subject: [PATCH 1318/4088] bluefish: rebuild for Python 3.10

---
 srcpkgs/bluefish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index 62c17b4e8915..44e1a016185e 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -1,7 +1,7 @@
 # Template file for 'bluefish'
 pkgname=bluefish
 version=2.2.12
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-spell-check --disable-update-databases
  --disable-xml-catalog-update $(vopt_enable python)"

From 72b47fd6b60c2ca0aa7764eac4cbf94f03b7e38f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:42 -0400
Subject: [PATCH 1319/4088] blender: rebuild for Python 3.10, update to 2.9.4.

---
 srcpkgs/blender/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index af946c2b7999..024a132f1edb 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,6 +1,6 @@
 # Template file for 'blender'
 pkgname=blender
-version=2.93.0
+version=2.93.4
 revision=1
 archs="x86_64* ppc64*"
 build_style="cmake"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.blender.org"
 distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=ba3b634a46d717c7b40dcaef33e1075a4fa29d68a2c109d23339ea3414be5938
+checksum=e5c1419cf2d3af0ac4cb90217df05e1a149040739b8c02dcfaaf2c2061487fb2
 python_version=3
 CXXFLAGS="-DNDEBUG"
 CFLAGS="$CXXFLAGS"

From ac2c84bb5870aab02002a6af7d9620ed9b0cf3a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:42 -0400
Subject: [PATCH 1320/4088] black: rebuild for Python 3.10

---
 srcpkgs/black/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index 386e0682b77e..b17749777fb0 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,7 +1,7 @@
 # Template file for 'black'
 pkgname=black
 version=21.9b0
-revision=1
+revision=2
 build_style=python3-module
 # Disable tests that require `black` in the search path for commands.
 make_check_args="--deselect tests/test_primer.py::PrimerLibTests::test_gen_check_output

From 1204fb84d6d2bd7c14ea82e3234d6ff722c5d600 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:41 -0400
Subject: [PATCH 1321/4088] beets: rebuild for Python 3.10

---
 srcpkgs/beets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index 8dfb44bf88ad..adb2acc85cc8 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,7 +1,7 @@
 # Template file for 'beets'
 pkgname=beets
 version=1.4.9
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-munkres python3-musicbrainzngs

From 12ec69428f6c3d8f5f0675f4665ce65c0772e807 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:41 -0400
Subject: [PATCH 1322/4088] bcc: rebuild for Python 3.10

---
 srcpkgs/bcc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index bb6561f4e660..60c9b746d3fe 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.22.0
-revision=1
+revision=2
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"

From fe31b1700b685175e100f99e0e84dcbb61dca8f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:41 -0400
Subject: [PATCH 1323/4088] backintime: rebuild for Python 3.10

---
 srcpkgs/backintime/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 928134763817..d663eec211e4 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,7 +1,7 @@
 # Template file for 'backintime'
 pkgname=backintime
 version=1.2.1
-revision=2
+revision=3
 configure_args="--python3"
 pycompile_dirs="/usr/share/backintime"
 hostmakedepends="gettext python3"

From 60c75b1f8df449ffb003c09363aef700f3eb1f41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:41 -0400
Subject: [PATCH 1324/4088] backblaze-b2: rebuild for Python 3.10

---
 srcpkgs/backblaze-b2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index b37ea7673f6d..f1839a1b90c7 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,7 +1,7 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
 version=2.1.0
-revision=1
+revision=2
 wrksrc="b2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 463c7fb7d93a6c7458cb80df4e6b8a520431ce3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:41 -0400
Subject: [PATCH 1325/4088] bCNC: rebuild for Python 3.10

---
 srcpkgs/bCNC/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bCNC/template b/srcpkgs/bCNC/template
index bffca03f61fe..00e403f55fee 100644
--- a/srcpkgs/bCNC/template
+++ b/srcpkgs/bCNC/template
@@ -1,7 +1,7 @@
 # Template file for 'bCNC'
 pkgname=bCNC
 version=0.9.14.307
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy"

From d6dd1e45a7179eaf5f4df8a88912b43cb170168e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:41 -0400
Subject: [PATCH 1326/4088] azote: rebuild for Python 3.10

---
 srcpkgs/azote/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 3a2d55d3d708..92deba3aa229 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,7 +1,7 @@
 # Template file for 'azote'
 pkgname=azote
 version=1.8.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-gobject python3-Pillow gtk+3"

From 301da2b2fbefc000caf097fd6a2ac25b5c9a93cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:40 -0400
Subject: [PATCH 1327/4088] awsume: rebuild for Python 3.10

---
 srcpkgs/awsume/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/awsume/template b/srcpkgs/awsume/template
index 8feaca3d4ad0..01ede3d4e3e4 100644
--- a/srcpkgs/awsume/template
+++ b/srcpkgs/awsume/template
@@ -1,7 +1,7 @@
 # Template file for 'awsume'
 pkgname=awsume
 version=4.5.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 makedepends="python3-argcomplete python3-boto3 python3-colorama python3-coverage

From 9c514284b74a15c6c7bbd13e040663e1c0104b37 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:40 -0400
Subject: [PATCH 1328/4088] aws-cli: rebuild for Python 3.10

---
 srcpkgs/aws-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 8ead2d8ff4a3..67550003bd47 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
 version=1.18.125
-revision=2
+revision=3
 wrksrc="aws-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 23b18a9c770ef998bbcbfdd94e8d3546a4969851 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:40 -0400
Subject: [PATCH 1329/4088] avr-gdb: rebuild for Python 3.10

---
 srcpkgs/avr-gdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/avr-gdb/template b/srcpkgs/avr-gdb/template
index 03a8e59405cf..c31d91cc4c5b 100644
--- a/srcpkgs/avr-gdb/template
+++ b/srcpkgs/avr-gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'avr-gdb'
 pkgname=avr-gdb
 version=11.1
-revision=1
+revision=2
 wrksrc=gdb-${version}
 build_style=gnu-configure
 configure_args="--target=avr --disable-werror --disable-nls --with-system-readline

From 7c26dc1fc856dc63369b7bd58e0038072bfca02d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:40 -0400
Subject: [PATCH 1330/4088] avideo: rebuild for Python 3.10

---
 srcpkgs/avideo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/avideo/template b/srcpkgs/avideo/template
index 17637289aac5..ca74d42c3240 100644
--- a/srcpkgs/avideo/template
+++ b/srcpkgs/avideo/template
@@ -1,7 +1,7 @@
 # Template file for 'avideo'
 pkgname=avideo
 version=2017.9.27
-revision=6
+revision=7
 wrksrc="avideo"
 build_style=python3-module
 hostmakedepends="python3"

From 1de11e3f2a52a0e17c54342997365ac330fd5bee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:40 -0400
Subject: [PATCH 1331/4088] autotiling: rebuild for Python 3.10

---
 srcpkgs/autotiling/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autotiling/template b/srcpkgs/autotiling/template
index a325fdf2f703..437d2a955294 100644
--- a/srcpkgs/autotiling/template
+++ b/srcpkgs/autotiling/template
@@ -1,7 +1,7 @@
 # Template file for 'autotiling'
 pkgname=autotiling
 version=1.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-wheel"
 depends="python3-i3ipc"

From ea704f9b9d9ca87db935fe64fde7f3c788806285 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:40 -0400
Subject: [PATCH 1332/4088] autorandr: rebuild for Python 3.10

---
 srcpkgs/autorandr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autorandr/template b/srcpkgs/autorandr/template
index 35977a529482..381455156586 100644
--- a/srcpkgs/autorandr/template
+++ b/srcpkgs/autorandr/template
@@ -1,7 +1,7 @@
 # Template file for 'autorandr'
 pkgname=autorandr
 version=1.11
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"
 depends="python3-setuptools xrandr"

From 40668cf0e76043020b013bc19cc0b98c7ca8f4d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:39 -0400
Subject: [PATCH 1333/4088] autopep8: rebuild for Python 3.10

---
 srcpkgs/autopep8/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autopep8/template b/srcpkgs/autopep8/template
index cf584e77be0d..c8d97dc32df8 100644
--- a/srcpkgs/autopep8/template
+++ b/srcpkgs/autopep8/template
@@ -1,7 +1,7 @@
 # Template file for 'autopep8'
 pkgname=autopep8
 version=1.5.4
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pycodestyle python3-toml"

From 2ac6d0a1b053852ee5c2973aa75625a61406258d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:39 -0400
Subject: [PATCH 1334/4088] audit: rebuild for Python 3.10

---
 srcpkgs/audit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index ca21e6078189..f21f32725d0d 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
 # Template file for 'audit'
 pkgname=audit
 version=3.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
  --with-apparmor --with-libcap-ng --with-python3"

From 82ca0de38c820235b843c2da2fffb7cf47f4b090 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:39 -0400
Subject: [PATCH 1335/4088] attic: rebuild for Python 3.10

---
 srcpkgs/attic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 153c0341edcb..2a52e536f94b 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,7 +1,7 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=20
+revision=21
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"

From d3b89af6159e63eba7b3c51f8b00b78861bb8092 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:39 -0400
Subject: [PATCH 1336/4088] asciinema: rebuild for Python 3.10

---
 srcpkgs/asciinema/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/asciinema/template b/srcpkgs/asciinema/template
index 57a1ea9d7cfc..dd608d6e935b 100644
--- a/srcpkgs/asciinema/template
+++ b/srcpkgs/asciinema/template
@@ -1,7 +1,7 @@
 # Template file for 'asciinema'
 pkgname=asciinema
 version=2.0.2
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="$hostmakedepends"

From 8daffd762057143b25e4c6968d31b07cbdcf77c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:39 -0400
Subject: [PATCH 1337/4088] arandr: rebuild for Python 3.10

---
 srcpkgs/arandr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arandr/template b/srcpkgs/arandr/template
index ab02261cb795..dc77641f3c15 100644
--- a/srcpkgs/arandr/template
+++ b/srcpkgs/arandr/template
@@ -1,7 +1,7 @@
 # Template file for 'arandr'
 pkgname=arandr
 version=0.1.10
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools python3-docutils"
 depends="python3-gobject xrandr python3"

From 6dea4a538df1686651b0fedc1437e191f729c255 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:39 -0400
Subject: [PATCH 1338/4088] apostrophe: rebuild for Python 3.10

---
 srcpkgs/apostrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..69e39f1bff62 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,7 +1,7 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=3
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir

From 70b51f230943fa1f6c97d8535be7b0af76250158 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:38 -0400
Subject: [PATCH 1339/4088] angrysearch: rebuild for Python 3.10

---
 srcpkgs/angrysearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/angrysearch/template b/srcpkgs/angrysearch/template
index 96b6b6604ba8..fa126e31db38 100644
--- a/srcpkgs/angrysearch/template
+++ b/srcpkgs/angrysearch/template
@@ -1,7 +1,7 @@
 # Template file for 'angrysearch'
 pkgname=angrysearch
 version=1.0.1
-revision=3
+revision=4
 wrksrc="ANGRYsearch-${version}"
 pycompile_dirs="usr/share/angrysearch"
 hostmakedepends="python3"

From bd94477e866e4868366b43fca9b35d3bdf4ddb6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:38 -0400
Subject: [PATCH 1340/4088] alot: rebuild for Python 3.10

---
 srcpkgs/alot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index 831b24deb8b4..69db144f617a 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=5
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"
 depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj

From a44303704c0e59e065439b30237f7711c7b31882 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:38 -0400
Subject: [PATCH 1341/4088] alienfx: rebuild for Python 3.10

---
 srcpkgs/alienfx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alienfx/template b/srcpkgs/alienfx/template
index cb3dc5f6e75f..c77f2e33cdc3 100644
--- a/srcpkgs/alienfx/template
+++ b/srcpkgs/alienfx/template
@@ -1,7 +1,7 @@
 # Template file for 'alienfx'
 pkgname=alienfx
 version=2.3.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-usb python3-cairo python3-gobject python3-setuptools

From c9d54070417ab0a464039b988a444b55a1ae6052 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:38 -0400
Subject: [PATCH 1342/4088] afew: rebuild for Python 3.10

---
 srcpkgs/afew/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/afew/template b/srcpkgs/afew/template
index a8ca1dac5b14..2b66b5c5e18c 100644
--- a/srcpkgs/afew/template
+++ b/srcpkgs/afew/template
@@ -1,7 +1,7 @@
 # Template file for 'afew'
 pkgname=afew
 version=3.0.1
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-Sphinx pkg-config"
 depends="notmuch-python3 python3-dkimpy python3-chardet notmuch"

From afffb4e54f8d93dc0b31fd391d5dc2c5c58b29d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:38 -0400
Subject: [PATCH 1343/4088] TwitchNotifier: rebuild for Python 3.10

---
 srcpkgs/TwitchNotifier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TwitchNotifier/template b/srcpkgs/TwitchNotifier/template
index 39a8c31c904e..b5fbfed27af1 100644
--- a/srcpkgs/TwitchNotifier/template
+++ b/srcpkgs/TwitchNotifier/template
@@ -1,7 +1,7 @@
 # Template file for 'TwitchNotifier'
 pkgname=TwitchNotifier
 version=0.5
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-devel"
 makedepends="python3-devel"

From fc14fc44915eef5bc38f8ef67f790082806f54d0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:38 -0400
Subject: [PATCH 1344/4088] Trimage: rebuild for Python 3.10

---
 srcpkgs/Trimage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Trimage/template b/srcpkgs/Trimage/template
index 5c97aec18624..fe556186d503 100644
--- a/srcpkgs/Trimage/template
+++ b/srcpkgs/Trimage/template
@@ -1,7 +1,7 @@
 # Template file for 'Trimage'
 pkgname=Trimage
 version=1.0.6
-revision=3
+revision=4
 wrksrc="Trimage-${version}"
 build_style=python3-module
 hostmakedepends="python3"

From 8e38b5f1f2a968bd869ff9dbdde9b25d283b3ff1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:37 -0400
Subject: [PATCH 1345/4088] Solaar: rebuild for Python 3.10

---
 srcpkgs/Solaar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template
index 393cede0f0ae..689322c13dd9 100644
--- a/srcpkgs/Solaar/template
+++ b/srcpkgs/Solaar/template
@@ -1,7 +1,7 @@
 # Template file for 'Solaar'
 pkgname=Solaar
 version=1.0.6
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyudev python3-psutil python3-yaml python3-xlib"

From 2045d0e3bea2b7057f7ae0b71a5586ddc26dc1e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:37 -0400
Subject: [PATCH 1346/4088] ReText: rebuild for Python 3.10

---
 srcpkgs/ReText/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ReText/template b/srcpkgs/ReText/template
index d7fc6f96c865..100044f19d08 100644
--- a/srcpkgs/ReText/template
+++ b/srcpkgs/ReText/template
@@ -1,7 +1,7 @@
 # Template file for 'ReText'
 pkgname=ReText
 version=7.2.1
-revision=1
+revision=2
 wrksrc="${pkgname,,}-${version}"
 build_style=python3-module
 hostmakedepends="ImageMagick python3 qt5-host-tools qt5-tools python3-setuptools"

From fd29d7b9544f28e344b2140faf1567fa41b5acc4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:37 -0400
Subject: [PATCH 1347/4088] PyInstaller: rebuild for Python 3.10

---
 srcpkgs/PyInstaller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PyInstaller/template b/srcpkgs/PyInstaller/template
index c6df686f3ede..aff08cf33e23 100644
--- a/srcpkgs/PyInstaller/template
+++ b/srcpkgs/PyInstaller/template
@@ -1,7 +1,7 @@
 # Template file for 'PyInstaller'
 pkgname=PyInstaller
 version=4.1
-revision=1
+revision=2
 wrksrc="pyinstaller-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 634bc1fda7aa96a40173eb649c67e4d21674d453 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:37 -0400
Subject: [PATCH 1348/4088] PhotoCollage: rebuild for Python 3.10

---
 srcpkgs/PhotoCollage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PhotoCollage/template b/srcpkgs/PhotoCollage/template
index 964603cf90c7..4e8ec2cb7ef5 100644
--- a/srcpkgs/PhotoCollage/template
+++ b/srcpkgs/PhotoCollage/template
@@ -1,7 +1,7 @@
 # Template file for 'PhotoCollage'
 pkgname=PhotoCollage
 version=1.4.4
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="gettext python3"
 depends="python3-Pillow python3-gobject"

From cde04f89e5efa7a365aaa43272a27cf766f6b458 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:37 -0400
Subject: [PATCH 1349/4088] PackageKit: rebuild for Python 3.10

---
 srcpkgs/PackageKit/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 805bd8245f9d..155dd156a06a 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,17 +1,17 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
 version=1.2.2
-revision=1
+revision=2
 wrksrc="PackageKit-PACKAGEKIT_${version//./_}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dgstreamer_plugin=false -Dgtk_module=false
  -Dsystemd=false -Dgobject_introspection=$(vopt_if gir true false)
  -Doffline_update=false -Dbash_command_not_found=false"
-hostmakedepends="glib-devel gettext-devel $(vopt_if vala 'vala-devel')
-	 libxslt-devel pkg-config which"
-makedepends="bash-completion gettext-devel glib-devel polkit-devel sqlite-devel
- $(vopt_if vala 'vala-devel') libxslt-devel"
+hostmakedepends="glib-devel gettext-devel polkit-devel
+ $(vopt_if vala 'vala-devel') libxslt-devel pkg-config which"
+makedepends="bash-completion gettext-devel glib-devel polkit-devel
+ sqlite-devel $(vopt_if vala 'vala-devel') libxslt-devel"
 short_desc="D-BUS abstraction layer to package management API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 91c972cd22bdf11dd8f6c5ac00538f438206dc3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:37 -0400
Subject: [PATCH 1350/4088] OpenLP: rebuild for Python 3.10

---
 srcpkgs/OpenLP/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index 0bf83bb6b6d5..64f86854a286 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
 version=2.4.6
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools qt5-host-tools"
 depends="python3-BeautifulSoup4 python3-PyQt5-multimedia python3-PyQt5-opengl

From faa9f0c68cba74b9b1d63c500621853b1c42e92a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 1351/4088] LabJackPython: rebuild for Python 3.10

---
 srcpkgs/LabJackPython/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/LabJackPython/template b/srcpkgs/LabJackPython/template
index 7ab2405a01b8..5d550b465c26 100644
--- a/srcpkgs/LabJackPython/template
+++ b/srcpkgs/LabJackPython/template
@@ -1,7 +1,7 @@
 # Template file for 'LabJackPython'
 pkgname=LabJackPython
 version=2.0.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3"
 depends="exodriver"

From 41bbeaaac9ef8eb08aa5f639c9b302a12ce36949 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 1352/4088] Komikku: rebuild for Python 3.10

---
 srcpkgs/Komikku/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index e0f018f13868..4d60614975dd 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=0.34.1
-revision=1
+revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"

From d3641a2270c6ae30d76a62527747146c7850f092 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 1353/4088] Grammalecte: rebuild for Python 3.10

---
 srcpkgs/Grammalecte/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Grammalecte/template b/srcpkgs/Grammalecte/template
index 9348beebb755..ead50b056cc1 100644
--- a/srcpkgs/Grammalecte/template
+++ b/srcpkgs/Grammalecte/template
@@ -1,7 +1,7 @@
 # Template file for 'Grammalecte'
 pkgname=Grammalecte
 version=1.6.0
-revision=3
+revision=4
 create_wrksrc=yes
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6d0de062d24197a75d6c6475f92a9fb384c19b2f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 1354/4088] Electron-Cash: rebuild for Python 3.10

---
 srcpkgs/Electron-Cash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index 20a8e18e2c49..0e5265f3a92d 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -1,7 +1,7 @@
 # Template file for 'Electron-Cash'
 pkgname=Electron-Cash
 version=4.2.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
 depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil

From f57fed82beb046bf92a865e1ea9eb5d5d56ee9e5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 1355/4088] Carla: rebuild for Python 3.10

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 701fd0ea30f7..7ab456abe988 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.1
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From cbc152e9a06f42bacd5812fbbf61b310c8fc4ae9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:44 -0400
Subject: [PATCH 1356/4088] caribou: remove package

Package doesn't build with current vala, last release is 5 years old.
---
 srcpkgs/caribou-devel                         |  1 -
 .../patches/autostart-set-nodisplay.patch     | 21 ---------
 srcpkgs/caribou/patches/fix-crash.patch       | 46 -------------------
 .../fix-font-property-in-style.css.patch      | 26 -----------
 srcpkgs/caribou/patches/fix-vala.patch        | 16 -------
 srcpkgs/caribou/template                      | 46 -------------------
 srcpkgs/libcaribou                            |  1 -
 7 files changed, 157 deletions(-)
 delete mode 120000 srcpkgs/caribou-devel
 delete mode 100644 srcpkgs/caribou/patches/autostart-set-nodisplay.patch
 delete mode 100644 srcpkgs/caribou/patches/fix-crash.patch
 delete mode 100644 srcpkgs/caribou/patches/fix-font-property-in-style.css.patch
 delete mode 100644 srcpkgs/caribou/patches/fix-vala.patch
 delete mode 100644 srcpkgs/caribou/template
 delete mode 120000 srcpkgs/libcaribou

diff --git a/srcpkgs/caribou-devel b/srcpkgs/caribou-devel
deleted file mode 120000
index 7f932efc02e7..000000000000
--- a/srcpkgs/caribou-devel
+++ /dev/null
@@ -1 +0,0 @@
-caribou
\ No newline at end of file
diff --git a/srcpkgs/caribou/patches/autostart-set-nodisplay.patch b/srcpkgs/caribou/patches/autostart-set-nodisplay.patch
deleted file mode 100644
index 10087f3f805c..000000000000
--- a/srcpkgs/caribou/patches/autostart-set-nodisplay.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 286582f90fbbc9b3baa6b055bba1141cc30e6e94 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Thu, 12 Oct 2017 18:14:35 -0400
-Subject: autostart: Set NoDisplay=true
-
-https://bugzilla.gnome.org/show_bug.cgi?id=788906
-https://launchpad.net/bugs/1723266
----
- data/caribou-autostart.desktop.in.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/caribou-autostart.desktop.in.in b/data/caribou-autostart.desktop.in.in
-index 4bd1c03..bf73a94 100644
---- a/data/caribou-autostart.desktop.in.in
-+++ b/data/caribou-autostart.desktop.in.in
-@@ -5,4 +5,5 @@ Exec=@libexecdir@/caribou
- AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
- X-GNOME-AutoRestart=true
- #X-GNOME-Autostart-Phase=Initialization
-+NoDisplay=true
- OnlyShowIn=GNOME;Unity;
diff --git a/srcpkgs/caribou/patches/fix-crash.patch b/srcpkgs/caribou/patches/fix-crash.patch
deleted file mode 100644
index a6fa3d7cd378..000000000000
--- a/srcpkgs/caribou/patches/fix-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 12 Jan 2021 18:01:47 +0000
-Subject: [PATCH] xadapter.vala: Remove XkbKeyTypesMask and fields from
- XKbChangeMap call.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was originally a workaround for xFree86 4.3 - see:
-https://bugzilla.gnome.org/show_bug.cgi?id=673547
-​
-As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this
-causes a BadLength error when attempting to use shifted characters.
-​
-Ref:
-https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server
----
- libcaribou/xadapter.vala | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala
-index 22858b7..1da5a78 100644
---- a/libcaribou/xadapter.vala
-+++ b/libcaribou/xadapter.vala
-@@ -195,15 +195,10 @@ namespace Caribou {
- 
-             Xkb.MapChanges changes = Xkb.MapChanges ();
- 
--            // We don't touch key types here but include the
--            // information in XkbSetMap request to the server, because
--            // some X servers need the information to check the sanity
--            // of the keysyms change.
--            changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask);
-+            changes.changed = (ushort) Xkb.KeySymsMask;
-             changes.first_key_sym = (char) this.reserved_keycode;
-             changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width;
--            changes.first_type = 0;
--            changes.num_types = this.xkbdesc.map.num_types;
-+
-             Xkb.change_map (this.xdisplay, this.xkbdesc, changes);
- 
-             this.xdisplay.flush ();
--- 
-GitLab
-
diff --git a/srcpkgs/caribou/patches/fix-font-property-in-style.css.patch b/srcpkgs/caribou/patches/fix-font-property-in-style.css.patch
deleted file mode 100644
index 722fae54eb61..000000000000
--- a/srcpkgs/caribou/patches/fix-font-property-in-style.css.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 13df8b92ae89c796238e669ee6ef4447a42d6355 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Fri, 1 Dec 2017 12:11:35 -0500
-Subject: style.css: Fix failure to start in GNOME Flashback
-
-The order for 'font' properties matters
-https://developer.gnome.org/gtk3/stable/chap-css-properties.html
-
-https://bugzilla.gnome.org/show_bug.cgi?id=791001
----
- data/antler/style.css | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/antler/style.css b/data/antler/style.css
-index 5ab6f71..4d84904 100644
---- a/data/antler/style.css
-+++ b/data/antler/style.css
-@@ -13,7 +13,7 @@
-   border-width: 0px;
-   border-radius: 2px;
-   border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch;
--  font: Sans 14px;
-+  font: 14px Sans;
-   background-image: -gtk-gradient (linear,
- 				     left top,
- 				     left bottom,
diff --git a/srcpkgs/caribou/patches/fix-vala.patch b/srcpkgs/caribou/patches/fix-vala.patch
deleted file mode 100644
index 9fae15bc231f..000000000000
--- a/srcpkgs/caribou/patches/fix-vala.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch from
-https://github.com/archlinux/svntogit-packages/blob/bf8285526628664f46c1b790238c6e3555e51499/trunk/unicode_to_keyval-symbol-check.patch
-
-diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala
-index 89015bc..e88342e 100644
---- a/libcaribou/key-model.vala
-+++ b/libcaribou/key-model.vala
-@@ -101,7 +101,7 @@ namespace Caribou {
-                     unichar uc;
-                     while (text.get_next_char (ref index, out uc)) {
-                         uint keyval = Gdk.unicode_to_keyval (uc);
--                        if (keyval != uc | 0x01000000)
-+                        if (keyval != (uc | 0x01000000))
-                             _keyvals += keyval;
-                     }
-                 } else {
diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
deleted file mode 100644
index 15bc2ccae74e..000000000000
--- a/srcpkgs/caribou/template
+++ /dev/null
@@ -1,46 +0,0 @@
-# Template file for 'caribou'
-pkgname=caribou
-version=0.4.21
-revision=5
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module
- PYTHON=/usr/bin/python3"
-hostmakedepends="pkg-config intltool python3-gobject-devel libxslt vala"
-makedepends="vala-devel libxklavier-devel libgee08-devel python3-gobject-devel
- clutter-devel gtk+3-devel libXtst-devel gir-freedesktop"
-depends="python3-gobject python3-atspi python3-dbus gir-freedesktop at-spi2-atk
- desktop-file-utils libcaribou>=${version}_${revision}"
-short_desc="Alternative to the Gnome On-screen Keyboard"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://wiki.gnome.org/Projects/Caribou"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55
-lib32disabled=yes
-
-libcaribou_package() {
-	lib32disabled=yes
-	short_desc+=" - library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/share/caribou
-		vmove usr/lib/girepository-1.0
-		vmove "usr/lib/gtk*"
-		vmove "usr/lib/gnome-settings-daemon*"
-	}
-}
-
-caribou-devel_package() {
-	lib32disabled=yes
-	depends="libXtst-devel libgee08-devel libxklavier-devel gtk+3-devel
-	 libxml2-devel libcaribou>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libcaribou b/srcpkgs/libcaribou
deleted file mode 120000
index 7f932efc02e7..000000000000
--- a/srcpkgs/libcaribou
+++ /dev/null
@@ -1 +0,0 @@
-caribou
\ No newline at end of file

From a9f495c2f23303004f4621ac7e00260b73ad4910 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:34 -0400
Subject: [PATCH 1357/4088] python3-SPARQLWrapper: remove package

Nothing depends on this package and the last release (from 2019) still
relies on setuptools functionality that no longer exists.
---
 srcpkgs/python3-SPARQLWrapper/template | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 srcpkgs/python3-SPARQLWrapper/template

diff --git a/srcpkgs/python3-SPARQLWrapper/template b/srcpkgs/python3-SPARQLWrapper/template
deleted file mode 100644
index 4ef6a709dcfd..000000000000
--- a/srcpkgs/python3-SPARQLWrapper/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python3-SPARQLWrapper'
-pkgname=python3-SPARQLWrapper
-version=1.8.4
-revision=4
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-rdflib"
-short_desc="SPARQL Endpoint interface to Python (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="W3C"
-homepage="https://rdflib.github.io/sparqlwrapper/"
-distfiles="${PYPI_SITE}/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz"
-checksum=21928e7a97f565e772cdeeb0abad428960f4307e3a13dbdd8f6d3da8a6a506c9

From 6634d7c7e842cf4a9ee8fdf1fc746bd84154be74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:43 -0400
Subject: [PATCH 1358/4088] python3-bluez: remove package

Nothing depends on this package, it does not build cleanly with current
setuptools, and upstream [1] says the project is not actively developed.

[1] https://github.com/pybluez/pybluez
---
 srcpkgs/python3-bluez/template | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 srcpkgs/python3-bluez/template

diff --git a/srcpkgs/python3-bluez/template b/srcpkgs/python3-bluez/template
deleted file mode 100644
index 2feb64200f16..000000000000
--- a/srcpkgs/python3-bluez/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python3-bluez'
-pkgname=python3-bluez
-version=0.23
-revision=2
-wrksrc="PyBluez-${version}"
-build_style=python3-module
-hostmakedepends="python3-devel python3-setuptools"
-makedepends="python3-devel libbluetooth-devel"
-short_desc="Python3 wrapper for the BlueZ Bluetooth stack"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://pybluez.readthedocs.io"
-distfiles="$PYPI_SITE/P/PyBluez/PyBluez-${version}.tar.gz"
-checksum=c8f04d2e78951eaa9de486b4d49381704e8943d0a6e6e58f55fcd7b8582e90de

From 57b1095806f7680e4630d9fe94e7178b74a26575 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:59 -0400
Subject: [PATCH 1359/4088] python3-gmpy2: remove package

Nothing depends on the package, it fails to build with Python 3.10, and
hasn't seen an official release in 5 years.
---
 srcpkgs/python3-gmpy2/template | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/python3-gmpy2/template

diff --git a/srcpkgs/python3-gmpy2/template b/srcpkgs/python3-gmpy2/template
deleted file mode 100644
index 2e322329db62..000000000000
--- a/srcpkgs/python3-gmpy2/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python3-gmpy2'
-pkgname=python3-gmpy2
-version=2.0.8
-revision=8
-wrksrc="gmpy2-${version}"
-build_style=python3-module
-hostmakedepends="unzip python3-setuptools
-gmp-devel mpfr-devel libmpc-devel"
-makedepends="python3-devel gmp-devel mpfr-devel libmpc-devel"
-short_desc="Python3 interface to GMP, MPFR and MPC libraries"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/aleaxit/gmpy"
-license="LGPL-3.0-or-later"
-distfiles="${PYPI_SITE}/g/gmpy2/gmpy2-${version}.zip"
-checksum=dd233e3288b90f21b0bb384bcc7a7e73557bb112ccf0032ad52aa614eb373d3f

From 3f86f1220204650e0e453170b88651d2f194c8a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:00 -0400
Subject: [PATCH 1360/4088] python3-grako: remove package

Nothing depends on it anymore, it doesn't build with Python 3.10, the
upstream site is dead and the PyPI page says development has stopped.
---
 srcpkgs/python3-grako/template | 25 -------------------------
 srcpkgs/python3-grako/update   |  2 --
 2 files changed, 27 deletions(-)
 delete mode 100644 srcpkgs/python3-grako/template
 delete mode 100644 srcpkgs/python3-grako/update

diff --git a/srcpkgs/python3-grako/template b/srcpkgs/python3-grako/template
deleted file mode 100644
index 6ee30b924547..000000000000
--- a/srcpkgs/python3-grako/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python3-grako'
-pkgname=python3-grako
-version=3.99.9
-revision=7
-wrksrc="grako-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython"
-makedepends="python3-devel"
-depends="python3-setuptools"
-short_desc="Grammar compiler, EBNF input, PEG/Packrat parser output (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://bitbucket.org/neogeny/grako"
-distfiles="$PYPI_SITE/g/grako/grako-$version.zip"
-checksum=fcc37309eab7cd0cbbb26cfd6a54303fbb80a00a58ab295d1e665bc69189c364
-conflicts="python-grako>=0"
-
-pre_build() {
-	sed -i '/setup_requires=/d' setup.py
-}
-post_install() {
-	# TODO: Find out why we need to change these permissions manually
-	chmod -R +r "${DESTDIR}/${py3_sitelib}"
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-grako/update b/srcpkgs/python3-grako/update
deleted file mode 100644
index 219b3c76f155..000000000000
--- a/srcpkgs/python3-grako/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/neogeny/grako/downloads/?tab=tags"
-pattern="[\d\.]*(?=\.tar\.(gz|bz2))"

From d0ba5c9e6287a01cd09ddc23da991a1b2784bcc8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:17:12 -0400
Subject: [PATCH 1361/4088] python3-keepalive: remove package

Nothing depends on it, it doesn't build with Python 3.10, and the last
commit on the upstream repo was four years ago.
---
 srcpkgs/python3-keepalive/template | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 srcpkgs/python3-keepalive/template

diff --git a/srcpkgs/python3-keepalive/template b/srcpkgs/python3-keepalive/template
deleted file mode 100644
index d9dd189ffaa6..000000000000
--- a/srcpkgs/python3-keepalive/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python3-keepalive'
-pkgname=python3-keepalive
-version=0.5
-revision=6
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-short_desc="Python3 urllib keepalive support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/wikier/keepalive"
-distfiles="${PYPI_SITE}/k/keepalive/keepalive-${version}.tar.gz"
-checksum=3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1

From 148b6c819a214d9f4dd1774ccacf03649b1d3ecc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:16:14 -0400
Subject: [PATCH 1362/4088] paraview: remove package

Vendoring of several components makes maintenance difficult and rebuilds
take an excessive amount of time. Generally the only activity this
package sees is work to drag it along when dependencies are
updated---especially new Python releases.
---
 srcpkgs/paraview/patches/cmake-py39.patch     | 11 ---
 .../patches/fix-page_size-macro.patch         | 13 ----
 .../patches/fix-vtksys-execinfo.patch         | 12 ---
 srcpkgs/paraview/patches/vtk-isnan.patch      | 45 -----------
 srcpkgs/paraview/template                     | 75 -------------------
 5 files changed, 156 deletions(-)
 delete mode 100644 srcpkgs/paraview/patches/cmake-py39.patch
 delete mode 100644 srcpkgs/paraview/patches/fix-page_size-macro.patch
 delete mode 100644 srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
 delete mode 100644 srcpkgs/paraview/patches/vtk-isnan.patch
 delete mode 100644 srcpkgs/paraview/template

diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch
deleted file mode 100644
index 5e15a6ffac13..000000000000
--- a/srcpkgs/paraview/patches/cmake-py39.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/VTK/CMake/patches/99/FindPython/Support.cmake	2020-10-08 00:54:51.788984364 -0400
-+++ b/VTK/CMake/patches/99/FindPython/Support.cmake	2020-10-08 00:54:56.640977251 -0400
-@@ -46,7 +46,7 @@
-   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
- endif()
- if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
--  set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+  set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
-   set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- else()
diff --git a/srcpkgs/paraview/patches/fix-page_size-macro.patch b/srcpkgs/paraview/patches/fix-page_size-macro.patch
deleted file mode 100644
index 62240a020148..000000000000
--- a/srcpkgs/paraview/patches/fix-page_size-macro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Plugins/Datamine/Readers/dmfile.cxx	2020-08-04 22:12:01.000000000 +0200
-+++ b/Plugins/Datamine/Readers/dmfile.cxx	2020-08-30 13:22:12.387889301 +0200
-@@ -421,8 +421,8 @@
- 
-   // number of records per page
-   // There is only 508 bytes per page ( table is 512 with 4 reserved )
--  const int PAGE_SIZE = 508;
--  int numRecsPerPage = PAGE_SIZE / recordLength;
-+  const int DM_PAGE_SIZE = 508;
-+  int numRecsPerPage = DM_PAGE_SIZE / recordLength;
- 
-   // number of record on last page
-   int numRecsLastPage = GetNLastPageRecs();
diff --git a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch b/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
deleted file mode 100644
index f01cce9b7e85..000000000000
--- a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/VTK/Utilities/KWSys/vtksys/CMakeLists.txt	2020-08-30 14:24:27.200081977 +0200
-+++ b/VTK/Utilities/KWSys/vtksys/CMakeLists.txt	2020-08-30 14:26:38.533088752 +0200
-@@ -592,7 +592,8 @@
-     # check for simple stack trace
-     # usually it's in libc but on FreeBSD
-     # it's in libexecinfo
--    FIND_LIBRARY(EXECINFO_LIB "execinfo")
-+    FIND_PACKAGE(PkgConfig REQUIRED)
-+    PKG_CHECK_MODULES(EXECINFO IMPORTED_TARGET libexecinfo)
-     MARK_AS_ADVANCED(EXECINFO_LIB)
-     IF (NOT EXECINFO_LIB)
-       SET(EXECINFO_LIB "")
diff --git a/srcpkgs/paraview/patches/vtk-isnan.patch b/srcpkgs/paraview/patches/vtk-isnan.patch
deleted file mode 100644
index 8bf0ec270333..000000000000
--- a/srcpkgs/paraview/patches/vtk-isnan.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h	2020-08-04 22:12:01.000000000 +0200
-+++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h	2020-08-29 22:33:06.824012475 +0200
-@@ -36,20 +36,20 @@
- template <typename T>
- struct has_NaN<T, true>
- {
--  static bool isnan(T x) { return std::isnan(x); }
-+  static bool vtkisnan(T x) { return std::isnan(x); }
- };
- 
- template <typename T>
- struct has_NaN<T, false>
- {
--  static bool isnan(T) { return false; }
-+  static bool vtkisnan(T) { return false; }
- };
- 
- template <typename T>
--bool isnan(T x)
-+bool vtkisnan(T x)
- {
-   // Select the correct partially specialized type.
--  return has_NaN<T, std::numeric_limits<T>::has_quiet_NaN>::isnan(x);
-+  return has_NaN<T, std::numeric_limits<T>::has_quiet_NaN>::vtkisnan(x);
- }
- } // namespace detail
- 
-@@ -127,7 +127,7 @@
-     for (vtkIdType i = 0; i < num; ++i)
-     {
-       auto value = this->AssociatedArray->GetValue(i);
--      if (::detail::isnan(value))
-+      if (::detail::vtkisnan(value))
-       {
-         NanIndices.push_back(i);
-       }
-@@ -140,7 +140,7 @@
-   std::vector<vtkIdType>* FindIndexVec(ValueType value)
-   {
-     std::vector<vtkIdType>* indices{ nullptr };
--    if (::detail::isnan(value) && !this->NanIndices.empty())
-+    if (::detail::vtkisnan(value) && !this->NanIndices.empty())
-     {
-       indices = &this->NanIndices;
-     }
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
deleted file mode 100644
index 20a7f5589677..000000000000
--- a/srcpkgs/paraview/template
+++ /dev/null
@@ -1,75 +0,0 @@
-# Template file for 'paraview'
-pkgname=paraview
-version=5.8.1
-revision=3
-wrksrc=ParaView-v${version}
-build_style=cmake
-configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
- -DPARAVIEW_ENABLE_FFMPEG=ON
- -DPARAVIEW_ENABLE_GDAL=ON
- -DPARAVIEW_USE_PYTHON=ON
- -DPARAVIEW_USE_MPI=ON
- -DVTK_PYTHON_FULL_THREADSAFE=ON
- -DVTK_PYTHON_VERSION=3
- -DVTK_SMP_IMPLEMENTATION_TYPE=TBB
- -DVTKm_ENABLE_MPI=ON
- -DVTKm_ENABLE_RENDERING=ON
- -DVTKm_USE_DOUBLE_PRECISION=ON"
-#make_build_args="VERBOSE=1"
-hostmakedepends="pkg-config which python3"
-# TODO: find some way of making this work with system vtk
-makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
- openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-svg-devel qt5-xmlpatterns python3-devel double-conversion-devel eigen
- expat-devel freetype-devel glew-devel hdf5-devel libjpeg-turbo-devel
- jsoncpp-devel proj-devel libxml2-devel liblzma-devel liblz4-devel netcdf-devel
- libogg-devel libpng-devel pugixml-devel libtheora-devel tiff-devel zlib-devel
- protobuf-devel protobuf python3-Pygments ffmpeg-devel tbb-devel boost-devel
- libgdal-devel python3-mpi4py"
-depends="openmpi"
-short_desc="Application for interactive, scientific visualization"
-maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
-license="BSD-3-Clause"
-homepage="https://www.paraview.org"
-distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz"
-checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034
-
-CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon"
-CXXFLAGS="${CFLAGS}"
-
-# qhelpgenerator: could not find a Qt installation of ''
-export QT_SELECT="5"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libexecinfo-devel"
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
-fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-
-post_extract() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		echo "vtk_module_link(VTK::CommonDataModel PRIVATE atomic)" >> \
-			VTK/Common/DataModel/CMakeLists.txt
-		echo "target_link_libraries(protobuf PRIVATE atomic)" >> \
-			ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt
-	fi
-}
-
-pre_configure() {
-	# use smaller debug info for 32-bit targets
-	if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
-		export CFLAGS="${CFLAGS/-g/-g1}"
-		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
-	fi
-	# conserve linker memory on 32-bit hosts
-	if [ "$XBPS_WORDSIZE" = "32" ]; then
-		export LDFLAGS+=" -Wl,--no-keep-memory"
-	fi
-}
-
-post_install() {
-	vlicense Copyright.txt
-}

From 11616ce5f9ff292f42ca5b8012fb351516f0121b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 25 Sep 2021 23:00:41 -0400
Subject: [PATCH 1363/4088] removed-packages: add multiple and revbump

- caribou
- python3-SPARQLWrapper
- python3-bluez
- python3-gmpy2
- python3-grako
- python3-keepalive
- paraview
---
 srcpkgs/removed-packages/template | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5fe46ab48121..482adf4556a2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=51
+revision=52
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -29,6 +29,9 @@ replaces="
  caja-gksu<=1.20.2_2
  california<=0.4.0_4
  captain-ballard<=1.0.0_2
+ caribou<=0.4.21_5
+ caribou-devel<=0.4.21_5
+ libcaribou<=0.4.21_5
  clamz<=0.5_4
  couchdb<=1.7.1_2
  cracklib-python<=2.9.7_1
@@ -228,6 +231,7 @@ replaces="
  onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
+ paraview<=5.8.1_3
  perl-Gtk2-Ex-Simple-List<=0.50_4
  perl-Gtk2-ImageView<=0.05_8
  perl-Gtk2-Notify<=0.05_8
@@ -256,6 +260,11 @@ replaces="
  python-sqlite<=2.8.3_1
  python-xlib<0.29_1
  python3-Django<=3.0.7_2
+ python3-SPARQLWrapper<=1.8.4_4
+ python3-bluez<=0.23_2
+ python3-grako<=3.99.9_7
+ python3-gmpy2<=2.0.8_8
+ python3-keepalive<=0.5_6
  python3-pyPEG2<=2.15.2_7
  python3-pyenet<=5.15.0_2
  python3-pyside<=5.15.0_2

From afb2f986b353f6b0ac609f10404f540215d95e6b Mon Sep 17 00:00:00 2001
From: Bikutoso <10584311+Bikutoso@users.noreply.github.com>
Date: Sun, 3 Oct 2021 12:22:06 +0200
Subject: [PATCH 1364/4088] anki: fix use of deprecated method removed in
 python 3.9

Closes: #33287 [via git-merge-pr]
---
 srcpkgs/anki/patches/fix_unescape.patch | 11 +++++++++++
 srcpkgs/anki/template                   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/anki/patches/fix_unescape.patch

diff --git a/srcpkgs/anki/patches/fix_unescape.patch b/srcpkgs/anki/patches/fix_unescape.patch
new file mode 100644
index 000000000000..f7024bc7bf15
--- /dev/null
+++ b/srcpkgs/anki/patches/fix_unescape.patch
@@ -0,0 +1,11 @@
+--- a/aqt/reviewer.py
++++ b/aqt/reviewer.py
+@@ -359,7 +359,7 @@
+         cor = stripHTML(cor)
+         # ensure we don't chomp multiple whitespace
+         cor = cor.replace(" ", "&nbsp;")
+-        cor = parser.unescape(cor)
++        cor = html.unescape(cor)
+         cor = cor.replace("\xa0", " ")
+         cor = cor.strip()
+         given = self.typedAnswer
diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template
index 55976fbd26eb..f2a476844717 100644
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@@ -1,7 +1,7 @@
 # Template file for 'anki'
 pkgname=anki
 version=2.1.15
-revision=4
+revision=5
 build_style=gnu-makefile
 depends="python3-PyQt5-webengine python3-requests python3-SQLAlchemy
  python3-PyAudio python3-mpv python3-Markdown python3-send2trash

From 1e95a00146e34cd1659619f0a8ea77132a987dee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 9 Oct 2021 10:47:04 -0400
Subject: [PATCH 1365/4088] Komikku: add glade3-devel to makedepends to unstick
 builders

---
 srcpkgs/Komikku/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 4d60614975dd..1202ed9de47d 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -5,7 +5,7 @@ revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
-makedepends="gtk+3-devel libhandy1-devel"
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic

From cbd2b04f465702cbae3cb112fd5342ac6981454f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 9 Oct 2021 11:20:33 -0400
Subject: [PATCH 1366/4088] freeorion: remove dangling symlink

---
 srcpkgs/freeorion-data | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/freeorion-data

diff --git a/srcpkgs/freeorion-data b/srcpkgs/freeorion-data
deleted file mode 120000
index 2eafad567b24..000000000000
--- a/srcpkgs/freeorion-data
+++ /dev/null
@@ -1 +0,0 @@
-freeorion
\ No newline at end of file

From b0b65946d5b37d2eeb8c52f454c60de0edf0531c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 9 Oct 2021 11:43:30 -0400
Subject: [PATCH 1367/4088] cinnamon: remove libcaribou dependency

---
 srcpkgs/cinnamon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index f9cc54f120f2..e131aa18f76f 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
 version=4.8.6
-revision=2
+revision=3
 build_helper=gir
 build_style=meson
 hostmakedepends="libtool pkg-config gobject-introspection gettext
@@ -11,7 +11,7 @@ makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
  startup-notification-devel pulseaudio-devel dbus-glib-devel
  libgnome-keyring-devel NetworkManager-devel libcroco-devel libsoup-devel
  cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
+depends="accountsservice cinnamon-settings-daemon>=${version%.*}
  cinnamon-session>=${version%.*} muffin>=${version%.*}
  cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
  cinnamon-translations>=${version%.*} nemo>=${version%.*}

From 71b55908a063404124d09525f64b6c5b8c621cbc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 9 Oct 2021 11:51:08 -0400
Subject: [PATCH 1368/4088] caribou: restore package

Upstream patches allow build to succeed with new vala and
gobject-introspection. It seems libcaribou is still required by the lock
screen in Cinnamon, so the package must be restored.

This reverts commit 5b0c846dd8798d337dc6fd54beeffa2ab92fe28e.
---
 srcpkgs/caribou-devel                         |    1 +
 .../patches/autostart-set-nodisplay.patch     |   21 +
 srcpkgs/caribou/patches/fix-crash.patch       |   46 +
 .../fix-font-property-in-style.css.patch      |   26 +
 srcpkgs/caribou/patches/fix-gir-vala.patch    | 1039 +++++++++++++++++
 srcpkgs/caribou/template                      |   51 +
 srcpkgs/libcaribou                            |    1 +
 7 files changed, 1185 insertions(+)
 create mode 120000 srcpkgs/caribou-devel
 create mode 100644 srcpkgs/caribou/patches/autostart-set-nodisplay.patch
 create mode 100644 srcpkgs/caribou/patches/fix-crash.patch
 create mode 100644 srcpkgs/caribou/patches/fix-font-property-in-style.css.patch
 create mode 100644 srcpkgs/caribou/patches/fix-gir-vala.patch
 create mode 100644 srcpkgs/caribou/template
 create mode 120000 srcpkgs/libcaribou

diff --git a/srcpkgs/caribou-devel b/srcpkgs/caribou-devel
new file mode 120000
index 000000000000..7f932efc02e7
--- /dev/null
+++ b/srcpkgs/caribou-devel
@@ -0,0 +1 @@
+caribou
\ No newline at end of file
diff --git a/srcpkgs/caribou/patches/autostart-set-nodisplay.patch b/srcpkgs/caribou/patches/autostart-set-nodisplay.patch
new file mode 100644
index 000000000000..10087f3f805c
--- /dev/null
+++ b/srcpkgs/caribou/patches/autostart-set-nodisplay.patch
@@ -0,0 +1,21 @@
+From 286582f90fbbc9b3baa6b055bba1141cc30e6e94 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Thu, 12 Oct 2017 18:14:35 -0400
+Subject: autostart: Set NoDisplay=true
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788906
+https://launchpad.net/bugs/1723266
+---
+ data/caribou-autostart.desktop.in.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/caribou-autostart.desktop.in.in b/data/caribou-autostart.desktop.in.in
+index 4bd1c03..bf73a94 100644
+--- a/data/caribou-autostart.desktop.in.in
++++ b/data/caribou-autostart.desktop.in.in
+@@ -5,4 +5,5 @@ Exec=@libexecdir@/caribou
+ AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
+ X-GNOME-AutoRestart=true
+ #X-GNOME-Autostart-Phase=Initialization
++NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
diff --git a/srcpkgs/caribou/patches/fix-crash.patch b/srcpkgs/caribou/patches/fix-crash.patch
new file mode 100644
index 000000000000..a6fa3d7cd378
--- /dev/null
+++ b/srcpkgs/caribou/patches/fix-crash.patch
@@ -0,0 +1,46 @@
+From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 12 Jan 2021 18:01:47 +0000
+Subject: [PATCH] xadapter.vala: Remove XkbKeyTypesMask and fields from
+ XKbChangeMap call.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This was originally a workaround for xFree86 4.3 - see:
+https://bugzilla.gnome.org/show_bug.cgi?id=673547
+​
+As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this
+causes a BadLength error when attempting to use shifted characters.
+​
+Ref:
+https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server
+---
+ libcaribou/xadapter.vala | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala
+index 22858b7..1da5a78 100644
+--- a/libcaribou/xadapter.vala
++++ b/libcaribou/xadapter.vala
+@@ -195,15 +195,10 @@ namespace Caribou {
+ 
+             Xkb.MapChanges changes = Xkb.MapChanges ();
+ 
+-            // We don't touch key types here but include the
+-            // information in XkbSetMap request to the server, because
+-            // some X servers need the information to check the sanity
+-            // of the keysyms change.
+-            changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask);
++            changes.changed = (ushort) Xkb.KeySymsMask;
+             changes.first_key_sym = (char) this.reserved_keycode;
+             changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width;
+-            changes.first_type = 0;
+-            changes.num_types = this.xkbdesc.map.num_types;
++
+             Xkb.change_map (this.xdisplay, this.xkbdesc, changes);
+ 
+             this.xdisplay.flush ();
+-- 
+GitLab
+
diff --git a/srcpkgs/caribou/patches/fix-font-property-in-style.css.patch b/srcpkgs/caribou/patches/fix-font-property-in-style.css.patch
new file mode 100644
index 000000000000..722fae54eb61
--- /dev/null
+++ b/srcpkgs/caribou/patches/fix-font-property-in-style.css.patch
@@ -0,0 +1,26 @@
+From 13df8b92ae89c796238e669ee6ef4447a42d6355 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Fri, 1 Dec 2017 12:11:35 -0500
+Subject: style.css: Fix failure to start in GNOME Flashback
+
+The order for 'font' properties matters
+https://developer.gnome.org/gtk3/stable/chap-css-properties.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=791001
+---
+ data/antler/style.css | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/antler/style.css b/data/antler/style.css
+index 5ab6f71..4d84904 100644
+--- a/data/antler/style.css
++++ b/data/antler/style.css
+@@ -13,7 +13,7 @@
+   border-width: 0px;
+   border-radius: 2px;
+   border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch;
+-  font: Sans 14px;
++  font: 14px Sans;
+   background-image: -gtk-gradient (linear,
+ 				     left top,
+ 				     left bottom,
diff --git a/srcpkgs/caribou/patches/fix-gir-vala.patch b/srcpkgs/caribou/patches/fix-gir-vala.patch
new file mode 100644
index 000000000000..bb11d8a2960e
--- /dev/null
+++ b/srcpkgs/caribou/patches/fix-gir-vala.patch
@@ -0,0 +1,1039 @@
+From 76fbd11575f918fc898cb0f5defe07f67c11ec38 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 20 Jan 2021 23:09:38 +0100
+Subject: [PATCH 1/5] Fix build with newer valac versions
+
+Fixes https://gitlab.gnome.org/GNOME/caribou/issues/7
+---
+ libcaribou/key-model.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala
+index 89015bc..e88342e 100644
+--- a/libcaribou/key-model.vala
++++ b/libcaribou/key-model.vala
+@@ -101,7 +101,7 @@ namespace Caribou {
+                     unichar uc;
+                     while (text.get_next_char (ref index, out uc)) {
+                         uint keyval = Gdk.unicode_to_keyval (uc);
+-                        if (keyval != uc | 0x01000000)
++                        if (keyval != (uc | 0x01000000))
+                             _keyvals += keyval;
+                     }
+                 } else {
+-- 
+GitLab
+
+
+From 3700b5396f0b5995d6911037f91863f7b0aa0cb4 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 20 Jan 2021 23:05:44 +0100
+Subject: [PATCH 2/5] Bump vala requirement to 0.40
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index eb84eae..539e451 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@ PKG_CHECK_MODULES(CARIBOU, [
+ AC_SUBST(CARIBOU_CFLAGS)
+ AC_SUBST(CARIBOU_LIBS)
+ 
+-AM_PROG_VALAC([0.13])
++AM_PROG_VALAC([0.40])
+ AC_SUBST(VALAC)
+ AC_SUBST(VALAFLAGS)
+ 
+-- 
+GitLab
+
+
+From 7a9992235ad3f4fdaa8f8e1cbdc358a8989a1af1 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 20 Jan 2021 23:08:01 +0100
+Subject: [PATCH 3/5] No need to check valadoc version
+
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 539e451..52dea73 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,7 +48,6 @@ PYGOBJECT_REQUIRED=2.90.3
+ GTK_REQUIRED=3.0.0
+ CLUTTER_REQUIRED=1.5.11
+ GDK_REQUIRED=3.0.0
+-VALADOC_REQUIRED=0.3.1
+ 
+ PKG_CHECK_MODULES(CARIBOU, [
+   pygobject-3.0 >= $PYGOBJECT_REQUIRED,
+@@ -137,8 +136,6 @@ AM_CONDITIONAL([ENABLE_DOCS], [test x$enable_docs = xyes])
+ 
+ have_valadoc=no
+ AS_IF([test x$enable_docs = xyes], [
+-  # make sure the library is new enough and the program exists
+-  PKG_CHECK_MODULES([VALADOC], [valadoc-1.0 >= $VALADOC_REQUIRED])
+   AC_PATH_PROG([VALADOC], [valadoc], [:])
+   AS_IF([test "$VALADOC" != :], have_valadoc=yes)
+ ])
+-- 
+GitLab
+
+
+From c52ce71c49dc8d6109a58d16cc8d491d7bd1d781 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 20 Jan 2021 22:59:49 +0100
+Subject: [PATCH 4/5] Stop patching the generated GIR
+
+---
+ libcaribou/Makefile.am |  8 ++-----
+ tools/Makefile.am      |  1 -
+ tools/fix_gir.py       | 53 ------------------------------------------
+ 3 files changed, 2 insertions(+), 60 deletions(-)
+ delete mode 100755 tools/fix_gir.py
+
+diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am
+index 05f2774..0634374 100644
+--- a/libcaribou/Makefile.am
++++ b/libcaribou/Makefile.am
+@@ -7,7 +7,7 @@ libcaribou_la_VALAFLAGS = \
+ 	--pkg xtst --pkg gee-0.8 --pkg gdk-x11-3.0 --pkg libxml-2.0 \
+ 	--pkg libxklavier --pkg external-libs \
+ 	--internal-vapi caribou-internals-1.0.vapi \
+-	--library caribou-1.0 --gir _Caribou-1.0.gir \
++	--library caribou-1.0 --gir Caribou-1.0.gir \
+ 	--symbols libcaribou.symbols \
+ 	$(VALAFLAGS)
+ 
+@@ -63,9 +63,6 @@ gir_DATA = Caribou-1.0.gir
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = Caribou-1.0.typelib
+ 
+-Caribou-1.0.gir: _Caribou-1.0.gir
+-	$(AM_V_GEN)$(PYTHON) -B $(top_srcdir)/tools/fix_gir.py $< > $@
+-
+ Caribou-1.0.typelib: Caribou-1.0.gir
+ 	@INTROSPECTION_COMPILER@ --shared-library=libcaribou.so.0 -o $@ $^
+ 
+@@ -81,8 +78,7 @@ CLEANFILES = \
+ 	caribou-1.0.vapi \
+ 	caribou-internals-1.0.vapi \
+ 	Caribou-1.0.typelib \
+-	Caribou-1.0.gir \
+-	_Caribou-1.0.gir
++	Caribou-1.0.gir
+ 
+ DISTCLEANFILES = \
+ 	caribou-1.0.pc
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 3a9bcdb..89f753d 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,5 +1,4 @@
+ EXTRA_DIST = \
+-	fix_gir.py \
+ 	make_schema.py \
+ 	convert_cldr.py \
+ 	basic.xsl
+diff --git a/tools/fix_gir.py b/tools/fix_gir.py
+deleted file mode 100755
+index 182d108..0000000
+--- a/tools/fix_gir.py
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#!/usr/bin/python
+-
+-from xml.dom import minidom
+-
+-def purge_white_space_and_fix_namespace(node, indent=0):
+-    if getattr(node, "tagName", None) == "namespace":
+-        name = node.getAttribute("name")
+-        node.setAttribute("name", name.lstrip('_'))
+-    for child in [c for c in node.childNodes]:
+-        if child.nodeType == node.TEXT_NODE or \
+-                getattr(child, "tagName", None) == "annotation":
+-            node.removeChild(child)
+-            continue
+-        purge_white_space_and_fix_namespace(child, indent+1)
+-
+-def find_ancestor(node, name):
+-    if getattr(node, "tagName", None) == name:
+-        return node
+-    parent = getattr(node, "parentNode", None)
+-    if not parent:
+-        return None
+-    return find_ancestor(parent, name)
+-
+-def fix_vfuncs(dom):
+-    for f in dom.getElementsByTagName("field"):
+-        callbacks = f.getElementsByTagName("callback")
+-
+-        record = find_ancestor(f, "record")
+-        if not record:
+-            continue
+-
+-        name = record.getAttribute("name")
+-        cname = record.getAttribute("c:type")
+-
+-        assert(name.endswith("Class") or name.endswith("Iface"))
+-        assert(cname.endswith("Class") or name.endswith("Iface"))
+-
+-        if len(callbacks) == 2:
+-            callbacks[-1].parentNode.removeChild(callbacks[-1])
+-
+-if __name__ == "__main__":
+-    import sys
+-
+-    if len(sys.argv) != 2:
+-        print("supply a gir file")
+-        sys.exit(1)
+-
+-    dom = minidom.parse(sys.argv[-1])
+-
+-    purge_white_space_and_fix_namespace(dom)
+-    fix_vfuncs(dom)
+-
+-    print(dom.toprettyxml(indent=" ", newl="\n"))
+-- 
+GitLab
+
+
+From af41f8a77b9e03a305a6169a6adfc767621d2217 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 20 Jan 2021 23:03:43 +0100
+Subject: [PATCH 5/5] Drop copy of atspi2.vapi
+
+---
+ vapi/Makefile.am  |   1 -
+ vapi/atspi-2.vapi | 803 ----------------------------------------------
+ 2 files changed, 804 deletions(-)
+ delete mode 100644 vapi/atspi-2.vapi
+
+diff --git a/vapi/Makefile.am b/vapi/Makefile.am
+index 1240b54..ea68a2a 100644
+--- a/vapi/Makefile.am
++++ b/vapi/Makefile.am
+@@ -1,6 +1,5 @@
+ EXTRA_DIST = \
+ 	config.vapi \
+-	atspi-2.vapi \
+ 	external-libs.vapi \
+ 	libxklavier.vapi
+ 
+diff --git a/vapi/atspi-2.vapi b/vapi/atspi-2.vapi
+deleted file mode 100644
+index efb8e91..0000000
+--- a/vapi/atspi-2.vapi
++++ /dev/null
+@@ -1,803 +0,0 @@
+-/* atspi-2.0.vapi generated by vapigen, do not modify. */
+-
+-[CCode (cprefix = "Atspi", gir_namespace = "Atspi", gir_version = "2.0", lower_case_cprefix = "atspi_")]
+-namespace Atspi {
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_accessible_get_type ()")]
+-	public class Accessible : Atspi.Object, Atspi.Action, Atspi.Collection, Atspi.Component, Atspi.Document, Atspi.EditableText, Atspi.Hypertext, Atspi.Image, Atspi.Selection, Atspi.Table, Atspi.Text, Atspi.Value {
+-		public weak Atspi.Accessible accessible_parent;
+-		public weak GLib.HashTable<void*,void*> attributes;
+-		public uint cached_properties;
+-		public weak GLib.List<void*> children;
+-		public weak string description;
+-		public int interfaces;
+-		public weak string name;
+-		public Atspi.Role role;
+-		public weak Atspi.StateSet states;
+-		[CCode (has_construct_function = false)]
+-		protected Accessible ();
+-		public void clear_cache ();
+-		public Atspi.Action get_action ();
+-		public Atspi.Accessible get_application () throws GLib.Error;
+-		public string get_atspi_version () throws GLib.Error;
+-		public GLib.HashTable<string,string> get_attributes () throws GLib.Error;
+-		public GLib.Array<string> get_attributes_as_array () throws GLib.Error;
+-		public Atspi.Accessible get_child_at_index (int child_index) throws GLib.Error;
+-		public int get_child_count () throws GLib.Error;
+-		public Atspi.Collection get_collection ();
+-		public Atspi.Component get_component ();
+-		public string get_description () throws GLib.Error;
+-		public Atspi.Document get_document ();
+-		public Atspi.EditableText get_editable_text ();
+-		public Atspi.Hyperlink get_hyperlink ();
+-		public Atspi.Hypertext get_hypertext ();
+-		public int get_id () throws GLib.Error;
+-		public Atspi.Image get_image ();
+-		public int get_index_in_parent () throws GLib.Error;
+-		public GLib.Array<string> get_interfaces ();
+-		public string get_localized_role_name () throws GLib.Error;
+-		public string get_name () throws GLib.Error;
+-		public Atspi.Accessible get_parent () throws GLib.Error;
+-		public uint get_process_id () throws GLib.Error;
+-		public GLib.Array<Atspi.Accessible> get_relation_set () throws GLib.Error;
+-		public Atspi.Role get_role () throws GLib.Error;
+-		public string get_role_name () throws GLib.Error;
+-		public Atspi.Selection get_selection ();
+-		public Atspi.StateSet get_state_set ();
+-		public Atspi.Table get_table ();
+-		public Atspi.Text get_text ();
+-		public string get_toolkit_name () throws GLib.Error;
+-		public string get_toolkit_version () throws GLib.Error;
+-		public Atspi.Value get_value ();
+-		public void set_cache_mask (int mask);
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_device_listener_get_type ()")]
+-	public class DeviceListener : GLib.Object {
+-		public weak GLib.List<void*> callbacks;
+-		public uint id;
+-		[CCode (has_construct_function = false)]
+-		public DeviceListener (owned Atspi.DeviceListenerCB callback);
+-		public void add_callback ([CCode (delegate_target_pos = 1.2, destroy_notify_pos = 1.1)] owned Atspi.DeviceListenerCB callback);
+-		[NoWrapper]
+-		public virtual bool device_event (Atspi.DeviceEvent arg0);
+-		public void remove_callback (Atspi.DeviceListenerCB callback);
+-		[CCode (has_construct_function = false)]
+-		public DeviceListener.simple ([CCode (destroy_notify_pos = 1.1)] owned Atspi.DeviceListenerSimpleCB callback);
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atspi_event_get_type ()")]
+-	[Compact]
+-	public class Event {
+-		public GLib.Value any_data;
+-		public int detail1;
+-		public int detail2;
+-		public weak Atspi.Accessible source;
+-		public weak string type;
+-		public static void main ();
+-		public static void quit ();
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_event_listener_get_type ()")]
+-	public class EventListener : GLib.Object {
+-		public weak Atspi.EventListenerCB callback;
+-		public weak GLib.DestroyNotify cb_destroyed;
+-		public void* user_data;
+-		[CCode (has_construct_function = false)]
+-		public EventListener (owned Atspi.EventListenerCB callback);
+-		public bool deregister (string event_type) throws GLib.Error;
+-		public static bool deregister_from_callback ([CCode (delegate_target_pos = 1.5)] Atspi.EventListenerCB callback, string event_type) throws GLib.Error;
+-		public static bool deregister_no_data (Atspi.EventListenerSimpleCB callback, string event_type) throws GLib.Error;
+-		public bool register (string event_type) throws GLib.Error;
+-		public static bool register_from_callback ([CCode (delegate_target_pos = 1.33333, destroy_notify_pos = 1.66667)] owned Atspi.EventListenerCB callback, string event_type) throws GLib.Error;
+-		public static bool register_no_data ([CCode (destroy_notify_pos = 1.5)] owned Atspi.EventListenerSimpleCB callback, string event_type) throws GLib.Error;
+-		[CCode (has_construct_function = false)]
+-		public EventListener.simple ([CCode (destroy_notify_pos = 1.1)] owned Atspi.EventListenerSimpleCB callback);
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_hyperlink_get_type ()")]
+-	public class Hyperlink : Atspi.Object {
+-		[CCode (has_construct_function = false)]
+-		protected Hyperlink ();
+-		public int get_end_index () throws GLib.Error;
+-		public Atspi.Range get_index_range () throws GLib.Error;
+-		public int get_n_anchors () throws GLib.Error;
+-		public Atspi.Accessible get_object (int i) throws GLib.Error;
+-		public int get_start_index () throws GLib.Error;
+-		public string get_uri (int i) throws GLib.Error;
+-		public bool is_valid () throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atspi_key_definition_get_type ()")]
+-	[Compact]
+-	public class KeyDefinition {
+-		public int keycode;
+-		public weak string keystring;
+-		public int keysym;
+-		public int unused;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_match_rule_get_type ()")]
+-	public class MatchRule : GLib.Object {
+-		public Atspi.CollectionMatchType attributematchtype;
+-		public weak GLib.HashTable<void*,void*> attributes;
+-		public Atspi.CollectionMatchType interfacematchtype;
+-		public weak GLib.Array<void*> interfaces;
+-		public bool invert;
+-		public Atspi.CollectionMatchType rolematchtype;
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public weak int[] roles;
+-		public Atspi.CollectionMatchType statematchtype;
+-		public weak Atspi.StateSet states;
+-		[CCode (has_construct_function = false)]
+-		public MatchRule (Atspi.StateSet states, Atspi.CollectionMatchType statematchtype, GLib.HashTable<string,string> attributes, Atspi.CollectionMatchType attributematchtype, GLib.Array<Atspi.Role> roles, Atspi.CollectionMatchType rolematchtype, GLib.Array<string> interfaces, Atspi.CollectionMatchType interfacematchtype, bool invert);
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_object_get_type ()")]
+-	public class Object : GLib.Object {
+-		public Atspi.Application app;
+-		public weak string path;
+-		[CCode (has_construct_function = false)]
+-		protected Object ();
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atspi_point_get_type ()")]
+-	[Compact]
+-	public class Point {
+-		public int x;
+-		public int y;
+-		public Atspi.Point copy ();
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atspi_range_get_type ()")]
+-	[Compact]
+-	public class Range {
+-		public int end_offset;
+-		public int start_offset;
+-		public Atspi.Range copy ();
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atspi_rect_get_type ()")]
+-	[Compact]
+-	public class Rect {
+-		public int height;
+-		public int width;
+-		public int x;
+-		public int y;
+-		public Atspi.Rect copy ();
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_relation_get_type ()")]
+-	public class Relation : GLib.Object {
+-		public Atspi.RelationType relation_type;
+-		public weak GLib.Array<void*> targets;
+-		[CCode (has_construct_function = false)]
+-		protected Relation ();
+-		public int get_n_targets ();
+-		public Atspi.RelationType get_relation_type ();
+-		public Atspi.Accessible get_target (int i);
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_state_set_get_type ()")]
+-	public class StateSet : GLib.Object {
+-		public void* accessible;
+-		public int64 states;
+-		[CCode (has_construct_function = false)]
+-		public StateSet (GLib.Array<Atspi.StateType> states);
+-		public void add (Atspi.StateType state);
+-		public Atspi.StateSet compare (Atspi.StateSet set2);
+-		public bool contains (Atspi.StateType state);
+-		public bool equals (Atspi.StateSet set2);
+-		public GLib.Array<Atspi.StateType> get_states ();
+-		public bool is_empty ();
+-		public void remove (Atspi.StateType state);
+-		public void set_by_name (string name, bool enabled);
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atspi_text_range_get_type ()")]
+-	[Compact]
+-	public class TextRange {
+-		public weak string content;
+-		public int end_offset;
+-		public int start_offset;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_action_get_type ()")]
+-	public interface Action : GLib.Object {
+-		public bool do_action (int i) throws GLib.Error;
+-		public string get_description (int i) throws GLib.Error;
+-		public string get_key_binding (int i) throws GLib.Error;
+-		public string get_localized_name (int i) throws GLib.Error;
+-		public int get_n_actions () throws GLib.Error;
+-		public string get_name (int i) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_collection_get_type ()")]
+-	public interface Collection : GLib.Object {
+-		public GLib.Array<Atspi.Accessible> get_matches (Atspi.MatchRule rule, Atspi.CollectionSortOrder sortby, int count, bool traverse) throws GLib.Error;
+-		public GLib.Array<Atspi.Accessible> get_matches_from (Atspi.Accessible current_object, Atspi.MatchRule rule, Atspi.CollectionSortOrder sortby, Atspi.CollectionTreeTraversalType tree, int count, bool traverse) throws GLib.Error;
+-		public GLib.Array<Atspi.Accessible> get_matches_to (Atspi.Accessible current_object, Atspi.MatchRule rule, Atspi.CollectionSortOrder sortby, Atspi.CollectionTreeTraversalType tree, bool limit_scope, int count, bool traverse) throws GLib.Error;
+-		public bool is_ancestor_of (Atspi.Accessible test) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_component_get_type ()")]
+-	public interface Component : GLib.Object {
+-		public bool contains (int x, int y, Atspi.CoordType ctype) throws GLib.Error;
+-		public Atspi.Accessible get_accessible_at_point (int x, int y, Atspi.CoordType ctype) throws GLib.Error;
+-		public double get_alpha () throws GLib.Error;
+-		public Atspi.Rect get_extents (Atspi.CoordType ctype) throws GLib.Error;
+-		public Atspi.ComponentLayer get_layer () throws GLib.Error;
+-		public short get_mdi_z_order () throws GLib.Error;
+-		public Atspi.Point get_position (Atspi.CoordType ctype) throws GLib.Error;
+-		public Atspi.Point get_size () throws GLib.Error;
+-		public bool grab_focus () throws GLib.Error;
+-		public bool set_extents (int x, int y, int width, int height, Atspi.CoordType ctype) throws GLib.Error;
+-		public bool set_position (int x, int y, Atspi.CoordType ctype) throws GLib.Error;
+-		public bool set_size (int width, int height) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_document_get_type ()")]
+-	public interface Document : GLib.Object {
+-		public string get_attribute_value (string attribute) throws GLib.Error;
+-		public GLib.HashTable<string,string> get_attributes () throws GLib.Error;
+-		public string get_locale () throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_editable_text_get_type ()")]
+-	public interface EditableText : GLib.Object {
+-		public bool copy_text (int start_pos, int end_pos) throws GLib.Error;
+-		public bool cut_text (int start_pos, int end_pos) throws GLib.Error;
+-		public bool delete_text (int start_pos, int end_pos) throws GLib.Error;
+-		public bool insert_text (int position, string text, int length) throws GLib.Error;
+-		public bool paste_text (int position) throws GLib.Error;
+-		public bool set_text_contents (string new_contents) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_hypertext_get_type ()")]
+-	public interface Hypertext : GLib.Object {
+-		public Atspi.Hyperlink get_link (int link_index) throws GLib.Error;
+-		public int get_link_index (int character_offset) throws GLib.Error;
+-		public int get_n_links () throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_image_get_type ()")]
+-	public interface Image : GLib.Object {
+-		public string get_image_description () throws GLib.Error;
+-		public Atspi.Rect get_image_extents (Atspi.CoordType ctype) throws GLib.Error;
+-		public string get_image_locale () throws GLib.Error;
+-		public Atspi.Point get_image_position (Atspi.CoordType ctype) throws GLib.Error;
+-		public Atspi.Point get_image_size () throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_selection_get_type ()")]
+-	public interface Selection : GLib.Object {
+-		public bool clear_selection () throws GLib.Error;
+-		public bool deselect_child (int child_index) throws GLib.Error;
+-		public bool deselect_selected_child (int selected_child_index) throws GLib.Error;
+-		public int get_n_selected_children () throws GLib.Error;
+-		public Atspi.Accessible get_selected_child (int selected_child_index) throws GLib.Error;
+-		public bool is_child_selected (int child_index) throws GLib.Error;
+-		public bool select_all () throws GLib.Error;
+-		public bool select_child (int child_index) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_table_get_type ()")]
+-	public interface Table : GLib.Object {
+-		public bool add_column_selection (int column) throws GLib.Error;
+-		public bool add_row_selection (int row) throws GLib.Error;
+-		public Atspi.Accessible get_accessible_at (int row, int column) throws GLib.Error;
+-		public Atspi.Accessible get_caption () throws GLib.Error;
+-		public int get_column_at_index (int index) throws GLib.Error;
+-		public string get_column_description (int column) throws GLib.Error;
+-		public int get_column_extent_at (int row, int column) throws GLib.Error;
+-		public Atspi.Accessible get_column_header (int column) throws GLib.Error;
+-		public int get_index_at (int row, int column) throws GLib.Error;
+-		public int get_n_columns () throws GLib.Error;
+-		public int get_n_rows () throws GLib.Error;
+-		public int get_n_selected_columns () throws GLib.Error;
+-		public int get_n_selected_rows () throws GLib.Error;
+-		public int get_row_at_index (int index) throws GLib.Error;
+-		public bool get_row_column_extents_at_index (int index, out int row, out int col, out int row_extents, out int col_extents, out bool is_selected) throws GLib.Error;
+-		public string get_row_description (int row) throws GLib.Error;
+-		public int get_row_extent_at (int row, int column) throws GLib.Error;
+-		public Atspi.Accessible get_row_header (int row) throws GLib.Error;
+-		public GLib.Array<int> get_selected_columns () throws GLib.Error;
+-		public GLib.Array<int> get_selected_rows () throws GLib.Error;
+-		public Atspi.Accessible get_summary () throws GLib.Error;
+-		public bool is_column_selected (int column) throws GLib.Error;
+-		public bool is_row_selected (int row) throws GLib.Error;
+-		public bool is_selected (int row, int column) throws GLib.Error;
+-		public bool remove_column_selection (int column) throws GLib.Error;
+-		public bool remove_row_selection (int row) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_text_get_type ()")]
+-	public interface Text : GLib.Object {
+-		public bool add_selection (int start_offset, int end_offset) throws GLib.Error;
+-		public GLib.HashTable<string,string> get_attribute_run (int offset, bool include_defaults, out int start_offset, out int end_offset) throws GLib.Error;
+-		public string get_attribute_value (int offset, string attribute_name) throws GLib.Error;
+-		public GLib.HashTable<string,string> get_attributes (int offset, out int start_offset, out int end_offset) throws GLib.Error;
+-		public GLib.Array<Atspi.TextRange> get_bounded_ranges (int x, int y, int width, int height, Atspi.CoordType type, Atspi.TextClipType clipTypeX, Atspi.TextClipType clipTypeY) throws GLib.Error;
+-		public int get_caret_offset () throws GLib.Error;
+-		public uint get_character_at_offset (int offset) throws GLib.Error;
+-		public int get_character_count () throws GLib.Error;
+-		public Atspi.Rect get_character_extents (int offset, Atspi.CoordType type) throws GLib.Error;
+-		public GLib.HashTable<string,string> get_default_attributes () throws GLib.Error;
+-		public int get_n_selections () throws GLib.Error;
+-		public int get_offset_at_point (int x, int y, Atspi.CoordType type) throws GLib.Error;
+-		public Atspi.Rect get_range_extents (int start_offset, int end_offset, Atspi.CoordType type) throws GLib.Error;
+-		public Atspi.Range get_selection (int selection_num) throws GLib.Error;
+-		public string get_text (int start_offset, int end_offset) throws GLib.Error;
+-		public Atspi.TextRange get_text_after_offset (int offset, Atspi.TextBoundaryType type) throws GLib.Error;
+-		public Atspi.TextRange get_text_at_offset (int offset, Atspi.TextBoundaryType type) throws GLib.Error;
+-		public Atspi.TextRange get_text_before_offset (int offset, Atspi.TextBoundaryType type) throws GLib.Error;
+-		public bool remove_selection (int selection_num) throws GLib.Error;
+-		public bool set_caret_offset (int new_offset) throws GLib.Error;
+-		public bool set_selection (int selection_num, int start_offset, int end_offset) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_value_get_type ()")]
+-	public interface Value : GLib.Object {
+-		public double get_current_value () throws GLib.Error;
+-		public double get_maximum_value () throws GLib.Error;
+-		public double get_minimum_increment () throws GLib.Error;
+-		public double get_minimum_value () throws GLib.Error;
+-		public bool set_current_value (double new_value) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", has_type_id = false)]
+-	public struct Application {
+-		public weak GLib.Object parent;
+-		public weak GLib.HashTable<void*,void*> hash;
+-		public weak string bus_name;
+-		public void* root;
+-		public Atspi.Cache cache;
+-		public weak string toolkit_name;
+-		public weak string toolkit_version;
+-		public weak string atspi_version;
+-		public void* time_added;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", has_type_id = false)]
+-	public struct ApplicationClass {
+-		public weak GLib.ObjectClass parent_class;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	[SimpleType]
+-	public struct ControllerEventMask : uint {
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", has_type_id = false)]
+-	public struct DeviceEvent {
+-		public Atspi.EventType type;
+-		public uint id;
+-		public ushort hw_code;
+-		public ushort modifiers;
+-		public uint timestamp;
+-		public weak string event_string;
+-		public bool is_text;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	[SimpleType]
+-	public struct DeviceEventMask : uint {
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", has_type_id = false)]
+-	public struct EventListenerMode {
+-		public bool synchronous;
+-		public bool preemptive;
+-		public bool global;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	[SimpleType]
+-	public struct KeyEventMask : uint {
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	[SimpleType]
+-	public struct KeyMaskType : uint {
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	[SimpleType]
+-	public struct KeystrokeListener {
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", has_type_id = false)]
+-	public struct Reference {
+-		public weak string name;
+-		public weak string path;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "_AtspiKeySet", has_type_id = false)]
+-	public struct _KeySet {
+-		public uint keysyms;
+-		public ushort keycodes;
+-		public weak string keystrings;
+-		public short len;
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_CACHE_")]
+-	[Flags]
+-	public enum Cache {
+-		NONE,
+-		PARENT,
+-		CHILDREN,
+-		NAME,
+-		DESCRIPTION,
+-		STATES,
+-		ROLE,
+-		INTERFACES,
+-		ATTRIBUTES,
+-		ALL,
+-		DEFAULT,
+-		UNDEFINED
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_Collection_MATCH_")]
+-	public enum CollectionMatchType {
+-		INVALID,
+-		ALL,
+-		ANY,
+-		NONE,
+-		EMPTY,
+-		LAST_DEFINED
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_Collection_SORT_ORDER_")]
+-	public enum CollectionSortOrder {
+-		INVALID,
+-		CANONICAL,
+-		FLOW,
+-		TAB,
+-		REVERSE_CANONICAL,
+-		REVERSE_FLOW,
+-		REVERSE_TAB,
+-		LAST_DEFINED
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_Collection_TREE_")]
+-	public enum CollectionTreeTraversalType {
+-		RESTRICT_CHILDREN,
+-		RESTRICT_SIBLING,
+-		INORDER,
+-		LAST_DEFINED
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_LAYER_")]
+-	public enum ComponentLayer {
+-		INVALID,
+-		BACKGROUND,
+-		CANVAS,
+-		WIDGET,
+-		MDI,
+-		POPUP,
+-		OVERLAY,
+-		WINDOW,
+-		LAST_DEFINED
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_COORD_TYPE_")]
+-	public enum CoordType {
+-		SCREEN,
+-		WINDOW
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_ERROR_")]
+-	public enum Error {
+-		APPLICATION_GONE,
+-		IPC
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_")]
+-	public enum EventType {
+-		KEY_PRESSED_EVENT,
+-		KEY_RELEASED_EVENT,
+-		BUTTON_PRESSED_EVENT,
+-		BUTTON_RELEASED_EVENT
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_KEY_")]
+-	public enum KeyEventType {
+-		PRESSED,
+-		RELEASED
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_KEYLISTENER_")]
+-	public enum KeyListenerSyncType {
+-		NOSYNC,
+-		SYNCHRONOUS,
+-		CANCONSUME,
+-		ALL_WINDOWS
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_KEY_")]
+-	public enum KeySynthType {
+-		PRESS,
+-		RELEASE,
+-		PRESSRELEASE,
+-		SYM,
+-		STRING
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_LOCALE_TYPE_")]
+-	public enum LocaleType {
+-		MESSAGES,
+-		COLLATE,
+-		CTYPE,
+-		MONETARY,
+-		NUMERIC,
+-		TIME
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_MODIFIER_")]
+-	public enum ModifierType {
+-		SHIFT,
+-		SHIFTLOCK,
+-		CONTROL,
+-		ALT,
+-		META,
+-		META2,
+-		META3,
+-		NUMLOCK
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_RELATION_")]
+-	public enum RelationType {
+-		NULL,
+-		LABEL_FOR,
+-		LABELLED_BY,
+-		CONTROLLER_FOR,
+-		CONTROLLED_BY,
+-		MEMBER_OF,
+-		TOOLTIP_FOR,
+-		NODE_CHILD_OF,
+-		NODE_PARENT_OF,
+-		EXTENDED,
+-		FLOWS_TO,
+-		FLOWS_FROM,
+-		SUBWINDOW_OF,
+-		EMBEDS,
+-		EMBEDDED_BY,
+-		POPUP_FOR,
+-		PARENT_WINDOW_OF,
+-		DESCRIPTION_FOR,
+-		DESCRIBED_BY,
+-		LAST_DEFINED
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_ROLE_")]
+-	public enum Role {
+-		INVALID,
+-		ACCELERATOR_LABEL,
+-		ALERT,
+-		ANIMATION,
+-		ARROW,
+-		CALENDAR,
+-		CANVAS,
+-		CHECK_BOX,
+-		CHECK_MENU_ITEM,
+-		COLOR_CHOOSER,
+-		COLUMN_HEADER,
+-		COMBO_BOX,
+-		DATE_EDITOR,
+-		DESKTOP_ICON,
+-		DESKTOP_FRAME,
+-		DIAL,
+-		DIALOG,
+-		DIRECTORY_PANE,
+-		DRAWING_AREA,
+-		FILE_CHOOSER,
+-		FILLER,
+-		FOCUS_TRAVERSABLE,
+-		FONT_CHOOSER,
+-		FRAME,
+-		GLASS_PANE,
+-		HTML_CONTAINER,
+-		ICON,
+-		IMAGE,
+-		INTERNAL_FRAME,
+-		LABEL,
+-		LAYERED_PANE,
+-		LIST,
+-		LIST_ITEM,
+-		MENU,
+-		MENU_BAR,
+-		MENU_ITEM,
+-		OPTION_PANE,
+-		PAGE_TAB,
+-		PAGE_TAB_LIST,
+-		PANEL,
+-		PASSWORD_TEXT,
+-		POPUP_MENU,
+-		PROGRESS_BAR,
+-		PUSH_BUTTON,
+-		RADIO_BUTTON,
+-		RADIO_MENU_ITEM,
+-		ROOT_PANE,
+-		ROW_HEADER,
+-		SCROLL_BAR,
+-		SCROLL_PANE,
+-		SEPARATOR,
+-		SLIDER,
+-		SPIN_BUTTON,
+-		SPLIT_PANE,
+-		STATUS_BAR,
+-		TABLE,
+-		TABLE_CELL,
+-		TABLE_COLUMN_HEADER,
+-		TABLE_ROW_HEADER,
+-		TEAROFF_MENU_ITEM,
+-		TERMINAL,
+-		TEXT,
+-		TOGGLE_BUTTON,
+-		TOOL_BAR,
+-		TOOL_TIP,
+-		TREE,
+-		TREE_TABLE,
+-		UNKNOWN,
+-		VIEWPORT,
+-		WINDOW,
+-		EXTENDED,
+-		HEADER,
+-		FOOTER,
+-		PARAGRAPH,
+-		RULER,
+-		APPLICATION,
+-		AUTOCOMPLETE,
+-		EDITBAR,
+-		EMBEDDED,
+-		ENTRY,
+-		CHART,
+-		CAPTION,
+-		DOCUMENT_FRAME,
+-		HEADING,
+-		PAGE,
+-		SECTION,
+-		REDUNDANT_OBJECT,
+-		FORM,
+-		LINK,
+-		INPUT_METHOD_WINDOW,
+-		TABLE_ROW,
+-		TREE_ITEM,
+-		DOCUMENT_SPREADSHEET,
+-		DOCUMENT_PRESENTATION,
+-		DOCUMENT_TEXT,
+-		DOCUMENT_WEB,
+-		DOCUMENT_EMAIL,
+-		COMMENT,
+-		LIST_BOX,
+-		GROUPING,
+-		IMAGE_MAP,
+-		NOTIFICATION,
+-		INFO_BAR,
+-		LAST_DEFINED;
+-		public static string get_name (Atspi.Role role);
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_STATE_")]
+-	public enum StateType {
+-		INVALID,
+-		ACTIVE,
+-		ARMED,
+-		BUSY,
+-		CHECKED,
+-		COLLAPSED,
+-		DEFUNCT,
+-		EDITABLE,
+-		ENABLED,
+-		EXPANDABLE,
+-		EXPANDED,
+-		FOCUSABLE,
+-		FOCUSED,
+-		HAS_TOOLTIP,
+-		HORIZONTAL,
+-		ICONIFIED,
+-		MODAL,
+-		MULTI_LINE,
+-		MULTISELECTABLE,
+-		OPAQUE,
+-		PRESSED,
+-		RESIZABLE,
+-		SELECTABLE,
+-		SELECTED,
+-		SENSITIVE,
+-		SHOWING,
+-		SINGLE_LINE,
+-		STALE,
+-		TRANSIENT,
+-		VERTICAL,
+-		VISIBLE,
+-		MANAGES_DESCENDANTS,
+-		INDETERMINATE,
+-		REQUIRED,
+-		TRUNCATED,
+-		ANIMATED,
+-		INVALID_ENTRY,
+-		SUPPORTS_AUTOCOMPLETION,
+-		SELECTABLE_TEXT,
+-		IS_DEFAULT,
+-		VISITED,
+-		LAST_DEFINED
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_TEXT_BOUNDARY_")]
+-	public enum TextBoundaryType {
+-		CHAR,
+-		WORD_START,
+-		WORD_END,
+-		SENTENCE_START,
+-		SENTENCE_END,
+-		LINE_START,
+-		LINE_END
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_TEXT_CLIP_")]
+-	public enum TextClipType {
+-		NONE,
+-		MIN,
+-		MAX,
+-		BOTH
+-	}
+-	[CCode (cheader_filename = "atspi/atspi.h", instance_pos = 1.9)]
+-	public delegate bool DeviceListenerCB (owned Atspi.DeviceEvent stroke);
+-	[CCode (cheader_filename = "atspi/atspi.h", has_target = false)]
+-	public delegate bool DeviceListenerSimpleCB (owned Atspi.DeviceEvent stroke);
+-	[CCode (cheader_filename = "atspi/atspi.h", instance_pos = 1.9)]
+-	public delegate void EventListenerCB (owned Atspi.Event event);
+-	[CCode (cheader_filename = "atspi/atspi.h", has_target = false)]
+-	public delegate void EventListenerSimpleCB (owned Atspi.Event event);
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_COMPONENTLAYER_COUNT")]
+-	public const int COMPONENTLAYER_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_COORD_TYPE_COUNT")]
+-	public const int COORD_TYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_ACCESSIBLE")]
+-	public const string DBUS_INTERFACE_ACCESSIBLE;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_ACTION")]
+-	public const string DBUS_INTERFACE_ACTION;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_APPLICATION")]
+-	public const string DBUS_INTERFACE_APPLICATION;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_CACHE")]
+-	public const string DBUS_INTERFACE_CACHE;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_COLLECTION")]
+-	public const string DBUS_INTERFACE_COLLECTION;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_COMPONENT")]
+-	public const string DBUS_INTERFACE_COMPONENT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_DEC")]
+-	public const string DBUS_INTERFACE_DEC;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER")]
+-	public const string DBUS_INTERFACE_DEVICE_EVENT_LISTENER;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_DOCUMENT")]
+-	public const string DBUS_INTERFACE_DOCUMENT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_EDITABLE_TEXT")]
+-	public const string DBUS_INTERFACE_EDITABLE_TEXT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_EVENT_KEYBOARD")]
+-	public const string DBUS_INTERFACE_EVENT_KEYBOARD;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_EVENT_MOUSE")]
+-	public const string DBUS_INTERFACE_EVENT_MOUSE;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_EVENT_OBJECT")]
+-	public const string DBUS_INTERFACE_EVENT_OBJECT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_HYPERLINK")]
+-	public const string DBUS_INTERFACE_HYPERLINK;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_HYPERTEXT")]
+-	public const string DBUS_INTERFACE_HYPERTEXT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_IMAGE")]
+-	public const string DBUS_INTERFACE_IMAGE;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_REGISTRY")]
+-	public const string DBUS_INTERFACE_REGISTRY;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_SELECTION")]
+-	public const string DBUS_INTERFACE_SELECTION;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_SOCKET")]
+-	public const string DBUS_INTERFACE_SOCKET;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_TABLE")]
+-	public const string DBUS_INTERFACE_TABLE;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_TEXT")]
+-	public const string DBUS_INTERFACE_TEXT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_INTERFACE_VALUE")]
+-	public const string DBUS_INTERFACE_VALUE;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_NAME_REGISTRY")]
+-	public const string DBUS_NAME_REGISTRY;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_PATH_DEC")]
+-	public const string DBUS_PATH_DEC;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_PATH_NULL")]
+-	public const string DBUS_PATH_NULL;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_PATH_REGISTRY")]
+-	public const string DBUS_PATH_REGISTRY;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_DBUS_PATH_ROOT")]
+-	public const string DBUS_PATH_ROOT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_EVENTTYPE_COUNT")]
+-	public const int EVENTTYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_KEYEVENTTYPE_COUNT")]
+-	public const int KEYEVENTTYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_KEYSYNTHTYPE_COUNT")]
+-	public const int KEYSYNTHTYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_MATCHTYPES_COUNT")]
+-	public const int MATCHTYPES_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_MODIFIERTYPE_COUNT")]
+-	public const int MODIFIERTYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_RELATIONTYPE_COUNT")]
+-	public const int RELATIONTYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_ROLE_COUNT")]
+-	public const int ROLE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_SORTORDER_COUNT")]
+-	public const int SORTORDER_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_STATETYPE_COUNT")]
+-	public const int STATETYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_TEXT_BOUNDARY_TYPE_COUNT")]
+-	public const int TEXT_BOUNDARY_TYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h", cname = "ATSPI_TEXT_CLIP_TYPE_COUNT")]
+-	public const int TEXT_CLIP_TYPE_COUNT;
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static bool deregister_device_event_listener (Atspi.DeviceListener listener, void* filter) throws GLib.Error;
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static bool deregister_keystroke_listener (Atspi.DeviceListener listener, GLib.Array<Atspi.KeyDefinition>? key_set, Atspi.KeyMaskType modmask, Atspi.KeyEventMask event_types) throws GLib.Error;
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static int exit ();
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static bool generate_keyboard_event (long keyval, string keystring, Atspi.KeySynthType synth_type) throws GLib.Error;
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static bool generate_mouse_event (long x, long y, string name) throws GLib.Error;
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static Atspi.Accessible get_desktop (int i);
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static int get_desktop_count ();
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static GLib.Array<void*> get_desktop_list ();
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static int init ();
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static bool register_device_event_listener (Atspi.DeviceListener listener, Atspi.DeviceEventMask event_types, void* filter) throws GLib.Error;
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static bool register_keystroke_listener (Atspi.DeviceListener listener, GLib.Array<Atspi.KeyDefinition>? key_set, Atspi.KeyMaskType modmask, Atspi.KeyEventMask event_types, int sync_type) throws GLib.Error;
+-	[CCode (cheader_filename = "atspi/atspi.h")]
+-	public static void set_timeout (int val, int startup_time);
+-}
+-- 
+GitLab
+
diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
new file mode 100644
index 000000000000..626b357b9243
--- /dev/null
+++ b/srcpkgs/caribou/template
@@ -0,0 +1,51 @@
+# Template file for 'caribou'
+pkgname=caribou
+version=0.4.21
+revision=5
+build_style=gnu-configure
+build_helper="gir"
+configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module
+ PYTHON=/usr/bin/python3"
+hostmakedepends="pkg-config intltool python3-gobject-devel libxslt vala
+ automake libtool gettext-devel-tools glib-devel"
+makedepends="vala-devel libxklavier-devel libgee08-devel python3-gobject-devel
+ clutter-devel gtk+3-devel libXtst-devel gir-freedesktop"
+depends="python3-gobject python3-atspi python3-dbus gir-freedesktop at-spi2-atk
+ desktop-file-utils libcaribou>=${version}_${revision}"
+short_desc="Alternative to the Gnome On-screen Keyboard"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-only"
+homepage="https://wiki.gnome.org/Projects/Caribou"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55
+lib32disabled=yes
+
+pre_configure() {
+	autoreconf -f -i
+}
+
+libcaribou_package() {
+	lib32disabled=yes
+	short_desc+=" - library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove usr/share/caribou
+		vmove usr/lib/girepository-1.0
+		vmove "usr/lib/gtk*"
+		vmove "usr/lib/gnome-settings-daemon*"
+	}
+}
+
+caribou-devel_package() {
+	lib32disabled=yes
+	depends="libXtst-devel libgee08-devel libxklavier-devel gtk+3-devel
+	 libxml2-devel libcaribou>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libcaribou b/srcpkgs/libcaribou
new file mode 120000
index 000000000000..7f932efc02e7
--- /dev/null
+++ b/srcpkgs/libcaribou
@@ -0,0 +1 @@
+caribou
\ No newline at end of file

From b28f6e796faadcad04abd252c394b35edb905887 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 9 Oct 2021 12:15:51 -0400
Subject: [PATCH 1369/4088] removed-packages: restore caribou

---
 srcpkgs/removed-packages/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 482adf4556a2..3e1adba6f210 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,9 +29,6 @@ replaces="
  caja-gksu<=1.20.2_2
  california<=0.4.0_4
  captain-ballard<=1.0.0_2
- caribou<=0.4.21_5
- caribou-devel<=0.4.21_5
- libcaribou<=0.4.21_5
  clamz<=0.5_4
  couchdb<=1.7.1_2
  cracklib-python<=2.9.7_1

From e6493e2cdac24a5cfa321916f8701d15190a97ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 9 Oct 2021 12:16:52 -0400
Subject: [PATCH 1370/4088] cinnamon: restore libcaribou dependency

This reverts commit ca5599c6e8707ab623ea0c386b59ffa83371ab0a.
---
 srcpkgs/cinnamon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index e131aa18f76f..3f3949b3a631 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -11,7 +11,7 @@ makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
  startup-notification-devel pulseaudio-devel dbus-glib-devel
  libgnome-keyring-devel NetworkManager-devel libcroco-devel libsoup-devel
  cinnamon-desktop-devel"
-depends="accountsservice cinnamon-settings-daemon>=${version%.*}
+depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  cinnamon-session>=${version%.*} muffin>=${version%.*}
  cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
  cinnamon-translations>=${version%.*} nemo>=${version%.*}

From 9b61cbf53e20cc92e4d5b863216a6572f4c932ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 9 Oct 2021 15:19:07 -0300
Subject: [PATCH 1371/4088] cinnamon: actually restore libcaribou dependency

8dc4f50b6f43e65d170734e638f3e8fe76208ea5 was missing a revbump.
---
 srcpkgs/cinnamon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 3f3949b3a631..e2149fe4d8fd 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
 version=4.8.6
-revision=3
+revision=4
 build_helper=gir
 build_style=meson
 hostmakedepends="libtool pkg-config gobject-introspection gettext

From d8af6a1f063e550602f2fda370e31f9800802e97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 9 Oct 2021 14:45:08 -0400
Subject: [PATCH 1372/4088] caribou: rebuild for Python 3.10

Forgot to revbump 6d122ed99c830ef8767bb1b28f0c7e0ff47085c6.
---
 srcpkgs/caribou/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
index 626b357b9243..fbaa66126440 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -1,7 +1,7 @@
 # Template file for 'caribou'
 pkgname=caribou
 version=0.4.21
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module

From 1f955bca5e446dc121c3153766d30c14f79b9043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 10 Oct 2021 02:17:33 -0300
Subject: [PATCH 1373/4088] flinks: fix distfiles.

Use HTTP for now to work around outdated certificate:

   Certificate verification failed for /CN=mbays.freeshell.org
   SSL_connect returned 1
---
 srcpkgs/flinks/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/flinks/template b/srcpkgs/flinks/template
index cf92b29b69e2..bb21298ad50b 100644
--- a/srcpkgs/flinks/template
+++ b/srcpkgs/flinks/template
@@ -10,7 +10,8 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://mbays.freeshell.org/flinks/"
 changelog="https://mbays.freeshell.org/flinks/ChangeLog"
-distfiles="https://mbays.freeshell.org/flinks/flinks-${version}.tar.gz"
+# warning: using HTTP temporarily
+distfiles="http://mbays.freeshell.org/flinks/flinks-${version}.tar.gz"
 checksum=e2834ca2309cbc02693f9bdacd860045bb6d3a9ef8bd0a54ee2f1c373a366266
 
 post_install() {

From 664024b06ac8196ed0b50bb59357feecab6a515d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Oct 2021 15:19:02 +0200
Subject: [PATCH 1374/4088] iotop: upstream site seems to be dead, mirror
 distfile

---
 srcpkgs/iotop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 91eb75cffa62..7119d9420dcb 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -9,7 +9,8 @@ short_desc="View I/O usage of processes"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="http://guichaz.free.fr/iotop"
-distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"
+#distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"
+distfiles="https://void.johnnynator.dev/iotop-0.6.tar.bz2"
 checksum=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b
 
 post_install() {

From 42e6e066d7e31aebae9fe58d246f188bb2f9638b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 1375/4088] DarkRadiant: rebuild for Python 3.10

---
 srcpkgs/DarkRadiant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 0c656d3566eb..6741fc8bae37 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
 version=2.13.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config ruby-asciidoctor"

From 742e5dd9c01eeab91b5fb5cb93ee1d7a56138056 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Oct 2021 18:21:57 +0200
Subject: [PATCH 1376/4088] cross-x86_64-w64-mingw32: isl moved to sourceforge.

---
 srcpkgs/cross-x86_64-w64-mingw32/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index c32a573bf20a..816e6f1f68eb 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -26,7 +26,7 @@ distfiles="
  ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  ${GNU_SITE}/gmp/gmp-${_gmp_version}.tar.xz
  ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
- http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2
  ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
 checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf

From 6981854bb79d4f7564c77fffa68a88908d2d3ee8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Oct 2021 22:28:22 +0200
Subject: [PATCH 1377/4088] kubecfg: update to 0.22.0.

---
 srcpkgs/kubecfg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index d4b50d8de2b4..ccd329254670 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.21.0
+version=0.22.0
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=deb0fb737a5d792a7f8ef1b7ed1680f0ab318a5b79cddfd73c81b3119a555c36
+checksum=1a27df34f815069c843da18430bca2ae0aa7d3156ea17c5bd4efcfa23014b768

From 09d3f889e95641151cda1cc0822c2f6d0d93f7d2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Oct 2021 22:29:34 +0200
Subject: [PATCH 1378/4088] skaffold: update to 1.33.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index c8d001479675..4905e07f3e10 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.32.0
+version=1.33.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=ea33655b42aa6da98ad614042c1368bab802e2b1cc1b3c6b19b5abf41c341bf9
+checksum=9e29d015e6c3f7355ac4239014fdfcf8a53e1ee16c1fb49ebac08e0e053d14ca

From ac0bae74cbc943b7b2bdd500e0c8c9d760783599 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Oct 2021 17:51:57 +0200
Subject: [PATCH 1379/4088] oksh: update to 7.0.

---
 srcpkgs/oksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index 84e6085f54f0..d41bc21f75f3 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
 # Template file for 'oksh'
 pkgname=oksh
-version=6.9
+version=7.0
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/ibara/oksh"
 distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz"
-checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35
+checksum=21d5891f38ffea3a5d1aa8c494f0a5579c93778535e0a92275b102dec3221da1
 register_shell="/bin/oksh"
 
 alternatives="

From fe53ca33b4158647aa9aa633535fba01fa4aab88 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Oct 2021 17:56:56 +0200
Subject: [PATCH 1380/4088] babashka: update to 0.6.2.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 078786ee7db1..4d2c328489ed 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.6.1
+version=0.6.2
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=422bce7925b77cb4175e940d0d1d0f9439b46ad6
-_babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_sci_commit=9cd4b8b2eb9db2c1e9000813c58672e08b3957d9
+_babashka_curl_commit=bc021581ad89d70d456175179847abad047aa13c
+_babashka_nrepl_commit=eadb3330f0a65e781755d8b328727698f1d41fb0
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
 _process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=c86fa1bff9564f48b3513e4e4820840bc65c4188
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=4b53187be2b44ee799cc83c22b83519a1cf34692
+_fs_commit=1f0b8ff14ffce8024a4c2340d74d7998555f2123
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="396bb8a0165f78997f0147273883c3a3d163d55ff6f8b07239aa4afbaa918920
- 8dd8b42e64a6b6511c924696c4792c2e7a597b52c5107758fee83a5ccd42f142
- e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+checksum="a03bff53c1953dd2be34cb141213ffefbb3e73b2a300b1f55e7bc7680cf52515
+ 86988afc9f57ebf3c6465a0fb700bba43da03368bf093248f4c87171d9f70ad3
+ 83ec20e495efde12dd4cd24e786612f873fa7d627b9dd18e6b241e8d3e83f8dc
+ 916d9cc8c0a3b895a72068b95c6ac985a65d30465a9d556af8acea20aaaacc42
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
  dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 437a7d55dafe5df0bcb0ee0b15d4ef90ab9c5d30cbb43ccdb4de88c0ea55257b
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 0ce3635be4510570d3a9593d8c2b021da2090f4e3279b8401638b4703c25bed1
+ 5d5f3159a5c8455f2142fc78c80b1e6d32f942c2eb447767488fe71520194de2"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From 1fbac4614836e8753180830f4859d5380eeb03d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Oct 2021 15:51:29 -0400
Subject: [PATCH 1381/4088] gst1-python3: trigger rebuild

---
 srcpkgs/gst1-python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 3f85e16de418..bc826060b984 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,4 +1,4 @@
-# Template file for 'gst1-python3'
+# Template file for 'gst1-python3'.
 pkgname=gst1-python3
 version=1.18.4
 revision=2

From a7b9755a13b38c4e9784fec99f3b8143c70a4592 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 11 Oct 2021 23:38:16 +0200
Subject: [PATCH 1382/4088] yt-dlp: update to 2021.10.10.

---
 srcpkgs/yt-dlp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 5f3204cf2fb0..7fd4f85e5467 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,7 +1,7 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2021.09.25
-revision=2
+version=2021.10.10
+revision=1
 wrksrc="$pkgname"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=ae08e0b56fea59a8bfdadacd92eddc9bdfdc1473199178cb4e31bacfd991864a
+checksum=6d8faf0b6fced99213eeaa5450c2c9e4acbee78081a9f5c04933ea0d316994fb
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From e1088fef2d44888551047f9ab2a8f23777074c25 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Oct 2021 20:14:28 +0200
Subject: [PATCH 1383/4088] lowdown: update to 0.9.2.

---
 srcpkgs/lowdown/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 74eabe1c0a0c..c76c46601e44 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.9.0
+version=0.9.2
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=a35b5dd7345395479e02585ac51275192994bc1b3178aadee9a8bef340455c43
+checksum=5c355d1db2071916b1ad6e789208de664be3781bd17dd8b6b09b1707a283a988
 
 post_install() {
 	vlicense LICENSE.md

From d1a4a6dc412ab9f4761e9df12684e64849252964 Mon Sep 17 00:00:00 2001
From: Vilhelm Bergsoe <vilhelmbergsoe@gmail.com>
Date: Sun, 10 Oct 2021 22:33:35 +0200
Subject: [PATCH 1384/4088] betterlockscreen: update to 4.0.3

---
 srcpkgs/betterlockscreen/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template
index c0e5d710f151..bb02d9c0f01e 100644
--- a/srcpkgs/betterlockscreen/template
+++ b/srcpkgs/betterlockscreen/template
@@ -1,14 +1,14 @@
 # Template file for 'betterlockscreen'
 pkgname=betterlockscreen
-version=3.0.1
-revision=3
-depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb"
+version=4.0.3
+revision=1
+depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb xset"
 short_desc="Sweet looking lockscreen for linux system"
 maintainer="Aleksander Zien <Aleks@nderZien.com>"
 license="MIT"
 homepage="https://github.com/pavanjadhaw/betterlockscreen"
-distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/${version}.tar.gz"
-checksum=9b80af4b93e0b35bc916a584522ecf9eb39414c8010a2e4f2bb6941fdc5faf28
+distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${version}.tar.gz"
+checksum=d96fd64f1c94c91fec5d26b9665ba68f7f130c8a8612978ad9edbfa859710671
 
 do_install() {
 	vbin ${pkgname}

From 190375b69154b1e8ff7149a93f1719a1247ddc99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sun, 3 Oct 2021 15:03:40 +0200
Subject: [PATCH 1385/4088] New package: parpd-1.7

---
 srcpkgs/parpd/files/parpd.conf                |  1 +
 srcpkgs/parpd/files/parpd/run                 |  3 ++
 .../patches/0001-fix-building-on-musl.patch   | 24 +++++++++++
 .../0002-Linux-File-compile-warnings.patch    | 43 +++++++++++++++++++
 srcpkgs/parpd/template                        | 20 +++++++++
 5 files changed, 91 insertions(+)
 create mode 100644 srcpkgs/parpd/files/parpd.conf
 create mode 100644 srcpkgs/parpd/files/parpd/run
 create mode 100644 srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
 create mode 100644 srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
 create mode 100644 srcpkgs/parpd/template

diff --git a/srcpkgs/parpd/files/parpd.conf b/srcpkgs/parpd/files/parpd.conf
new file mode 100644
index 000000000000..926fc5f839d2
--- /dev/null
+++ b/srcpkgs/parpd/files/parpd.conf
@@ -0,0 +1 @@
+# see parpd.conf(5)
diff --git a/srcpkgs/parpd/files/parpd/run b/srcpkgs/parpd/files/parpd/run
new file mode 100644
index 000000000000..029dfdac68dd
--- /dev/null
+++ b/srcpkgs/parpd/files/parpd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec parpd ${OPTS:=-fl} 1>&2
diff --git a/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch b/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
new file mode 100644
index 000000000000..71d6efe01d33
--- /dev/null
+++ b/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
@@ -0,0 +1,24 @@
+From 466a788c7533b19f20f6d91514773e89e87f5f6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Wed, 6 Oct 2021 11:37:14 +0200
+Subject: [PATCH 1/2] fix building on musl
+
+---
+ parpd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/parpd.c b/parpd.c
+index a178696..19e266c 100644
+--- a/parpd.c
++++ b/parpd.c
+@@ -57,6 +57,7 @@ const char copyright[] = "Copyright (c) 2008-2017 Roy Marples";
+ #include <search.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <signal.h>
+ #include <string.h>
+ #include <syslog.h>
+ #include <unistd.h>
+-- 
+2.32.0
+
diff --git a/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch b/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
new file mode 100644
index 000000000000..c57b45e19d51
--- /dev/null
+++ b/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
@@ -0,0 +1,43 @@
+From 5b32ed79ccc1c9bb9a5bd815c28c4a4730cd1cc5 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 7 Oct 2019 15:07:25 +0100
+Subject: [PATCH 2/2] Linux: File compile warnings
+
+---
+ lpf.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lpf.c b/lpf.c
+index 36cbd1c..cfd517b 100644
+--- a/lpf.c
++++ b/lpf.c
+@@ -27,6 +27,7 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/uio.h>
+ 
+ #include <arpa/inet.h>
+ #include <net/if.h>
+@@ -91,7 +92,7 @@ bpf_open_arp(struct interface *ifp)
+ 	memset(&su, 0, sizeof(su));
+ 	su.sll.sll_family = PF_PACKET;
+ 	su.sll.sll_protocol = htons(ETH_P_ALL);
+-	su.sll.sll_ifindex = if_nametoindex(ifp->ifname);
++	su.sll.sll_ifindex = (int)if_nametoindex(ifp->ifname);
+ 	if (bind(s, &su.sa, sizeof(su.sll)) == -1)
+ 		goto eexit;
+ 
+@@ -140,7 +141,7 @@ bpf_read(struct interface *ifp, void *data, size_t len)
+ 	}
+ 	bytes -= ETHER_HDR_LEN;
+ 	if ((size_t)bytes > len)
+-		bytes = len;
+-	memcpy(data, ifp->buffer + ETHER_HDR_LEN, bytes);
++		bytes = (ssize_t)len;
++	memcpy(data, ifp->buffer + ETHER_HDR_LEN, (size_t)bytes);
+ 	return bytes;
+ }
+-- 
+2.32.0
+
diff --git a/srcpkgs/parpd/template b/srcpkgs/parpd/template
new file mode 100644
index 000000000000..0991d61360f8
--- /dev/null
+++ b/srcpkgs/parpd/template
@@ -0,0 +1,20 @@
+# Template file for 'parpd'
+pkgname=parpd
+version=1.7
+revision=1
+build_style=gnu-makefile
+make_install_args="BINDIR=/usr/bin"
+short_desc="RFC 1027 compliant Proxy ARP Daemon"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="BSD-2-Clause"
+homepage="https://roy.marples.name/projects/parpd/"
+distfiles="https://roy.marples.name/downloads/parpd/parpd-${version}.tar.xz"
+checksum=f1f2ed753243b86205922ab0ec1cd0f426779e6b8c273206f0568e819a3fe3b4
+conf_files=/etc/parpd.conf
+
+post_install() {
+	vsv parpd
+	vlicense LICENSE
+
+	vconf "${FILESDIR}/parpd.conf"
+}

From 099ef323ff23c54b01838b06e1ae35bd57b009a9 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Sun, 10 Oct 2021 18:16:46 -0600
Subject: [PATCH 1386/4088] goimapnotify: update to 2.3.7

---
 srcpkgs/goimapnotify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 262ed98857c9..4b54689a434d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,6 +1,6 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
-version=2.3.5
+version=2.3.7
 revision=1
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
@@ -11,4 +11,4 @@ license="GPL-3.0-only"
 homepage="https://gitlab.com/shackra/goimapnotify"
 changelog="https://gitlab.com/shackra/goimapnotify/blob/master/CHANGELOG.rst"
 distfiles="https://${go_import_path}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=71fd3e22b4a04c06c0789b36edc8815554ed4baeaae5a9290b1aba7bac91ec3a
+checksum=166f5f47aeda4a8ee986cefce32ef542cb2d581bf4196ef8da5daef01d06991d

From bf06c04e45f28d1720f73ad8f1c752174f568599 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Sun, 10 Oct 2021 21:14:47 +0200
Subject: [PATCH 1387/4088] vscode: update to 1.61.0

---
 srcpkgs/vscode/patches/disable-crash-reporter.patch | 12 ++++++------
 srcpkgs/vscode/patches/product.patch                |  4 ++--
 srcpkgs/vscode/template                             |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch
index 59553fabf753..17c0b0db545c 100644
--- a/srcpkgs/vscode/patches/disable-crash-reporter.patch
+++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch
@@ -14,7 +14,7 @@ So, disable it entirely. No cookies for you, Visual Studio Code team.
  3 files changed, 1 insertion(+), 20 deletions(-)
 
 diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
-index 55303d9a556..ead5d08663f 100644
+index f7b07e49255..576c82f23e8 100644
 --- a/src/bootstrap-fork.js
 +++ b/src/bootstrap-fork.js
 @@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) {
@@ -28,7 +28,7 @@ index 55303d9a556..ead5d08663f 100644
  require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']);
  
 diff --git a/src/main.js b/src/main.js
-index 9cf737e0649..1d779632498 100644
+index ad838aa245e..e6319e100b9 100644
 --- a/src/main.js
 +++ b/src/main.js
 @@ -46,22 +46,6 @@ const codeCachePath = getCodeCachePath();
@@ -55,13 +55,13 @@ index 9cf737e0649..1d779632498 100644
  // to ensure that no 'logs' folder is created on disk at a
  // location outside of the portable directory
 diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
-index 135f444bdbf..9d207a91bcf 100644
+index 1d71361b942..6452f501e34 100644
 --- a/src/vs/code/electron-main/app.ts
 +++ b/src/vs/code/electron-main/app.ts
-@@ -982,7 +982,7 @@ export class CodeApplication extends Disposable {
- 			const argvJSON = JSON.parse(stripComments(argvString));
+@@ -992,7 +992,7 @@ export class CodeApplication extends Disposable {
  			if (argvJSON['enable-crash-reporter'] === undefined) {
- 				const enableCrashReporterSetting = this.configurationService.getValue('telemetry.enableCrashReporter');
+ 				const telemetryConfig = getTelemetryLevel(this.configurationService);
+ 				const enableCrashReporterSetting = telemetryConfig >= TelemetryLevel.ERROR;
 -				const enableCrashReporter = typeof enableCrashReporterSetting === 'boolean' ? enableCrashReporterSetting : true;
 +				const enableCrashReporter = typeof enableCrashReporterSetting === 'boolean' ? enableCrashReporterSetting : false;
  				const additionalArgvContent = [
diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index 47440585d5de..827b90297879 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,5 +1,5 @@
 diff --git a/product.json b/product.json
-index 9010521ca351..3abefe7bd69a 100644
+index 7b60eac641d..c9aeeeecfe6 100644
 --- a/product.json
 +++ b/product.json
 @@ -22,6 +22,9 @@
@@ -23,4 +23,4 @@ index 9010521ca351..3abefe7bd69a 100644
 +	},
  	"builtInExtensions": [
  		{
- 			"name": "ms-vscode.node-debug",
+ 			"name": "ms-vscode.references-view",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 3244acb30a9a..2c7ec4950880 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.60.2
+version=1.61.0
 revision=1
 _electronver=13.3.0
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=34c6a974f95735c4f934c16837ec553613ba9a7f098876871471edcddbbd65a2
+checksum=68bff7284804054cdd38ae3984ecb2a23af86668e23ec2335440dc56a2d1e82a
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"

From e42ed85578638f5774f1c69c738f457a7039cf91 Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Thu, 7 Oct 2021 22:04:05 -0500
Subject: [PATCH 1388/4088] vmdfmt: update to v0.1.0

---
 srcpkgs/vmdfmt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 6b8be84ed05c..1771e944f834 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
-version=0.0.6
+version=0.1.0
 revision=1
 wrksrc="vmd-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="ISC"
 homepage="https://github.com/bobertlo/vmd"
 distfiles="https://github.com/bobertlo/vmd/archive/v${version}.tar.gz"
-checksum=3d696c45da7ddd8a0bf07eb9d74b4d9c7f48ff2d980cab3b168fb6f815430308
+checksum=b60cafbe6d6a1e2cfca16f12b28ac27bbc8a2b1ec3a2a4a77a048ba1cddf9b9c
 
 post_install() {
 	vlicense LICENSE

From 5bcc1f33ec0ba5a09a55889c937ae9b94025c53f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Oct 2021 10:20:29 +0300
Subject: [PATCH 1389/4088] goodvibes: update to 0.7.1 and adopt.

Also:
- change license (upstream change)
- remove amtk-devel from makedepends (upstream change, @paper42).
---
 srcpkgs/goodvibes/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 44ac0bf3836a..38ff5434a8e0 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,20 +1,20 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.6.3
+version=0.7.1
 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
+makedepends="dconf-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel libkeybinder3-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1  gst-plugins-ugly1"
 short_desc="Light and simple internet radio player"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-only"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/-/raw/master/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=8c22aedf839518fa4d4a82bfab4c6efee9c3054a4bc0d3f1bb1a7434ce843c5c
+checksum=5549e1601a6486eb7d705d4dcdd80827a2abaaa01c5c04f8438e26c24d4478b0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"

From 09b7b309261fada14b968e5d39d06c10c7d7edc2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 12 Oct 2021 10:40:05 +0200
Subject: [PATCH 1390/4088] neovim: fix python 3.10 detection

---
 srcpkgs/neovim/patches/python-3.10.patch | 23 +++++++++++++++++++++++
 srcpkgs/neovim/template                  |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/neovim/patches/python-3.10.patch

diff --git a/srcpkgs/neovim/patches/python-3.10.patch b/srcpkgs/neovim/patches/python-3.10.patch
new file mode 100644
index 000000000000..7ff1b17cc24f
--- /dev/null
+++ b/srcpkgs/neovim/patches/python-3.10.patch
@@ -0,0 +1,23 @@
+From e78fc38908dfb9f952e75026987f0db1f9ce4253 Mon Sep 17 00:00:00 2001
+From: "Tejasvi S. Tomar" <45873379+tejasvi@users.noreply.github.com>
+Date: Thu, 7 Oct 2021 11:41:52 +0530
+Subject: [PATCH] Fix python provider's minor version comparison
+
+`'3.10' < '3.3'` but v3.10 > v3.3
+---
+ runtime/autoload/provider/pythonx.vim | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
+index c292b374b6f5..0eeb35cba8f1 100644
+--- a/runtime/autoload/provider/pythonx.vim
++++ b/runtime/autoload/provider/pythonx.vim
+@@ -96,7 +96,7 @@ function! provider#pythonx#CheckForModule(prog, module, major_version) abort
+     if prog_version !~ '^' . a:major_version
+       return [0, prog_path . ' is Python ' . prog_version . ' and cannot provide Python '
+             \ . a:major_version . '.']
+-    elseif prog_version =~ '^' . a:major_version && prog_version < min_version
++    elseif prog_version =~ '^' . a:major_version && str2nr(prog_version[2:]) < str2nr(min_version[2:])
+       return [0, prog_path . ' is Python ' . prog_version . ' and cannot provide Python >= '
+             \ . min_version . '.']
+     endif
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 4e393c2c0b7a..bb22714097d4 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
 # Template file for 'neovim'
 pkgname=neovim
 version=0.5.1
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_BUILD_TYPE=Release"

From af3a155c416089f71620103bfbcba438f10a9b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Oct 2021 10:57:20 +0200
Subject: [PATCH 1391/4088] scummvm: update to 2.5.0.

scummvm now includes residualvm
---
 srcpkgs/residualvm                            |  1 +
 .../residualvm/patches/fluidsynth-2.1.patch   | 29 ------------
 srcpkgs/residualvm/template                   | 47 -------------------
 srcpkgs/residualvm/update                     |  2 -
 srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff | 25 ----------
 srcpkgs/scummvm/template                      | 17 ++++---
 6 files changed, 12 insertions(+), 109 deletions(-)
 create mode 120000 srcpkgs/residualvm
 delete mode 100644 srcpkgs/residualvm/patches/fluidsynth-2.1.patch
 delete mode 100644 srcpkgs/residualvm/template
 delete mode 100644 srcpkgs/residualvm/update
 delete mode 100644 srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff

diff --git a/srcpkgs/residualvm b/srcpkgs/residualvm
new file mode 120000
index 000000000000..f36c75d23fd7
--- /dev/null
+++ b/srcpkgs/residualvm
@@ -0,0 +1 @@
+scummvm
\ No newline at end of file
diff --git a/srcpkgs/residualvm/patches/fluidsynth-2.1.patch b/srcpkgs/residualvm/patches/fluidsynth-2.1.patch
deleted file mode 100644
index 4302d8cfac07..000000000000
--- a/srcpkgs/residualvm/patches/fluidsynth-2.1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/audio/softsynth/fluidsynth.cpp	2019-10-04 21:41:29.000000000 +0000
-+++ b/audio/softsynth/fluidsynth.cpp	2020-01-03 08:45:52.431870573 +0000
-@@ -20,10 +20,16 @@
-  *
-  */
- 
--#include "common/scummsys.h"
-+#include "config.h"
- 
- #ifdef USE_FLUIDSYNTH
- 
-+// Fluidsynth v2.1+ uses printf in one of it's headers,
-+// include/fluidsynth/log.h around line 82 so need to include this
-+// prior scummsys.h inclusion and thus forbidden.h
-+#include <fluidsynth.h>
-+
-+#include "common/scummsys.h"
- #include "common/config-manager.h"
- #include "common/error.h"
- #include "common/system.h"
-@@ -35,8 +41,6 @@
- #include "backends/platform/ios7/ios7_common.h"
- #endif
- 
--#include <fluidsynth.h>
--
- class MidiDriver_FluidSynth : public MidiDriver_Emulated {
- private:
- 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
deleted file mode 100644
index b0abb4052a9c..000000000000
--- a/srcpkgs/residualvm/template
+++ /dev/null
@@ -1,47 +0,0 @@
-# Template file for 'residualvm'
-pkgname=residualvm
-version=0.3.1
-revision=5
-build_style=configure
-configure_args="--prefix=/usr --enable-all-engines --enable-release
- --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
-hostmakedepends="pkg-config"
-makedepends="SDL2-devel libvorbis-devel libmad-devel libjpeg-turbo-devel
- libpng-devel libtheora-devel zlib-devel libmpeg2-devel freetype-devel
- glew-devel libflac-devel fluidsynth-devel faad2-devel $(vopt_if sndio sndio-devel)"
-short_desc="Cross-platform 3D game interpreter"
-maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause, ISC, MIT, Zlib"
-homepage="https://www.residualvm.org/"
-distfiles="https://www.residualvm.org/downloads/release/${version}/residualvm-${version}-sources.tar.bz2"
-checksum=f50c83bbc55a8121eefc279e83982b6ec590e608e145b7f750006619dd0bf9e9
-
-build_options="sndio"
-build_options_default="sndio"
-
-if [ -n "$CROSS_BUILD" ]; then
-	configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
-
-	pre_configure() {
-		# - sdl-config wrapper already sets --prefix
-		# - freetype-config wrapper already sets --prefix
-		vsed -e "s;_ranlib=ranlib;_ranlib=${XBPS_CROSS_TRIPLET}-ranlib;" \
-		 -e "s;_strip=strip;_strip=${XBPS_CROSS_TRIPLET}-strip;" \
-		 -e "s;_ar=\"ar cru\";_ar=\"${XBPS_CROSS_TRIPLET}-ar cru\";" \
-		 -e "s;_as=\"as\";_as=\"${XBPS_CROSS_TRIPLET}-as\";" \
-		 -e 's;--prefix="$_sdlpath";;' \
-		 -e 's;--prefix="$_freetypepath";;' \
-		 -e "s;^_host_cpu=\"\";_host_cpu=\"${XBPS_TARGET_MACHINE}\";" \
-		 -e 's;^_host_os="";_host_os="linux";' \
-		 -i configure
-	}
-fi
-
-post_install() {
-	# move licenses to the right place
-	vmkdir usr/share/licenses/residualvm
-	mv ${DESTDIR}/usr/share/doc/residualvm/COPYING* ${DESTDIR}/usr/share/licenses/residualvm/
-	vlicense COPYING.BSD
-	vlicense COPYING.ISC
-	vlicense COPYING.MIT
-}
diff --git a/srcpkgs/residualvm/update b/srcpkgs/residualvm/update
deleted file mode 100644
index 6c45ed9186c0..000000000000
--- a/srcpkgs/residualvm/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://www.residualvm.org/downloads/"
-pattern="residualvm-\K[\d.]+(?=-sources)"
diff --git a/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff b/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff
deleted file mode 100644
index c7c9b50d4887..000000000000
--- a/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -144,11 +144,11 @@
- 	return p;
- }
- 
--static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
-+static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void *handle) {
- 	return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED;
- }
- 
--static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
-+static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, int origin) {
- 	return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED;
- }
- 
-@@ -157,7 +157,7 @@
- 	return FLUID_OK;
- }
- 
--static long SoundFontMemLoader_tell(void *handle) {
-+static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
- 	return ((Common::SeekableReadStream *) handle)->pos();
- }
- #endif
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 0cec3ab176d7..e3ff00792958 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,21 +1,20 @@
 # Template file for 'scummvm'
 pkgname=scummvm
-version=2.2.0
-revision=2
+version=2.5.0
+revision=1
 build_style=configure
-configure_args="--prefix=/usr --enable-release-mode
- --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
+configure_args="--prefix=/usr --enable-release-mode"
 hostmakedepends="pkg-config nasm"
 makedepends="zlib-devel libpng-devel SDL2-devel libmad-devel faad2-devel
  fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel
  freetype-devel libjpeg-turbo-devel libcurl-devel SDL2_net-devel
- libmpeg2-devel liba52-devel"
+ libmpeg2-devel liba52-devel gtk+3-devel"
 short_desc="Free implementation of LucasArts' SCUMM interpreter"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.scummvm.org/"
 distfiles="https://downloads.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387
+checksum=b47ee4b195828d2c358e38a4088eda49886dc37a04f1cc17b981345a59e0d623
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*);;
@@ -29,3 +28,9 @@ fi
 do_check() {
 	make test
 }
+
+residualvm_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}

From 5b5f821bee1d68d5baa77b6eb76459337cd3bedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 10 Oct 2021 17:16:28 -0300
Subject: [PATCH 1392/4088] python3-sympy: update to 1.9.

---
 srcpkgs/python3-sympy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template
index 5f553a6f527e..807f0db5f1a2 100644
--- a/srcpkgs/python3-sympy/template
+++ b/srcpkgs/python3-sympy/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-sympy'
 pkgname=python3-sympy
-version=1.8
-revision=2
+version=1.9
+revision=1
 wrksrc="sympy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-mpmath"
+depends="python3-mpmath"
 checkdepends="python3-mpmath"
 short_desc="Computer algebra system for Python3"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://sympy.org/"
 distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz"
-checksum=1ca588a9f6ce6a323c5592f9635159c2093572826668a1022c75c75bdf0297cb
+checksum=c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc
 
 post_install() {
 	vman doc/man/isympy.1

From bfe23cbdf754d17888c25f6d2c4f5c1d65cf2aec Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel.chotai@hyperexponential.com>
Date: Fri, 8 Oct 2021 17:21:04 +0100
Subject: [PATCH 1393/4088] Solaar: update to 1.0.7

---
 srcpkgs/Solaar/INSTALL.msg | 3 +++
 srcpkgs/Solaar/template    | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/Solaar/INSTALL.msg

diff --git a/srcpkgs/Solaar/INSTALL.msg b/srcpkgs/Solaar/INSTALL.msg
new file mode 100644
index 000000000000..7596828f668a
--- /dev/null
+++ b/srcpkgs/Solaar/INSTALL.msg
@@ -0,0 +1,3 @@
+To use Solaar without root privileges, copy the file
+    /usr/share/solaar/udev-rules.d/42-logitech-unify-permissions.rules
+into the directory /etc/udev/rules.d/ and reload udev rules.
diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template
index 689322c13dd9..9377d7a11fa6 100644
--- a/srcpkgs/Solaar/template
+++ b/srcpkgs/Solaar/template
@@ -1,7 +1,7 @@
 # Template file for 'Solaar'
 pkgname=Solaar
-version=1.0.6
-revision=2
+version=1.0.7
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyudev python3-psutil python3-yaml python3-xlib"
@@ -10,6 +10,6 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://pwr-solaar.github.io/Solaar/"
 distfiles="https://github.com/pwr-Solaar/Solaar/archive/${version}.tar.gz"
-checksum=fb879136911978f8f0183262a86f2b47a50b1816516599ae9a6681ad1d9a4e49
+checksum=39c025b4186b6cb4620bc52d1d20e2d841082982c8be0fed155398faee7a9cd1
 # Package provides no tests
 make_check=no

From 5a7c911d17fd816a6e47a2b8e1cb0436c1649c46 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Oct 2021 12:37:05 +0200
Subject: [PATCH 1394/4088] erlang: update to 24.1.2.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 9cc54fe8fb3c..3a4883b93086 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.1.1
+version=24.1.2
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=96a9ffd0ce529dda8bb98eb3e607994fe9f67c1abb3fc1cca545826ad088358d
+checksum=c141a046bb7184a7bb5c3d6da2ed013e465d1fbe4ff5cd16e0fbb7a0e786a152
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 48210c2fedcac95f45321e441bfce3a63299fcf1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Oct 2021 16:08:54 +0200
Subject: [PATCH 1395/4088] stress-ng: update to 0.13.05.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6e2525435499..8d3e2236c941 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.04
+version=0.13.05
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=0277943033fc9750aa869b3fa109663f3540d233a3ddc300d3a869ecbd56f451
+checksum=f058c8fba37596ab32c3a4b2aedbdbf5f2b8a8ba1d312059e733290543ad00ac

From fa7641c2365a46ecc7a30c89816ed942fb21c186 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Tue, 12 Oct 2021 18:59:48 +0200
Subject: [PATCH 1396/4088] backintime: update to 1.3.1., import py 3.10 patch

closes #33503
---
 ...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 +++++++++++++++++++
 srcpkgs/backintime/template                   |  8 +--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch

diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
new file mode 100644
index 000000000000..e6a871e962d3
--- /dev/null
+++ b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
@@ -0,0 +1,51 @@
+From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
+From: Germar Reitze <germar.reitze@gmail.com>
+Date: Mon, 5 Jul 2021 19:11:58 +0200
+Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
+
+---
+ CHANGES         | 5 ++++-
+ common/tools.py | 7 +++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/CHANGES b/CHANGES
+index c01501f2..0eb5b489 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -1,7 +1,10 @@
+ Back In Time
+ 
++Version 1.3.2
++* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
++
+ Version 1.3.1
+-* bump version, forgot to push branch to Github before releasing 
++* bump version, forgot to push branch to Github before releasing
+ 
+ Version 1.3.0
+ * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
+diff --git a/common/tools.py b/common/tools.py
+index 528da707..12645224 100644
+--- a/common/tools.py
++++ b/common/tools.py
+@@ -25,7 +25,10 @@
+ import errno
+ import gzip
+ import tempfile
+-import collections
++try:
++    from collections.abc import MutableSet
++except ImportError:
++    from collections import MutableSet
+ import hashlib
+ import ipaddress
+ import atexit
+@@ -1802,7 +1805,7 @@ def reset(self, path):
+         self.history = [path,]
+         self.index = 0
+ 
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(MutableSet):
+     """
+     OrderedSet from Python recipe
+     http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index d663eec211e4..9763814a1350 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,7 +1,7 @@
 # Template file for 'backintime'
 pkgname=backintime
-version=1.2.1
-revision=3
+version=1.3.1
+revision=1
 configure_args="--python3"
 pycompile_dirs="/usr/share/backintime"
 hostmakedepends="gettext python3"
@@ -10,8 +10,8 @@ short_desc="Simple backup tool for Linux"
 maintainer="Alpicoid <alpicoid@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
-checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644
+distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
+checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
 python_version=3
 
 do_configure() {

From 3ff02fa101f49f0af4e73382f7a94ff73d8865a2 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Tue, 12 Oct 2021 19:07:42 +0200
Subject: [PATCH 1397/4088] qt6-base: actually create
 qt6-plugin-networkinformation plugin

closes #33445
---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 3c7ba930d920..4fea74a5b09a 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -222,7 +222,7 @@ qt6-plugin-tls-qcertonly_package() {
 	}
 }
 
-qt6-plugin-networkinformation() {
+qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
 		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so

From fd519714e03d2cef44e48a3c8e39e14646eb3c96 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 11 Oct 2021 18:05:54 +0200
Subject: [PATCH 1398/4088] linux5.4: update to 5.4.152.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 679cb6a661ff..a431a16b557c 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.151
+version=5.4.152
 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=bbe73fb83c31a6a7269de85b6b2bbd54dd31e6613f4edab20bb7a6f37cf53313
+checksum=8044c7134c5eed21af9662f1c5399a5d8781b5bc2d8979e9ad06b4435a0a5ed5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From bc0caa240791846d50e5e11d837f25fae7e0ebcf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 11 Oct 2021 18:08:50 +0200
Subject: [PATCH 1399/4088] linux4.19: update to 4.19.210.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b780f4fdf046..1b0298f63b59 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.209
+version=4.19.210
 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=7327d5b92e60b0134488c9bec463ef3d252ea49ac718117b37e80a8e5f87e913
+checksum=9ba722594a5a5444df19510925df7b6b76cbf20ab4dc54e57f1c3e4da4116133
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 416084e7b0400d0ec9fe87c149424612c3c27583 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 12 Oct 2021 19:14:30 +0200
Subject: [PATCH 1400/4088] libkdcraw5: update to 21.08.2.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index e8bff51be24c..3630adfa4380 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.1
+version=21.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=95d7c72853e1529391c105b4d2c2ae2dc2a3aeb43f34db6a28a86628e9bb329e
+checksum=a83969796b51a68766b290b9ed3ace394952c230cfd79dc2b7f1c57be8cf0c7a
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ab1729c28a82feb5146ba112a84764a849d12a67 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 12 Oct 2021 19:25:26 +0200
Subject: [PATCH 1401/4088] gwenview: update to 21.08.2.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index d173352578aa..8a1a3a502514 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -16,4 +16,4 @@ 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=40a1fdb2b940928eda673df641de43c39b8e26c7fd52ba05d800fc7004caeba0
+checksum=8e2d0576cefd57582c708360161af7fca286b58df1df9ee41f7f9307bcb22f7a

From ca48885ff3b5f31c4857c79c8ed63dc45130aa25 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Oct 2021 19:37:49 +0200
Subject: [PATCH 1402/4088] vscode: do not download prebuilt ripgrep

This unbreaks ppc64le at least.
---
 srcpkgs/vscode/patches/ripgrep.patch | 30 ++++++++++++++++++++++++++++
 srcpkgs/vscode/template              |  4 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vscode/patches/ripgrep.patch

diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
new file mode 100644
index 000000000000..a00a0e348168
--- /dev/null
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -0,0 +1,30 @@
+Ping q66 if this needs updating.
+
+This prevents vscode from fetching prebuilt ripgrep from Microsoft
+during build, which unbreaks build on platforms where MS deos not
+ship a prebuilt ripgrep.
+
+--- a/package.json
++++ b/package.json
+@@ -82,7 +82,7 @@
+     "vscode-oniguruma": "1.5.1",
+     "vscode-proxy-agent": "^0.11.0",
+     "vscode-regexpp": "^3.1.0",
+-    "vscode-ripgrep": "^1.12.1",
++    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
+     "vscode-textmate": "5.4.0",
+     "xterm": "4.15.0-beta.3",
+     "xterm-addon-search": "0.9.0-beta.5",
+diff --git a/remote/package.json b/remote/package.json
+index b0bff62..88a036e 100644
+--- a/remote/package.json
++++ b/remote/package.json
+@@ -22,7 +22,7 @@
+     "vscode-oniguruma": "1.5.1",
+     "vscode-proxy-agent": "^0.11.0",
+     "vscode-regexpp": "^3.1.0",
+-    "vscode-ripgrep": "^1.12.1",
++    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
+     "vscode-textmate": "5.4.0",
+     "xterm": "4.15.0-beta.3",
+     "xterm-addon-search": "0.9.0-beta.5",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 2c7ec4950880..0f7846816b50 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -3,7 +3,7 @@ pkgname=vscode
 version=1.61.0
 revision=1
 _electronver=13.3.0
-hostmakedepends="pkg-config python nodejs yarn tar git"
+hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
 makedepends="libxkbfile-devel libsecret-devel electron13"
 depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
 short_desc="Microsoft Code for Linux"
@@ -45,7 +45,7 @@ do_build() {
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
-	yarn install --ignore-engines --frozen-lockfile --arch=x64
+	yarn install --ignore-engines --arch=x64
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min
 }

From 476484e75b02aa843c316162d12b028eda9a8a39 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Oct 2021 20:14:36 +0200
Subject: [PATCH 1403/4088] vscode: nocross

---
 srcpkgs/vscode/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 0f7846816b50..102635ef5d5d 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -12,6 +12,7 @@ license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
 checksum=68bff7284804054cdd38ae3984ecb2a23af86668e23ec2335440dc56a2d1e82a
+nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"

From 1edb7732845e984ece0a8ad2e44a8fa25c7b704d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 12 Oct 2021 20:19:31 +0200
Subject: [PATCH 1404/4088] wine: update to 6.19.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch |  4 ++--
 srcpkgs/wine/patches/musl-uid-t.patch        | 11 +++++++++++
 srcpkgs/wine/template                        |  6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/wine/patches/musl-uid-t.patch

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0d1ac0899da3..5b0a33ef4451 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.18/dlls/dnsapi/libresolv.c
-+++ b/wine-6.18/dlls/dnsapi/libresolv.c
+--- a/wine-6.19/dlls/dnsapi/libresolv.c
++++ b/wine-6.19/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
new file mode 100644
index 000000000000..b032d69fb1ce
--- /dev/null
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -0,0 +1,11 @@
+--- a/wine-6.19/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-6.19/server/security.h	2021-10-12 19:53:08.605490926 +0200
+@@ -21,6 +21,8 @@
+ #ifndef __WINE_SERVER_SECURITY_H
+ #define __WINE_SERVER_SECURITY_H
+ 
++#include<unistd.h>
++
+ extern const LUID SeIncreaseQuotaPrivilege;
+ extern const LUID SeSecurityPrivilege;
+ extern const LUID SeTakeOwnershipPrivilege;
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index da66f6e841bc..173ed8b30ead 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.18
+version=6.19
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="fd22e8d64d7333bda4096d73e87ca88f5dd9eda92103d8f79d0673ca7ce6b1d0
- 6d252d3501431b241a2e37d841e287918b51889917b07382ed204703fb77cae4"
+checksum="4182e2d9627704cc376f46fc3109580ea9077796f44f5ee83e08e3e96bf0ab66
+ 47158842c938f68d9097965135321892515bb7f133c88be469c91f845f942ac3"
 
 build_options="mingw staging"
 build_options_default="mingw"

From f3ffb73b2713c6f63eefe9f7009dc24e21d3a71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 12 Oct 2021 18:48:59 +0200
Subject: [PATCH 1405/4088] gitui: update to 0.18.0.

---
 srcpkgs/gitui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 69646a938e3d..069d77dbe999 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,6 +1,6 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.17.1
+version=0.18.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 changelog="https://github.com/extrawurst/gitui/blob/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
-checksum=36821f83d67a1233e10daa51178c03250618964ca5a5b8c001ac338bf7a355f5
+checksum=7c8d5829fc8e555d02c576ba0325f0a68114c1fd2eadf17166a3bda866f539be
 
 post_install() {
 	vlicense LICENSE.md

From 532844e1be334c76e6b3574f9d05654ac5637421 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 12 Oct 2021 15:36:33 +0200
Subject: [PATCH 1406/4088] praat: update to 6.1.54

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 9ace8e337b59..9d574875bd7b 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.53
+version=6.1.54
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=9d3ee242533194cd22945c42eb6ff8fc3b8f829d4c4f2bef6483f8a892f8cf00
+checksum=ffd4a2c482d2bc561409ebf7688ca1408e9fe25b0f2a8338e5d190043ddcc689
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From 2da61e323ca69bc1aa31fca3393c40f8b668d315 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 12 Oct 2021 15:38:41 +0200
Subject: [PATCH 1407/4088] python3-pikepdf: update to 3.2.0.

---
 srcpkgs/python3-pikepdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 25e55edf1133..8a7e57ed946d 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=3.1.0
-revision=2
+version=3.2.0
+revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
 hostmakedepends="python3-pybind11 python3-setuptools_scm python3-wheel"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=aeb813b5f36534d2bedf08487ab2b022c43f4c8a3e86e611c5f7c8fb97309db5
+checksum=a0582f00440668c07edb8403e82724961c7812c8e6c30655e34825b2645f15cd
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From b075cbcf9998593a5fe072cee34f1128b5ceba26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 12 Oct 2021 17:10:20 +0200
Subject: [PATCH 1408/4088] geany: update to 1.38.

---
 srcpkgs/geany/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 4a3ac7f2ac9e..be726f7817a4 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,6 +1,6 @@
 # Template file for 'geany'
 pkgname=geany
-version=1.37.1
+version=1.38
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vte --enable-gtk3"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.geany.org"
 changelog="https://raw.githubusercontent.com/geany/geany/master/NEWS"
 distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18
+checksum=abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546
 python_version=3
 
 pre_configure() {

From 6d514522f87144656af8232ecb6d1bb61e11be5d Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sun, 10 Oct 2021 20:22:56 +0700
Subject: [PATCH 1409/4088] vivaldi: update to 4.3.2439.44

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 7cb5236a6097..183b8d18a591 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=4.3.2439.39
+version=4.3.2439.44
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=91353cc0e566dea6ff06043700bfbfc542958136091929bdc86d0d9a589c5445
+checksum=09c26ecc2868bfbb22333b8791cb29aec65baf31b8d514c0250e0da2bb425daf
 repository=nonfree
 restricted=yes
 nostrip=yes

From b1a5e61daa0d6659d7dbfb648fc791bfbe0f0caf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Oct 2021 16:18:07 +0300
Subject: [PATCH 1410/4088] growlight: update to 1.2.37.

---
 srcpkgs/growlight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 942222435ec4..40c5f2e94e36 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.36
+version=1.2.37
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=d4f5c28230d714e9941f50b38ccf9b72f76bfed719c89058d391de8cca55f43c
+checksum=82a349b623dcfd5db6dc56332f52a2c605775dba31f926576466e9896240a090
 
 build_options="man zfs"
 

From 17b729795fddbc03954cc315a5d22875b68bab3b Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Tue, 12 Oct 2021 16:50:13 +1100
Subject: [PATCH 1411/4088] deadbeef: update to 1.8.8

---
 srcpkgs/deadbeef/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index 5666c1d97c92..159ad1ce38bc 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,6 +1,6 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.7
+version=1.8.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
@@ -16,15 +16,15 @@ short_desc="Ultimate Music Player for GNU/Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
 _apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
-_mp4p_commit=f111d7aa10d4516f5e02465245e9202db83b7c10
+_mp4p_commit=77ac9f2ecaa3a2f6e232fb45cd7f8550e13cc3d3
 homepage="https://deadbeef.sourceforge.io"
 changelog="https://deadbeef.sourceforge.io/news0.html"
 distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
  https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
  https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
-checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27
+checksum="a667d55b787d76bc9d3593882b57ae9a449a99e93e1c11f85ec638566e10877d
  c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
- 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d"
+ d0ba1b4ad062cb5c056c4a59ed55769d79371fc9b3bf9aaa0ca48f508e3eba75"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 # The soundtouchup plugin was made default in 1.8.4 and fails to build on i686.

From 9e7f31b6a045c5e3d254e44eacb8b7f38465e79f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 12 Oct 2021 13:14:40 -0500
Subject: [PATCH 1412/4088] python3-blessed: update to 1.19.0.

---
 srcpkgs/python3-blessed/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index f646113f9cf6..a73cea37a04e 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-blessed'
 pkgname=python3-blessed
-version=1.18.1
-revision=2
+version=1.19.0
+revision=1
 wrksrc="blessed-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/jquast/blessed"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b53b132d49db9308feaa0b83b49ae4a319dc181f90eb17bdab7d7cf166f102b
+checksum=1a3b5cd5b441bb5f35a269cd6d7b32c88c39f65170b6bfe4de3c8808b7ed131c
 
 post_install() {
 	vlicense LICENSE

From 97acee9b3b767eb77749770537d67fc0b2dbbfc5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 12 Oct 2021 13:15:49 -0500
Subject: [PATCH 1413/4088] libxlsxwriter: update to 1.1.4.

---
 common/shlibs                  | 2 +-
 srcpkgs/libxlsxwriter/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eda1db94ebf4..6956eef1225e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.3 libxlsxwriter-1.1.3_1
+libxlsxwriter.so.4 libxlsxwriter-1.1.4_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 2d528ae9aa26..d4223b858fa8 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.3
+version=1.1.4
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=bd7a3d38c6a8ef5e31d07a61fded23ac00d29d758417ca42db89da60bf796d78
+checksum=b379eb35fdd9c653ebe72485b9c992f612c7ea66f732784457997d6e782f619b
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From 11cb4fc17f1cc4a7a14337942f76cca46f69cf18 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 12 Oct 2021 13:16:00 -0500
Subject: [PATCH 1414/4088] sc-im: rebuild for libxlsxwriter

---
 srcpkgs/sc-im/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index ecb412ed9158..f2900d5ca98f 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,7 +1,7 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=3
+revision=4
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"

From 88d1f8f8ee70d76e84816acdf4f9ea34aca10e6a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 11 Oct 2021 10:20:38 -0400
Subject: [PATCH 1415/4088] atop: update to 2.6.0.

---
 srcpkgs/atop/patches/atop-bb-compat.patch    | 28 ++++++--------------
 srcpkgs/atop/patches/fix-cflags.patch        | 11 --------
 srcpkgs/atop/patches/musl-fix-includes.patch | 20 +++++++-------
 srcpkgs/atop/template                        |  5 ++--
 4 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/atop/patches/fix-cflags.patch

diff --git a/srcpkgs/atop/patches/atop-bb-compat.patch b/srcpkgs/atop/patches/atop-bb-compat.patch
index 20f849e97b9d..5995eb4a0392 100644
--- a/srcpkgs/atop/patches/atop-bb-compat.patch
+++ b/srcpkgs/atop/patches/atop-bb-compat.patch
@@ -1,36 +1,24 @@
-diff --git atop.daily atop.daily
-index c72214c..ac4b3b7 100755
---- a/atop.daily
-+++ b/atop.daily
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- CURDAY=`date +%Y%m%d`
- LOGPATH=/var/log/atop
- BINPATH=/usr/bin
-@@ -7,15 +7,20 @@ INTERVAL=600		# interval 10 minutes
+--- a/atop.daily	2021-10-11 10:06:37.318316573 -0400
++++ b/atop.daily	2021-10-11 10:10:51.593483875 -0400
+@@ -30,13 +30,18 @@
  
  # verify if atop still runs for daily logging
  #
--if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null
+-if [ -e "$PIDFILE" ] && ps -p `cat "$PIDFILE"` | grep 'atop$' > /dev/null
 +pid=
 +if [ -e $PIDFILE ]; then
-+       pid=$(cat $PIDFILE)
++	pid=$(cat $PIDFILE)
 +fi
 +
 +if [ -n "$pid" ] && [ -d /proc/$pid ]
  then
--	kill -USR2 `cat $PIDFILE`       # final sample and terminate
+-	kill -USR2 `cat "$PIDFILE"`       # final sample and terminate
 +	kill -USR2 $pid       # final sample and terminate
  
  	CNT=0
  
--	while ps -p `cat $PIDFILE` > /dev/null
+-	while ps -p `cat "$PIDFILE"` > /dev/null
 +	while [ -d /proc/$pid ]
  	do
--		let CNT+=1
-+		CNT=$(($CNT + 1))
+ 		CNT=$((CNT + 1))
  
- 		if [ $CNT -gt 5 ]
- 		then
diff --git a/srcpkgs/atop/patches/fix-cflags.patch b/srcpkgs/atop/patches/fix-cflags.patch
deleted file mode 100644
index 3838a87a5a14..000000000000
--- a/srcpkgs/atop/patches/fix-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2016-02-26 23:20:11.536799936 +0100
-+++ b/Makefile	2016-02-26 23:20:19.545799337 +0100
-@@ -39,7 +39,7 @@ atopacctd:	atopacctd.o netlink.o
- 		$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
- 
- netlink.o:	netlink.c
--		$(CC) -I. -Wall -c netlink.c
-+		$(CC) -I. -Wall -c netlink.c $(CFLAGS)
- 
- clean:
- 		rm -f *.o
diff --git a/srcpkgs/atop/patches/musl-fix-includes.patch b/srcpkgs/atop/patches/musl-fix-includes.patch
index eac397fec348..0fc1f0520ef2 100644
--- a/srcpkgs/atop/patches/musl-fix-includes.patch
+++ b/srcpkgs/atop/patches/musl-fix-includes.patch
@@ -1,13 +1,3 @@
---- a/deviate.c
-+++ b/deviate.c
-@@ -178,6 +178,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <limits.h>
- #include <memory.h>
 --- a/procdbase.c
 +++ b/procdbase.c
 @@ -67,7 +67,7 @@
@@ -19,3 +9,13 @@
  
  #include "atop.h"
  #include "photoproc.h"
+--- a/photosyst.c	2021-10-11 10:19:03.436752176 -0400
++++ b/photosyst.c	2021-10-11 10:19:17.451816812 -0400
+@@ -165,6 +165,7 @@
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/sysmacros.h>
++#include <limits.h>
+ 
+ #define SCALINGMAXCPU	8	// threshold for scaling info per CPU
+ 
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 8c981e657879..eec97dfae5fa 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -1,6 +1,6 @@
 # Template file for 'atop'
 pkgname=atop
-version=2.5.0
+version=2.6.0
 revision=1
 build_style=gnu-makefile
 make_install_target="sysvinstall"
@@ -10,8 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.atoptool.nl/"
 distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
-checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
-python_version=2 #unverified
+checksum=9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72
 
 make_dirs="/var/log/atop 755 root root"
 

From 5c5cb88b73ad5b864d0186972d949313505f211a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 11 Oct 2021 16:22:35 +0300
Subject: [PATCH 1416/4088] qt5ct: update to 1.5.

---
 srcpkgs/qt5ct/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..a3967cb6893d 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.5
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=d63d0ce16e02427207d86531f70a71c5b9c850044dd5b2dcb2285531f416e490
 
 post_install() {
 	vlicense COPYING

From 07244f13e520309148e2eb31cf73def66d55c513 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 11 Oct 2021 09:12:16 -0400
Subject: [PATCH 1417/4088] codelite: update to 15.0.6.

---
 srcpkgs/codelite/patches/92ed90e07.patch | 48 ----------------------
 srcpkgs/codelite/patches/musl.patch      | 52 ++++++++++++++----------
 srcpkgs/codelite/template                | 30 +++++---------
 3 files changed, 41 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/codelite/patches/92ed90e07.patch

diff --git a/srcpkgs/codelite/patches/92ed90e07.patch b/srcpkgs/codelite/patches/92ed90e07.patch
deleted file mode 100644
index 5a469602e40f..000000000000
--- a/srcpkgs/codelite/patches/92ed90e07.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 92ed90e07774dfc8556bee02c66120eed4938a40 Mon Sep 17 00:00:00 2001
-From: dghart <dghart david@4Pane.co.uk>
-Date: Wed, 19 Jun 2019 11:23:38 +0100
-Subject: [PATCH] Compilation fix for wx3.0 gtk+3 builds
-
----
- codelite_terminal/TextView.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/codelite_terminal/TextView.cpp b/codelite_terminal/TextView.cpp
-index 83d2e260c..5966f9972 100644
---- a/codelite_terminal/TextView.cpp
-+++ b/codelite_terminal/TextView.cpp
-@@ -12,7 +12,11 @@ TextView::TextView(wxWindow* parent, wxWindowID winid)
-     m_ctrl->SetCaretStyle(wxSTC_CARETSTYLE_BLOCK);
-     m_ctrl->SetYCaretPolicy(wxSTC_CARET_STRICT | wxSTC_CARET_SLOP, 4);
-     m_ctrl->SetLexer(wxSTC_LEX_CONTAINER);
-+#if wxCHECK_VERSION(3, 1, 1)
-     m_ctrl->StartStyling(0);
-+#else
-+    m_ctrl->StartStyling(0, 0x1f);
-+#endif
-     m_ctrl->SetWrapMode(wxSTC_WRAP_CHAR);
- #else
-     m_ctrl = new TextCtrl_t(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize,
-@@ -61,7 +65,11 @@ void TextView::SetDefaultStyle(const wxTextAttr& attr)
- {
- #if USE_STC
-     m_defaultAttr = attr;
-+#if wxCHECK_VERSION(3, 1, 1)
-     m_ctrl->StartStyling(m_ctrl->GetLastPosition());
-+#else
-+    m_ctrl->StartStyling(m_ctrl->GetLastPosition(), 0x1f);
-+#endif
- #else
-     m_ctrl->SetDefaultStyle(attr);
- #endif
-@@ -210,6 +218,10 @@ void TextView::Clear()
- #if USE_STC
-     m_ctrl->ClearAll();
-     m_ctrl->ClearDocumentStyle();
-+#if wxCHECK_VERSION(3, 1, 1)
-     m_ctrl->StartStyling(0);
-+#else
-+    m_ctrl->StartStyling(0, 0x1f);
-+#endif
- #endif
- }
diff --git a/srcpkgs/codelite/patches/musl.patch b/srcpkgs/codelite/patches/musl.patch
index d911036ddb94..6dfbdb42152f 100644
--- a/srcpkgs/codelite/patches/musl.patch
+++ b/srcpkgs/codelite/patches/musl.patch
@@ -1,36 +1,42 @@
---- a/codelitegcc/main.cpp	2019-06-29 08:37:38.818622077 +0200
-+++ b/codelitegcc/main.cpp	2019-06-29 08:38:04.090937646 +0200
-@@ -33,6 +33,7 @@ extern int ExecuteProcessWIN(const std::
- #include <sys/file.h>
- #include <sys/stat.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- 
- void WriteContent( const std::string& logfile, const std::string& filename, const std::string& flags )
- {
---- a/sdk/codelite_indexer/libctags/read.c	2019-06-29 08:54:26.592208449 +0200
-+++ b/sdk/codelite_indexer/libctags/read.c	2019-06-29 08:56:18.688608501 +0200
-@@ -605,6 +605,9 @@ extern int readChars (char *buffer, size
+diff --git a/codelitegcc/main.cpp b/codelitegcc/main.cpp
+index 1b78e0825..a4ffdc3e7 100644
+--- a/codelitegcc/main.cpp
++++ b/codelitegcc/main.cpp
+@@ -33,6 +33,7 @@ extern int ExecuteProcessWIN(const std::string& commandline);
+ #include <sys/file.h>
+ #include <sys/stat.h>
+ #include <sys/stat.h>
++#include <fcntl.h>
+ 
+ void WriteContent( const std::string& logfile, const std::string& filename, const std::string& flags )
+ {
+diff --git a/sdk/codelite_indexer/libctags/read.c b/sdk/codelite_indexer/libctags/read.c
+index 144032de5..bfabf75d3 100644
+--- a/sdk/codelite_indexer/libctags/read.c
++++ b/sdk/codelite_indexer/libctags/read.c
+@@ -605,6 +605,9 @@ extern int readChars (char *buffer, size_t bufferSize, fpos_t location, fpos_t e
  #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__)
  	if(location < 0)
  		return 0;
 +#elif defined(__linux__) && !defined(__GLIBC__) /* musl */
 +	if(location.__lldata < 0)
 +		return 0;
- #else
- 	if(location.__pos < 0)
+ #elif defined(__NetBSD__)
+ 	if(location._pos < 0)
  		return 0;
-@@ -619,6 +622,8 @@ extern int readChars (char *buffer, size
+@@ -622,6 +625,8 @@ extern int readChars (char *buffer, size_t bufferSize, fpos_t location, fpos_t e
  
  #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__)
  	sizeToRead = endPos - location;
 +#elif defined(__linux__) && !defined(__GLIBC__) /* musl */
 +	sizeToRead = endPos.__lldata - location.__lldata;
+ #elif defined(__NetBSD__)
+ 	sizeToRead = endPos._pos - location._pos;
  #else
- 	sizeToRead = endPos.__pos - location.__pos;
- #endif
---- a/sdk/codelite_indexer/network/named_pipe.cpp	2019-06-29 09:06:20.260132366 +0200
-+++ b/sdk/codelite_indexer/network/named_pipe.cpp	2019-06-29 09:06:38.468360112 +0200
+diff --git a/sdk/codelite_indexer/network/named_pipe.cpp b/sdk/codelite_indexer/network/named_pipe.cpp
+index 6e729946d..3e587a428 100644
+--- a/sdk/codelite_indexer/network/named_pipe.cpp
++++ b/sdk/codelite_indexer/network/named_pipe.cpp
 @@ -27,9 +27,9 @@
  
  #ifndef __WXMSW__
@@ -42,8 +48,10 @@
  #endif
  
  #ifdef __WXMSW__
---- a/sdk/codelite_indexer/network/named_pipe_server.cpp	2019-06-29 09:07:26.077955618 +0200
-+++ b/sdk/codelite_indexer/network/named_pipe_server.cpp	2019-06-29 09:07:35.484073269 +0200
+diff --git a/sdk/codelite_indexer/network/named_pipe_server.cpp b/sdk/codelite_indexer/network/named_pipe_server.cpp
+index 708df483d..68d7e3958 100644
+--- a/sdk/codelite_indexer/network/named_pipe_server.cpp
++++ b/sdk/codelite_indexer/network/named_pipe_server.cpp
 @@ -26,8 +26,8 @@
  #include "named_pipe_server.h"
  #ifndef __WXMSW__
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index cedc1e11c247..3a993a2c0cfb 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -1,38 +1,30 @@
 # Template file for 'codelite'
 pkgname=codelite
-version=13.0
-revision=5
-archs="i686* x86_64* ppc64le*"
+version=15.0.6
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
-configure_args="-DWITH_PCH=0
- $(vopt_if sftp -DENABLE_SFTP=1)
- $(vopt_if lldb -DENABLE_LLDB=1)"
-hostmakedepends="pkg-config clang which"
+configure_args="-DWITH_PCH=0 -DWITH_WX_CONFIG=wx-config-gtk3
+ $(vopt_if sftp -DENABLE_SFTP=1 -DENABLE_SFTP=0)
+ $(vopt_if lldb -DENABLE_LLDB=1 -DENABLE_LLDB=0)"
+hostmakedepends="pkg-config which"
 makedepends="gtk+3-devel wxWidgets-gtk3-devel sqlite-devel
  $(vopt_if lldb lldb-devel) $(vopt_if hunspell hunspell-devel)
- $(vopt_if mysql libmariadbclient-devel) $(vopt_if sftp libssh-devel)"
+ $(vopt_if sftp libssh-devel)"
 short_desc="Open-source, cross platform IDE for the C/C++ programming languages"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.codelite.org"
 distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz"
-checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac
-nocross=yes
-python_version=2 #unverified
+checksum=28430c37d163219b1001b6e539e520e4f3e750ea5b8ee2457d92d0961fee15bb
+python_version=3
 
-build_options="hunspell lldb mysql sftp"
+build_options="hunspell lldb sftp"
 build_options_default="hunspell sftp"
 desc_option_hunspell="Enable SpellCheck plugin"
 desc_option_lldb="Enable support for LLDB"
-desc_option_mysql="Enable mysql/mariadb support"
 desc_option_sftp="Enable Workspace Mirroring plugin"
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|ppc64le*) build_options_default+=" lldb";;
+	x86_64*|ppc64le*|aarch64*|arm*) build_options_default+=" lldb";;
 esac
-
-pre_configure() {
-	sed -i -e 's,wx-config,&-gtk3,g' \
-	 CMakeLists.txt
-}

From c6e1a9b7868461272a92ba3a46ad1934db395a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 10 Oct 2021 13:29:00 +0200
Subject: [PATCH 1418/4088] dnscrypt-proxy: update to 2.1.1.

---
 srcpkgs/dnscrypt-proxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 184f172f6936..6b1ee815c75b 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,6 +1,6 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://github.com/DNSCrypt/dnscrypt-proxy"
 changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog"
 distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=4af43a2143a1d0f9b430f5f08981417cb4475cc590daf79d11c9a0487f72fadc
+checksum=cc4a2f274ce48c3731ff981e940e6475d912fb356a80481e91725e81d67bde14
 conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"

From b2aaffc0cc07c21084465cbcbf8ebb35dbb6f79d Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Sun, 10 Oct 2021 14:04:54 +1100
Subject: [PATCH 1419/4088] libopenmpt: update to 0.5.12.

Also require dependency devel packages in devel package to fix
pkg-config warning.
---
 srcpkgs/libopenmpt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index a14239a77583..d0f3d275e552 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,6 +1,6 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.10
+version=0.5.12
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 changelog="https://lib.openmpt.org/doc/changelog.html"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=59a8fa28d8b8df69cb7fa5972bdf931081dab4e1e1156c69a1a53b65c2be9ffa
+checksum=892aea7a599b5d21842bebf463b5aafdad5711be7008dd84401920c6234820af
 
 post_install() {
 	vlicense LICENSE
@@ -28,7 +28,7 @@ build_options="pulseaudio sdl2 portaudio"
 build_options_default="pulseaudio sdl2 portaudio"
 
 libopenmpt-devel_package() {
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision} mpg123-devel libvorbis-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/share/doc/libopenmpt/examples

From 20400a2752ccbb486a003e77dcd94fb02db0cdba Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 10 Oct 2021 01:23:54 +0300
Subject: [PATCH 1420/4088] lf: update to r25.

---
 srcpkgs/lf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index ad60a7a2ec31..0a8c8b3c01d4 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r24
+version=r25
 revision=1
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/gokcehan/lf"
 distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=252e7fda36b874260e78285ddad1e4d8001cc1a40fcc27812ef155bbb10d9855
+checksum=a4590c046ac2c2b338de64aad5b6bf76cbad11b5503d141677536ecef7019119
 
 post_install() {
 	vlicense LICENSE

From 168c3924b10525890bb9db06a0d60caad80eb27b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Oct 2021 23:06:28 +0300
Subject: [PATCH 1421/4088] feh: update to 3.7.2.

---
 srcpkgs/feh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 6155d9f3e463..9dbf092a8661 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -1,6 +1,6 @@
 # Template file for 'feh'
 pkgname=feh
-version=3.7.1
+version=3.7.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -15,7 +15,7 @@ license="MIT-feh"
 homepage="https://feh.finalrewind.org"
 changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog"
 distfiles="${homepage}/feh-${version}.tar.bz2"
-checksum=57ab1ca61f57c96595878069f550d36f518530f88fa31b74cc39cd739f9258b6
+checksum=84718fd2720cf540d245768494fe0eb4e598f44b39e2326bae8c368a829c8258
 
 pre_build() {
 	vsed -i 's|doc/feh/examples|examples/feh|' config.mk

From 7974ba452226cd8955649c2983b9e6c9dabb8bde Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Oct 2021 23:02:32 +0300
Subject: [PATCH 1422/4088] broot: update to 1.6.4.

---
 srcpkgs/broot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..28e1bfb81bf4 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.6.4
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=609bd9e6c7fea85b68586435280b37cb90c2af3cb0a3f63a5a37dfdcc822fdc7
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From c62ccb3e21bf8d0068e84c053dc5436b3f5d2066 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 9 Oct 2021 16:48:39 -0300
Subject: [PATCH 1423/4088] icewm: update to 2.8.0.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..e9ba69605326 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.8.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=f225a7e5cf225493b6ae8d427d3a08ab9d3ab6bcd2a297ec41350655ddba7be1
 # broken tests
 make_check=no
 

From 5f94d9ccd513fd4e00d872a93d618e1efa8978cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Sat, 9 Oct 2021 08:56:07 +0200
Subject: [PATCH 1424/4088] spotify: EULA update

---
 srcpkgs/spotify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index fca6c2515543..f3c66031dd21 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,7 +1,7 @@
 # Template file for 'spotify'
 pkgname=spotify
 version=1.1.68
-revision=1
+revision=2
 _ver="${version}.632.g2b11de83_amd64"
 _filename="spotify-client_${_ver}.deb"
 archs="x86_64"
@@ -15,7 +15,7 @@ license="custom:Proprietary"
 homepage="https://www.spotify.com"
 distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/${_filename}"
 checksum=72a3ab2cd491ff5cdb8d54fce3edc301a24c49961c447c53e018f50f4f47c92c
-_license_checksum=ceab67e78aef6b9cbd9bfbea9261c0b344cd54b91d15dad3825caf8e7f4d83c3
+_license_checksum=4465d0bba5deb87866184b04ba76604cd93561c0dc9cd21cacdf5b0295bdae3a
 repository=nonfree
 restricted=yes
 nostrip=yes

From a728c39825a1995f7954c65a26bb9a1a7eb5590c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 8 Oct 2021 19:01:36 -0700
Subject: [PATCH 1425/4088] conmon: update to 2.0.30

---
 srcpkgs/conmon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index f79124a91a5f..27852dd99a8e 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,16 +1,16 @@
 # Template file for 'conmon'
 pkgname=conmon
-version=2.0.29
+version=2.0.30
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="libglib-devel"
+makedepends="libglib-devel libseccomp-devel"
 short_desc="OCI container runtime monitor"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/conmon"
 distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
-checksum=eb4d5e157671a61b88786e44094775194e30e1d0ad0b9d50035532ece78dbc28
+checksum=4b0a98fbe8a63c42f60edac25c19aa6606caa7b1e4fe7846fc7f7de0b566ba25
 
 do_install() {
 	vbin bin/conmon

From 2e5b1c32f07f44fc8be1e712a5bbb60a0bb1e4dd Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Sat, 9 Oct 2021 00:56:14 +0100
Subject: [PATCH 1426/4088] libQuotient: update to 0.6.11.

---
 common/shlibs                | 2 +-
 srcpkgs/libQuotient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6956eef1225e..8893b343af6c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3580,7 +3580,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
 libpkgconf.so.3 libpkgconf-1.8.0_1
 libkodiplatform.so.19.0 kodi-platform-20180302_1
-libQuotient.so.0.6 libQuotient-0.6.9_1
+libQuotient.so.0.6 libQuotient-0.6.11_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.3.1_1
diff --git a/srcpkgs/libQuotient/template b/srcpkgs/libQuotient/template
index 8488858d8096..eb7616b3f11e 100644
--- a/srcpkgs/libQuotient/template
+++ b/srcpkgs/libQuotient/template
@@ -1,6 +1,6 @@
 # Template file for 'libQuotient'
 pkgname=libQuotient
-version=0.6.9
+version=0.6.11
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1 -DQuotient_INSTALL_TESTS=0"
@@ -11,7 +11,7 @@ maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
 license="LGPL-2.1-or-later"
 homepage="https://matrix.org/docs/projects/sdk/quotient"
 distfiles="https://github.com/quotient-im/libQuotient/archive/${version}.tar.gz"
-checksum=ed474e6c13ac961d0c45794d52ddd7227002eff005894b3d3cc8efefafdf9625
+checksum=12b15d1296e630477d5e8f4d32c821dc724b3c5b99d15d383417ba7d88f03c46
 
 libQuotient-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 3b791681680a5559d5e2e6336a53e898016ae84b Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Sat, 9 Oct 2021 00:57:19 +0100
Subject: [PATCH 1427/4088] Quaternion: update to 0.0.95.1.

---
 srcpkgs/Quaternion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 6ab5c987ede2..b4d4630cedff 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,6 +1,6 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.95
+version=0.0.95.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -13,7 +13,7 @@ maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/quotient-im/Quaternion"
 distfiles="https://github.com/quotient-im/Quaternion/archive/${version}.tar.gz"
-checksum=fa047bd9c3e3221bfde805844763f872114397dd1a0c6a3568f8222628fb3406
+checksum=69f034241dddc8d9436a895bb76b022e492e61e2f49d9a80ed8d79ab12b63a0e
 
 build_options="qtkeychain"
 build_options_default="qtkeychain"

From d218778ccfa62275afc19916a89527946d996e12 Mon Sep 17 00:00:00 2001
From: Bin Wang <jerry.binwang@gmail.com>
Date: Sun, 10 Oct 2021 16:16:47 -0400
Subject: [PATCH 1428/4088] font-iosevka: update to 10.3.2

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a4c78de4ce5e..ee14527111e0 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.3.0
+version=10.3.2
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 54f7f064c902d9453db475d54a894dcc57228363058f5a453db0cf17d30de39f
- b8685c8dead724313694ec1cafdc63601713e4f0c9cb32e07355c6b7243119b8"
+ bde311f16f3f671de0ea9e0f33f175eeeda82ee5f05b765990a9a3fff6b0e282
+ c26623065fdf9fa560c33b7d31b2ec71734fdf7300ed125366f666c42b59a259"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 6af0e380021499224bb596b12ec76d527ccfc00b Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 11 Oct 2021 08:07:40 +1000
Subject: [PATCH 1429/4088] kops: update to 1.21.2

---
 srcpkgs/kops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 5fe8ee2f45ba..f62388049b93 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.21.0
+version=1.21.2
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From 3f1c3985b043daefc904d463f34592b23f7cb3b7 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Oct 2021 19:24:14 +0200
Subject: [PATCH 1430/4088] pipe-viewer: update to 0.1.5.

---
 srcpkgs/pipe-viewer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index a37f45d4832c..3b8fe02ea609 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,7 +1,7 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.1.4
-revision=2
+version=0.1.5
+revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
 hostmakedepends="perl-Module-Build"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/pipe-viewer"
 changelog="https://github.com/trizen/pipe-viewer/releases"
 distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz"
-checksum=b55d8098d671c0aa3c6441e3305693d3223f0c699b16d1b977a3705ca457e7b9
+checksum=2b2aaabeba4335e661c9dba0abad3ee7d30a5028446f252100db6e5d3bea90d5
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 69397d2af5fd78b2a1d3a27978e7b48d0f2a3180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Sat, 9 Oct 2021 09:53:57 +0200
Subject: [PATCH 1431/4088] tvbrowser: update to 4.2.3

---
 srcpkgs/tvbrowser/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tvbrowser/template b/srcpkgs/tvbrowser/template
index 3810d4859285..82de18539f84 100644
--- a/srcpkgs/tvbrowser/template
+++ b/srcpkgs/tvbrowser/template
@@ -1,7 +1,7 @@
 # Template file for 'tvbrowser'
 pkgname=tvbrowser
-version=4.2.1
-revision=3
+version=4.2.3
+revision=1
 depends="openjdk11 hicolor-icon-theme bash" # XXX: openjdk11 or later version, when available
 short_desc="Ad free open source TV guide for more than 1000 channels"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later, GPL-2.0-or-later, LPPL-1.0, Apache-2.0, LGPL-2.1-or-l
 homepage="http://tvbrowser.org"
 distfiles="${SOURCEFORGE_SITE}/tvbrowser/TV-Browser%20Releases%20%28Java%2011%20and%20higher%29/${version}/tvbrowser_${version}_bin.tar.gz
  http://www.tvbrowser.org/images/tvbrowser/tvbrowser_logo.svg"
-checksum="c198bc306c8693c0f9220637b011c4616543d41c79ba59c98cc9a878b83574fd
+checksum="4e8a9651683cd27723c22a36ac71499ead33193c2e9c3e78b257776c23aa2e05
  d5bcdf07965ef86fcaa0cb3e0dbde07ff370dd8af4e89d0d75f328e3c1631c4e"
 skip_extraction="tvbrowser_logo.svg"
 

From 101f5f2a66a5b2565d226281d9b6175b01a51e4b Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 9 Oct 2021 20:42:53 -0300
Subject: [PATCH 1432/4088] twemoji: update to 13.1.0.

---
 srcpkgs/twemoji/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/twemoji/template b/srcpkgs/twemoji/template
index 144e093c9a35..d54b74c934b0 100644
--- a/srcpkgs/twemoji/template
+++ b/srcpkgs/twemoji/template
@@ -1,7 +1,7 @@
 # Template file for 'twemoji'
 pkgname=twemoji
-version=13.0.1
-revision=2
+version=13.1.0
+revision=1
 wrksrc="TwitterColorEmoji-SVGinOT-Linux-${version}"
 depends="font-util"
 short_desc="Twitter emoji font set in color and b&w"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="CC-BY-SA-4.0, MIT"
 homepage="https://github.com/eosrei/twemoji-color-font"
 distfiles="https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"
-checksum=7655b0989d12e6138f40274e6343c29d2f9bc85c48251d504418eca1cc62c2d6
+checksum=57c0d651400af872c33dcab78b33ecd7be0f7d49da49e2c1c83a59c215085f94
 
 font_dirs="/usr/share/fonts/twemoji"
 

From a17c0bc40aaae9a7d961face2e3b77521efb88e6 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 9 Oct 2021 19:47:36 -0300
Subject: [PATCH 1433/4088] xob: update to 0.3.

---
 srcpkgs/xob/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template
index d3ec09871ba2..f2d1701f523e 100644
--- a/srcpkgs/xob/template
+++ b/srcpkgs/xob/template
@@ -1,15 +1,15 @@
 # Template file for 'xob'
 pkgname=xob
-version=0.2
+version=0.3
 revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr sysconfdir=/etc"
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libX11-devel libconfig-devel"
+makedepends="libX11-devel libconfig-devel libXrender-devel"
 short_desc="Lightweight overlay bar for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/florentc/xob"
 distfiles="https://github.com/florentc/xob/archive/v${version}.tar.gz"
-checksum=06fb0d9a081546b6b9d1785f6d6fa36f905516eec5df3a567b5d22bd1f8df33a
+checksum=ab96717cff59cd0d3b42cbbc293cbd12f94d975584c47111717607779c155122

From c17b43f0628e36120b4da7a2b3438e03860894e0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Oct 2021 23:10:25 +0300
Subject: [PATCH 1434/4088] gscreenshot: update to 2.16.1.

---
 srcpkgs/gscreenshot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template
index 23c381d5df4c..5530723120f8 100644
--- a/srcpkgs/gscreenshot/template
+++ b/srcpkgs/gscreenshot/template
@@ -1,7 +1,7 @@
 # Template file for 'gscreenshot'
 pkgname=gscreenshot
-version=2.15.0
-revision=2
+version=2.16.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools gettext"
 depends="gtk+3 python3-setuptools python3-Pillow python3-gobject scrot"
@@ -10,6 +10,6 @@ maintainer="Rui Flora <rui.flora@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/thenaterhood/gscreenshot"
 distfiles="https://github.com/thenaterhood/gscreenshot/archive/v${version}.tar.gz"
-checksum=d707d763236d397079a5c3063754fe2be0391513b1b448cb0b92c2a5aef8ba63
+checksum=a52695e6566569976b12ca9ccb934043b7a5747c3d3c90c9b79db305592e8bb7
 # doesn't ship any tests
 make_check=no

From 8cce257378e53ac1d1fdd27cdf2539d8c30863e1 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Tue, 12 Oct 2021 20:30:50 +0200
Subject: [PATCH 1435/4088] libvirt: make sure that polkit is enabled when
 cross compiling

the meson script makes an unnecessary check whether pkcheck exists in $PATH
---
 srcpkgs/libvirt/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index a6c1ba360084..9991d3e78af1 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,9 +1,10 @@
 # Template file for 'libvirt'
 pkgname=libvirt
 version=7.8.0
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
+configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
+ -Dpolkit=enabled"
 hostmakedepends="automake dnsmasq docbook-xsl gettext gettext-devel iptables
  libapparmor-devel libtool libxslt lvm2 parted perl pkg-config python3-docutils
  rpcsvc-proto"

From a3542184ce33313d253f4ebc4e1aaa7f0302d1ba Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 10 Oct 2021 12:36:44 -0300
Subject: [PATCH 1436/4088] imlib2: update to 1.7.4.

---
 srcpkgs/imlib2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..5ff691292d96 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=f51a85634aa7ec53e36320f8a6b2e2b96cb7a2e1f92a5538e4b2f390c22c9951
 
 post_install() {
 	vlicense COPYING

From 25ef5d409a468a0903810311466de42ba26f4319 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 9 Oct 2021 11:01:09 +0200
Subject: [PATCH 1437/4088] pgweb: update to 0.11.9.

---
 srcpkgs/pgweb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 0698c86b0c46..0db7ab580af0 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,15 +1,15 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.11.8
+version=0.11.9
 revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
-homepage="http://sosedoff.github.io/pgweb"
+homepage="https://sosedoff.github.io/pgweb"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=b391dee6e88c534db82d71515d7efa642e6a34bcded93250fd3f8c2150e75cd9
+checksum=2b93e8ebbb381e480c70a4c25ba62b7bb31a04e60be52951ddd874f603bd3789
 
 post_install() {
 	vdoc README.md

From 83164d8893ca6138f1814338a81aca5f487edfc4 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 10 Oct 2021 22:48:58 +0200
Subject: [PATCH 1438/4088] golangci-lint: update to 1.42.1.

---
 srcpkgs/golangci-lint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 169680cf5797..aceec3333a89 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.36.0
+version=1.42.1
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -9,8 +9,9 @@ short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
+changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=3476288341b2c6e2b5a426334ec982769a9ea5341e0336198fd33c7250b4928b
+checksum=ce44ca899cddc5520ac8816defd8c4ab23beab4da00baaca138f10028729388a
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From 16442c1f967b5bb49be52354ad94396ca41b4c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 19 Apr 2021 14:06:42 +0200
Subject: [PATCH 1439/4088] cargo-about: update to 0.3.0.

---
 srcpkgs/cargo-about/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-about/template b/srcpkgs/cargo-about/template
index 7018e3e92932..27eddbd2cfc4 100644
--- a/srcpkgs/cargo-about/template
+++ b/srcpkgs/cargo-about/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-about'
 pkgname=cargo-about
-version=0.2.3
+version=0.3.0
 revision=1
 build_style=cargo
 short_desc="Cargo plugin to generate list of all licenses for a crate"
@@ -8,7 +8,11 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-about"
 distfiles="https://github.com/EmbarkStudios/cargo-about/archive/${version}.tar.gz"
-checksum=e39528da6826ddb609165866858984578ebbf80819b136d66215e840c69621c7
+checksum=01c5c78e4486b6de5694c0f140cab4b0f6efb807736a64602636a2266e2f015b
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	broken="broken on architectures without atomic8"
+fi
 
 post_install() {
 	vlicense LICENSE-APACHE

From 4a2a25010bc865af85fa818d522861c828333bbf Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 9 Oct 2021 11:50:56 +0530
Subject: [PATCH 1440/4088] python3-acme: update to 1.20.0.

---
 srcpkgs/python3-acme/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index abdae128a47e..9d7c7323c457 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
-version=1.19.0
-revision=2
+version=1.20.0
+revision=1
 wrksrc="acme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/certbot"
 distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=a7071c5576032092d3f5aa77d4424feb943745ce95714d3194e88df74c3359ce
+checksum=0ddfde8d8e574d35af2bf1d1648b6bdb359c82e257e39d6b074e35136777016e

From e01ed7fc7d4f83a03fb57588ebbebc944708e9be Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 9 Oct 2021 11:51:01 +0530
Subject: [PATCH 1441/4088] certbot: update to 1.20.0.

---
 srcpkgs/certbot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 2b7a00ff5fd5..b8431cac1b3b 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.19.0
-revision=2
+version=1.20.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-acme python3-ConfigArgParse python3-configobj
@@ -14,4 +14,4 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
-checksum=015cbe210498a01f38b04ca32502c9142ba0e8aeea74bb6ba81a985df14a072c
+checksum=ea26b9f28e347d8c5c6f6c697c65e333c0660ca93ffd5444ba20d1bc6a5f0d0a

From 400f8a0a688e6a722493ef6e9a7e99226db056bb Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 9 Oct 2021 11:51:05 +0530
Subject: [PATCH 1442/4088] certbot-apache: update to 1.20.0.

---
 srcpkgs/certbot-apache/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index ac2400bf7141..13275dac57fd 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot-apache'
 pkgname=certbot-apache
-version=1.19.0
-revision=2
+version=1.20.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="certbot python3-acme python3-augeas python3-zope.interface"
@@ -11,4 +11,4 @@ maintainer="Kartik S. <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-apache/certbot-apache-${version}.tar.gz"
-checksum=4f080da078ae77eda1d8ba20383f1a0fbac540a99cab6e93cae8f08f043fbd48
+checksum=b964fef5a77d0f0b702fb82929d22aeb93dcdc9f8c74f368112fcdf069544dbc

From 83267e4ae50b39d63cd2ebe0f5d34f736e8fb4d5 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 9 Oct 2021 11:51:08 +0530
Subject: [PATCH 1443/4088] certbot-nginx: update to 1.20.0.

---
 srcpkgs/certbot-nginx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index 8c28f0475912..e1a8cdec9263 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot-nginx'
 pkgname=certbot-nginx
-version=1.19.0
-revision=2
+version=1.20.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="certbot python3-acme python3-parsing python3-zope.interface"
@@ -11,4 +11,4 @@ maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-nginx/certbot-nginx-${version}.tar.gz"
-checksum=0c2b6b0185304c8d73f7c0ce5fbfe82a03c2322fec09c4dc6c44beee8e18f246
+checksum=24f16680c0b7931986ea690a31ddb7ebfa7f8435211cd71b19af95c1de9b8ea4

From 7845f498b7c1fe7c9fe9614f3b984c2e2c060730 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Sat, 9 Oct 2021 12:04:01 +0530
Subject: [PATCH 1444/4088] python3-josepy: update to 1.10.0.

---
 srcpkgs/python3-josepy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index 2e08d8f0dbf3..11316ba9cd3a 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.8.0
-revision=2
+version=1.10.0
+revision=1
 wrksrc="josepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=a5a182eb499665d99e7ec54bb3fe389f9cbc483d429c9651f20384ba29564269
+checksum=e9bcaf605411cadaec04841ae2d5f77ebb178b7b6df7c9aed1d97399ac18685b
 
 pre_check() {
 	vsed -e '/addopts/d' -i pytest.ini

From 3bd1c8c24ddca5b0a9b8cb8147383125815fce56 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 08:39:24 +0200
Subject: [PATCH 1445/4088] atlantis: update to 0.17.4.

---
 srcpkgs/atlantis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index 310485c96904..78656b21123b 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,6 +1,6 @@
 # Template file for 'atlantis'
 pkgname=atlantis
-version=0.17.2
+version=0.17.4
 revision=1
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
@@ -10,4 +10,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://runatlantis.io"
 distfiles="https://github.com/runatlantis/atlantis/archive/v${version}.tar.gz"
-checksum=7dcba88cbcad2f7830bbc4e42839593a912c5419f0e1d49796f2a7b27203cf3f
+checksum=1556e4467f81e6d8cb28da6cd1ce530611b2f94f112e3a92bd818426a364a5c1

From 66d166b203427ba1af6ea69a95555040a78388b5 Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel.chotai@hyperexponential.com>
Date: Fri, 8 Oct 2021 17:00:39 +0100
Subject: [PATCH 1446/4088] aws-vault: update to 6.3.1

---
 srcpkgs/aws-vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index cdb99ac57ece..a3f6d60583c6 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
-version=6.2.0
-revision=2
+version=6.3.1
+revision=1
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v6
 go_ldflags="-X \"main.Version=${version}\" -s -w"
@@ -10,7 +10,7 @@ maintainer="klardotsh <josh@klar.sh>"
 license="MIT"
 homepage="https://github.com/99designs/aws-vault"
 distfiles="https://github.com/99designs/aws-vault/archive/v${version}.tar.gz"
-checksum=39886f4bc3985d4aefbae6fc88532499ac2c39cbabc33d860bba6d355158e17d
+checksum=433df90b7ed1cf1ec08aa75a4f1f993edfe5fa3fecfff5519574613ab0ab4630
 
 post_install() {
 	vlicense LICENSE

From fe64bd82745d8383d32461ed2d9169933391caec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 10 Jul 2021 21:52:53 +0200
Subject: [PATCH 1447/4088] qjackctl: update to 0.9.5, adopt, change
 build-style to cmake.

---
 srcpkgs/qjackctl/template | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 8bcba9039fd7..838d908cb8d9 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -1,20 +1,21 @@
 # Template file for 'qjackctl'
 pkgname=qjackctl
-version=0.9.2
+version=0.9.5
 revision=1
-build_style=gnu-configure
-build_helper=qmake
-configure_args="$(vopt_enable jack_session jack-session)
- ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"
+build_style=cmake
+make_cmd=make
+configure_args="$(vopt_bool jack_session CONFIG_JACK_SESSION)"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="alsa-lib-devel qt5-devel jack-devel qt5-x11extras-devel"
+makedepends="alsa-lib-devel qt5-devel jack-devel portaudio-devel qt5-tools-devel"
 depends="desktop-file-utils hicolor-icon-theme jack"
 short_desc="JACK Audio Connection Kit - Qt GUI Interface"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
-homepage="http://qjackctl.sourceforge.net"
+homepage="https://qjackctl.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=867c088ed819f61d2eb1e550d4bb8f6330d8f247ab99843a584d81825f1a5d24
+checksum=3b9b15cafc6b61540596240db216c59338e6e4a1fb9042a0a5bc59dd35efc1bc
+
+export CMAKE_GENERATOR="Unix Makefiles"
 
 build_options="jack_session"
 build_options_default="jack_session"

From 514d78c54b594c2eec77e9393a04dff887cd6036 Mon Sep 17 00:00:00 2001
From: heitor <heitorleite.dev@gmail.com>
Date: Fri, 8 Oct 2021 17:34:55 -0300
Subject: [PATCH 1448/4088] kdenlive: update to 21.08.2.

---
 srcpkgs/kdenlive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 9f53c3f371fd..9090dc27a1a6 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e441df27deab64cb342f4b1b874313f149950d4baada12f074ad833aa996ce22
+checksum=f59c3749f1432cf04151a657a7e345ac45f76e75dbc7a3d411b31dd93430a183
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From 279ca00dd9e4db8c6158ed23b675b96e4daf09bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Fri, 8 Oct 2021 21:26:22 +0000
Subject: [PATCH 1449/4088] tailscale: update to 1.16.0.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e4ff92b874ad..89ea8c8134a3 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.14.0
+version=1.16.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=10549257e1edf3dd6c055d706140ec15ed40d4977d20770830883e39485960da
+checksum=dae0eaa5aef8cb9d3cdd83cb07039b57b202c44e4f581e26cfee98707c251c78
 
 post_install() {
 	vlicense LICENSE

From 8133696e6f740f0899334e1b75521824c6238894 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 8 Oct 2021 23:53:59 +0100
Subject: [PATCH 1450/4088] pnpm: update to 6.16.1.

---
 srcpkgs/pnpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 24d7a6dc7f51..99e694ee826e 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=6.3.0
+version=6.16.1
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.js.org/"
 distfiles="https://registry.npmjs.org/${pkgname}/-/${pkgname}-${version}.tgz"
-checksum=eebd1dfe4466e5e84fb83332c5bf0e970002eedcb1cae8922257a477d67c5636
+checksum=2a40a3d8a56eaa411819fb8aa8cdd4d9fe729f74571929311247922387925f5a
 python_version=3
 
 do_install() {

From c8f62a34ebbafb470aa017c818e5cc32c7b9dcd2 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 4 Oct 2021 20:49:55 +0200
Subject: [PATCH 1451/4088] simple-scan: update to 40.5.

---
 srcpkgs/simple-scan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index d462d6d6f900..83cb9b159803 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,6 +1,6 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=40.1
+version=40.5
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ebee39ab1fe4ca053c4ed2bd3a3ca76742ff109436dd0645d3415622132ba0b4
+checksum=eb5379e4cb6ca605092c942210c18425d036773da76541e43b89d8223f82b9a4

From b4526fefff09ebe7a3c9254fc01c616d8ccaa1e8 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 4 Oct 2021 22:46:36 +0200
Subject: [PATCH 1452/4088] sane: update to 1.0.32.

---
 srcpkgs/sane/template | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 35dac1cc846a..4e8cdab17d61 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,14 +1,14 @@
 # Template file for 'sane'
 pkgname=sane
-_gitlab_release_hash=8bf1cae2e1803aefab9e5331550e5d5d
-version=1.0.31
-revision=3
+_gitlab_release_hash=104f09c07d35519cc8e72e604f11643f
+version=1.0.32
+revision=1
 wrksrc="sane-backends-${version}"
 build_style=gnu-configure
 configure_args="--disable-locking --enable-ipv6 --enable-pthread
  --with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes
  $(vopt_with snmp)"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config python3"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
  v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
@@ -16,14 +16,19 @@ depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"
 short_desc="Scanner Access Now Easy"
 maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-2.0-or-later, SANE-exception"
+license="custom:GPL-2.0-or-later-with-SANE-exception"
 homepage="http://www.sane-project.org/"
 distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
-checksum=4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa
+checksum=3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114
 noshlibprovides="avoid false detection of device drivers"
 
 build_options="snmp"
 
+# tests broken on 32bit.  https://gitlab.com/sane-project/backends/-/issues/157
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	make_check=no
+fi
+
 post_build() {
 	# generate udev file
 	cd tools
@@ -39,7 +44,9 @@ post_install() {
 
 	vlicense LICENSE # License clarification
 	vlicense COPYING # GPL-2.0
-	sed -n "1,43 p" "${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION"
+	sed -n \
+		-e "/\/* sane - Scanner Access Now Easy./,/dynamic linking to load backends on demand./p" \
+		"${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION"
 }
 
 libsane_package() {

From 2224b8967a484f29bc3fbd39f4ce9aa12340489f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 2 Oct 2021 21:03:42 -0400
Subject: [PATCH 1453/4088] tarpaulin: update to 0.18.2

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index 1c95f61183f4..0de59100dbb1 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,6 +1,6 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
-version=0.17.0
+version=0.18.2
 revision=1
 archs="x86_64*"
 build_style=cargo
@@ -12,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/xd009642/tarpaulin"
 distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
-checksum=54b282eedf4bcf67c3ec63bec8ae7d995efc1c398cd8e6d5c78ab85bfd5f3ade
+checksum=f60e613d866c76153729f2e2f39821da00995663dd3706e8af7e08850069dd94
 
 post_install() {
 	vlicense LICENSE-MIT

From 17fa2256df7d47cd625c5c4f91e38e02ddb6fa23 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 8 Oct 2021 20:38:01 +0300
Subject: [PATCH 1454/4088] gc: update to 8.0.6

---
 srcpkgs/gc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template
index f7ed0c10010d..3e00fa2ab468 100644
--- a/srcpkgs/gc/template
+++ b/srcpkgs/gc/template
@@ -1,6 +1,6 @@
 # Template file for 'gc'
 pkgname=gc
-version=8.0.4
+version=8.0.6
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static --enable-mmap"
@@ -9,9 +9,9 @@ makedepends="libatomic_ops-devel"
 short_desc="Garbage collector for C and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.hboehm.info/gc/"
+homepage="https://www.hboehm.info/gc/"
 distfiles="https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
-checksum=436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d
+checksum=3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl)

From 8694da68ed7fc311bea17bb6b792dcde5b799d60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 4 Oct 2021 22:19:08 +0200
Subject: [PATCH 1455/4088] New package: libtpms-0.9.0

---
 common/shlibs            |  1 +
 srcpkgs/libtpms-devel    |  1 +
 srcpkgs/libtpms/template | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libtpms-devel
 create mode 100644 srcpkgs/libtpms/template

diff --git a/common/shlibs b/common/shlibs
index 8893b343af6c..09e6a5facd4b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3445,6 +3445,7 @@ libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
 libre.so.1 re-2.0.1_1
+libtpms.so.0 libtpms-0.9.0_1
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/libtpms-devel b/srcpkgs/libtpms-devel
new file mode 120000
index 000000000000..a7b2c51dadbc
--- /dev/null
+++ b/srcpkgs/libtpms-devel
@@ -0,0 +1 @@
+libtpms
\ No newline at end of file
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
new file mode 100644
index 000000000000..90ae5f6907a8
--- /dev/null
+++ b/srcpkgs/libtpms/template
@@ -0,0 +1,33 @@
+# Template file for 'libtpms'
+pkgname=libtpms
+version=0.9.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="libtool automake pkg-config"
+makedepends="openssl-devel"
+short_desc="Software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause, custom:IBM"
+homepage="https://github.com/stefanberger/libtpms"
+distfiles="https://github.com/stefanberger/libtpms/archive/refs/tags/v${version}.tar.gz"
+checksum=bcd94c8880c471358c58db89be30420384ca0ef50a0048da8d04352841d1e2fb
+
+pre_configure() {
+	autoreconf -f -i
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+libtpms-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 255ff9bc542b2d2f1bf932cf94b7f1eba4f6a674 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 4 Oct 2021 22:37:55 +0200
Subject: [PATCH 1456/4088] New package: swtpm-0.6.1

---
 common/shlibs          |  1 +
 srcpkgs/libswtpm       |  1 +
 srcpkgs/libswtpm-devel |  1 +
 srcpkgs/swtpm/template | 50 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 120000 srcpkgs/libswtpm
 create mode 120000 srcpkgs/libswtpm-devel
 create mode 100644 srcpkgs/swtpm/template

diff --git a/common/shlibs b/common/shlibs
index 09e6a5facd4b..b3fc25ca6f30 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3446,6 +3446,7 @@ libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
 libre.so.1 re-2.0.1_1
 libtpms.so.0 libtpms-0.9.0_1
+libswtpm_libtpms.so.0 libswtpm-0.6.1_1
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/libswtpm b/srcpkgs/libswtpm
new file mode 120000
index 000000000000..0e4930bcfe73
--- /dev/null
+++ b/srcpkgs/libswtpm
@@ -0,0 +1 @@
+swtpm
\ No newline at end of file
diff --git a/srcpkgs/libswtpm-devel b/srcpkgs/libswtpm-devel
new file mode 120000
index 000000000000..0e4930bcfe73
--- /dev/null
+++ b/srcpkgs/libswtpm-devel
@@ -0,0 +1 @@
+swtpm
\ No newline at end of file
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
new file mode 100644
index 000000000000..5e2b170c32b6
--- /dev/null
+++ b/srcpkgs/swtpm/template
@@ -0,0 +1,50 @@
+# Template file for 'swtpm'
+pkgname=swtpm
+version=0.6.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-gnutls ac_cv_path_TCSD="
+hostmakedepends="libtool automake pkg-config iproute2 expect
+ socat python3 gnutls-tools"
+makedepends="gnutls-devel libtasn1-devel libtpms-devel json-glib-devel
+ libseccomp-devel fuse-devel"
+depends="gnutls-tools trousers"
+short_desc="TPM emulator with socket, character device, and Linux CUSE interface"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="https://github.com/stefanberger/swtpm"
+distfiles="https://github.com/stefanberger/swtpm/archive/refs/tags/v${version}.tar.gz"
+checksum=114905d6a51af89baac9ac279bf6534761e01adcf9c9bb298f1c09c7d4b2599d
+# check expects that root directory is setup fully for swtpm with e.g. tss user created
+make_check=no
+ignore_elf_files="/usr/share/swtpm/swtpm-localca"
+make_dirs="/usr/lib/swtpm-localca 0750 tss root"
+
+conf_files="/etc/swtpm-localca.conf
+ /etc/swtpm-localca.options
+ /etc/swtpm_setup.conf"
+
+pre_configure() {
+	autoreconf -f -i
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+libswtpm_package() {
+	short_desc+=" - library"
+	pkg_install() {
+		vmove "usr/lib/swtpm/*.so.*"
+	}
+}
+
+libswtpm-devel_package() {
+	depends="lib${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/swtpm/*.a"
+		vmove "usr/lib/swtpm/*.so"
+		vmove usr/include
+	}
+}

From f6a3961e1c544f60d30bc4e4568a26b649d414fe Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 24 Sep 2021 20:43:26 +0100
Subject: [PATCH 1457/4088] tlp: update to 1.4.0.

---
 srcpkgs/tlp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/tlp/template b/srcpkgs/tlp/template
index 18a7b44c10ab..8ed5ee1e97f0 100644
--- a/srcpkgs/tlp/template
+++ b/srcpkgs/tlp/template
@@ -1,16 +1,16 @@
 # Template file for 'tlp'
 pkgname=tlp
-version=1.3.1
-revision=3
+version=1.4.0
+revision=1
 wrksrc="TLP-${version}"
 depends="hdparm bash iw util-linux ethtool perl"
 short_desc="Advanced power management tool for Linux"
 maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"
-#changelog="https://github.com/linrunner/TLP/blob/master/changelog"
+changelog="https://raw.githubusercontent.com/linrunner/TLP/main/changelog"
 distfiles="https://github.com/linrunner/TLP/archive/${version}.tar.gz"
-checksum=4c783606ca6e98a3ddb3dc911785b4d7a73fec4ebb9decfca4ca15e315ece768
+checksum=581c38042334c9a65131ddb5cd093c7926b63983e77866b3d7945e9d3f27dfbb
 
 conflicts="laptop-mode>=0"
 conf_files="/etc/tlp.conf /etc/tlp.d/*.conf"

From 3a245c4f5722bd45a28903bcd61eff29a887d879 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Wed, 29 Sep 2021 00:25:33 -0700
Subject: [PATCH 1458/4088] bin86: dev86: make bin86 a subpackage of dev86.

---
 srcpkgs/bin86                         |  1 +
 srcpkgs/bin86/patches/fix_x86_64.diff | 12 -----------
 srcpkgs/bin86/template                | 20 ------------------
 srcpkgs/dev86/template                | 30 ++++++++++++++++-----------
 4 files changed, 19 insertions(+), 44 deletions(-)
 create mode 120000 srcpkgs/bin86
 delete mode 100644 srcpkgs/bin86/patches/fix_x86_64.diff
 delete mode 100644 srcpkgs/bin86/template

diff --git a/srcpkgs/bin86 b/srcpkgs/bin86
new file mode 120000
index 000000000000..6c075505a031
--- /dev/null
+++ b/srcpkgs/bin86
@@ -0,0 +1 @@
+dev86
\ No newline at end of file
diff --git a/srcpkgs/bin86/patches/fix_x86_64.diff b/srcpkgs/bin86/patches/fix_x86_64.diff
deleted file mode 100644
index 05c374aeb6f2..000000000000
--- a/srcpkgs/bin86/patches/fix_x86_64.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ld/x86_aout.h    2005-11-07 20:07:31.506442000 +0100
-+++ b/ld/x86_aout.h 2020-02-07 20:07:41.106982496 +0100
-@@ -12,6 +12,9 @@
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
- #define __OUT_OK 1
-+#elif defined(__x86_64__)
-+typedef int Long;
-+#define __OUT_OK 1
- #else
- typedef char Long[4];
- #endif
diff --git a/srcpkgs/bin86/template b/srcpkgs/bin86/template
deleted file mode 100644
index 8d711210193e..000000000000
--- a/srcpkgs/bin86/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'bin86'
-pkgname=bin86
-version=0.16.21
-revision=4
-short_desc="A complete 8086 assembler and loader"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://v3.sk/~lkundrak/dev86/"
-license="GPL-2"
-distfiles="http://v3.sk/~lkundrak/dev86/bin86-${version}.tar.gz"
-checksum=021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738
-archs="i686* x86_64*"
-
-do_build() {
-	make ${makejobs} CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" PREFIX=/usr
-}
-do_install() {
-	vmkdir usr/bin
-	vmkdir usr/share/man/man1
-	make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man/man1 install
-}
diff --git a/srcpkgs/dev86/template b/srcpkgs/dev86/template
index 174e6d9602a8..137e4f461f81 100644
--- a/srcpkgs/dev86/template
+++ b/srcpkgs/dev86/template
@@ -1,31 +1,37 @@
 # Template file for 'dev86'
 pkgname=dev86
 version=0.16.21
-revision=4
-archs="i686* x86_64*"
-makedepends="bin86"
-depends="${makedepends}"
+revision=5
 short_desc="8086 cross development compiler, assembler and linker"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-1.0-or-later, GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://v3.sk/~lkundrak/dev86/"
-distfiles="${homepage}/Dev86src-$version.tar.gz"
-checksum=234b110e6df9b7f6843e2ee53473127c2211243a16748f229fc0127845f68d94
+homepage="https://github.com/lkundrak/dev86/"
+distfiles="https://github.com/lkundrak/dev86/archive/v${version}.tar.gz"
+checksum=49c7ee9102d45c2eef072bfb8a49ba3821c9fe3ef31ccd3290f658b667b579a8
+nocross=yes
 nostrip=yes
 nopie=yes
 
-do_build() {
+pre_build() {
 	for f in libc/bcc libc/misc libc/msdos libc/string libc/syscall \
 		libc/bios; do
 		sed -i -e "s|\$(CCFLAGS) ||g" ${wrksrc}/${f}/Makefile
 	done
-	make DIST=${DESTDIR}
 }
 
 do_install() {
 	make DIST=${DESTDIR} MANDIR=/usr/share/man install install-man
+}
 
-	# Remove stuff supplied by bin86
-	rm -f ${DESTDIR}/usr/bin/{as,ld,nm,objdump,size}86
-	rm -f ${DESTDIR}/usr/share/man/man1/{as,ld}86.1
+bin86_package() {
+	short_desc="Complete 8086 assembler and loader"
+	pkg_install() {
+		vmove /usr/bin/as86
+		vmove /usr/bin/ld86
+		vmove /usr/bin/nm86
+		vmove /usr/bin/objdump86
+		vmove /usr/bin/size86
+		vmove /usr/share/man/man1/as86.1
+		vmove /usr/share/man/man1/ld86.1
+	}
 }

From 3bed1565926306a7ca9d0a6e44ed6d4a546e42ba Mon Sep 17 00:00:00 2001
From: Tuxliban <tenshalito@gmail.com>
Date: Fri, 24 Sep 2021 00:53:53 -0500
Subject: [PATCH 1459/4088] libarchive: update to 3.5.2

---
 srcpkgs/libarchive/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 605cac399d34..9437ce72db63 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
-version=3.5.1
-revision=2
+version=3.5.2
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -16,8 +16,8 @@ short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://www.libarchive.org/"
-distfiles="https://github.com/libarchive/libarchive/releases/download/${version}/libarchive-${version}.tar.gz"
-checksum=9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a
+distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz"
+checksum=5f245bd5176bc5f67428eb0aa497e09979264a153a074d35416521a5b8e86189
 
 build_options="acl expat lzo lz4 ssl zstd"
 build_options_default="acl ssl lz4 zstd"

From e413ef59029faf73d040a1e11773852470c73d99 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 25 Sep 2021 10:09:16 +0000
Subject: [PATCH 1460/4088] pam: update to 1.5.2.

---
 srcpkgs/pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 6168a3184295..bc15bef7c8f1 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,6 +1,6 @@
 # Template file for 'pam'
 pkgname=pam
-version=1.5.1
+version=1.5.2
 revision=1
 wrksrc="Linux-PAM-$version"
 build_style=gnu-configure
@@ -30,7 +30,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/linux-pam/linux-pam"
 changelog="https://raw.githubusercontent.com/linux-pam/linux-pam/master/NEWS"
 distfiles="${homepage}/releases/download/v${version}/Linux-PAM-${version}.tar.xz"
-checksum=201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc
+checksum=e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d
 lib32disabled=yes
 
 if [ "$XBPS_CHECK_PKGS" = musl ]; then

From 26365b3f1bb5d384a807a476ed0fea1158d09641 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:30:46 +0300
Subject: [PATCH 1461/4088] skalibs: update to 2.11.0.0.

---
 common/shlibs            | 2 +-
 srcpkgs/skalibs/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b3fc25ca6f30..68476af72810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2344,7 +2344,7 @@ libgnunettransport.so.2 gnunet-0.12.2_1
 libgnunettransportapplication.so.0 gnunet-0.12.2_1
 libgnunettransportcore.so.0 gnunet-0.12.2_1
 libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
-libskarnet.so.2.10 skalibs-2.10.0.1_1
+libskarnet.so.2.11 skalibs-2.11.0.0_1
 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
 libtidy.so.58 libtidy5-5.8.0_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index 891680dd1847..c02e30b5a79b 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.10.0.3
+version=2.11.0.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
 changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b780b0ae650dda0c3ec5f8975174998af2d24c2a2e2be669b1bab46e73b1464d
+checksum=98dfc8a02a333f5b12d069d84471c0d51ab5a421c4292963048b3652563d34d9
 
 post_install() {
 	vlicense COPYING LICENSE

From c96592428b610f2ec83ea0db5478346ef4a7d841 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:30:51 +0300
Subject: [PATCH 1462/4088] nsss: update to 0.2.0.0.

---
 srcpkgs/nsss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index 3baf95812104..1f660dd3221b 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,6 +1,6 @@
 # Template file for 'nsss'
 pkgname=nsss
-version=0.1.0.1
+version=0.2.0.0
 revision=1
 # Only available for musl
 archs="*-musl"
@@ -16,7 +16,7 @@ license="ISC"
 homepage="https://skarnet.org/software/nsss/"
 changelog="https://skarnet.org/software/nsss/upgrade.html"
 distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz"
-checksum=20c7b015eb31d0a263ffbe3a672b2ed0be173190dce25b41b9adb95341c851d9
+checksum=f1291e2d63e7df8f8b71eb917dc51ee37c87ed38cce7048d2290a5be27a7e07d
 
 build_options="static"
 

From 168d61d17796ed96e8b8c62c9eedc538e18022a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:30:56 +0300
Subject: [PATCH 1463/4088] execline: update to 2.8.1.0.

---
 srcpkgs/execline/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 856750ada28b..aa5908a7badc 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.8.0.1
+version=2.8.1.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a373f497d2335905d750e2f3be2ba47a028c11c4a7d5595dca9965c161e53aed
+checksum=5b55c9f9641e36d4238811ed3ab5586d3a1045cb48e0bda97c9a49fe8bfb5557
 
 CFLAGS="-fPIC"
 

From 3bab0c30fc9a46ce5849811a3bc8a37518a8acd2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:31:02 +0300
Subject: [PATCH 1464/4088] s6: update to 2.11.0.0.

---
 srcpkgs/s6/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 730c74a530a9..bfbe2e6067bb 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
 # Template file for 's6'
 pkgname=s6
-version=2.10.0.3
+version=2.11.0.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -15,7 +15,7 @@ license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=1d21373151704150df0e8ed199f097f6ee5d2befb9a68aca4f20f3862e5d8757
+checksum=c545e4e18cd98e7fdbef84566e212276e44630f25de3e7891a3c58e83a9074a8
 
 build_options="static"
 

From 0e7c9511ce3ea6b2e8639f8947956d12dec2c202 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:31:06 +0300
Subject: [PATCH 1465/4088] s6-rc: update to 0.5.2.3.

---
 srcpkgs/s6-rc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index 41565de3c458..e6c28c5ce76c 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,6 +1,6 @@
 # Template file for 's6-rc'
 pkgname=s6-rc
-version=0.5.2.2
+version=0.5.2.3
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-rc/"
 changelog="https://skarnet.org/software/s6-rc/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=2a8d1cd455c05c8502b34517cfe79841aa46d08ad969076b37a15d3910617f89
+checksum=b2b4e120e16ae9e1b37e0f9bbb238e9affa9e89447a5f2ea28cbe2fd39bdcaf7
 
 build_options="static"
 

From ca85ad20796ca933de37294c35cc67b2adf2c8e0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:38:46 +0300
Subject: [PATCH 1466/4088] s6-portable-utils: update to 2.2.3.3.

---
 srcpkgs/s6-portable-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index 39aa659bec74..d6bb09fb9244 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.2.3.2
+version=2.2.3.3
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-portable-utils/"
 changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=6627a2d3ea263539e83512a36f10a587fa0dd5e899bc3612187e9e3b9faf769c
+checksum=0445f0d6195707553fa2b09a67a06849e20d7194c7e64c0d9f8074347191528c
 
 build_options="static"
 

From c1464a0f3a53920964021ce5fb4c0a6fe198db2c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:38:53 +0300
Subject: [PATCH 1467/4088] s6-linux-utils: update to 2.5.1.6.

---
 srcpkgs/s6-linux-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 52d3622be3b4..01d00b5bc786 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-linux-utils'
 pkgname=s6-linux-utils
-version=2.5.1.5
+version=2.5.1.6
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-linux-utils"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=c300dbf36b533083f82c6827830c55ce34bfc6cd493c782f207d199669a345ba
+checksum=1f8df105dbde095ed7793dc988ef44cbabbf7f1fe439867889469d06a84d2443
 
 build_options="static"
 

From 15b2048c4f10a858b299e6cca2e3b78d347304fb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:39:01 +0300
Subject: [PATCH 1468/4088] s6-dns: update to 2.3.5.2.

---
 srcpkgs/s6-dns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index ee56726d19e9..4e3b796e41b2 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,6 +1,6 @@
 # Template file for 's6-dns'
 pkgname=s6-dns
-version=2.3.5.1
+version=2.3.5.2
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib
@@ -13,7 +13,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
 homepage="https://skarnet.org/software/s6-dns"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=0c1d50e5d7bc65cbf59b6f37fbd7f6f5645694224bb8c4dc1943d7921bc74f63
+checksum=dca3f38a33310e7b848b10cf9f1fcaa43fdac480c53de67f8edcdc9daffc9f59
 
 build_options="static"
 

From 3d945be0285f2a09c6434a01dce5504ab6678d4b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:39:06 +0300
Subject: [PATCH 1469/4088] s6-networking: update to 2.5.0.0.

---
 srcpkgs/s6-networking/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 575d9b0f34df..f71b2d0fe615 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,6 +1,6 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
-version=2.4.1.1
+version=2.5.0.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
@@ -16,7 +16,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-networking"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=a3fbca789dc5c82b3055fdbd2f55110902198f3136447617ce8f8b79fa8aa554
+checksum=b09a843555aabae5ca4bc41e49e3b437204f7371024d48a9eab63e3e5f7ac3ba
 
 build_options="bearssl libtls static"
 build_options_default="bearssl"

From c0889be30d5f4ec528085677c173b8b3781e8fd1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Sep 2021 21:39:12 +0300
Subject: [PATCH 1470/4088] mdevd: update to 0.1.5.0.

---
 srcpkgs/mdevd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index b85ef940243b..14b618d60a2b 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,6 +1,6 @@
 # Template file for 'mdevd'
 pkgname=mdevd
-version=0.1.4.0
+version=0.1.5.0
 revision=1
 build_style=configure
 configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/mdevd/"
 changelog="https://skarnet.org/software/mdevd/upgrade.html"
 distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=ffd3b223b4cf0e51253b4a8f09cb88d70bf22693228ab0818af174a3f099dcd2
+checksum=c012037c80c4596c5d4549aff5fd9e5cf84e8c01a1d1959b8c7c94baecebd307
 
 build_options="static"
 

From c15d733ec6d5397c6bdb75785f1168998d5db7f7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 29 Sep 2021 18:24:15 +0300
Subject: [PATCH 1471/4088] s6-man-pages: update to 2.11.0.0.2.

---
 srcpkgs/s6-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
index a435dda4f58b..8c01b2e8883b 100644
--- a/srcpkgs/s6-man-pages/template
+++ b/srcpkgs/s6-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 's6-man-pages'
 pkgname=s6-man-pages
-version=2.10.0.3.1
+version=2.11.0.0.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/s6-man-pages"
 distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
-checksum=df23a0c68e276f4d6851997dc2535cec357e2e61f7dd5bd3bc991d3d60280029
+checksum=0936736aec214ee0be94ecafa6501003d5b36cd5e7e157a00b9d5caf27cd3682
 
 
 do_install() {

From 9e2cb007c52d0e9e31db7f2e7378e6bda66aef09 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 29 Sep 2021 18:24:27 +0300
Subject: [PATCH 1472/4088] s6-networking-man-pages: update to 2.5.0.0.2.

---
 srcpkgs/s6-networking-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
index 4a0d92c55dd7..bed94f2b6b98 100644
--- a/srcpkgs/s6-networking-man-pages/template
+++ b/srcpkgs/s6-networking-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 's6-networking-man-pages'
 pkgname=s6-networking-man-pages
-version=2.4.1.1.1
+version=2.5.0.0.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/s6-networking-man-pages"
 distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
-checksum=7606122ab71893fa216b48990d6c2e4eb124490acc237b84972ec6c1096c45f7
+checksum=70181696bd4acaccf95831a5d3ee25bc5bc0e13c0d36b508ee7a5a9d94e0cc9f
 
 do_install() {
 	vmkdir usr/share/man/man1

From 0cdc49c4a2685ade59e8d32081ad0b16622e90ac Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 29 Sep 2021 18:24:34 +0300
Subject: [PATCH 1473/4088] execline-man-pages: update to 2.8.1.0.2.

---
 srcpkgs/execline-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index d15dd021ab58..027b47ef7412 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 'execline-man-pages'
 pkgname=execline-man-pages
-version=2.8.0.1.1
+version=2.8.1.0.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/execline-man-pages"
 distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=4e03d919660ffa1ec0713af0ebf6f7214d3f18a1633e1f97155da120824bcb92
+checksum=7280b70e0eacd551bfa215550d78a8ed12876a1bd7012c084addaa50c809c2fa
 
 do_install() {
 	vmkdir usr/share/man/man1

From 2c44b9039c5d1831b0322a9f723e73eb380473d8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 29 Sep 2021 21:26:57 +0300
Subject: [PATCH 1474/4088] oblibs: update to 0.1.4.0.

---
 srcpkgs/oblibs/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index 43add1381b43..c47caaf61f44 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,8 +1,8 @@
 # Template file for 'oblibs'
 pkgname=oblibs
-version=0.1.3.0
+version=0.1.4.0
 revision=1
-wrksrc="${pkgname}-v${version}"
+wrksrc="oblibs-v${version}"
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps"
 makedepends="skalibs-devel execline-devel"
@@ -10,8 +10,8 @@ short_desc="Obarun library"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://framagit.org/Obarun/oblibs"
-distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=40f8ef6ba08cecd467e03a137dad14eba649789049bde10f08b0706a657e970d
+distfiles="https://framagit.org/Obarun/oblibs/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
+checksum=0ebb6024b9b2c737b0e065e2d49a98965db116c04caff4289acde332316b781a
 
 post_install() {
 	vlicense LICENSE

From 0948b6290ceddfd0d992c45228d740dea27d8a97 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 1 Oct 2021 18:40:24 +0300
Subject: [PATCH 1475/4088] 66: update to 0.6.2.0.

---
 srcpkgs/66/patches/shutdown_posixsh.diff | 27 ++++++++++++++++++++++++
 srcpkgs/66/template                      |  5 +++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/66/patches/shutdown_posixsh.diff

diff --git a/srcpkgs/66/patches/shutdown_posixsh.diff b/srcpkgs/66/patches/shutdown_posixsh.diff
new file mode 100644
index 000000000000..c89983519291
--- /dev/null
+++ b/srcpkgs/66/patches/shutdown_posixsh.diff
@@ -0,0 +1,27 @@
+diff --git a/skel/shutdown b/skel/shutdown
+index 0f59623855bc8e8ad260eeeb57a090f88b26b5d1..b39f0f0decb9b8e27c65ba59b3891482f326a876 100755
+--- a/skel/shutdown
++++ b/skel/shutdown
+@@ -28,18 +28,18 @@ Time must be one of these formats: [ now | [+]mins | hh:mm ] where:
+     mins or +mins : relative time; triggers the shutdown sequence after mins minutes.
+     hh:mm : absolute time; triggers the shutdown sequence when the time hh:mm occurs.
+ 
+-See also 66-shutdown program to more features.
++See also 66-shutdown program for more features.
+ EOF
+ exit 111
+ }
+ 
+ die() {
+-    printf "${PROG}:fatal: options must be set first\n" >&1
++    printf "%s:fatal: options must be set first\n" "${PROG}" >&1
+     usage
+ }
+ 
+-[ -z ${1} ] && die
++[ -z "${1}" ] && die
+ 
+-[ ${1:0:1} != '-' ] && die
++[ "${1%%"${1#?}"}" != '-' ] && die
+ 
+ 66-shutdown "${@}"
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 46e5770b2ad0..7ad72f7d6411 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,6 +1,6 @@
 # Template file for '66'
 pkgname=66
-version=0.6.1.2
+version=0.6.2.0
 revision=1
 wrksrc="66-v${version}"
 build_style=configure
@@ -18,7 +18,8 @@ license="ISC"
 homepage="http://web.obarun.org/software/"
 changelog="https://framagit.org/Obarun/66/raw/master/NEWS.md"
 distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
-checksum=99de5ede29670ffb55808dc0c3f28a49bf005d594ba3016b13271d4de025f589
+checksum=f63600e9f8e53211e421707aae7f98d2fa9d1b0d0b4b39162cf180df12b99c28
+patch_args="-Np1"
 
 conf_files="/etc/66/init.conf"
 

From 99dc3223202ef1b0dce601c08745e457b177c824 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 1 Oct 2021 18:40:30 +0300
Subject: [PATCH 1476/4088] 66-tools: update to 0.0.8.0.

---
 srcpkgs/66-tools/patches/fix-man.patch | 17 -----------------
 srcpkgs/66-tools/template              |  6 +++---
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/66-tools/patches/fix-man.patch

diff --git a/srcpkgs/66-tools/patches/fix-man.patch b/srcpkgs/66-tools/patches/fix-man.patch
deleted file mode 100644
index 667520f6f789..000000000000
--- a/srcpkgs/66-tools/patches/fix-man.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/doc/make-man.sh
-+++ b/doc/make-man.sh
-@@ -10,11 +10,9 @@ done
- 
- for i in ${man1}; do
-     lowdown -s -Tman doc/"${i}".md -o doc/man/man1/"${i}".1
--    var=$(head -n1 < doc/man/man1/"${i}".1)
--    var=$(printf '%s' "$var" | tr '7' '1')
--    var="${var} \"\" \"General Commands Manual\""
--    sed -i "s!^.TH.*!${var}!" doc/man/man1/"${i}".1
--    sed -i '2,7d' doc/man/man1/"${i}".1
-+    var=$(sed -n '/^.TH/p' doc/man/man1/"${f}".1 | tr '7' '1')
-+    sed -i "s!^.TH.*!${var}!" doc/man/man1/"${f}".1
-+    sed -i '4,8d' doc/man/man1/"${f}".1
- done
- 
- man_5(){
diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index b9c5e7c66a79..1b61ce1aa874 100644
--- a/srcpkgs/66-tools/template
+++ b/srcpkgs/66-tools/template
@@ -1,8 +1,8 @@
 # Template file for '66-tools'
 pkgname=66-tools
-version=0.0.7.3
+version=0.0.8.0
 revision=1
-wrksrc=${pkgname}-v${version}
+wrksrc="66-tools-v${version}"
 build_style=configure
 configure_args="--prefix=/usr
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -16,7 +16,7 @@ license="ISC"
 homepage="http://web.obarun.org/software/index.html"
 changelog="https://framagit.org/Obarun/66-tools/-/raw/master/doc/upgrade.md"
 distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz"
-checksum=c8cbe0d6c104e4d87d588d5980201770a6fd2fad11f99ff138a37ff918d68491
+checksum=58f072ce1bbc6b6440046d3dc860ca31bb3f39801d09853141006dd5f7041dbb
 
 post_install() {
 	vlicense LICENSE

From 57e33ddd20bb5913c5e788f163e1fb6da77bae92 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Oct 2021 22:35:38 +0200
Subject: [PATCH 1477/4088] build-style/meson: ensure stdout is unbuffered for
 continuous log

This should deal with the annoying thing that meson will only print
its configure output all at once at the end.
---
 common/build-style/meson.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index c59fd7d984dd..ab9f2cacfd0a 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -102,7 +102,8 @@ do_configure() {
 	# We also force gcc-ar usage in the crossfile above.
 	export AR="gcc-ar"
 
-	${meson_cmd} \
+	# unbuffered output for continuous logging
+	PYTHONUNBUFFERED=1 ${meson_cmd} \
 		--prefix=/usr \
 		--libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
 		--libexecdir=/usr/libexec \

From d9eb827561af7d77904a80c5c95bdb21036f977f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 28 Sep 2021 20:30:31 +0200
Subject: [PATCH 1478/4088] pulseaudio: fix segfault when listing handlers

PulseAudio segfaulted when asserts were disabled and an application tried
to list handlers:

    pactl send-message /core list-handlers

This was bug was triggered with the pavucontrol 5.0 update.

https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1278
---
 ...ession-with-side-effect-in-pa_assert.patch | 79 +++++++++++++++++++
 srcpkgs/pulseaudio/template                   |  2 +-
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.patch

diff --git a/srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.patch b/srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.patch
new file mode 100644
index 000000000000..eff6b1c1406c
--- /dev/null
+++ b/srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.patch
@@ -0,0 +1,79 @@
+From e1899245703f1dfa3220af465046c287a5f1c2ba Mon Sep 17 00:00:00 2001
+From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
+Date: Thu, 30 Sep 2021 08:40:35 +0300
+Subject: [PATCH] Fix expression with side effect in pa_assert
+
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/641>
+---
+ src/modules/bluetooth/module-bluez5-device.c | 4 ++--
+ src/pulsecore/card.c                         | 4 ++--
+ src/pulsecore/core.c                         | 4 ++--
+ src/pulsecore/dbus-util.c                    | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
+index 9774be5cc..afbb7e3fa 100644
+--- a/src/modules/bluetooth/module-bluez5-device.c
++++ b/src/modules/bluetooth/module-bluez5-device.c
+@@ -2513,10 +2513,10 @@ static int bluez5_device_message_handler(const char *object_path, const char *me
+     pa_bluetooth_profile_t profile;
+     const pa_a2dp_endpoint_conf *endpoint_conf;
+     const char *codec_name;
+-    struct userdata *u;
++    struct userdata *u = userdata;
+     bool is_a2dp_sink;
+ 
+-    pa_assert(u = (struct userdata *)userdata);
++    pa_assert(u);
+     pa_assert(message);
+     pa_assert(response);
+ 
+diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
+index 23b347b59..4f5997d2c 100644
+--- a/src/pulsecore/card.c
++++ b/src/pulsecore/card.c
+@@ -467,10 +467,10 @@ int pa_card_suspend(pa_card *c, bool suspend, pa_suspend_cause_t cause) {
+ }
+ 
+ static int card_message_handler(const char *object_path, const char *message, const pa_json_object *parameters, char **response, void *userdata) {
+-    pa_card *c;
++    pa_card *c = userdata;
+     char *message_handler_path;
+ 
+-    pa_assert(c = (pa_card *) userdata);
++    pa_assert(c);
+     pa_assert(message);
+     pa_assert(response);
+ 
+diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
+index 174d0650e..132f08bbb 100644
+--- a/src/pulsecore/core.c
++++ b/src/pulsecore/core.c
+@@ -86,9 +86,9 @@ static char *message_handler_list(pa_core *c) {
+ }
+ 
+ static int core_message_handler(const char *object_path, const char *message, const pa_json_object *parameters, char **response, void *userdata) {
+-    pa_core *c;
++    pa_core *c = userdata;
+ 
+-    pa_assert(c = (pa_core *) userdata);
++    pa_assert(c);
+     pa_assert(message);
+     pa_assert(response);
+     pa_assert(pa_safe_streq(object_path, "/core"));
+diff --git a/src/pulsecore/dbus-util.c b/src/pulsecore/dbus-util.c
+index 7d550204e..466a882d8 100644
+--- a/src/pulsecore/dbus-util.c
++++ b/src/pulsecore/dbus-util.c
+@@ -737,7 +737,7 @@ pa_proplist *pa_dbus_get_proplist_arg(DBusConnection *c, DBusMessage *msg, DBusM
+     pa_assert(msg);
+     pa_assert(iter);
+ 
+-    pa_assert(signature = dbus_message_iter_get_signature(iter));
++    pa_assert_se(signature = dbus_message_iter_get_signature(iter));
+     pa_assert_se(pa_streq(signature, "a{say}"));
+ 
+     dbus_free(signature);
+-- 
+GitLab
+
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index f1f88d7fb08a..685154e8c0e1 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=15.0
-revision=2
+revision=3
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled

From 4ce2e9b91377b6ee8b29be68a72b0b61df48980f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 28 Sep 2021 20:33:20 +0200
Subject: [PATCH 1479/4088] pavucontrol: update to 5.0.

This update was previously reverted because it was segfaulting
pulseaudio, but this has been fixed.
---
 .../pavucontrol/patches/fix-segfault.patch    | 319 ------------------
 srcpkgs/pavucontrol/template                  |  12 +-
 2 files changed, 6 insertions(+), 325 deletions(-)
 delete mode 100644 srcpkgs/pavucontrol/patches/fix-segfault.patch

diff --git a/srcpkgs/pavucontrol/patches/fix-segfault.patch b/srcpkgs/pavucontrol/patches/fix-segfault.patch
deleted file mode 100644
index fe7fcba5ccc7..000000000000
--- a/srcpkgs/pavucontrol/patches/fix-segfault.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Upstream: yes, not released.
-
-Remove configure.ac changes to avoid need to reconfigure.
-We know we have the necessary version of its dependencies.
-
-From 284082551938b65e71d06bda793fedbd4a4f41ab Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler@gmail.com>
-Date: Sat, 28 Dec 2019 12:39:38 -0300
-Subject: [PATCH] Migrate away from deprecated Gtk interfaces
-
-This was accomplished by building with -DGTKMM_DISABLE_DEPRECATED.
----
- configure.ac           |  2 +-
- src/channelwidget.h    |  2 +-
- src/devicewidget.cc    |  6 +++---
- src/mainwindow.cc      | 12 ++++++------
- src/pavuapplication.cc | 22 +++++++++++++++-------
- src/pavuapplication.h  |  2 ++
- src/pavucontrol.cc     |  7 ++++---
- src/pavucontrol.glade  | 24 ++++++++++++------------
- src/sinkwidget.h       |  2 +-
- src/streamwidget.cc    |  2 +-
- 10 files changed, 46 insertions(+), 35 deletions(-)
-
-diff --git a/src/channelwidget.h b/src/channelwidget.h
-index c9c5c9d..6216b74 100644
---- a/src/channelwidget.h
-+++ b/src/channelwidget.h
-@@ -38,7 +38,7 @@ public:
- 
-     Gtk::Label *channelLabel;
-     Gtk::Label *volumeLabel;
--    Gtk::HScale *volumeScale;
-+    Gtk::Scale *volumeScale;
- 
-     int channel;
-     MinimalStreamWidget *minimalStreamWidget;
-diff --git a/src/devicewidget.cc b/src/devicewidget.cc
-index e1b1869..dd41487 100644
---- a/src/devicewidget.cc
-+++ b/src/devicewidget.cc
-@@ -227,7 +227,7 @@ void DeviceWidget::prepareMenu() {
- 
- bool DeviceWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
- 
-@@ -259,8 +259,8 @@ void DeviceWidget::renamePopup() {
-     x->get_widget("renameText", renameText);
- 
-     renameText->set_text(description);
--    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
--    dialog->add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-+    dialog->add_button("_Cancel", Gtk::RESPONSE_CANCEL);
-+    dialog->add_button("_OK", Gtk::RESPONSE_OK);
-     dialog->set_default_response(Gtk::RESPONSE_OK);
-     if (Gtk::RESPONSE_OK == dialog->run()) {
-         pa_operation* o;
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index f3d8620..e1a0a82 100644
---- a/src/mainwindow.cc
-+++ b/src/mainwindow.cc
-@@ -95,11 +95,11 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
-     x->get_widget("notebook", notebook);
-     x->get_widget("showVolumeMetersCheckButton", showVolumeMetersCheckButton);
- 
--    cardsVBox->set_reallocate_redraws(true);
--    sourcesVBox->set_reallocate_redraws(true);
--    streamsVBox->set_reallocate_redraws(true);
--    recsVBox->set_reallocate_redraws(true);
--    sinksVBox->set_reallocate_redraws(true);
-+    sourcesVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sourcesVBox->queue_draw(); });
-+    cardsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ cardsVBox->queue_draw(); });
-+    streamsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ streamsVBox->queue_draw(); });
-+    recsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ recsVBox->queue_draw(); });
-+    sinksVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sinksVBox->queue_draw(); });
- 
-     sinkInputTypeComboBox->set_active((int) showSinkInputType);
-     sourceOutputTypeComboBox->set_active((int) showSourceOutputType);
-@@ -222,7 +222,7 @@ bool MainWindow::on_key_press_event(GdkEventKey* event) {
-             case GDK_KEY_Q:
-             case GDK_KEY_w:
-             case GDK_KEY_q:
--                Gtk::Main::quit();
-+                this->get_application()->quit();
-                 return true;
-         }
-     }
-diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc
-index 2ff5739..6773b53 100644
---- a/src/pavuapplication.cc
-+++ b/src/pavuapplication.cc
-@@ -30,6 +30,14 @@
- #include "pavucontrol.h"
- #include "mainwindow.h"
- 
-+static PavuApplication globalInstance;
-+
-+PavuApplication&
-+PavuApplication::get_instance()
-+{
-+    return globalInstance;
-+}
-+
- PavuApplication::PavuApplication() :
-     Gtk::Application("org.pulseaudio.pavucontrol", Gio::ApplicationFlags::APPLICATION_HANDLES_COMMAND_LINE),
-     mainWindow(NULL),
-@@ -143,26 +151,26 @@ int main(int argc, char *argv[]) {
-     signal(SIGPIPE, SIG_IGN);
- 
-     /* Create the application */
--    auto app = PavuApplication();
-+    globalInstance = PavuApplication();
- 
-     /* Add command-line options */
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_INT,
-         "tab", 't',
-         _("Select a specific tab on load."),
-         _("number"));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "retry", 'r',
-         _("Retry forever if pa quits (every 5 seconds)."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "maximize", 'm',
-         _("Maximize the window."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "version", 'v',
-         _("Show version."));
-@@ -170,7 +178,7 @@ int main(int argc, char *argv[]) {
-     /* Connect to the "on_command_line" signal which is fired
-      * when the application receives command-line arguments
-      */
--    app.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &app), false);
-+    globalInstance.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &globalInstance), false);
- 
-     /* Run the application.
-      * In the first launched instance, this will return when its window is
-@@ -179,5 +187,5 @@ int main(int argc, char *argv[]) {
-      * Handling a new request consists of presenting the existing window (and
-      * optionally, select a tab).
-      */
--    return app.run(argc, argv);
-+    return globalInstance.run(argc, argv);
- }
-diff --git a/src/pavuapplication.h b/src/pavuapplication.h
-index 3589c5d..d2a1f5a 100644
---- a/src/pavuapplication.h
-+++ b/src/pavuapplication.h
-@@ -37,6 +37,8 @@ public:
-     gint32 tab;
-     bool version;
- 
-+    static PavuApplication& get_instance();
-+
- protected:
-     // Override default signal handlers:
-     void on_activate() override;
-diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
-index 6981707..bcdde8e 100644
---- a/src/pavucontrol.cc
-+++ b/src/pavucontrol.cc
-@@ -40,6 +40,7 @@
- #include "sourceoutputwidget.h"
- #include "rolewidget.h"
- #include "mainwindow.h"
-+#include "pavuapplication.h"
- 
- static pa_context* context = NULL;
- static pa_mainloop_api* api = NULL;
-@@ -56,7 +57,7 @@ void show_error(const char *txt) {
-     Gtk::MessageDialog dialog(buf, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
-     dialog.run();
- 
--    Gtk::Main::quit();
-+    PavuApplication::get_instance().quit();
- }
- 
- static void dec_outstanding(MainWindow *w) {
-@@ -571,7 +572,7 @@ void context_state_callback(pa_context *c, void *userdata) {
- 
-         case PA_CONTEXT_TERMINATED:
-         default:
--            Gtk::Main::quit();
-+            w->get_application()->quit();
-             return;
-     }
- }
-@@ -613,7 +614,7 @@ gboolean connect_to_pulse(gpointer userdata) {
-         else {
-             if(!retry) {
-                 reconnect_timeout = -1;
--                Gtk::Main::quit();
-+                w->get_application()->quit();
-             } else {
-                 g_debug(_("Connection failed, attempting reconnect"));
-                 reconnect_timeout = 5;
-diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
-index e26e0c4..ed83b04 100644
---- a/src/pavucontrol.glade
-+++ b/src/pavucontrol.glade
-@@ -425,10 +425,10 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-                         <child>
--                          <object class="GtkTable" id="encodingSelect">
-+                          <object class="GtkGrid" id="encodingSelect">
-                             <property name="can_focus">False</property>
--                            <property name="n_rows">2</property>
--                            <property name="n_columns">3</property>
-+                            <property name="row_homogeneous">True</property>
-+                            <property name="column_homogeneous">True</property>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatPCM">
-                                 <property name="label" translatable="yes">PCM</property>
-@@ -439,6 +439,10 @@
-                                 <property name="active">True</property>
-                                 <property name="draw_indicator">True</property>
-                               </object>
-+                              <packing>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">0</property>
-+                              </packing>
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatAC3">
-@@ -450,7 +454,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -462,8 +466,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-+                                <property name="left_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -475,8 +479,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">1</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -489,9 +493,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -504,9 +506,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                           </object>
-diff --git a/src/sinkwidget.h b/src/sinkwidget.h
-index 0044ffc..924fca0 100644
---- a/src/sinkwidget.h
-+++ b/src/sinkwidget.h
-@@ -46,7 +46,7 @@ public:
- 
- #if HAVE_EXT_DEVICE_RESTORE_API
-     encodingList encodings[PAVU_NUM_ENCODINGS];
--    Gtk::Table *encodingSelect;
-+    Gtk::Grid *encodingSelect;
- #endif
- 
-     virtual void onMuteToggleButton();
-diff --git a/src/streamwidget.cc b/src/streamwidget.cc
-index 00df09f..d203b20 100644
---- a/src/streamwidget.cc
-+++ b/src/streamwidget.cc
-@@ -66,7 +66,7 @@ void StreamWidget::init(MainWindow* mainWindow) {
- 
- bool StreamWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
-     return false;
--- 
-GitLab
-
diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template
index 45e93d9b130a..dfd14580be52 100644
--- a/srcpkgs/pavucontrol/template
+++ b/srcpkgs/pavucontrol/template
@@ -1,14 +1,14 @@
 # Template file for 'pavucontrol'
 pkgname=pavucontrol
-reverts="5.0_1"
-version=4.0
-revision=3
+version=5.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="gtkmm-devel libcanberra-devel gtk+3-devel pulseaudio-devel"
+makedepends="gtkmm-devel libcanberra-devel gtk+3-devel pulseaudio-devel
+ json-glib-devel"
 short_desc="PulseAudio Volume Control"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/software/pulseaudio/pavucontrol/"
-distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2
+distfiles="${FREEDESKTOP_SITE}/pulseaudio/pavucontrol/pavucontrol-${version}.tar.xz"
+checksum=ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a

From f8cabce7322bd23e43da8a30e5d06a7d5a410318 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 12 Oct 2021 08:05:39 +0200
Subject: [PATCH 1480/4088] libadwaita: update to 1.0.0alpha3.

---
 srcpkgs/libadwaita/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 6b49f233b3ec..94379f7d8a9a 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,8 +1,8 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.0alpha2
+version=1.0.0alpha3
 revision=1
-_ver=1.0.0-alpha.2
+_ver=1.0.0.alpha.3
 wrksrc="$pkgname-${_ver}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+checksum=dfb7397b9d04580707b57431e9d0991d9216b5aca472f108b21a09bbd29910cd
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 72e9de1e295aa998bc428443bd0532b9631c04fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:31:28 -0400
Subject: [PATCH 1481/4088] protobuf28: rename to protobuf, update to 3.18.1

In a discussion a year ago [1], I proposed dropping versioned libs
subpackages and the consensus was that the versioning should be kept.
Since then, protobuf has been updated several times and we've always
been able to migrate all dependants, so there's no need to keep the
versioned packages around just in case that can't happen some day.

Let's drop the versioned packages to make upgrades easier and avoid
polluting repo indexes with old packages that don't get cleaned. Users
who need old versions of the libs for un-packaged software may need to
build those old versions by hand, but this is just one of the pitfalls
of using a rolling Linux distribution.

[1]: https://github.com/void-linux/void-packages/pull/18691
---
 common/shlibs                             |  6 +--
 srcpkgs/libprotobuf                       |  1 +
 srcpkgs/libprotobuf-lite                  |  1 +
 srcpkgs/libprotobuf28                     |  1 -
 srcpkgs/libprotobuf28-lite                |  1 -
 srcpkgs/libprotoc                         |  1 +
 srcpkgs/libprotoc-devel                   |  2 +-
 srcpkgs/libprotoc28                       |  1 -
 srcpkgs/libprotoc28-devel                 |  1 -
 srcpkgs/protobuf                          |  1 -
 srcpkgs/protobuf-devel                    |  2 +-
 srcpkgs/protobuf-lite                     |  1 -
 srcpkgs/{protobuf28 => protobuf}/template | 65 ++++++++---------------
 srcpkgs/protobuf28-devel                  |  1 -
 14 files changed, 30 insertions(+), 55 deletions(-)
 create mode 120000 srcpkgs/libprotobuf
 create mode 120000 srcpkgs/libprotobuf-lite
 delete mode 120000 srcpkgs/libprotobuf28
 delete mode 120000 srcpkgs/libprotobuf28-lite
 create mode 120000 srcpkgs/libprotoc
 delete mode 120000 srcpkgs/libprotoc28
 delete mode 120000 srcpkgs/libprotoc28-devel
 delete mode 120000 srcpkgs/protobuf
 delete mode 120000 srcpkgs/protobuf-lite
 rename srcpkgs/{protobuf28 => protobuf}/template (61%)
 delete mode 120000 srcpkgs/protobuf28-devel

diff --git a/common/shlibs b/common/shlibs
index 68476af72810..7a4d4ea1794d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3081,9 +3081,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.28 libprotobuf28-lite-3.17.0_1
-libprotoc.so.28 libprotoc28-3.17.0_1
-libprotobuf.so.28 libprotobuf28-3.17.0_1
+libprotobuf-lite.so.29 libprotobuf-lite-3.18.0_1
+libprotoc.so.29 libprotoc-3.18.0_1
+libprotobuf.so.29 libprotobuf-3.18.0_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
diff --git a/srcpkgs/libprotobuf b/srcpkgs/libprotobuf
new file mode 120000
index 000000000000..779a5a300bcd
--- /dev/null
+++ b/srcpkgs/libprotobuf
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf-lite b/srcpkgs/libprotobuf-lite
new file mode 120000
index 000000000000..779a5a300bcd
--- /dev/null
+++ b/srcpkgs/libprotobuf-lite
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf28 b/srcpkgs/libprotobuf28
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/libprotobuf28
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf28-lite b/srcpkgs/libprotobuf28-lite
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/libprotobuf28-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/libprotoc b/srcpkgs/libprotoc
new file mode 120000
index 000000000000..779a5a300bcd
--- /dev/null
+++ b/srcpkgs/libprotoc
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
index 695e4991b431..779a5a300bcd 120000
--- a/srcpkgs/libprotoc-devel
+++ b/srcpkgs/libprotoc-devel
@@ -1 +1 @@
-protobuf28
\ No newline at end of file
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc28 b/srcpkgs/libprotoc28
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/libprotoc28
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/libprotoc28-devel b/srcpkgs/libprotoc28-devel
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/libprotoc28-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/protobuf b/srcpkgs/protobuf
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/protobuf
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
index 695e4991b431..779a5a300bcd 120000
--- a/srcpkgs/protobuf-devel
+++ b/srcpkgs/protobuf-devel
@@ -1 +1 @@
-protobuf28
\ No newline at end of file
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/protobuf-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/protobuf28/template b/srcpkgs/protobuf/template
similarity index 61%
rename from srcpkgs/protobuf28/template
rename to srcpkgs/protobuf/template
index 7fcf2e2fa707..c127080916f4 100644
--- a/srcpkgs/protobuf28/template
+++ b/srcpkgs/protobuf/template
@@ -1,7 +1,7 @@
-# Template file for 'protobuf28'
-pkgname=protobuf28
-version=3.17.3
-revision=2
+# Template file for 'protobuf'
+pkgname=protobuf
+version=3.18.1
+revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
@@ -12,13 +12,14 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=c6003e1d2e7fefa78a3039f19f383b4f3a61e81be8c19356f85b6461998ad3db
+checksum=9111bf0b542b631165fadbd80aa60e7fb25b25311c532139ed2089d76ddf6dd7
 # Checks rely on googletest
 make_check=no
 
 # Switch to versioned package
-conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0 protobuf26>=0"
-replaces="protobuf<=3.11.4_1 ${conflicts}"
+conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0
+ protobuf25>=0 protobuf26>=0 protobuf28>=0"
+replaces="${conflicts}"
 
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
@@ -44,7 +45,7 @@ post_install() {
 	vlicense LICENSE
 }
 
-libprotobuf28_package() {
+libprotobuf_package() {
 	short_desc="Protocol buffers C++ library"
 	pkg_install() {
 		vmove "usr/lib/libprotobuf.so.*"
@@ -52,7 +53,7 @@ libprotobuf28_package() {
 	}
 }
 
-libprotobuf28-lite_package() {
+libprotobuf-lite_package() {
 	short_desc="Protocol buffers C++ library (lite version)"
 	pkg_install() {
 		vmove "usr/lib/libprotobuf-lite.so.*"
@@ -60,7 +61,7 @@ libprotobuf28-lite_package() {
 	}
 }
 
-libprotoc28_package() {
+libprotoc_package() {
 	short_desc="Protocol buffers compiler library"
 	pkg_install() {
 		vmove "usr/lib/libprotoc.so.*"
@@ -68,13 +69,14 @@ libprotoc28_package() {
 	}
 }
 
-libprotoc28-devel_package() {
-	depends="libprotoc28-${version}_${revision}"
+libprotoc-devel_package() {
+	depends="libprotoc-${version}_${revision}"
 	short_desc="Protocol buffers compiler library - development files"
 	# Switch to versioned package
 	conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0
-	 libprotoc24-devel>=0 libprotoc25-devel>=0 libprotoc26-devel>=0"
-	replaces="libprotoc-devel<=3.11.4_1 ${conflicts}"
+	 libprotoc24-devel>=0 libprotoc25-devel>=0
+	 libprotoc26-devel>=0 libprotoc28-devel>=0"
+	replaces="${conflicts}"
 	pkg_install() {
 		vmove usr/lib/libprotoc.a
 		vmove usr/lib/libprotoc.so
@@ -82,15 +84,16 @@ libprotoc28-devel_package() {
 	}
 }
 
-protobuf28-devel_package() {
+protobuf-devel_package() {
 	depends="zlib-devel
-	 libprotobuf28-${version}_${revision}
-	 libprotobuf28-lite-${version}_${revision}"
+	 libprotobuf-${version}_${revision}
+	 libprotobuf-lite-${version}_${revision}"
 	short_desc="Protocol buffers C++ library - development files"
 	# Switch to versioned package
 	conflicts="protobuf18-devel>=0 protobuf23-devel>=0
-	 protobuf24-devel>=0 protobuf25-devel>=0 protobuf26-devel>=0"
-	replaces="protobuf-devel<=3.11.4_1 ${conflicts}"
+	 protobuf24-devel>=0 protobuf25-devel>=0
+	 protobuf26-devel>=0 protobuf28-devel>=0"
+	replaces="${conflicts}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/libprotobuf.a
@@ -100,27 +103,3 @@ protobuf28-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-protobuf_package() {
-	build_style=meta
-	short_desc="Protocol buffers compiler (meta package)"
-	depends="protobuf28"
-}
-
-protobuf-devel_package() {
-	build_style=meta
-	short_desc="Protocol buffers C++ library - development files (meta package)"
-	depends="protobuf28-devel"
-}
-
-protobuf-lite_package() {
-	build_style=meta
-	short_desc="Protocol buffers C++ library - lite version (meta package)"
-	depends="libprotobuf28-lite"
-}
-
-libprotoc-devel_package() {
-	build_style=meta
-	short_desc="Protocol buffers compiler library - development files (meta package)"
-	depends="libprotoc28-devel"
-}
diff --git a/srcpkgs/protobuf28-devel b/srcpkgs/protobuf28-devel
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/protobuf28-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file

From 0a44ec4e5dd165f667c2f91c0d220e8829c1cc7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 1482/4088] python3-protobuf: update to 3.18.1.

---
 srcpkgs/python3-protobuf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index 37af66f20ea2..d17d50bd3b49 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.17.3
-revision=2
+version=3.18.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-wheel"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=72804ea5eaa9c22a090d2803813e280fb273b62d5ae497aaf3553d141c4fdd7b
+checksum=1c9bb40503751087300dd12ce2e90899d68628977905c76effc48e66d089391e
 
 build_options="cppext"
 build_options_default="cppext"

From 7f8b13c24315dc4710f3b85d663ef0b246a6f239 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:55 -0400
Subject: [PATCH 1483/4088] EternalTerminal: rebuild for protobuf

---
 srcpkgs/EternalTerminal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index f4f2b4720362..08fd631a1028 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
 version=6.0.13
-revision=3
+revision=4
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"

From 4dc6c55893e2f33907d37b89042008eaede2f246 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:55 -0400
Subject: [PATCH 1484/4088] android-tools: rebuild for protobuf

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 20ffbbb80366..214c3002145f 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
 version=31.0.2
-revision=1
+revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf pkg-config"

From f0b8a0c67430cfbadb41de8cf05a08f17d7af0cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 1485/4088] astroid: rebuild for protobuf

---
 srcpkgs/astroid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index e5095cbaf5f2..039f1c8c66a9 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'astroid'
 pkgname=astroid
 version=0.16
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
 makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel

From f7a292de7f3966e38a20fde516ce5eb05e732fb8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 1486/4088] bloaty: rebuild for protobuf

---
 srcpkgs/bloaty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template
index bee0eae3543a..6427ccc64be3 100644
--- a/srcpkgs/bloaty/template
+++ b/srcpkgs/bloaty/template
@@ -1,7 +1,7 @@
 # Template file for 'bloaty'
 pkgname=bloaty
 version=1.1
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config protobuf"
 makedepends="capstone-devel protobuf-devel re2-devel zlib-devel"

From 4d525a7827beaf4fd6ef30eeba8d809590160076 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 1487/4088] clementine: rebuild for protobuf

---
 srcpkgs/clementine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 40a6ac8c70a1..7f7e4eac9332 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.4.0rc1
-revision=5
+revision=6
 _fullver=$version-343-gb49afcc5b
 wrksrc=${pkgname}-${_fullver}
 build_style=cmake

From cf2ba242d957298ecea7c4ee7f11b35be04fc9bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 1488/4088] cura-engine: rebuild for protobuf

---
 srcpkgs/cura-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 10a1a7f45021..c1f2be20a24b 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
 version=4.11.0
-revision=1
+revision=2
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"

From 0709fd4029ceaec6e00e421da04ba43951a25fa1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 1489/4088] grpc: rebuild for protobuf

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 551fcd28f3d1..dcbfa82d1997 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.39.1
-revision=1
+revision=2
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON

From 0d37d2105d0fd531d0912fddee24873a9e40d87e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 1490/4088] kismet: rebuild for protobuf

---
 srcpkgs/kismet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index 6d8a4524beeb..175be70112e5 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
 # Template file for 'kismet'
 pkgname=kismet
 version=2021.08.R1
-revision=1
+revision=2
 _realver="${version//./-}"
 wrksrc="${pkgname}-${_realver}"
 build_style=gnu-configure

From e3bdaf9813352cede13ff2a0b2bc0316a7b7253f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 1491/4088] libArcus: rebuild for protobuf

---
 srcpkgs/libArcus/patches/protobuf.patch | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 srcpkgs/libArcus/patches/protobuf.patch

diff --git a/srcpkgs/libArcus/patches/protobuf.patch b/srcpkgs/libArcus/patches/protobuf.patch
new file mode 100644
index 000000000000..e138558cf2ba
--- /dev/null
+++ b/srcpkgs/libArcus/patches/protobuf.patch
@@ -0,0 +1,42 @@
+Migrate away from previously deprecated functions dropped in protobuf>=3.18.0_1.
+
+--- a/src/Socket_p.h
++++ b/src/Socket_p.h
+@@ -128,9 +128,6 @@
+ 
+         static const int keep_alive_rate = 500; //Number of milliseconds between sending keepalive packets
+ 
+-        // This value determines when protobuf should warn about very large messages.
+-        static const int message_size_warning = 400 * 1048576;
+-
+         // This value determines when protobuf should error out because the message is too large.
+         // Due to the way Protobuf is implemented, messages large than 512MiB will cause issues.
+         static const int message_size_maximum = 500 * 1048576;
+@@ -362,11 +359,15 @@
+             return;
+         }
+ 
+-        uint32_t message_size = message->ByteSize();
+-        if(platform_socket.writeUInt32(message_size) == -1)
++        auto message_size = message->ByteSizeLong();
++        if (message_size > UINT32_MAX) {
++            error(ErrorCode::SendFailedError, "Message size is too large to send");
++            return;
++        }
++
++        if(platform_socket.writeUInt32(static_cast<uint32_t>(message_size)) == -1)
+         {
+             error(ErrorCode::SendFailedError, "Could not send message size");
+-            return;
+         }
+ 
+         uint32_t type_id = message_types.getMessageTypeId(message);
+@@ -548,7 +549,7 @@
+ 
+         google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size);
+         google::protobuf::io::CodedInputStream stream(&array);
+-        stream.SetTotalBytesLimit(message_size_maximum, message_size_warning);
++        stream.SetTotalBytesLimit(message_size_maximum);
+         if(!message->ParseFromCodedStream(&stream))
+         {
+             error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data));

From 2a11afcbc91ed6221b20ad9b9da85ac00d32d24b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 1492/4088] libcompizconfig: rebuild for protobuf

---
 srcpkgs/libcompizconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template
index bef72c22e6bc..f178053b42db 100644
--- a/srcpkgs/libcompizconfig/template
+++ b/srcpkgs/libcompizconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'libcompizconfig'
 pkgname=libcompizconfig
 version=0.8.18
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config protobuf"

From 1b2e464e6ff64062f9e5cbc04f8ea89581039d8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 1493/4088] litecoin: rebuild for protobuf

---
 srcpkgs/litecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index fc91bb89f120..89d084d742ff 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
  --disable-tests --with-openssl"

From aca4fdbfd94e85a187a29e23f2d4bedd5c5b054f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 1494/4088] mixxx: rebuild for protobuf

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 6841ca1322cf..75e4921b1347 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=9
+revision=10
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 8e13dbe2f5b7f382d2ffdd617ee9d7a0d371ee23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 1495/4088] mosh: rebuild for protobuf

---
 srcpkgs/mosh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index a4641f66bb3e..4b66ba23dd89 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
 makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"

From 834bb935807812e10fddeb60ccaf704b9491ed39 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 1496/4088] mozc: rebuild for protobuf, patch gyp to build with
 Python 3.10

---
 srcpkgs/mozc/patches/gyp-py310.patch | 20 ++++++++++++++++++++
 srcpkgs/mozc/template                |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mozc/patches/gyp-py310.patch

diff --git a/srcpkgs/mozc/patches/gyp-py310.patch b/srcpkgs/mozc/patches/gyp-py310.patch
new file mode 100644
index 000000000000..56600b8514e5
--- /dev/null
+++ b/srcpkgs/mozc/patches/gyp-py310.patch
@@ -0,0 +1,20 @@
+--- a/gyp/pylib/gyp/common.py
++++ b/gyp/pylib/gyp/common.py
+@@ -4,7 +4,7 @@
+ 
+ from __future__ import with_statement
+ 
+-import collections
++import collections.abc
+ import errno
+ import filecmp
+ import os.path
+@@ -494,7 +494,7 @@
+ 
+ 
+ # Based on http://code.activestate.com/recipes/576694/.
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+   def __init__(self, iterable=None):
+     self.end = end = []
+     end += [None, end, end]         # sentinel node for doubly linked list
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 2c279fc35f57..f10095f057fb 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -3,7 +3,7 @@ pkgname=mozc
 # src/data/version/mozc_version_template.bzl
 # revision is always 102, template always says 100 ;)
 version=2.26.4472.102
-revision=1
+revision=2
 _commit=439a610ac6b6a92375b4a8188d6c9ef45ea591dd
 _abseil=20210324.1
 create_wrksrc=yes

From 88d8962ec31c4af026d2fb4bb39b657c5441d329 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 1497/4088] mumble: rebuild for protobuf

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index d578a511d47e..69a5cb3c7961 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=6
+revision=7
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio

From 82fc1919409910c52f4bc9d6880e5405a67359e5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 1498/4088] nsjail: rebuild for protobuf

---
 srcpkgs/nsjail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index acff592d2eee..67f0035c30d4 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
 # Template file for 'nsjail'
 pkgname=nsjail
 version=3.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf which"
 makedepends="libnl3-devel protobuf-devel"

From 6cb37bb68c7b8755b0bf9b87bfab2bcee1353ece Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 1499/4088] protobuf-c: rebuild for protobuf

---
 srcpkgs/protobuf-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template
index ab3915524c66..f2fb4d113f9c 100644
--- a/srcpkgs/protobuf-c/template
+++ b/srcpkgs/protobuf-c/template
@@ -1,7 +1,7 @@
 # Template file for 'protobuf-c'
 pkgname=protobuf-c
 version=1.3.3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="$(vopt_enable protoc)"
 hostmakedepends="pkg-config protobuf"

From b09fc3ada3fe27eb6c773649b92e1870f1d6a626 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 1500/4088] strawberry: rebuild for protobuf

---
 srcpkgs/strawberry/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 35828b1e3c24..7b631bdb7b68 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
 # Template file for 'strawberry'
 pkgname=strawberry
 version=0.9.3
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel

From c237c337205c0ef8ac247c07e34c89957b9b5f66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 1501/4088] sysdig: rebuild for protobuf

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 56cdb8f38dcb..160bd7bbe41c 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=11
+revision=12
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

From d29aab8f3f6dc95ae48e9699367a0bb5f4a33b00 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 1502/4088] usbguard: rebuild for protobuf

---
 srcpkgs/usbguard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index 06fc3bf92e95..df27cec8a154 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
 # Template file for 'usbguard'
 pkgname=usbguard
 version=1.0.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
 conf_files="/etc/usbguard/*"

From f95913ed06efd81a1e0e9cd3c2fa15e40f843ec8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 1503/4088] vlc: rebuild for protobuf

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..c18324de4345 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread

From bf8b8ca820c997c0ea49514fc2162a2f9ae227ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 13:44:02 -0400
Subject: [PATCH 1504/4088] zbackup: remove package

Package will not build with new protobuf, upstream hasn't seen a commit
since Feb 2016, a release hasn't been cut since Sep 2015, and issues/PRs
have sat for years without maintainer feedback or other activity.

This project is dead.
---
 .../patches/cmake-build-type-none.patch       | 26 -------------------
 srcpkgs/zbackup/template                      | 13 ----------
 2 files changed, 39 deletions(-)
 delete mode 100644 srcpkgs/zbackup/patches/cmake-build-type-none.patch
 delete mode 100644 srcpkgs/zbackup/template

diff --git a/srcpkgs/zbackup/patches/cmake-build-type-none.patch b/srcpkgs/zbackup/patches/cmake-build-type-none.patch
deleted file mode 100644
index caba5e5e45a8..000000000000
--- a/srcpkgs/zbackup/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,8 +6,6 @@ project( zbackup )
- 
- set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
- 
--set( CMAKE_BUILD_TYPE Release )
--
- find_package( ZLIB REQUIRED )
- include_directories( ${ZLIB_INCLUDE_DIRS} )
- 
-Index: tartool/CMakeLists.txt
-===================================================================
---- a/tartool/CMakeLists.txt
-+++ b/tartool/CMakeLists.txt
-@@ -4,8 +4,6 @@
- cmake_minimum_required( VERSION 2.6.0 )
- project( tartool )
- 
--set( CMAKE_BUILD_TYPE Release )
--
- add_executable( tartool tartool.cc ../file.cc ../dir.cc )
- 
- install( TARGETS tartool DESTINATION bin )
diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
deleted file mode 100644
index c69c8e711cfd..000000000000
--- a/srcpkgs/zbackup/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'zbackup'
-pkgname=zbackup
-version=1.4.4
-revision=23
-build_style=cmake
-hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
-short_desc="Versatile deduplicating backup tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://zbackup.org/"
-distfiles="https://github.com/zbackup/zbackup/archive/${version}.tar.gz"
-checksum=efccccd2a045da91576c591968374379da1dc4ca2e3dec4d3f8f12628fa29a85

From 899569fb973cba4c76d54a5881075211e0669fae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 13:47:32 -0400
Subject: [PATCH 1505/4088] removed-packages: add zbackup

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3e1adba6f210..91ba0a994d94 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,7 @@ replaces="
  libspa-ffmpeg<=0.3.32_1
  libco<=20_1
  libco-devel<=20_1
+ zbackup<=1.4.4_23
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 42ca30e7a901da5334ef26a8099848bc1574493c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Oct 2021 22:10:32 +0300
Subject: [PATCH 1506/4088] mercurial: update to 5.9.2.

---
 srcpkgs/mercurial/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index d58c1971087b..8008c97d9b63 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,7 +1,7 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.9.1
-revision=2
+version=5.9.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
 makedepends="python3-devel"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=32eff9433c62d781dc93e5a6103327264d897ad2bbce3ecb5d2d78a93cf49f27
+checksum=1edad93096f64d5cae55b9550bb835ac73840c7406861c3cf4e14c3b443bec54
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 4eda527b35726a86eb36afad65c275bd53b8adb7 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 11 Oct 2021 02:23:22 +0300
Subject: [PATCH 1507/4088] himalaya: update to 0.5.0.

---
 srcpkgs/himalaya/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index e4405958d993..b74215c98c69 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,18 +1,17 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=cargo
-make_check_args="--lib" # avoid tests with imap server
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
 short_desc="CLI email client"
 maintainer="Gadzhi Kharkharov <me@kkga.me>"
 license="BSD-3-Clause"
 homepage="https://github.com/soywod/himalaya"
-changelog="https://github.com/soywod/himalaya/blob/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/soywod/himalaya/master/CHANGELOG.md"
 distfiles="https://github.com/soywod/himalaya/archive/v${version}.tar.gz"
-checksum=07359cc9827ecda8052a23428f642e06da5a899c40fe887acc5a880c76676131
+checksum=9ac8828f476f7b91ead4598237aa0e46a782327ef8f3d1ab6d7db75eb928173a
 
 post_install() {
 	vlicense LICENSE

From 6a9acb2a49b18e0aff34bc38bd5fc9e795ec1ec9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 12 Oct 2021 21:40:46 -0400
Subject: [PATCH 1508/4088] chezmoi: update to 2.7.0.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index ed94487b6f46..20cbc8b0186b 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.6.1
+version=2.7.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=9703edbe369a498feb82173bda6400f23b7d1624154f84aa0beccf19462f082f
+checksum=93c838f450132cdc41f219cfc1eb764424c3b00e533fd9d6c217e4163529a9ee
 
 export CGO_ENABLED=1
 

From c40a272d21b46d72503de255425f120667e2047e Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 6 Oct 2021 08:31:29 +0200
Subject: [PATCH 1509/4088] pamixer: update to 1.5.

---
 srcpkgs/pamixer/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pamixer/template b/srcpkgs/pamixer/template
index db1914bbabc7..67a9df9ece51 100644
--- a/srcpkgs/pamixer/template
+++ b/srcpkgs/pamixer/template
@@ -1,7 +1,7 @@
 # Template file for 'pamixer'
 pkgname=pamixer
-version=1.4
-revision=2
+version=1.5
+revision=1
 build_style=gnu-makefile
 makedepends="pulseaudio-devel boost-devel"
 short_desc="Pulseaudio command line mixer"
@@ -9,7 +9,8 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cdemoulins/pamixer"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d8c7175dd844e458f4222fd24367e16d2b6cc4edb450bfa8bb9b3dec538cbdea
+checksum=eb75a9f71b99429bc5a789e82bbd3260bc27104aaaf8d9c17b56e23f74531708
+CXXFLAGS="-DVERSION=$version"
 
 do_install() {
 	vbin pamixer

From 7b54da194aa6e6573bda0a1da4feb0be92546a46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 06:04:05 -0400
Subject: [PATCH 1510/4088] libArcus: really rebuild for protobuf

The revbump was lost in a rebase.
---
 srcpkgs/libArcus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d43a77dbd980..f1249f37faed 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
 version=4.11.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"

From 0353423b24a936a7a5600a6375bf1cd9221fd21a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Oct 2021 12:33:40 +0200
Subject: [PATCH 1511/4088] linux5.10: update to 5.10.73.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 3b6578f4c923..a523e44201d4 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.71
+version=5.10.73
 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=02e688d27d963f0325f5cd30e383329cf00ab23db46d1586d6e848e3f992a497
+checksum=edb228032b23efa14077a68d968bc5b0d4026c1d1ef8bb958547a87ccb030e76
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From e4ac08c8e2266c55a382ee4e042b6533cf2f5921 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Oct 2021 12:36:43 +0200
Subject: [PATCH 1512/4088] checksec: update to 2.5.0.

---
 srcpkgs/checksec/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/checksec/template b/srcpkgs/checksec/template
index 304698eaf85f..8b4882c8659d 100644
--- a/srcpkgs/checksec/template
+++ b/srcpkgs/checksec/template
@@ -1,6 +1,6 @@
 # Template file for 'checksec'
 pkgname=checksec
-version=2.4.0
+version=2.5.0
 revision=1
 wrksrc="checksec.sh-${version}"
 depends="binutils"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/slimm609/checksec.sh"
 distfiles="https://github.com/slimm609/checksec.sh/archive/${version}.tar.gz"
-checksum=05bb28e22a916ff5f43d60ddf7b00f233618bbf8f283a059f8e0ceb695bc4ac0
+checksum=1034459d7cd2b0ee515c2b6b003375fec566fb59c838fc5e1961e1fcf76b54fa
 
 do_install() {
 	vbin checksec

From 31a334624837977fb89b22537f26a3be38cea3e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Oct 2021 12:37:24 +0200
Subject: [PATCH 1513/4088] nsd: update to 4.3.8.

---
 srcpkgs/nsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 8e32ee600953..fe9bab7c2a96 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.3.7
+version=4.3.8
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.nlnetlabs.nl/projects/nsd/"
 changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
 distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=fd3b9ec53bbd168d567a0bfcdf140c966511fdaf78bd539d091c1a13c13be8ad
+checksum=11897e25f72f5a98f9202bd5378c936886d54376051a614d3688e451e9cb99e1
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"

From 29463eb9f2d25c34bbed82dca478cd2a2c5ae2b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Oct 2021 12:42:24 +0200
Subject: [PATCH 1514/4088] yash: update to 2.52.

---
 srcpkgs/yash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yash/template b/srcpkgs/yash/template
index 48d666f68151..dd3d2e4fcd4f 100644
--- a/srcpkgs/yash/template
+++ b/srcpkgs/yash/template
@@ -1,6 +1,6 @@
 # Template file for 'yash'
 pkgname=yash
-version=2.51
+version=2.52
 revision=1
 build_style=configure
 configure_args="--prefix=/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://yash.osdn.jp/"
 changelog="https://github.com/magicant/yash/releases"
 distfiles="https://github.com/magicant/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=6f15e68eeb63fd42e91c3ce75eccf325f2c938fa1dc248e7213af37c043aeaf8
+checksum=55137beffd83848805b8cef90c0c6af540744afcc103e1b0f7bdf3ef1991b5c9
 alternatives="
  sh:sh:/usr/bin/yash
  sh:sh.1:/usr/share/man/man1/yash.1"

From 4f56fec3f50e4b2b9ebcbcad3571a365acd82d89 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Oct 2021 19:04:56 +0200
Subject: [PATCH 1515/4088] firefox: update to 93.0.

---
 ...0293649628d32911c909219d514bebb8ce63.patch | 50 +++++++++++++++++++
 srcpkgs/firefox/patches/fix-i386-fdlibm.patch | 18 +++++++
 srcpkgs/firefox/patches/fix-tools.patch       | 13 -----
 srcpkgs/firefox/patches/skia-sucks3.patch     |  4 +-
 srcpkgs/firefox/template                      |  5 +-
 5 files changed, 73 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch
 create mode 100644 srcpkgs/firefox/patches/fix-i386-fdlibm.patch
 delete mode 100644 srcpkgs/firefox/patches/fix-tools.patch

diff --git a/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch b/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch
new file mode 100644
index 000000000000..6a0f7b6c4a2b
--- /dev/null
+++ b/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch
@@ -0,0 +1,50 @@
+
+# HG changeset patch
+# User Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
+# Date 1631000649 0
+# Node ID eac40293649628d32911c909219d514bebb8ce63
+# Parent  6582d77235867224aaf8621bad8ee167dfb31460
+Bug 1729124 - [MIPS64][ARM64] Fix gcc build issue. r=lth
+
+The SpecificRegs struct needs a constructor.
+
+Differential Revision: https://phabricator.services.mozilla.com/D124535
+
+diff --git a/js/src/wasm/WasmBCRegDefs.h b/js/src/wasm/WasmBCRegDefs.h
+--- a/js/src/wasm/WasmBCRegDefs.h
++++ b/js/src/wasm/WasmBCRegDefs.h
+@@ -374,25 +374,31 @@ struct SpecificRegs {
+ };
+ #elif defined(JS_CODEGEN_ARM)
+ struct SpecificRegs {
+   RegI64 abiReturnRegI64;
+ 
+   SpecificRegs() : abiReturnRegI64(ReturnReg64) {}
+ };
+ #elif defined(JS_CODEGEN_ARM64)
+-struct SpecificRegs {};
++struct SpecificRegs {
++  // Required by gcc.
++  SpecificRegs() {}
++};
+ #elif defined(JS_CODEGEN_MIPS32)
+ struct SpecificRegs {
+   RegI64 abiReturnRegI64;
+ 
+   SpecificRegs() : abiReturnRegI64(ReturnReg64) {}
+ };
+ #elif defined(JS_CODEGEN_MIPS64)
+-struct SpecificRegs {};
++struct SpecificRegs {
++  // Required by gcc.
++  SpecificRegs() {}
++};
+ #else
+ struct SpecificRegs {
+ #  ifndef JS_64BIT
+   RegI64 abiReturnRegI64;
+ #  endif
+ 
+   SpecificRegs() { MOZ_CRASH("BaseCompiler porting interface: SpecificRegs"); }
+ };
+
diff --git a/srcpkgs/firefox/patches/fix-i386-fdlibm.patch b/srcpkgs/firefox/patches/fix-i386-fdlibm.patch
new file mode 100644
index 000000000000..831e5e03678d
--- /dev/null
+++ b/srcpkgs/firefox/patches/fix-i386-fdlibm.patch
@@ -0,0 +1,18 @@
+# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double')
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
+
+--- a/modules/fdlibm/src/math_private.h
++++ b/modules/fdlibm/src/math_private.h
+@@ -30,7 +30,12 @@
+  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+  */
+ 
++#if defined(__linux__) && defined(__i386__)
++// rely on glibc's double_t
++typedef long double __double_t;
++#else
+ typedef double      __double_t;
++#endif
+ typedef __double_t  double_t;
+ 
+ /*
diff --git a/srcpkgs/firefox/patches/fix-tools.patch b/srcpkgs/firefox/patches/fix-tools.patch
deleted file mode 100644
index 94de423ce593..000000000000
--- a/srcpkgs/firefox/patches/fix-tools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:09:40.980448579 +0100
-+++ b/tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
-@@ -497,8 +501,10 @@
- ucontext_t sSyncUContext;
- 
- void Registers::SyncPopulate() {
-+#if defined(__GLIBC__)
-   if (!getcontext(&sSyncUContext)) {
-     PopulateRegsFromContext(*this, &sSyncUContext);
-   }
-+#endif
- }
- #endif
diff --git a/srcpkgs/firefox/patches/skia-sucks3.patch b/srcpkgs/firefox/patches/skia-sucks3.patch
index 908311cdb6db..38657e80cf12 100644
--- a/srcpkgs/firefox/patches/skia-sucks3.patch
+++ b/srcpkgs/firefox/patches/skia-sucks3.patch
@@ -33,9 +33,9 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
 --- a/gfx/layers/composite/CompositableHost.cpp
 +++ b/gfx/layers/composite/CompositableHost.cpp
 @@ -13,6 +13,7 @@
- #include "ImageHost.h"  // for ImageHostBuffered, etc
+ #include "Effects.h"  // for EffectMask, Effect, etc
+ #include "gfxUtils.h"
  #include "Layers.h"
- #include "TiledContentHost.h"  // for TiledContentHost
 +#include "mozilla/EndianUtils.h"
  #include "mozilla/gfx/gfxVars.h"
  #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 55cfb9e782da..768d56ed528a 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=92.0
+version=93.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 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=299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84
+checksum=a78f080f5849bc284b84299f3540934a12e961a7ea368b592ae6576ea1f97102
 
 lib32disabled=yes
 
@@ -173,6 +173,7 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' '
 }
 do_install() {
 	export MACH_USE_SYSTEM_PYTHON=1
+	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
 	DESTDIR="$DESTDIR" ./mach install
 
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/browser/defaults/preferences

From a88acd729b0277fb5f0570239d6d5bc9458ca02c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Oct 2021 19:08:33 +0200
Subject: [PATCH 1516/4088] firefox-i18n: update to 93.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index ba532d57588f..c1459b7dae64 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=92.0
+version=93.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="deffe6a7953f43833182782749c4a7dc9037d2793509cba69c934cb344754835
- fb638c717a87d6bcd477bf4a1baab7d75d0ae3ad13d71fb11f3a51de4eb99f92
- 3648b7c46b7492ae4dc426eab3c9e657ad2198b25670e1ec91f89f698edeff1d
- a7b3d8168abac11a5df7f267df982f1a961f3a1caab7c8e08c203c1a179a0906
- d5a5d558aaf8cbc5f31e877ac11662073a22a941bff92413e297508a8fe02c32
- 80b7cb2a503df569532e462066fc04dce4194f99ab387b5a62cccf106a5fceca
- f4400682c9bd3af68008a62b052e9c9fe27fc2a9b46a315f182c6a4936a1c3a5
- bdd6ebf11e9c43bf8c60017f0498f528b064c12ae2a0754a89d9e7ea39a2e55f
- 457af3c65505709a697aa1482eb476cbe71efb6b4186136083939ed03a0d7676
- bcc90a96e037c0d99d66a9e099a9ec27bee934b94da3ab620fea6a0ba58b665a
- 079b636d2baa1298cbcdb819e462a4e52768d2274c6092d6206b30d3baff9eae
- 41ad199057240a94686978264ac1198ce147dbdf34ebe62e6b89ab55043c5cef
- 9d5e1de2a344546714154be019a76838e8688cacb2fc5eb60cf70a4396edf298
- 81fb902784a89f509b4f61b53f323bdbbe56f73f526d2ad29eeabec4035384f8
- 663e601e2a1b0a8815e98e17846ad9dce40fd4ad2ce358d389d3722b064f20e9
- 97bb0ec88c43e7fd4e7c970c3841a87a10d48c4a78eb494183e6a5bb6e500bd4
- 931d8d6b670d8425bb40cb32373c455c123e4a02a0bb3d7bd7284d78490d8186
- 97462f998be1717f388e2337af0ab942a412eaf9f0118274a8950e3ebe315d51
- b7911b542efd8be87eb97e8e703f349372d6dfb3ade6550c17659c69f35da588
- 409deca86fd6b90c91ca324740cbd9d61c8b827fde12d042c425aea7130bfd4c
- f4fae2b7c09a2a208de1d254bfb27f27b93ed892c2194999a2bcbfd8cc0b8252
- 5892fe2ed6c3325b96158ff6e15eff4f082a43a0c1856c954aac4934b0e244ed
- ae35db1ecbf4d8bdfe3034b322ea341ac392813ec059e312cedaf504fdd49405
- c860b368368cb0391370d08389a941b2508fc4f8761f6debadbe7b3cfe8662ca
- 6d2c5a5a8402936066f093e848f13b4efc5dabb574471a588ea0e90ca057fad9
- 52e1405ff150d5a8af9d7576917f6dd8e8b616c73cd7305010a1db9c358bd845
- 24731f8b478691b009d823a9262776cd0ed5413000a1cb60e58be9f5f53957f7
- 8c38d90ad21afb38e7caf483f07a27040f18d42d927a7e69739272c7f2854b1c
- 630b71c32d5fe5e2808f1147df6bb45452d0983ddc34cd97ba48045ef448f77b
- ada3bda133b84524d0686a87c456f080c6fce00c4234870c6fcdec77c65fa380
- 7eae554b92f2aa583f7a54f659622d9083bd5a10ca0759a9712e46fea673d702
- 1e56852bb0c3bc3db6680d0d70bf2b3558d6fef3b112cc4798be9f05936adb3b
- ce5a0f1d296376a5d9de4033e0e5881db8304fd6fd69823ec53840abd0d4794a
- a44156cae8f71c933f443aa773333e3a708eb161d65c377eb085f927ccb048ca
- d914f3f1ded89a03fc4be04ec222ab50cf5bc1c87f607a38a28619a1ced217d6
- 7d9e68214b83c3c81208a4187872cf5abb92c4f1b32a04016782e0ab7f8f80e4
- e3869c0befd88e187b784f9a219b5f70d2f3c2caecb5e83c2080bb56dd93e60c
- f07e029f984d552eded7871bb07de224edfbbb2ba4f1d81ff65b8d7a47df9161
- 9a77806a83358509ed3fe5ad0a1beb4b208b36bfd92139192f3fb97a4c00ad90
- fc2dad73d361cce99d4b9ab5b42306a282e773647b329a95e6aa862a37d5d8dc
- 50063560640626d9737893a2d1d17cedbc917879e389306fdb052df20294c9f0
- bf1cdb05e982d0e4a9c96f3c6868821cfd880c15b8c7cc5a2e33d0ccfee01da8
- 70e5167253463f7ede9b54327c4642ff75ef3beaa40846899f68e5faa15fbdb8
- 02ff467917228b8669f92ac80c99613c9180655efa96170c075951b407ab23e6
- aff4648d4aed49bc2d8ee2d5b90a58216f30c77a2ce9c88cbb18341014318dfd
- 703209a3e81fb38576618817d75d4408c35c14c8dd7e660a0c23e058df59a35a
- 62b5ed218d06b3e9f527ae127618ee7c18140c22760a8bb494613dc27b9f91cf
- 20e982f1687cc40c9548866a622f90964988726d7360d57fc723c06c5cb50d1c
- 0c5125a79d300bd4ac93891200c67dcdbad6132d3bdff9f0da617591411afff6
- 6d1bedfd9c4c0b6171a2c6e471c6a354a34aeb8ecabc1680d36bafea870a960e
- 6f724acf7c33f388ec8a98112c0a799ecae4c194d9fe72eae6308e309867667b
- 1d038d6de44910083513e96fb98cda524b271b6f9ab677fcb4198a32140be3d3
- 62bda4f064b7b7c4075487bee0865d22724172ec5763595e9dd70c6c9a5aa26d
- 70f33bff59cbe69ba8797033e7fbae320f8853f0be1c9de193f000ff164cf3c5
- c8ea6c4f35072ca72e0afa3010f46f1de7d8d09c8771a5ce625bfbc8e7483d5f
- 4bee415b4a4cb177797b59843810acabf6b882d49049a6b05ea9c8dbddf41196
- af6c91f4f24d8acde38983c3072691dd78ac183541d867beb7a6177b93db2a3f
- b4e03b9a058c9014be2cfeb1f6e83bb8ad1d282b050795323111e6511bd37055
- 059dae35df30515e54225872f1f41b9e3ed77a6011bf23349b8879eef046921e
- 458793f49b8434f7283ee22aa77e327ab8b8f2baa57da99a16c2a745faadcde5
- 19624273c2ec5d478d87925396191aa6f0cc7f6ae54c697097cf4597e77e21d1
- 0e5d7bacaebfb4207cf1b676708638792464df1499ca900320f56291f459f766
- fa4ef67d2529378b2485e6f6c1a7664c988b0088d516322ba7a085c2a22eab68
- 890f0720026a5cb33ddf8a1a32abd8c7566ce2b13212881a0cc783da50f53dc6
- 9b2312059a311e37d6f77e57eeb11f6631fbce96420bc1a5498a8afb40577894
- 6227b68207d927171b3839a2afe674dd4b5d698e1d6ba3873765d7c2e989bac3
- 197dce034ac15a048f7b53c2b119595a7eaffdc9f88a9f810f1e8e7c356f812a
- eb669c68f93c03b110446e159bf21ca9701aec2db015ae6b2502256ebbd073cc
- d6e44db5d2c0d02d7bbbeebfa92b5183ca6a1087b59fe0985722cb2c7012c92b
- 37ac38ec417e9c1410930ce7782ccdfb26d33f6dc92fbf54fe39b5e750e86588
- e2c08f0b75dd58e891c8885cb3c7f21e7ff549397632a52b78f6c4b643ea5e7d
- 94df0e146542f182950a75bc78d75b27de15ece953408499472fe294c4ea27f6
- 7fbb226971d49988a87d9702ce1d99cdd3f48130ff1c9eeb2f70b669d3e7bc36
- b509b5be27e88d8b8acdcc2732163bb75f6ccdd255fcaf84a8e4c8d8d88f610a
- be0c91bd505c227fd9c3287e68ea5ff84bde12e770e2fe35a6bbaff17d6fdff1
- bd3a33805c666c6a3b677a415030e556878dc6283b562a45cb583f02941d1850
- 20331a2b0044fd265fd21b086950395c5e6bfdf561304614b79cc434700947b8
- 356aa46bc5d1140b8d5a151149f05bad20038d9fdd6a42dc59d26fad55d4140a
- 04ec0ba3a013b17d57ac410c41296a66b30ce6ea6f57072f038cc3646ca7840a
- a07c8cc749582e8e778fbac4f68df3367bf3f85ce87ebed82ab7e02211af5ab9
- cfede62380177a14d32ed3612ee5ba967d61724ad5c11f07544863e6529078b6
- 51d8d77c75571ec97fd98a32191b2d324b0631e7f14fb5824a11ba24655e5c52
- 3edd8130f8cd76c1830176185744cf25189b1af236d5718b6d1bd2b6837f67a1
- cbcb6fcbcd9536f912ef4168c43578f8f37cbddb7bc081024575b8911957e260
- eada6f6d14f58b1f565c5f144bcfc65002e8b62445aa3f7fc1410e7cd42002c9
- 51b8e7f9c818cb42bc68232e4d5dd135f617b10c955a8109be09f547b97398f8
- 7634c5c0e79a5f111221d25cbc456cf604ce63bec851d5d40ae8ced0a554acf5
- 14c210e781d8674e4f787a5f3f421b26d4116ee1d82b017310e5ce4de958b6cc
- 3f1823c5ab80501e7dcbc4eeeae8ac4b70b77e738cc13619d194635770d0dda8
- 38d8e41b707b8deb675224c8af2065ab3141557de48fdb3f915ea619f1c06ae3
- 949393e90a46562bd176b937a0070f43f71c3935724b4c74234d5e5232957d1d
- c578c4c70eaf15bf25591c1ec37ffe0b3f8b933479e14776223db5f6844fb95c
- e2bb482aa83c49ecc164219413d9b1dd41e03b0a62175df00deb04ff25b60cef
- 120b9b09f296416dec31027d30b60fc4bb432bf41db31fe692341ee29177c57b
- d1e710fef65c67ad0947e5d8cbfa76d5f688b38a1bf9932bff412d597c3c2521
- 0b4c8d85dcc58a41e3cfa65d2ab6d5e2452b4fad4ca25e7b95eae7fd4a4b3fbe"
+checksum="205196fab018220eb8b61936f1de3ba35e19daf72a866c31a2943a669de8bdf6
+ 30d632e9f12a7a31bb3c40c763f4232a91ece7064a4504814eb463467a2a59a9
+ 07c2e6b8fb048b0b9f86320466f2c1d79dd98cbffd6f55151a12d2f888695381
+ 690177541fce49dee39b0dd8f83cffd4abf7efb284e4074b3378309b5840b2a6
+ b2ee763e4ad39dabbea73b0b091b8e5b8e11a4e990d92cac62ca588dbec0e5c6
+ 35533681d0b3ca46034ee1e6090ded3bb2f0f4f38d657e95cc03865bb0cb0536
+ 264181cac8d091da6a3be50107e2e1ccc995ed90f62c25331c7a127123a7e78a
+ e13ab64fcf53d0671114e478f2de8f4e27d2257dbc916dd4502ed63ae222dc13
+ e2f8df73d3532857176efac61a024bf6751a16311db09ac394dcc4d85304eb12
+ 56f7b66997483f9e10e237a9c8ea221b095701ec8cccb3d7e4050dd70db7893f
+ 0470602f1119f6264945d433ae079a64b03e7d8e433b0fc78f541458687e3844
+ a9db270fe486050e1d58046f16e61ba6792f1479fc45bae9fefbae0797a21b6b
+ b2b0496bba90a942d2e35c39878ea92bc5258d611af0100a92e37c77d0083456
+ 4cbba00afe27435510697f971ae18a52e2cb360f5efeaf74639073edf50ee987
+ 54dda701522cb3a1d3c1d13105f013e565adc842646961e7da06ff088470aed5
+ 16a0059573fc1be855e8f35ce35f83e9b4ee1ec7554f20dad65bcba5e2921ebf
+ efa487757370f0c96b4d0c781e5ed7fb3b730b3338a1078c255703c6e6a7eb1c
+ 4c54311cbbf508be0340b2913702050fd3ccc59cf51f2122d43c978d2f17424f
+ a76d9cc440ad223cff7e7a57aa7d2cf3da5b0a46a65917747983d7a6523eb23d
+ a8b398e3cfa4f65387d3fee858a46a405266aa4168489c4dc5dd9da3e38c33e9
+ c087924fbfed5b560c2e34663703bb37ef44d851c147773619eeac46575dbce9
+ a05952cbe9d561a006fab28c30caae17a07eba9ccd984445870f62ac982661fa
+ 4f0fc3a1509db5401e0fa2b4fd2403dbeaeb82643e8313130e70325f5edd4aed
+ 71eebc3d09460e237531ee118ec4b88fe56814079d384efc30d94549af9c53ec
+ f1cfb868eb637e30e220a54320ff76f6d3f0451a248c968784bfec0fb9df0b0b
+ 94764abce683d7edf9a5bab08336254a053ab55f7f476ef25c5cde823aa816c2
+ bbc6e26f73d015d15640748d9e9f1cdf13eeb5b10e5b57d427cd5e9a752b8337
+ e2affd7dd6f514551b0c6879e34a51f2d59808095c7edfeb1329f757e09b3eab
+ 43cae94d429045aa839bd36ac49c5c1f682a919bd79a67c2deb7874ecd87eb21
+ 7f5461b1c3ecebcb17dc99db48a3f97a59eb4075db2aa177e351f1c8dd78a48e
+ 7319ab081347df1e5ef935e5cb9adcd24dc1cff4441e389d22e21da624cdecb1
+ eb39d71646de48d3ae2dbbc9dd6bedd8d99ff9138c60a8c18ffcd5afd2e1958a
+ 59e84e7396a15872307870ef1ef3d93126405129174c1f8ff988f555fbb0a38a
+ dae5f559a446fd8e5ce05db2c9fc927988ca0c7e45baaa1d147c9c7f71b64567
+ 04488a756824bacc67d6147b71e4453ebce6d399d77e4a4a963489bd6cfe6362
+ 101ff43850da5237ad14d5c81f81fff70c8e997dce5f638f7dc8ce6e3f331e0f
+ c708cd6b49dffc393e8e08fc4ab985bdd463cd59e57a21eb440350cbf5b1b219
+ 2064a493a8471abbf426f6a22373478abb3215794707a856dbe1ea89fdf03f21
+ f2dd6ac46e8c02dd15e0eea716169d00caad126df4b02cb94695bfd3865ae4a2
+ c4ccfcd6aaca3caa0b4942679b50db3f4383b4d5958ce491804524e097eb5772
+ 3e0629b328f289686d23e108fc302d5b49d2866fa688a0d40487c66227a6728a
+ ef461c1a4ec1dc205097cf183f093594013b95e8b358ef4b7004cca811a31f0e
+ 5c396fcff01d9a87ea7bd30d5acccfcba4a92d29c07bfeb04a8b000d2c9948d4
+ 03003d6e28dcba6c6bf48bb9b910728780badc43b1fd9a11561522bd2e3dd6a5
+ 707cec518b6ee76a55beb2cfc273ab40c63dce5291b45eafe5f807567d14f184
+ 51240964df10e0869f26a3fc1256b7ef9f53882eae227c7f9cc9f9cc43f54c41
+ a57a6a15677d1a80d882b85aed91d628166acd9e2ca96c4d23a9b78f65fd3047
+ 454c643379da0862f6dba701cdac9cbc731e1c0341603b69f2ae6623c7545902
+ 933a1af28467d8d73a06dd31dbf3055ce100f1dc05ad041e07f7c5464368d6af
+ 65846aa1dd9f2f5f527ca5377c0ca6af11da46f2b687512591191d7bd7d27550
+ dc57eacef684cae17e1b1a126b56cf8cf1b22cdb30fb61314b3440bfd652b525
+ 885cc218fba7cf694d47ff7f65ee0696bf0f0b36c48f8982853c63e840028fc8
+ f5fbc21f3883857e26c106c5a15b499a4e56cfdf01674c6dc20fcaf5cc9aab0c
+ df6d621267a99c03be813a05a9ab95dbb024cdd543514c05334cbf6cee3a4e41
+ 153a48967ff40697f2607bb84fcac215960ff91f501fde8870e7f659f7339b4a
+ 7dbaeeb8fde6c997505baea730ba056fa1b312d117cf2f0f24f237166c8a6efe
+ a7abe1aedd1dc391aa0c47cf8c8cddb3ebcd230c80d7b06f61b066aad067d4fb
+ ba2890a377d56707ba6462b6013bca1a1f7be9b6e24e130d8f1b0139a30dff2f
+ ca5141ec8f50e39242dc8b7b3464d7da01d45db360fddc2538fbdf9b9d9aadb9
+ c2ccd05e593292cb049f6c03aba5defbcbe0aecbbb02543beb4474bcf2f84a87
+ 758efb23999160306d846c9f0be809bd8c81909341bd262703c6268eff7b0ac6
+ 7ca5aa56abb9d4ab37dfb049079e03be1470ff7fc9796a15056f0c12a5db6abf
+ 5f4f6cd6034d5084bc5511acd01c9892438c5e98d82e3d336807e7c83a1ea1a1
+ 8e9f39dcc20013e728133400eda3fa12a4174754287d917cbea9e2fc0fc0b55c
+ f028d25b60ba7eb0007b9f0692cd50ce5b7c02a357dd825ed85e5e6efa17acc0
+ 1de3b542d9cfd802be8f9eff12f3a38e7cae659c6079587fd3e6187f1911c3c4
+ 85b6c6d61fb57cc7e9f691dee9b13570ed5fc0c3b8272b07a415bdce474cdd78
+ 7db4dd2742c0281cd00b397e9d81b8220a9fe6df318b2c08c1d4ef3cb65f564a
+ f9f88ed6b9bbf5f37c9d79c5246be4494ccfe108b4c57503319f40fbafd525a4
+ 9370edacc24a3c88a876bdd0ca6f3dea32a90da1d2f265861963b2d3bddb4199
+ 95c24b9a11ea9b5f10002e0c0f40e2effdbddaa82db0d862c24b0a4b79d88926
+ 043f768cd79c61face5697953f22b626e7d0bc4aad6836bee3cfeac93d1cc17f
+ a02f8d3d66feb947fd86848a8b68a2208a33518ef3739ba622781421f3916ce6
+ 2f760748ea106e691db0732d70c6435d1862961d8cb1146d62da89e1489d98d9
+ 76b91012a0026e324ee7c46d41f6be9733e4b9fccf00642accb42aee75875d9a
+ 3b8a176e8b5b886cf3770fc2ce5eb1856bf2dcb6a7f6d8151e493c7c16d7c791
+ 594ab045a7df211e4a9a021b9f528d4112aa2cbd92b26f7e399d2d2e32c5ca0b
+ 66786e5ebe6411746b21bc0037f6bde0f25f06b54e6394aefb71df3b9d323611
+ d1fa02e67204c831de6dfb4a1361382d2ae413a78ad9f17278913b6a916d992b
+ 3f2c13ba290cece3d0a2aeee479bbb4c86f079ff2569e990962c7b219bf7cce0
+ 15687d53325dfbac6acbf6d9e680a3d010d809cc3aa0cbdb1b040a11faec8fac
+ ceff983ce091dbfd9d115e795b32d0a4011802d1b5003d79776c34f7401a7eb2
+ 00e7ec42efb67c7ee4ba589f05b469e3f55ead59f8745c12711d38eedb2dfbf9
+ 66e33c127b1f9a67cf5fa3c96eb858531121f6230d6e44b4b804397dfba4dc71
+ 3b389289c421b39765acf4fd9406a68593718abd85b7b8d056904c4071ab4ed9
+ df9ffb4bbe0fc617ffd5cc7ae501f8cfa202a53f19d8e7b202d8a380f5171806
+ 6a424899c2bfeef4adf50797c43b2523b84938d3eb48a5d996165148d2f864b5
+ d4026f0925aa07f7c9525064c38a2ed12227a19ef4d9e88f0a1632f26a828d9d
+ 2469899daa5bb1ee012c3f4741fb409a9158b044aa262597d2f6d617555e42e8
+ ec19dae4249b7c6d1301072c3368454b251a81db23e9448bdca503c64d42755f
+ 54702199fdc7f736925ebe1c62ecae030ad3b52d068f59edce5bee0aab800c8e
+ a04f54f6743c00b9fe3adc5dbf0c7c3f9e47fae33fcdf909f3aab990db575ee9
+ b42452476c04b284654a9ccc97b6207753b317dfa1c4ba9b2328c38d4c4663b7
+ fb2606fecf5310d19650e18c4e2da6b51517afe3d7c0282d4152d7a753d8761d
+ 5074ad3b60f5ce72a2a882475d8bfb6a57a0f06a43bf9ecb8aa1abb75b925c5a
+ f37dc20001682438b7795e9c27124b9ca034ef7d7f0a4f70bdd0e7529f60021a"

From b7fb2198f5afd28d27f8c3def731d38f8bef0330 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 10:39:19 -0400
Subject: [PATCH 1517/4088] maturin: update to 0.11.5.

---
 srcpkgs/maturin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 57b4f7eccb54..01363b438ae8 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,7 +1,7 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.11.4
-revision=2
+version=0.11.5
+revision=1
 build_style=cargo
 build_helper=qemu
 # Disable the 'rustls' feature, which leads to bad platform compatibility
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz"
-checksum="9d4fa5f0b556bd05204f27d465771573a0ff54262b118df0151cd3f13c3ec219
+checksum="33b67e66e725c76eac866c2174cfbe708e77a44d215878474d84bc5f9f6386f3
  b6c2ddab7498cf6eab8e637a5b7895f3170b2f9ef989861d1ff33af6c8459b27"
 # Tests use unstable features and fail to build
 make_check=no

From 658489fccab44bea843308c544cd42f29e034826 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 10:44:34 -0400
Subject: [PATCH 1518/4088] python3-pip: update to 21.3.

---
 srcpkgs/python3-pip/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index fa95a4ecf18a..88379e9930b3 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
-revision=2
+version=21.3
+revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=741a61baab1dbce2d8ca415effa48a2b6a964564f81a9f4f1fce4c433346c034
 # Tests have unpackaged dependencies
 make_check=no
 

From a516de04f45ef188e7142ae88ec2e63200d9dc86 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 11:34:29 -0400
Subject: [PATCH 1519/4088] python3-tomli: do not build with python3-flit_core,
 it introduces a cycle

---
 srcpkgs/python3-tomli/template | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-tomli/template b/srcpkgs/python3-tomli/template
index b4cb466abad3..1f9fb2165cf7 100644
--- a/srcpkgs/python3-tomli/template
+++ b/srcpkgs/python3-tomli/template
@@ -1,20 +1,35 @@
 # Template file for 'python3-tomli'
 pkgname=python3-tomli
 version=1.2.1
-revision=2
-wrksrc="tomli-${version}"
+revision=3
+create_wrksrc=yes
+build_wrksrc="tomli-${version}"
 build_style=python3-pep517
-hostmakedepends="python3-flit_core"
+hostmakedepends="python3"
 depends="python3"
 short_desc="Little TOML parser for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/hukkin/tomli"
-distfiles="${PYPI_SITE}/t/tomli/tomli-${version}.tar.gz"
-checksum=a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442
+# flit_core>=3.4.0 requires tomli to run, while tomli requires flit_core to
+# build. Both upstreams are aware of the cycle, but neither cares:
+#     https://github.com/hukkin/tomli/issues/130
+#     https://github.com/takluyver/flit/issues/451
+# As a result, we can't use python3-flit_core to build this package, so we have
+# to just fetch the flit_core tarball to bootstrap tomli. Sigh.
+_flit_version=3.4.0
+distfiles="${PYPI_SITE}/t/tomli/tomli-${version}.tar.gz
+ ${PYPI_SITE}/f/flit_core/flit_core-${_flit_version}.tar.gz"
+checksum="a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442
+ 29468fa2330969167d1f5c23eb9c0661cb6dacfcd46f361a274609a7f4197530"
 # Archive includes no tests
 make_check=no
 
+pre_build() {
+	# Build requires that tomli be able to import flit_core *and* itself!
+	export PYTHONPATH="${PWD}:${wrksrc}/flit_core-${_flit_version}"
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 6906c2e9ac1a80fc0d1411a03606fb15a66aed36 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 10:47:17 -0400
Subject: [PATCH 1520/4088] python3-flit_core: update to 3.4.0.

---
 srcpkgs/python3-flit_core/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index 556363426c16..7dc2741a99e2 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
-revision=2
+version=3.4.0
+revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
 build_style=python3-pep517
-depends="python3-toml"
+depends="python3-tomli"
 checkdepends="python3-pytest python3-testpath $depends"
 short_desc="Simplified packaging of Python modules - PEP 517 build backend"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=390288b27d89a084a32fc40020ad953e14bc215c5a01e6eb6ab8c9bdbcc57283
 
 post_install() {
 	vlicense ../LICENSE

From e7bb7dc488fd03a98de0805658118b7a972a4939 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 11:35:10 -0400
Subject: [PATCH 1521/4088] python3-tifffile: update to 2021.10.12.

---
 srcpkgs/python3-tifffile/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index cc343a24a3b3..edb815401f07 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.30
-revision=2
+version=2021.10.12
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=97d504bdf38c4a8187c36ea0ae74d296e3028191f6b342f3ff2cd344b1127269
+checksum=d239b9bf1d549128f710d5671bccc22bc863b4b7e73eb2c8337e2a51df89f4d2
 # Tests require unpackaged fsspec
 make_check=no
 

From ed0371f90da5dacce32562a28a3005d9e87ee015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 11 Oct 2021 10:55:20 -0300
Subject: [PATCH 1522/4088] python3-gmpy2: restore package, update to 2.1.0rc1

Upstream 2.1.0rc1 builds on python3.10, last official version does not.

This package is used by python3-mpmath for multiprecission arithmetic.
If not installed, mpmath defaults to python bigints which are very slow.

For example: compute 1M digits of pi using sympy:

$ isympy	# without python3-gmpy2
In [1]: %time a=pi.n(1_000_000)
CPU times: user 49.4 s, sys: 2.96 ms, total: 49.4 s
Wall time: 49.4 s

vs.

$ isympy	# with python3-gmpy2
In [1]: %time a=pi.n(1_000_000)
CPU times: user 632 ms, sys: 5.99 ms, total: 638 ms
Wall time: 639 ms

Note that just installing python3-gmpy2 brings this improvement.
Arguably python3-gmpy2 could be made a dependency of python3-mpmath.

This reverts commit f91cea99ddace872a5cdf0ae5d93fcc15b2f3191.

Also:
 - fix hostmakedepends
 - make tests work
 - adopt
---
 srcpkgs/python3-gmpy2/template | 20 ++++++++++++++++++++
 srcpkgs/python3-gmpy2/update   |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-gmpy2/template
 create mode 100644 srcpkgs/python3-gmpy2/update

diff --git a/srcpkgs/python3-gmpy2/template b/srcpkgs/python3-gmpy2/template
new file mode 100644
index 000000000000..1be0a070fa5b
--- /dev/null
+++ b/srcpkgs/python3-gmpy2/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-gmpy2'
+pkgname=python3-gmpy2
+version=2.1.0rc1
+revision=1
+wrksrc="gmpy2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel gmp-devel mpfr-devel libmpc-devel"
+depends="python3"
+short_desc="Python3 interface to GMP, MPFR and MPC libraries"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/aleaxit/gmpy"
+distfiles="${PYPI_SITE}/g/gmpy2/gmpy2-${version}.tar.gz"
+checksum=86cb6d8e5837560c32c706d48d6ed25676be6b3c79e6aa5d245965b9e99231b9
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" \
+		python3 test/runtests.py
+}
diff --git a/srcpkgs/python3-gmpy2/update b/srcpkgs/python3-gmpy2/update
new file mode 100644
index 000000000000..b5703618d280
--- /dev/null
+++ b/srcpkgs/python3-gmpy2/update
@@ -0,0 +1 @@
+ignore="*a[1-9] *b[1-9] *rc[1-9]"

From 00323ff91a2075a8cb5caadc738016c7e494a7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 11 Oct 2021 12:57:04 -0300
Subject: [PATCH 1523/4088] removed-packages: remove python3-gmpy2

... since the package has been restored.

Closes: #33481 [via git-merge-pr]
---
 srcpkgs/removed-packages/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 91ba0a994d94..3781b64247bc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -260,7 +260,6 @@ replaces="
  python3-SPARQLWrapper<=1.8.4_4
  python3-bluez<=0.23_2
  python3-grako<=3.99.9_7
- python3-gmpy2<=2.0.8_8
  python3-keepalive<=0.5_6
  python3-pyPEG2<=2.15.2_7
  python3-pyenet<=5.15.0_2

From b1b8a045c60c1b97e99ac162fa50eabd49b5707e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 12 Oct 2021 18:46:45 +0200
Subject: [PATCH 1524/4088] python3-resolvelib: update to 0.8.1.

---
 srcpkgs/python3-resolvelib/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-resolvelib/template b/srcpkgs/python3-resolvelib/template
index b77554c03270..9223fe4c5259 100644
--- a/srcpkgs/python3-resolvelib/template
+++ b/srcpkgs/python3-resolvelib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-resolvelib'
 pkgname=python3-resolvelib
-version=0.7.1
-revision=2
+version=0.8.1
+revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,8 +10,9 @@ short_desc="Resolve abstract dependencies into concrete ones"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="ISC"
 homepage="https://github.com/sarugaku/resolvelib"
+changelog="https://raw.githubusercontent.com/sarugaku/resolvelib/master/CHANGELOG.rst"
 distfiles="https://github.com/sarugaku/resolvelib/archive/refs/tags/${version}.tar.gz"
-checksum=fe09a918c04172656e5edc33ca62166ff7e557d8c22e0bf60cc9981220ac51cf
+checksum=f400ebd5e60361b3b328241f4aded5a0f7665e46a83c374fea86d874cff0ffd5
 # Check depends on unpackaged python modules
 make_check=no
 

From cb87c3bff79e90ac31f930f9cd0364de7f689701 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 9 Oct 2021 14:48:23 -0700
Subject: [PATCH 1525/4088] python3-pycryptodomex: update to 3.11.0.

---
 srcpkgs/python3-pycryptodomex/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index 7119d0947f50..5d6855a58c7f 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycryptodomex'
 pkgname=python3-pycryptodomex
-version=3.10.4
-revision=2
+version=3.11.0
+revision=1
 wrksrc="pycryptodomex-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,9 +10,9 @@ short_desc="Pycryptodome equivalent that installs under the 'Cryptodome' name"
 maintainer="Antonio Gurgel <antonio@goorzhel.com>"
 license="Public Domain, BSD-2-Clause"
 homepage="https://www.pycryptodome.org/"
-changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+changelog="https://www.pycryptodome.org/en/latest/src/changelog.html"
 distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
-checksum=acd3498a8ccf8ad20ce7daa5f7f5e6521465eeceb026f28a6adb0228dd9fcc6e
+checksum=0398366656bb55ebdb1d1d493a7175fc48ade449283086db254ac44c7d318d6d
 
 post_install() {
 	vlicense LICENSE.rst

From c0c5ba09215f626f8e103f6ea3ccb39ae3cb05ce Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 13 Oct 2021 08:22:20 -0400
Subject: [PATCH 1526/4088] python3-certifi: update to 2021.10.08.

---
 srcpkgs/python3-certifi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-certifi/template b/srcpkgs/python3-certifi/template
index ecb66930f3be..203798f0324a 100644
--- a/srcpkgs/python3-certifi/template
+++ b/srcpkgs/python3-certifi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-certifi'
 pkgname=python3-certifi
-version=2021.05.30
-revision=2
+version=2021.10.08
+revision=1
 wrksrc="python-certifi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MPL-2.0"
 homepage="https://certifi.io"
 distfiles="https://github.com/certifi/python-certifi/archive/${version}.tar.gz"
-checksum=9bffc4826ac0308591e26852a0404548a9e4e30b7214ebfd86360cd214f51dda
+checksum=51c2cf76f7f2582d9c4eb5440bb311ef523ba0b319d0a973450ecebfb6802a3a
 
 do_check() {
 	cd build/lib

From beb469a1334bc795276cb8122ad408aaa0345d51 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 13 Oct 2021 08:25:51 -0400
Subject: [PATCH 1527/4088] python3-numpy-stl: update to 2.16.3.

---
 srcpkgs/python3-numpy-stl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template
index 4afa60d25c40..2e77adb71479 100644
--- a/srcpkgs/python3-numpy-stl/template
+++ b/srcpkgs/python3-numpy-stl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numpy-stl'
 pkgname=python3-numpy-stl
-version=2.16.0
-revision=2
+version=2.16.3
+revision=1
 wrksrc="numpy-stl-${version}"
 build_style=python3-module
 build_helper="numpy"
@@ -14,7 +14,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/WoLpH/numpy-stl/"
 distfiles="https://github.com/WoLpH/numpy-stl/archive/v${version}.tar.gz"
-checksum=0231f943f1142124242dc5cfc0d2105471c9ba9787f1847b9b4154219b68a78f
+checksum=11a0afb41923e5a6839dcce4cc5f55229a36c7251e138d3a1a818d7636e5e777
 
 conflicts="python-numpy-stl>=0"
 

From 2c0f6107ee203aea25c231665de8cf88264e6b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 12 Oct 2021 20:38:13 -0300
Subject: [PATCH 1528/4088] python3-mpmath: depend on python3-gmpy2

By default mpmath uses python's builtin long integers which are very
slow. Installing python3-gmpy2 makes it use gmp, mpfr, mpc for that,
which is asymptotically faster.

After a discussion in #33481 it was decided to add it to depends.

Also:
 - remove INSTALL.msg; for plotting, mpmath itself gives a warning.
 - Adopt.
---
 srcpkgs/python3-mpmath/INSTALL.msg | 4 ----
 srcpkgs/python3-mpmath/template    | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 srcpkgs/python3-mpmath/INSTALL.msg

diff --git a/srcpkgs/python3-mpmath/INSTALL.msg b/srcpkgs/python3-mpmath/INSTALL.msg
deleted file mode 100644
index d38bcd667418..000000000000
--- a/srcpkgs/python3-mpmath/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-If you require plotting capabilities, install python3-matplotlib.
-
-mpmath internally uses Python's builtin long integers by default.
-For much faster high-precision arithmetic, install python3-gmpy2.
diff --git a/srcpkgs/python3-mpmath/template b/srcpkgs/python3-mpmath/template
index 4087ac129345..edd45ee5b6e8 100644
--- a/srcpkgs/python3-mpmath/template
+++ b/srcpkgs/python3-mpmath/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-mpmath'
 pkgname=python3-mpmath
 version=1.2.1
-revision=2
+revision=3
 wrksrc="mpmath-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3"
+depends="python3 python3-gmpy2"
 checkdepends="python3-pytest"
 short_desc="Python3 library for arbitrary-precision floating-point arithmetic"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="http://mpmath.org/"
 distfiles="${PYPI_SITE}/m/mpmath/mpmath-${version}.tar.gz"

From 2e729fd3774057f7dc980c88c2ccc65a8481e86f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 15:42:14 -0400
Subject: [PATCH 1529/4088] python3-bokeh: update to 2.4.1.

---
 srcpkgs/python3-bokeh/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index dc00df55ca0b..ce5cb0c1b8c1 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,12 +1,10 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
-version=2.4.0
-revision=2
+version=2.4.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-make_build_args="--build-js"
-make_install_args="--install-js"
-hostmakedepends="python3-setuptools nodejs"
+hostmakedepends="python3-setuptools"
 depends="python3-yaml python3-dateutil python3-Jinja2 python3-numpy
  python3-Pillow python3-packaging python3-tornado python3-typing_extensions"
 short_desc="Interactive data visualization in a browser, from Python"
@@ -15,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://bokeh.org"
 changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
 distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
-checksum=6fa00ed8baab5cca33f4175792c309fa2536eaae7e90abee884501ba8c90fddb
+checksum=d0410717d743a0ac251e62480e2ea860a7341bdcd1dbe01499a904f233c90512
 # Tests have unpackaged dependencies and require fetching data; skipping
 make_check=no
 

From d49f1a617a4290911fefda5917c8b484f3c2d6da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 15:47:30 -0400
Subject: [PATCH 1530/4088] python-cffi: update to 1.15.0.

---
 srcpkgs/python-cffi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 9a256a738359..498821b07fa8 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -1,7 +1,7 @@
 # Template file for 'python-cffi'
 pkgname=python-cffi
-version=1.14.6
-revision=2
+version=1.15.0
+revision=1
 wrksrc="cffi-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools libffi-devel"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://cffi.readthedocs.io/"
 changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
 distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd
+checksum=920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954
 
 do_check() {
 	# glibc libm.so is a GNU ld script that isn't properly handled

From a3ef04c7baf6d57e95f1cfa46b51823b373e887e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 16:10:35 -0400
Subject: [PATCH 1531/4088] python-dbus: update to 1.2.18.

---
 srcpkgs/python-dbus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index 884d001dcef8..19ac9e7cbf0b 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
-version=1.2.16
-revision=4
+version=1.2.18
+revision=1
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config python-devel python3-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz"
-checksum=11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4
+checksum=92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260
 lib32disabled=yes
 
 pre_configure() {

From c17dbde3960fb16e2456335ffbc4c83be937e594 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 13 Oct 2021 23:18:17 +0200
Subject: [PATCH 1532/4088] bmake: update to 20211001

---
 ...1-fix-broken-shared-library-creation.patch | 25 -------------------
 srcpkgs/bmake/template                        |  4 +--
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/bmake/patches/0001-fix-broken-shared-library-creation.patch

diff --git a/srcpkgs/bmake/patches/0001-fix-broken-shared-library-creation.patch b/srcpkgs/bmake/patches/0001-fix-broken-shared-library-creation.patch
deleted file mode 100644
index 6516461fb2e3..000000000000
--- a/srcpkgs/bmake/patches/0001-fix-broken-shared-library-creation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 20210a4abd417f067483875fbb8aaabe56a344d0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 23 Jun 2021 03:02:10 +0200
-Subject: [PATCH] fix broken shared library creation
-
----
- mk/lib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/lib.mk b/mk/lib.mk
-index c397941..ca29e8f 100644
---- a/bmake/mk/lib.mk
-+++ b/bmake/mk/lib.mk
-@@ -170,7 +170,7 @@ LD_solib= lib${LIB}_pic.a
- .elif ${TARGET_OSNAME} == "Linux"
- SHLIB_LD = ${CC}
- # this is ambiguous of course
--LD_shared=-shared -Wl,"-soname lib${LIB}.so.${SHLIB_MAJOR}"
-+LD_shared=-shared -Wl,-soname,lib${LIB}.so.${SHLIB_MAJOR}
- LD_solib= -Wl,--whole-archive lib${LIB}_pic.a -Wl,--no-whole-archive
- .if ${COMPILER_TYPE} == "gcc"
- # Linux uses GNU ld, which is a multi-pass linker
--- 
-2.31.1
-
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..56e931e68705 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20211001
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+checksum=cad7ef0fb41138050f8932af3a7ade16f7265b3f37ff6356703e0b1ad6542739
 python_version=3
 
 do_configure() {

From 0b3f9e3da5a30c17742bb4cac51567349f209267 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 13 Oct 2021 19:35:34 -0400
Subject: [PATCH 1533/4088] digikam: rebuild for opencv

The opencv update rolled into the Python 3.10 upgrade apparently broke
ABI and prevented digikam from launching. None of the other dependants
of opencv were obviously affected in some simple tests.

Fixes #33530.
---
 srcpkgs/digikam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 0a5e9fa36dc1..ba0f4931db08 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
 # Template file for 'digikam'
 pkgname=digikam
 version=7.3.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config bison flex qt5-qmake

From 9a261f2eb1321da1ab38977f5d1e9f3c62d7b0ae Mon Sep 17 00:00:00 2001
From: Colin Reeder <colin@vpzom.click>
Date: Wed, 13 Oct 2021 11:48:56 -0600
Subject: [PATCH 1534/4088] python3-tabulate: Update to 0.8.9

---
 srcpkgs/python3-tabulate/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-tabulate/template b/srcpkgs/python3-tabulate/template
index b5fa805bb8ad..65da8e918ccc 100644
--- a/srcpkgs/python3-tabulate/template
+++ b/srcpkgs/python3-tabulate/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-tabulate'
 pkgname=python3-tabulate
-version=0.8.7
-revision=2
+version=0.8.9
+revision=1
 wrksrc="tabulate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-wcwidth"
-checkdepends="python3-nose"
+depends="python3-wcwidth"
+checkdepends="python3-pytest $depends"
 short_desc="Pretty-print tabular data (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://bitbucket.org/astanin/python-tabulate"
+homepage="https://github.com/astanin/python-tabulate"
 distfiles="${PYPI_SITE}/t/tabulate/tabulate-${version}.tar.gz"
-checksum=db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007
+checksum=eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7
 
 post_install() {
 	vlicense LICENSE

From e66ed8dca2a3d97a8aac8a76b1ffa60b2980a273 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Oct 2021 12:45:07 +0200
Subject: [PATCH 1535/4088] janet: update to 1.18.0.

---
 common/shlibs          | 2 +-
 srcpkgs/janet/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7a4d4ea1794d..6b97d658c44a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3875,7 +3875,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.17 janet-1.17.0_1
+libjanet.so.1.18 janet-1.18.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index a691390ed7b2..5b88d6aa70f8 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.17.2
+version=1.18.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://janet-lang.org/"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=3a1d885e16d0940f999b9449efedaa4f70f44f680e9815e1c9a774ed99a8d921
+checksum=f2d751b3b6e1a1712aae0f639be7a76764469303a55ae5d8881d6535dbe3bd0e
 
 post_install() {
 	vlicense LICENSE

From 87815c630865d4d5baef02684d68f48e958e9a72 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Oct 2021 12:50:10 +0200
Subject: [PATCH 1536/4088] New package: jpm-0.0.1

---
 srcpkgs/jpm/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/jpm/template

diff --git a/srcpkgs/jpm/template b/srcpkgs/jpm/template
new file mode 100644
index 000000000000..aba50b22510a
--- /dev/null
+++ b/srcpkgs/jpm/template
@@ -0,0 +1,17 @@
+# Template file for 'jpm'
+pkgname=jpm
+version=0.0.1
+revision=1
+hostmakedepends="janet"
+depends="janet janet-devel"
+short_desc="Janet Project Manager"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/janet-lang/jpm"
+distfiles="https://github.com/janet-lang/jpm/archive/refs/tags/${version}.tar.gz"
+checksum=1241e8ba046926cbc1b9e9b0ff6a50af68eb7075956097b10d22ca4beb1d54ee
+
+do_install() {
+	PREFIX=/usr DESTDIR=$DESTDIR janet bootstrap.janet
+	vlicense LICENSE
+}

From b4e1c7df084780382e44e7d529faa1082074040e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 12 Oct 2021 17:01:49 +0200
Subject: [PATCH 1537/4088] ansible-core: update to 2.11.6.

---
 srcpkgs/ansible-core/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index a92a3479dcf0..5a5b546ed033 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,7 +1,7 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.11.2
-revision=2
+version=2.11.6
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5ae4c3da765df08ce23f6315a6d48121c0090324fe0a9d305c85f362ff6bcaeb
+checksum=93d50283c7c5b476debf83dc089b3f679b939a8b9a7b5d628d28daafbb3d303a
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 make_check=no

From 4f27a794051c5e91149f5ff8ac985e7e19cfe71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 12 Oct 2021 17:02:58 +0200
Subject: [PATCH 1538/4088] ansible: update to 4.6.0.

---
 srcpkgs/ansible/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 34388da31eab..42cbc79a1809 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,7 +1,7 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=4.1.0
-revision=2
+version=4.6.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="ansible-core"
@@ -10,5 +10,5 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=f561cca7fbc4daa14d98e18cd0cb74bd8b173f1501b8fa11543f6ef002de3167
+checksum=2955fcbf51367f8bd88c38a86f8be83d4fcd05f778afb4feed31abfe8dcff639
 make_check=no

From 5991a64a12cc51940aac85dd8b931cc0dd611af8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 13 Oct 2021 21:24:41 +0300
Subject: [PATCH 1539/4088] ffsend: update to 0.2.74.

---
 srcpkgs/ffsend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index 41a623200e5c..ca806e24c142 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,6 +1,6 @@
 # Template file for 'ffsend'
 pkgname=ffsend
-version=0.2.73
+version=0.2.74
 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=76032cfeaf5e8a84592cb501859816f09240c8f6438d1cd96ff63c134cfddc80
+checksum=e6092fc4f40be6d79ddf46a0fb4a739310a2db5407fd3f5db2c43cafc8c41485
 
 post_extract() {
 	# avoid ring dependency

From 96ec3f8f257c37fc2e309cc78d67d96e0c184fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 12 Oct 2021 19:43:58 +0200
Subject: [PATCH 1540/4088] scrpkgs/: orphan Joseph LaFreniere's packages

This includes:
 - python3-GitPython
 - python3-ansible-lint
 - python3-ansicolor
 - python3-bitbucket-api
 - python3-gitdb
 - python3-github3
 - python3-gitlab
 - python3-gogs-client
 - python3-ndg_httpsclient
 - python3-progress
 - python3-proselint
 - python3-smmap
 - python3-vint
 - python3-voluptuous
 - python3-yamllint
 - tokei
---
 srcpkgs/python3-GitPython/template       | 2 +-
 srcpkgs/python3-ansible-lint/template    | 2 +-
 srcpkgs/python3-ansicolor/template       | 2 +-
 srcpkgs/python3-bitbucket-api/template   | 2 +-
 srcpkgs/python3-gitdb/template           | 2 +-
 srcpkgs/python3-github3/template         | 2 +-
 srcpkgs/python3-gitlab/template          | 2 +-
 srcpkgs/python3-gogs-client/template     | 2 +-
 srcpkgs/python3-ndg_httpsclient/template | 2 +-
 srcpkgs/python3-progress/template        | 2 +-
 srcpkgs/python3-proselint/template       | 2 +-
 srcpkgs/python3-smmap/template           | 2 +-
 srcpkgs/python3-vint/template            | 2 +-
 srcpkgs/python3-voluptuous/template      | 2 +-
 srcpkgs/python3-yamllint/template        | 2 +-
 srcpkgs/tokei/template                   | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/python3-GitPython/template b/srcpkgs/python3-GitPython/template
index 0f40f6742488..995c290b5c48 100644
--- a/srcpkgs/python3-GitPython/template
+++ b/srcpkgs/python3-GitPython/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gitdb"
 short_desc="Library to interact with Git repositories (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/gitpython-developers/GitPython"
 distfiles="${PYPI_SITE}/G/GitPython/GitPython-${version}.tar.gz"
diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index bc8b03fcd823..a548608b35f5 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="ansible python3-six python3-yaml python3-ruamel.yaml"
 short_desc="Linter for Ansible files"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/willthames/ansible-lint"
 changelog="https://raw.githubusercontent.com/willthames/ansible-lint/master/CHANGELOG.md"
diff --git a/srcpkgs/python3-ansicolor/template b/srcpkgs/python3-ansicolor/template
index 45792486aaa4..f8e720e69361 100644
--- a/srcpkgs/python3-ansicolor/template
+++ b/srcpkgs/python3-ansicolor/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Library to produce ansi color output (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/numerodix/ansicolor"
 distfiles="${PYPI_SITE}/a/ansicolor/ansicolor-${version}.tar.gz"
diff --git a/srcpkgs/python3-bitbucket-api/template b/srcpkgs/python3-bitbucket-api/template
index 784664aaa6b9..1110e04aa644 100644
--- a/srcpkgs/python3-bitbucket-api/template
+++ b/srcpkgs/python3-bitbucket-api/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests-oauthlib python3-sh"
 short_desc="Wrapper for BitBucket's REST API (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/Sheeprider/BitBucket-api"
 distfiles="${PYPI_SITE}/b/bitbucket-api/bitbucket-api-${version}.tar.gz"
diff --git a/srcpkgs/python3-gitdb/template b/srcpkgs/python3-gitdb/template
index 60b322745dec..804f4970ec44 100644
--- a/srcpkgs/python3-gitdb/template
+++ b/srcpkgs/python3-gitdb/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-smmap"
 short_desc="Pure-Python git object database (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/gitpython-developers/gitdb"
 distfiles="${PYPI_SITE}/g/gitdb2/gitdb2-${version}.tar.gz"
diff --git a/srcpkgs/python3-github3/template b/srcpkgs/python3-github3/template
index 70842cbc2f9e..5ff03dbac0bb 100644
--- a/srcpkgs/python3-github3/template
+++ b/srcpkgs/python3-github3/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-uritemplate"
 short_desc="Wrapper for GitHub's API (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github3py.readthedocs.org"
 changelog="https://raw.githubusercontent.com/sigmavirus24/github3.py/master/docs/source/release-notes/${version}.rst"
diff --git a/srcpkgs/python3-gitlab/template b/srcpkgs/python3-gitlab/template
index 51b23ee5e8b7..ecd31be86034 100644
--- a/srcpkgs/python3-gitlab/template
+++ b/srcpkgs/python3-gitlab/template
@@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests python3-six"
 checkdepends="${depends}"
 short_desc="Wrapper for GitLab's API (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/gpocentek/python-gitlab"
 changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst"
diff --git a/srcpkgs/python3-gogs-client/template b/srcpkgs/python3-gogs-client/template
index dd91bd7a55b2..cc5f23d6364d 100644
--- a/srcpkgs/python3-gogs-client/template
+++ b/srcpkgs/python3-gogs-client/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-requests python3-attrs"
 short_desc="Python3 library for interacting with a gogs server"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/unfoldingWord-dev/python-gogs-client"
 distfiles="${PYPI_SITE}/g/gogs_client/gogs_client-${version}.tar.gz"
diff --git a/srcpkgs/python3-ndg_httpsclient/template b/srcpkgs/python3-ndg_httpsclient/template
index d0c5563a6799..9a41db4753e1 100644
--- a/srcpkgs/python3-ndg_httpsclient/template
+++ b/srcpkgs/python3-ndg_httpsclient/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-openssl python3-pyasn1"
 short_desc="HTTPS support for httplib and urllib2 (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/cedadev/ndg_httpsclient"
 distfiles="${PYPI_SITE}/n/ndg_httpsclient/ndg_httpsclient-${version}.tar.gz"
diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template
index a47654388306..4a4ec6e0a5a2 100644
--- a/srcpkgs/python3-progress/template
+++ b/srcpkgs/python3-progress/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Easy to use progress bars (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/verigak/progress"
 distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz"
diff --git a/srcpkgs/python3-proselint/template b/srcpkgs/python3-proselint/template
index ed0008cfbed0..2ad63eba5c31 100644
--- a/srcpkgs/python3-proselint/template
+++ b/srcpkgs/python3-proselint/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-click python3-future python3-six"
 short_desc="Linter for prose (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/amperser/proselint"
 changelog="https://raw.githubusercontent.com/amperser/proselint/master/CHANGELOG.md"
diff --git a/srcpkgs/python3-smmap/template b/srcpkgs/python3-smmap/template
index 20317a484d76..2bfc12aab9f8 100644
--- a/srcpkgs/python3-smmap/template
+++ b/srcpkgs/python3-smmap/template
@@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-nose"
 short_desc="Sliding memory map manager (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/gitpython-developers/smmap"
 distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-vint/template b/srcpkgs/python3-vint/template
index 5424ffb0ce37..e8d7ddd6b203 100644
--- a/srcpkgs/python3-vint/template
+++ b/srcpkgs/python3-vint/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-ansicolor python3-chardet python3-yaml"
 short_desc="Lint tool for Vim script language (Python3)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Kuniwak/vint"
 distfiles="${PYPI_SITE}/v/vim-vint/vim-vint-${version}.tar.gz"
diff --git a/srcpkgs/python3-voluptuous/template b/srcpkgs/python3-voluptuous/template
index 8e37fdf329e5..5c9464d3e22e 100644
--- a/srcpkgs/python3-voluptuous/template
+++ b/srcpkgs/python3-voluptuous/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Python3 data validation library"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/alecthomas/voluptuous"
 changelog="https://raw.githubusercontent.com/alecthomas/voluptuous/master/CHANGELOG.md"
diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template
index 70c4643e21a6..24ae8d39a2d3 100644
--- a/srcpkgs/python3-yamllint/template
+++ b/srcpkgs/python3-yamllint/template
@@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-pathspec python3-setuptools python3-yaml"
 checkdepends="python3-pathspec python3-yaml"
 short_desc="Python3 linter for YAML files"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/yamllint"
 distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template
index 59205436a68a..2ef21c8e0d60 100644
--- a/srcpkgs/tokei/template
+++ b/srcpkgs/tokei/template
@@ -4,7 +4,7 @@ version=12.1.2
 revision=1
 build_style=cargo
 short_desc="Count lines of code"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/XAMPPRocky/tokei"
 distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}.tar.gz"

From 19a5bafd536439e3447c7f40db205848c794416a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 12 Oct 2021 20:58:59 +0200
Subject: [PATCH 1541/4088] srcpkgs/: adopt ansible-lint, yamllint and tokei

---
 srcpkgs/python3-ansible-lint/template | 2 +-
 srcpkgs/python3-yamllint/template     | 2 +-
 srcpkgs/tokei/template                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index a548608b35f5..93f631fa6a17 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="ansible python3-six python3-yaml python3-ruamel.yaml"
 short_desc="Linter for Ansible files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/willthames/ansible-lint"
 changelog="https://raw.githubusercontent.com/willthames/ansible-lint/master/CHANGELOG.md"
diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template
index 24ae8d39a2d3..201a7b34423a 100644
--- a/srcpkgs/python3-yamllint/template
+++ b/srcpkgs/python3-yamllint/template
@@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-pathspec python3-setuptools python3-yaml"
 checkdepends="python3-pathspec python3-yaml"
 short_desc="Python3 linter for YAML files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/yamllint"
 distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template
index 2ef21c8e0d60..32aeea5e1a2a 100644
--- a/srcpkgs/tokei/template
+++ b/srcpkgs/tokei/template
@@ -4,7 +4,7 @@ version=12.1.2
 revision=1
 build_style=cargo
 short_desc="Count lines of code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/XAMPPRocky/tokei"
 distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}.tar.gz"

From c07aeef4e0373399ac82948d6dfb9193f72632ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Oct 2021 17:37:07 +0200
Subject: [PATCH 1542/4088] outils: update to 0.10.

---
 srcpkgs/outils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/outils/template b/srcpkgs/outils/template
index 80f967a00148..0bea4ec3cb29 100644
--- a/srcpkgs/outils/template
+++ b/srcpkgs/outils/template
@@ -1,6 +1,6 @@
 # Template file for 'outils'
 pkgname=outils
-version=0.9
+version=0.10
 revision=1
 build_style=gnu-makefile
 make_install_args="install install-calendars"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC, BSD-3-Clause"
 homepage="https://github.com/leahneukirchen/outils"
 distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
-checksum=b7afdf1a0d11b9d5a0e1ea165ad2841e32b21245ec573170cb6498a13bf43b73
+checksum=6b5101e805c1baa8ca7111b4df8260bfa1b2b7b8670ed341af7233a9971706d4
 conflicts="signify>=0 openbsd-rs>=0"
 
 post_install() {

From b309905663d6f666ce31bc10cc3eb20fa89de75f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Oct 2021 18:46:15 +0200
Subject: [PATCH 1543/4088] xscreensaver: update to 6.02.

---
 srcpkgs/xscreensaver/template | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 5d045fecd8f3..a2a95bf800dc 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'xscreensaver'
 pkgname=xscreensaver
-version=6.01
-revision=2
+version=6.02
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam --with-login-manager
  --with-x-app-defaults=/usr/share/X11/app-defaults
@@ -18,14 +18,7 @@ license="MIT"
 homepage="https://www.jwz.org/xscreensaver/"
 changelog="https://www.jwz.org/xscreensaver/changelog.html"
 distfiles="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz"
-checksum=085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b
-
-do_extract() {
-	# Ugly hack as xscreensaver-6.01.tar.gz contains a spurious
-	# hardlink, which trips up bsdtar, but extracts correctly.
-	# So ignore the error.
-	bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz -C ${wrksrc}/.. || true
-}
+checksum=5e6d6cb09033ad562cfe6d46bf9312e4451f7946bed8a4671aa9344df9193184
 
 do_install() {
 	vmkdir etc/pam.d

From 525c61d87a0e835d318ee4afcbf4d74237e98a3c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 13 Oct 2021 15:45:43 +0300
Subject: [PATCH 1544/4088] yaru: update to 21.10.2, adopt.

Also:
- enable building the components for xfce.
---
 srcpkgs/yaru/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template
index e1b6a1b89cac..ae750b0e6e5f 100644
--- a/srcpkgs/yaru/template
+++ b/srcpkgs/yaru/template
@@ -1,13 +1,14 @@
 # Template file for 'yaru'
 pkgname=yaru
-version=21.10.1
+version=21.10.2
 revision=1
 build_style=meson
+configure_args="-Dxfwm4=true"
 hostmakedepends="glib-devel sassc pkg-config"
 makedepends="gtk+3-devel libglib-devel"
 short_desc="Default Ubuntu 18.10+ theme"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/ubuntu/yaru"
 distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz"
-checksum=8a79e37efed926ddad91532bfa95f9a833e4b843dfb7c100b70cc628b6b8edd3
+checksum=996e4a3e51d438dcb8ec63829de981d9c0a1a893c5553fd5c5a261c936cea551

From 0de56103d1595698abf1102ac1f7276072054101 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Wed, 13 Oct 2021 18:02:28 +0600
Subject: [PATCH 1545/4088] crun: update to 1.2.

Closes: #33520 [via git-merge-pr]
---
 srcpkgs/crun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 906b83122ad8..c7886c200691 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -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=5f2d98a13bdd7ab3c83620abc7dc29cfaf7b8f7487b5b3722453bc9619d3ea0b
+checksum=1032a69878c18ddeeb97cd26251c2819afb76e0d4a50c047139829b00d147978
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From 19603773e745912445eb252e1aaec84c57bc1258 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Wed, 13 Oct 2021 22:02:14 +0200
Subject: [PATCH 1546/4088] mkvtoolnix: update to 62.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0edb4e648b96..07ff426921b5 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=61.0.0
+version=62.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=7b8dd54d7d464a4fbdbc5315be9f000b904d0cd3b4711910059ce66c7778935b
+checksum=42b853a063ea77b79d37fb698857947159a4481842c3b3d45fe862ee234400e1
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From a60b55d74c475fa6915f5e925291ae1a1e76d787 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Oct 2021 21:11:08 +0200
Subject: [PATCH 1547/4088] xscreensaver: fix build on aarch64.

---
 srcpkgs/xscreensaver/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index a2a95bf800dc..38877de95607 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -20,6 +20,9 @@ changelog="https://www.jwz.org/xscreensaver/changelog.html"
 distfiles="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz"
 checksum=5e6d6cb09033ad562cfe6d46bf9312e4451f7946bed8a4671aa9344df9193184
 
+# marbling.c: In function 'fade': incompatible type for argument 1 of 'vqdmulhq_s16'
+CFLAGS=-flax-vector-conversions
+
 do_install() {
 	vmkdir etc/pam.d
 	make install_prefix=${DESTDIR} install

From 7247f07b6ba5bbbbfce8f8e7ccfc8c5a8cea468b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 12 Oct 2021 13:23:20 -0500
Subject: [PATCH 1548/4088] timeshift: update to 21.09.1, orphan.

---
 srcpkgs/timeshift/patches/d437358a.patch | 23 -----------------------
 srcpkgs/timeshift/template               |  8 ++++----
 2 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch

diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..fd367655c6d1 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,17 +1,17 @@
 # Template file for 'timeshift'
 pkgname=timeshift
-version=20.11.1
-revision=2
+version=21.09.1
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
 depends="rsync psmisc"
 short_desc="System restore tool"
-maintainer="Andrew Benson <abenson+void@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://teejeetech.com/timeshift/"
 distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz"
-checksum=c6dcca80b42f80a8c8d9d03e91eb17aa634be2f1031f667bba3f483410297abb
+checksum=70b21355439c284860264f746b980f11614c8e8307106d37f8fbee98377c455d
 
 # Remove hard-dep on crontab, leave up to user to decide
 post_extract() {

From 4840274edac181633d942051cfaca30855d23ea3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Oct 2021 11:09:51 -0500
Subject: [PATCH 1549/4088] ffmpeg: update to 4.4.

---
 ...070d9b092d3a354a6963c65197054ddf7a75.patch | 41 ---------
 ...8cca6e51db0f19928c12d0348deaa17137b3.patch | 83 -------------------
 srcpkgs/ffmpeg/template                       | 14 +++-
 3 files changed, 11 insertions(+), 127 deletions(-)
 delete mode 100644 srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
 delete mode 100644 srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch

diff --git a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
deleted file mode 100644
index 7a7466c6523e..000000000000
--- a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2687070d9b092d3a354a6963c65197054ddf7a75 Mon Sep 17 00:00:00 2001
-From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
-Date: Sat, 23 Jan 2021 19:33:13 +0100
-Subject: [PATCH] lsws/ppc/yuv2rgb: Fix transparency converting from
- yuv->rgb32.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Based on 68363b69 by Reimar Döffinger.
-
-Fixes ticket #9077.
----
- libswscale/ppc/yuv2rgb_altivec.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
-index 58e480dd2c..4f5382e4c1 100644
---- a/libswscale/ppc/yuv2rgb_altivec.c
-+++ b/libswscale/ppc/yuv2rgb_altivec.c
-@@ -425,13 +425,13 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in,          \
- }
- 
- #define out_abgr(a, b, c, ptr)                                          \
--    vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), c, b, a, ptr)
-+    vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), c, b, a, ptr)
- #define out_bgra(a, b, c, ptr)                                          \
--    vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) { 255 }), ptr)
-+    vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr)
- #define out_rgba(a, b, c, ptr)                                          \
--    vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) { 255 }), ptr)
-+    vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr)
- #define out_argb(a, b, c, ptr)                                          \
--    vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, b, c, ptr)
-+    vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), a, b, c, ptr)
- #define out_rgb24(a, b, c, ptr) vec_mstrgb24(a, b, c, ptr)
- #define out_bgr24(a, b, c, ptr) vec_mstbgr24(a, b, c, ptr)
- 
--- 
-2.20.1
-
diff --git a/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch b/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch
deleted file mode 100644
index 86f55882f0c1..000000000000
--- a/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Upstream: Yes, https://github.com/FFmpeg/FFmpeg/commit/3e098cca6e51db0f19928c12d0348deaa17137b3
-From 3e098cca6e51db0f19928c12d0348deaa17137b3 Mon Sep 17 00:00:00 2001
-From: Lynne <dev@lynne.ee>
-Date: Tue, 7 Jul 2020 16:01:58 +0100
-Subject: [PATCH] aarch64/yuv2rgb_neon: fix return value
-
-We return 0 for this particular architecture but should instead be
-returning the number of lines.
-Fixes users who check the return value matches what they expect.
----
- libswscale/aarch64/swscale_unscaled.c | 31 ++++++++++++---------------
- libswscale/aarch64/yuv2rgb_neon.S     |  2 ++
- 2 files changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c
-index 551daad9e353..c7a2a1037df8 100644
---- a/libswscale/aarch64/swscale_unscaled.c
-+++ b/libswscale/aarch64/swscale_unscaled.c
-@@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[],
-                                            uint8_t *dst[], int dstStride[]) {               \
-     const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE };                                   \
-                                                                                             \
--    ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH,                                        \
--                                 dst[0] + srcSliceY * dstStride[0], dstStride[0],           \
--                                 src[0], srcStride[0],                                      \
--                                 src[1], srcStride[1],                                      \
--                                 src[2], srcStride[2],                                      \
--                                 yuv2rgb_table,                                             \
--                                 c->yuv2rgb_y_offset >> 6,                                  \
--                                 c->yuv2rgb_y_coeff);                                       \
--    return 0;                                                                               \
-+    return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH,                                 \
-+                                        dst[0] + srcSliceY * dstStride[0], dstStride[0],    \
-+                                        src[0], srcStride[0],                               \
-+                                        src[1], srcStride[1],                               \
-+                                        src[2], srcStride[2],                               \
-+                                        yuv2rgb_table,                                      \
-+                                        c->yuv2rgb_y_offset >> 6,                           \
-+                                        c->yuv2rgb_y_coeff);                                \
- }                                                                                           \
- 
- #define DECLARE_FF_YUVX_TO_ALL_RGBX_FUNCS(yuvx)                                             \
-@@ -76,14 +75,12 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[],
-                                            uint8_t *dst[], int dstStride[]) {               \
-     const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE };                                   \
-                                                                                             \
--    ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH,                                        \
--                                 dst[0] + srcSliceY * dstStride[0], dstStride[0],           \
--                                 src[0], srcStride[0], src[1], srcStride[1],                \
--                                 yuv2rgb_table,                                             \
--                                 c->yuv2rgb_y_offset >> 6,                                  \
--                                 c->yuv2rgb_y_coeff);                                       \
--                                                                                            \
--    return 0;                                                                               \
-+    return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH,                                 \
-+                                        dst[0] + srcSliceY * dstStride[0], dstStride[0],    \
-+                                        src[0], srcStride[0], src[1], srcStride[1],         \
-+                                        yuv2rgb_table,                                      \
-+                                        c->yuv2rgb_y_offset >> 6,                           \
-+                                        c->yuv2rgb_y_coeff);                                \
- }                                                                                           \
- 
- #define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx)                                               \
-diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S
-index b7446aa10511..f4b220fb608e 100644
---- a/libswscale/aarch64/yuv2rgb_neon.S
-+++ b/libswscale/aarch64/yuv2rgb_neon.S
-@@ -142,6 +142,7 @@
- .macro declare_func ifmt ofmt
- function ff_\ifmt\()_to_\ofmt\()_neon, export=1
-     load_args_\ifmt
-+    mov                 w9, w1
- 1:
-     mov                 w8, w0                                          // w8 = width
- 2:
-@@ -193,6 +194,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1
-     increment_\ifmt
-     subs                w1, w1, #1                                      // height -= 1
-     b.gt                1b
-+    mov                 w0, w9
-     ret
- endfunc
- .endm
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 2d47b5ef117f..9397ac713f68 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
 # Template file for 'ffmpeg'
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
-version=4.3.2
-revision=4
+version=4.4
+revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb
+checksum=06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -38,6 +38,10 @@ case "$XBPS_TARGET_MACHINE" in
 	mips*) CFLAGS="-mnan=legacy";;
 esac
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 _apply_patch() {
 	local args="$1" pname="$(basename $2)"
 
@@ -80,6 +84,10 @@ do_configure() {
 		ppc|ppc-musl) _args+=" --disable-altivec";;
 	esac
 
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		_args+=" --extra-libs=-latomic"
+	fi
+
 	./configure --prefix=/usr --disable-debug --enable-gpl --enable-gnutls \
 		--disable-stripping \
 		--enable-libcdio --enable-version3 --enable-runtime-cpudetect \

From 0d4222b1e0acfb8d60db189631a403162e3a04c1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 14 Oct 2021 21:52:06 +0200
Subject: [PATCH 1550/4088] webkit2gtk: update to 2.34.0

---
 .../patches/be-imagebufferbackend.patch       | 343 ++++++++++--------
 .../webkit2gtk/patches/be-typedarray.patch    | 177 ++++-----
 srcpkgs/webkit2gtk/template                   |   6 +-
 3 files changed, 254 insertions(+), 272 deletions(-)

diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index 27055015de3e..b466ef11c329 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -1,205 +1,243 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
+Original source: Jacek Piszczek <jacek.piszczek@runbox.com>
 
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+diff --git a/Source/WebCore/platform/graphics/PixelBufferConversion.cpp b/Source/WebCore/platform/graphics/PixelBufferConversion.cpp
+index 9acf304d..618b7b26 100644
+--- a/Source/WebCore/platform/graphics/PixelBufferConversion.cpp
++++ b/Source/WebCore/platform/graphics/PixelBufferConversion.cpp
+@@ -140,9 +140,17 @@ static void convertImagePixelsAccelerated(const ConstPixelBufferConversionView&
+ enum class PixelFormatConversion { None, Permute };
  
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ template<PixelFormatConversion pixelFormatConversion>
++#if CPU(BIG_ENDIAN)
++static void convertSinglePixelPremultipliedToPremultiplied(PixelFormat sourcePixelFormat, const uint8_t* sourcePixel, PixelFormat destinationPixelFormat, uint8_t* destinationPixel)
++#else
+ static void convertSinglePixelPremultipliedToPremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
++#endif
  {
 +#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++    uint8_t alpha = sourcePixel[sourcePixelFormat == PixelFormat::ARGB8 ? 0 : 3];
 +#else
-     uint8_t alpha = srcPixel[3];
+     uint8_t alpha = sourcePixel[3];
 +#endif
      if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         reinterpret_cast<uint32_t*>(destinationPixel)[0] = 0;
          return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
+@@ -151,23 +158,81 @@ static void convertSinglePixelPremultipliedToPremultiplied(const uint8_t* source
+     if constexpr (pixelFormatConversion == PixelFormatConversion::None)
+         reinterpret_cast<uint32_t*>(destinationPixel)[0] = reinterpret_cast<const uint32_t*>(sourcePixel)[0];
+     else {
 +#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
++        // Swap pixel channels ARGB <-> RGBA.
++        if (destinationPixelFormat == PixelFormat::ARGB8)
++        {
++            destinationPixel[0] = sourcePixel[3];
++            destinationPixel[1] = sourcePixel[0];
++            destinationPixel[2] = sourcePixel[1];
++            destinationPixel[3] = sourcePixel[2];
++        }
++        else
++        {
++            destinationPixel[0] = sourcePixel[1];
++            destinationPixel[1] = sourcePixel[2];
++            destinationPixel[2] = sourcePixel[3];
++            destinationPixel[3] = sourcePixel[0];
++        }
 +#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
+         // Swap pixel channels BGRA <-> RGBA.
+         destinationPixel[0] = sourcePixel[2];
+         destinationPixel[1] = sourcePixel[1];
+         destinationPixel[2] = sourcePixel[0];
+         destinationPixel[3] = sourcePixel[3];
 +#endif
+     }
  }
  
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ template<PixelFormatConversion pixelFormatConversion>
++#if CPU(BIG_ENDIAN)
++static void convertSinglePixelPremultipliedToUnpremultiplied(PixelFormat sourcePixelFormat, const uint8_t* sourcePixel, PixelFormat destinationPixelFormat, uint8_t* destinationPixel)
++#else
+ static void convertSinglePixelPremultipliedToUnpremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
++#endif
  {
 +#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++    uint8_t alpha = sourcePixel[sourcePixelFormat == PixelFormat::ARGB8 ? 0 : 3];
 +#else
-     uint8_t alpha = srcPixel[3];
+     uint8_t alpha = sourcePixel[3];
 +#endif
-+
      if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
++#if CPU(BIG_ENDIAN)
++        convertSinglePixelPremultipliedToPremultiplied<pixelFormatConversion>(sourcePixelFormat, sourcePixel, destinationPixelFormat, destinationPixel);
++#else
+         convertSinglePixelPremultipliedToPremultiplied<pixelFormatConversion>(sourcePixel, destinationPixel);
++#endif
          return;
      }
  
 +#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
++    UNUSED_PARAM(destinationPixelFormat);
++    if constexpr (pixelFormatConversion == PixelFormatConversion::None) {
++        if (sourcePixelFormat == PixelFormat::ARGB8) {
++            destinationPixel[0] = alpha;
++            destinationPixel[1] = (sourcePixel[1] * 255) / alpha;
++            destinationPixel[2] = (sourcePixel[2] * 255) / alpha;
++            destinationPixel[3] = (sourcePixel[3] * 255) / alpha;
++        } else {
++            destinationPixel[0] = (sourcePixel[0] * 255) / alpha;
++            destinationPixel[1] = (sourcePixel[1] * 255) / alpha;
++            destinationPixel[2] = (sourcePixel[2] * 255) / alpha;
++            destinationPixel[3] = alpha;
++        }
++    } else {
++        if (sourcePixelFormat == PixelFormat::ARGB8) {
++            destinationPixel[0] = (sourcePixel[1] * 255) / alpha;
++            destinationPixel[1] = (sourcePixel[2] * 255) / alpha;
++            destinationPixel[2] = (sourcePixel[3] * 255) / alpha;
++            destinationPixel[3] = alpha;
++        } else {
++            destinationPixel[0] = alpha;
++            destinationPixel[1] = (sourcePixel[0] * 255) / alpha;
++            destinationPixel[2] = (sourcePixel[1] * 255) / alpha;
++            destinationPixel[3] = (sourcePixel[2] * 255) / alpha;
 +        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
 +    }
 +#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
+     if constexpr (pixelFormatConversion == PixelFormatConversion::None) {
+         destinationPixel[0] = (sourcePixel[0] * 255) / alpha;
+         destinationPixel[1] = (sourcePixel[1] * 255) / alpha;
+@@ -180,17 +245,58 @@ static void convertSinglePixelPremultipliedToUnpremultiplied(const uint8_t* sour
+         destinationPixel[2] = (sourcePixel[0] * 255) / alpha;
+         destinationPixel[3] = alpha;
+     }
 +#endif
  }
  
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ template<PixelFormatConversion pixelFormatConversion>
++#if CPU(BIG_ENDIAN)
++static void convertSinglePixelUnpremultipliedToPremultiplied(PixelFormat sourcePixelFormat, const uint8_t* sourcePixel, PixelFormat destinationPixelFormat, uint8_t* destinationPixel)
++#else
+ static void convertSinglePixelUnpremultipliedToPremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
++#endif
  {
 +#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++    uint8_t alpha = sourcePixel[sourcePixelFormat == PixelFormat::ARGB8 ? 0 : 3];
 +#else
-     uint8_t alpha = srcPixel[3];
+     uint8_t alpha = sourcePixel[3];
 +#endif
-+
      if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
++#if CPU(BIG_ENDIAN)
++        convertSinglePixelPremultipliedToPremultiplied<pixelFormatConversion>(sourcePixelFormat, sourcePixel, destinationPixelFormat, destinationPixel);
++#else
+         convertSinglePixelPremultipliedToPremultiplied<pixelFormatConversion>(sourcePixel, destinationPixel);
++#endif
          return;
      }
  
 +#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
++    UNUSED_PARAM(destinationPixelFormat);
++    if constexpr (pixelFormatConversion == PixelFormatConversion::None) {
++        if (sourcePixelFormat == PixelFormat::ARGB8) {
++            destinationPixel[0] = alpha;
++            destinationPixel[1] = (sourcePixel[1] * alpha + 254) / 255;
++            destinationPixel[2] = (sourcePixel[2] * alpha + 254) / 255;
++            destinationPixel[3] = (sourcePixel[3] * alpha + 254) / 255;
++        } else {
++            destinationPixel[0] = (sourcePixel[0] * alpha + 254) / 255;
++            destinationPixel[1] = (sourcePixel[1] * alpha + 254) / 255;
++            destinationPixel[2] = (sourcePixel[2] * alpha + 254) / 255;
++            destinationPixel[3] = alpha;
++        }
++    } else {
++        if (sourcePixelFormat == PixelFormat::ARGB8) {
++            destinationPixel[0] = (sourcePixel[1] * alpha + 254) / 255;
++            destinationPixel[1] = (sourcePixel[2] * alpha + 254) / 255;
++            destinationPixel[2] = (sourcePixel[3] * alpha + 254) / 255;
++            destinationPixel[3] = alpha;
++        } else {
++            destinationPixel[0] = alpha;
++            destinationPixel[1] = (sourcePixel[0] * alpha + 254) / 255;
++            destinationPixel[2] = (sourcePixel[1] * alpha + 254) / 255;
++            destinationPixel[3] = (sourcePixel[2] * alpha + 254) / 255;
 +        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
 +    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
 +#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
+     if constexpr (pixelFormatConversion == PixelFormatConversion::None) {
+         destinationPixel[0] = (sourcePixel[0] * alpha + 254) / 255;
+         destinationPixel[1] = (sourcePixel[1] * alpha + 254) / 255;
+@@ -203,23 +309,49 @@ static void convertSinglePixelUnpremultipliedToPremultiplied(const uint8_t* sour
+         destinationPixel[2] = (sourcePixel[0] * alpha + 254) / 255;
+         destinationPixel[3] = alpha;
+     }
 +#endif
  }
  
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
+ template<PixelFormatConversion pixelFormatConversion>
 +#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
++static void convertSinglePixelUnpremultipliedToUnpremultiplied(PixelFormat sourcePixelFormat, const uint8_t* sourcePixel, PixelFormat destinationPixelFormat, uint8_t* destinationPixel)
++#else
+ static void convertSinglePixelUnpremultipliedToUnpremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
++#endif
+ {
+     if constexpr (pixelFormatConversion == PixelFormatConversion::None)
+         reinterpret_cast<uint32_t*>(destinationPixel)[0] = reinterpret_cast<const uint32_t*>(sourcePixel)[0];
+     else {
++#if CPU(BIG_ENDIAN)
++        UNUSED_PARAM(sourcePixelFormat);
++        // Swap pixel channels ARGB <-> RGBA.
++        if (destinationPixelFormat == PixelFormat::ARGB8) {
++            destinationPixel[0] = sourcePixel[3];
++            destinationPixel[1] = sourcePixel[0];
++            destinationPixel[2] = sourcePixel[1];
++            destinationPixel[3] = sourcePixel[2];
++        }
++        else {
++            destinationPixel[0] = sourcePixel[1];
++            destinationPixel[1] = sourcePixel[2];
++            destinationPixel[2] = sourcePixel[3];
++            destinationPixel[3] = sourcePixel[0];
++        }
 +#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
+         // Swap pixel channels BGRA <-> RGBA.
+         destinationPixel[0] = sourcePixel[2];
+         destinationPixel[1] = sourcePixel[1];
+         destinationPixel[2] = sourcePixel[0];
+         destinationPixel[3] = sourcePixel[3];
 +#endif
+     }
  }
  
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
++#if CPU(BIG_ENDIAN)
++template<void (*convertFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
++#else
+ template<void (*convertFunctor)(const uint8_t*, uint8_t*)>
++#endif
+ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
  {
-     // We don't currently support getting or putting pixel data with deep color buffers.
+     const uint8_t* sourceRows = source.rows;
+@@ -228,7 +360,11 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
+     size_t bytesPerRow = destinationSize.width() * 4;
+     for (int y = 0; y < destinationSize.height(); ++y) {
+         for (size_t x = 0; x < bytesPerRow; x += 4)
++#if CPU(BIG_ENDIAN)
++            convertFunctor(source.format.pixelFormat, &sourceRows[x], destination.format.pixelFormat, &destinationRows[x]);
++#else
+             convertFunctor(&sourceRows[x], &destinationRows[x]);
++#endif
+         sourceRows += source.bytesPerRow;
+         destinationRows += destination.bytesPerRow;
+     }
+@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
+ void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
+ {
+     // We don't currently support converting pixel data with non-8-bit buffers.
 +    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+     ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
+     ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
  
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
+index 1ca711b8..4a7168f8 100644
+--- a/Source/WebCore/platform/graphics/PixelFormat.h
++++ b/Source/WebCore/platform/graphics/PixelFormat.h
+@@ -33,6 +33,9 @@ namespace WebCore {
  enum class PixelFormat : uint8_t {
      RGBA8,
      BGRA8,
@@ -209,6 +247,3 @@ index 31ce9775..4c52fa52 100644
      RGB10,
      RGB10A8,
  };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..f44b4e3a8ab5 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -4,8 +4,56 @@ https://tenfourfox.tenderapp.com/discussions/problems/7505-problems-uploading-to
 
 Updated by @q66.
 
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
-index dbe211d..4da5fbd 100644
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 8b9e57d3..3802e0f2 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -186,3 +186,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index b8a0f205..7afc8f8f 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index c7d1a204..4f33d06d 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1751,7 +1751,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
+diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h b/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
+index c22c55a0..bc1e55c3 100644
 --- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
 +++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
 @@ -28,6 +28,7 @@
@@ -56,7 +104,7 @@ index dbe211d..4da5fbd 100644
      }
      
      bool setIndex(JSGlobalObject* globalObject, unsigned i, JSValue jsValue)
-@@ -172,13 +197,54 @@ public:
+@@ -172,13 +197,56 @@ public:
          if (isDetached() || i >= m_length)
              return false;
  
@@ -94,31 +142,33 @@ index dbe211d..4da5fbd 100644
 +#endif
 +    }
  
--    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
-+    static Optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue)
+-    static std::optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue) { return toNativeFromValueWithoutCoercion<Adaptor>(jsValue); }
++    static std::optional<ElementType> toAdaptorNativeFromValueWithoutCoercion(JSValue jsValue)
 +    {
++        auto opt = toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
 +#if CPU(BIG_ENDIAN)
 +        switch (Adaptor::typeValue) {
 +        case TypeFloat32:
 +        case TypeFloat64:
-+            return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
++            break;
 +        default:
 +            // typed array views are commonly expected to be little endian views of the underlying data
-+            return flipBytes(toNativeFromValueWithoutCoercion<Adaptor>(jsValue));
++            if (!opt)
++                break;
++            return std::optional<ElementType>{flipBytes(*opt)};
 +        }
-+#else
-+        return toNativeFromValueWithoutCoercion<Adaptor>(jsValue);
 +#endif
++        return opt;
 +    }
  
      void sort()
      {
-diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-index 126f33c..0913af5 100644
+diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+index 00492c0a..7bb150dc 100644
 --- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
 +++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
 @@ -208,9 +208,36 @@ ALWAYS_INLINE EncodedJSValue genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
-     scope.assertNoException();
+     scope.assertNoExceptionExceptTermination();
      RELEASE_ASSERT(!thisObject->isDetached());
  
 -    if (std::isnan(static_cast<double>(*targetOption))) {
@@ -156,106 +206,3 @@ index 126f33c..0913af5 100644
                  return JSValue::encode(jsBoolean(true));
          }
      } else {
-diff --git Source/WTF/wtf/FlipBytes.h Source/WTF/wtf/FlipBytes.h
-index 6cd7126..24708f7 100644
---- a/Source/WTF/wtf/FlipBytes.h
-+++ b/Source/WTF/wtf/FlipBytes.h
-@@ -24,6 +24,7 @@
-  */
- 
- #pragma once
-+#include "Optional.h"
- 
- namespace WTF {
- 
-@@ -98,6 +99,42 @@ inline T flipBytes(T value)
-     return T();
- }
- 
-+template<typename T>
-+inline T flipBytes(WTF::Optional<T> value)
-+{
-+    if (sizeof(*value) == 1)
-+        return *value;
-+    if (sizeof(*value) == 2) {
-+        union {
-+            T original;
-+            uint16_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 4) {
-+        union {
-+            T original;
-+            uint32_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    if (sizeof(*value) == 8) {
-+        union {
-+            T original;
-+            uint64_t word;
-+        } u;
-+        u.original = *value;
-+        u.word = flipBytes(u.word);
-+        return u.original;
-+    }
-+    RELEASE_ASSERT_NOT_REACHED();
-+    return T();
-+}
-+
- template<typename T>
- inline T flipBytesIfLittleEndian(T value, bool littleEndian)
- {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 6344712112a6..bc04fe3f0ca6 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,14 +1,14 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.32.4
+version=2.34.0
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
  -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DCMAKE_SKIP_RPATH=ON
- -DUSE_SYSTEMD=OFF -DUSE_WOFF2=ON
+ -DUSE_SYSTEMD=OFF -DUSE_WOFF2=ON -DUSE_SOUP2=ON
  -DENABLE_GTKDOC=OFF -DUSE_WPE_RENDERER=ON
  -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF)
  -DENABLE_JIT=$(vopt_if jit ON OFF)
@@ -37,7 +37,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd
+checksum=880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34
 make_check=no
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser

From 09531dcac9d372560d4be4064091e71b21b7d306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 14 May 2021 22:44:30 +0200
Subject: [PATCH 1551/4088] New package: wally-udev-rules-2.1.1

---
 srcpkgs/wally-udev-rules/INSTALL.msg |  3 +++
 srcpkgs/wally-udev-rules/template    | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/wally-udev-rules/INSTALL.msg
 create mode 100644 srcpkgs/wally-udev-rules/template

diff --git a/srcpkgs/wally-udev-rules/INSTALL.msg b/srcpkgs/wally-udev-rules/INSTALL.msg
new file mode 100644
index 000000000000..6313b5615bad
--- /dev/null
+++ b/srcpkgs/wally-udev-rules/INSTALL.msg
@@ -0,0 +1,3 @@
+Please add your user to the group 'plugdev' by executing the following:
+
+usermod -aG plugdev "$USER"
diff --git a/srcpkgs/wally-udev-rules/template b/srcpkgs/wally-udev-rules/template
new file mode 100644
index 000000000000..83f37457047b
--- /dev/null
+++ b/srcpkgs/wally-udev-rules/template
@@ -0,0 +1,23 @@
+# Template file for 'wally-udev-rules'
+pkgname=wally-udev-rules
+version=2.1.1
+revision=1
+build_style=fetch
+short_desc="Set of udev rules for ZSA keyboards, for usage with wally and oryx"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/zsa/wally"
+distfiles="https://raw.githubusercontent.com/zsa/wally/${version}/dist/linux64/50-oryx.rules
+ https://raw.githubusercontent.com/zsa/wally/${version}/dist/linux64/50-wally.rules
+ https://raw.githubusercontent.com/zsa/wally/${version}/license.md"
+checksum="6c7d4d27745080269115c58c4c5d863b23c534635975f3bca581c52687721c52
+ 269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143
+ d2841d63f4e0bdfda102390ab1ca09136230d22f88538863b24b0c7fc68e548e"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules /usr/lib/udev/rules.d/50-oryx.rules"
+system_groups="plugdev"
+
+do_install() {
+	vlicense license.md
+	vinstall 50-oryx.rules 0644 /usr/lib/udev/rules.d
+	vinstall 50-wally.rules 0644 /usr/lib/udev/rules.d
+}

From 4378e23df68e7a3f325be708a255e7ba7f00745e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 14 May 2021 22:23:49 +0200
Subject: [PATCH 1552/4088] wally-cli: don't vendor udev rules

So far, the udev rules contained in this package were manually
maintained, which is probably the reason that the necessary rules for
using the Moonlander keyboard with their training software, Oryx, wasn't
present. I've created a new package, wally-udev-rules, which fetches the
udev rules from the upstream repo instead. As the build process for
wally itself (which should not be confused with wally-cli) is completely
undocumented, I've not done this "properly" (which would be packaging
wally and having wally-udev be a subpackage of wally, which is then
depended upon by wally-cli) for now, but this is already a step in the
right direction IMO.

Closes: #30879 [via git-merge-pr]
---
 srcpkgs/wally-cli/INSTALL.msg          |  3 ---
 srcpkgs/wally-cli/files/50-wally.rules | 11 -----------
 srcpkgs/wally-cli/template             |  8 +++-----
 3 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/wally-cli/INSTALL.msg
 delete mode 100644 srcpkgs/wally-cli/files/50-wally.rules

diff --git a/srcpkgs/wally-cli/INSTALL.msg b/srcpkgs/wally-cli/INSTALL.msg
deleted file mode 100644
index 6313b5615bad..000000000000
--- a/srcpkgs/wally-cli/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-Please add your user to the group 'plugdev' by executing the following:
-
-usermod -aG plugdev "$USER"
diff --git a/srcpkgs/wally-cli/files/50-wally.rules b/srcpkgs/wally-cli/files/50-wally.rules
deleted file mode 100644
index 742cde5c1f91..000000000000
--- a/srcpkgs/wally-cli/files/50-wally.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# These rules are derived from the instructions at
-# https://github.com/zsa/wally/wiki/Linux-install#2-create-a-udev-rule-file
-
-# Teensy rules for the Ergodox EZ
-ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
-ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
-KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
-
-# STM32 rules for the Moonlander and Planck EZ
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
\ No newline at end of file
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index 3c70966e7b68..93c694c2e8fe 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,23 +1,21 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.0
-revision=1
+revision=2
 wrksrc="wally-cli-${version}-linux"
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"
 makedepends="libusb-devel pkg-config go-bindata"
+depends="wally-udev-rules"
 short_desc="Flashing firmware for ZSA keyboards"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"
 license="MIT"
 homepage="https://www.zsa.io/wally/"
 distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
-checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
-conf_files="/usr/lib/udev/rules.d/50-wally.rules"
-system_groups="plugdev"
+checksum=2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745
 
 post_install() {
 	# vendoring license is obsolete in the next release
 	vlicense "$FILESDIR/LICENSE"
-	vinstall "$FILESDIR/50-wally.rules" 0644 /usr/lib/udev/rules.d
 }

From 0aed42f182f62ab613a7aca403db730f7045d95b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 14 Oct 2021 23:23:47 +0200
Subject: [PATCH 1553/4088] wally-cli: update to 2.0.1.

---
 srcpkgs/wally-cli/files/LICENSE | 9 ---------
 srcpkgs/wally-cli/template      | 9 ++++-----
 2 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/wally-cli/files/LICENSE

diff --git a/srcpkgs/wally-cli/files/LICENSE b/srcpkgs/wally-cli/files/LICENSE
deleted file mode 100644
index 45bbd402c83a..000000000000
--- a/srcpkgs/wally-cli/files/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-## License (MIT)
-
-Copyright 2019-2020, ZSA Technology Labs Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index 93c694c2e8fe..26868744d456 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
-version=2.0.0
-revision=2
+version=2.0.1
+revision=1
 wrksrc="wally-cli-${version}-linux"
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
@@ -13,9 +13,8 @@ maintainer="Wayne Van Son <waynevanson@gmail.com>"
 license="MIT"
 homepage="https://www.zsa.io/wally/"
 distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
-checksum=2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745
+checksum=071b1bd10e9160c441e833be3bea211ccf835c4f1792b0c6c7fc86f7aa0695d1
 
 post_install() {
-	# vendoring license is obsolete in the next release
-	vlicense "$FILESDIR/LICENSE"
+	vlicense "${wrksrc}/license.md"
 }

From 0dab9d0d60c19a6d482df87c8384d396b28f5fe8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 14 Oct 2021 20:48:26 +0200
Subject: [PATCH 1554/4088] chromium: update to 94.0.4606.81.

---
 srcpkgs/chromium/patches/python3.10.patch | 57 +++++++++++++++++++++++
 srcpkgs/chromium/template                 |  4 +-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/chromium/patches/python3.10.patch

diff --git a/srcpkgs/chromium/patches/python3.10.patch b/srcpkgs/chromium/patches/python3.10.patch
new file mode 100644
index 000000000000..9ce6ee71202e
--- /dev/null
+++ b/srcpkgs/chromium/patches/python3.10.patch
@@ -0,0 +1,57 @@
+diff -ur ./third_party/jinja2.orig/runtime.py ./third_party/jinja2/runtime.py
+--- a/third_party/jinja2.orig/runtime.py	2021-09-24 00:26:35.000000000 -0400
++++ b/third_party/jinja2/runtime.py	2021-10-13 11:51:16.493986556 -0400
+@@ -315,7 +315,7 @@
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+diff -ur ./third_party/jinja2.orig/sandbox.py ./third_party/jinja2/sandbox.py
+--- a/third_party/jinja2.orig/sandbox.py	2021-09-24 00:26:35.000000000 -0400
++++ b/third_party/jinja2/sandbox.py	2021-10-13 11:50:51.513980399 -0400
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+diff -ur ./third_party/jinja2.orig/tests.py ./third_party/jinja2/tests.py
+--- a/third_party/jinja2.orig/tests.py	2021-09-24 00:26:35.000000000 -0400
++++ b/third_party/jinja2/tests.py	2021-10-13 11:51:51.693995227 -0400
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
+diff -ur ./third_party/jinja2.orig/utils.py ./third_party/jinja2/utils.py
+--- a/third_party/jinja2.orig/utils.py	2021-09-24 00:26:35.000000000 -0400
++++ b/third_party/jinja2/utils.py	2021-10-13 11:51:34.969991106 -0400
+@@ -482,7 +482,7 @@
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index a26d99aa08a9..c57c29508dfc 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=94.0.4606.61
+version=94.0.4606.81
 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=6446db535c02c461c7e5c8d294a0300db03abba791f97f0c70bc52255aedb9bf
+checksum=7071aa2b2caf48094c2ae816395948b4daec940606f4982ad5bbf68e5d2de598
 nocross=yes
 
 lib32disabled=yes

From 726044f13a9ee4c10ac483bf3ce9ce47ab0bbd07 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Oct 2021 17:44:52 -0500
Subject: [PATCH 1555/4088] libreoffice: enable java support on x86_64-musl

Without Java support, LibreBase is severely limited in its
capabilities.  This should put -Base on x86_64-musl at the
same parity as on glibc.

The reported issue was that -Base would not create a new
HSQLDB database, which relies on Java support.
---
 srcpkgs/libreoffice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 840077229cfd..581cceaa98a3 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=3
+revision=4
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
@@ -230,7 +230,7 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
 		;;
-	x86_64)	build_options_default="java"
+	x86_64*) build_options_default="java"
 		makedepends+=" apache-ant openjdk11 "
 		;;
 esac

From e1014f328ebdb2911a8fc72bd40e38921d061392 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 Oct 2021 20:16:45 -0400
Subject: [PATCH 1556/4088] orca: patch for compatibility with Python 3.10

---
 srcpkgs/orca/patches/python3.10.patch | 31 +++++++++++++++++++++++++++
 srcpkgs/orca/template                 |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/orca/patches/python3.10.patch

diff --git a/srcpkgs/orca/patches/python3.10.patch b/srcpkgs/orca/patches/python3.10.patch
new file mode 100644
index 000000000000..53565ec4fa63
--- /dev/null
+++ b/srcpkgs/orca/patches/python3.10.patch
@@ -0,0 +1,31 @@
+From 41b7a370addd507d6583c135c8ac99c7c06076e5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Fri, 10 Sep 2021 10:12:23 +0200
+Subject: [PATCH] Fix compatibility with Python 3.10
+
+Python 3.10 removed aliases to Collections Abstract Base Classes that
+were deprecated in Python 3.3.
+
+Fix this by just using collections.abc directly without using the alias.
+
+https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-0-alpha-5
+---
+ src/orca/generator.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/orca/generator.py b/src/orca/generator.py
+index e98970992..e9a9d89de 100644
+--- a/src/orca/generator.py
++++ b/src/orca/generator.py
+@@ -78,7 +78,7 @@ class Generator:
+         self._activeProgressBars = {}
+         self._methodsDict = {}
+         for method in \
+-            [z for z in [getattr(self, y).__get__(self, self.__class__) for y in [x for x in dir(self) if x.startswith(METHOD_PREFIX)]] if isinstance(z, collections.Callable)]:
++            [z for z in [getattr(self, y).__get__(self, self.__class__) for y in [x for x in dir(self) if x.startswith(METHOD_PREFIX)]] if isinstance(z, collections.abc.Callable)]:
+             name = method.__name__[len(METHOD_PREFIX):]
+             name = name[0].lower() + name[1:]
+             self._methodsDict[name] = method
+-- 
+GitLab
+
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index b2df76b8446f..9ad08628e514 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
 # Template file for 'orca'
 pkgname=orca
 version=40.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"

From 27115eb90f5194033c44d7960e64e1c555d47ca7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 15 Oct 2021 05:40:56 +0200
Subject: [PATCH 1557/4088] libreoffice: also enable java on ppc64*

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 581cceaa98a3..6ea455c5c0cb 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -230,7 +230,7 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
 		;;
-	x86_64*) build_options_default="java"
+	x86_64*|ppc64*) build_options_default="java"
 		makedepends+=" apache-ant openjdk11 "
 		;;
 esac

From 5a1bf5f48c6f1d1ab468ce743817d86bf3bef3be Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Thu, 14 Oct 2021 22:45:13 -0500
Subject: [PATCH 1558/4088] simavr: update to 1.7

---
 srcpkgs/simavr/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/simavr/template b/srcpkgs/simavr/template
index 035e29cdde36..aabb164041e3 100644
--- a/srcpkgs/simavr/template
+++ b/srcpkgs/simavr/template
@@ -1,7 +1,7 @@
 # Template file for 'simavr'
 pkgname=simavr
-version=1.6
-revision=2
+version=1.7
+revision=1
 hostmakedepends="pkg-config"
 hostmakedepends="which"
 makedepends="elfutils-devel libfreeglut-devel avr-libc"
@@ -10,7 +10,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/buserror/simavr"
 distfiles="https://github.com/buserror/simavr/archive/v${version}.tar.gz"
-checksum=a55ad04d055eef5656c49f78bc089968b059c6efb6a831618b8d7e67a840936d
+checksum=e7b3d5f0946e84fbe76a37519d0f146d162bbf88641ee91883b3970b02c77093
 CFLAGS="-fPIC -Wno-error=stringop-truncation"
 
 do_build() {

From 35b3524f19d725049a540d26e4405dfef417ae1f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 13 Oct 2021 16:13:55 +0300
Subject: [PATCH 1559/4088] kvantum: update to 0.20.2.

---
 srcpkgs/kvantum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..3b138ff583f3 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.2
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=863b7d1d656525464aeb59911f8d78ceb35507a85c5f4c4bdb2ea5c024bc2142
 
 post_install() {
 	vdoc doc/Theme-Config.pdf

From df71ce34174ddfd7b7e77005862a8caa0660d505 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 13 Oct 2021 11:28:00 +0200
Subject: [PATCH 1560/4088] s: update to 0.6.0.

---
 srcpkgs/s/template | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..05b801ea5a5c 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,8 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
+version=0.6.0
 revision=1
+build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,9 +11,18 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=0019e21dba7bb30e4de279b71e027c7d78f3236d709c2fe5be39b38d22aa7097
+
+post_build() {
+	s_cli=$(find $GOPATH/bin -name s)
+	vtargetrun $s_cli --completion bash >s.bash
+	vtargetrun $s_cli --completion fish >s.fish
+	vtargetrun $s_cli --completion zsh >s.zsh
+}
 
 post_install() {
 	vlicense LICENSE
-	vinstall autocomplete/s.fish 644 usr/share/fish/vendor_completions.d
+	vcompletion s.bash bash
+	vcompletion s.fish fish
+	vcompletion s.zsh zsh
 }

From 31d6cf019fe7da47af35f93877ce5086a0439dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 15 Oct 2021 01:25:36 -0300
Subject: [PATCH 1561/4088] New package: python3-mistune2-2.0.0rc1

Use release candidate because it's the latest 2.x release and md2gemini
requires 2.x. python3-jupyte_nbconvert isn't compatible with it yet [1],
unfortunately, so we need a new package.

[1] https://github.com/jupyter/nbconvert/pull/1074
---
 srcpkgs/python3-mistune2/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-mistune2/template

diff --git a/srcpkgs/python3-mistune2/template b/srcpkgs/python3-mistune2/template
new file mode 100644
index 000000000000..7be37071593f
--- /dev/null
+++ b/srcpkgs/python3-mistune2/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-mistune2'
+pkgname=python3-mistune2
+version=2.0.0rc1
+revision=1
+wrksrc="mistune-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Markdown parser for Python"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/lepture/mistune"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ad224a1117fb84f148bc7d804ebe6ad7f14930c3602691e3a85cb894b03606c5
+conflicts="python3-mistune>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From a2365f5e3abb9e441f26404bc32c80cb88a9543d Mon Sep 17 00:00:00 2001
From: Alexis <flexibeast@gmail.com>
Date: Thu, 10 Sep 2020 14:36:48 +1000
Subject: [PATCH 1562/4088] New package: python3-md2gemini-1.8.1.

---
 srcpkgs/python3-md2gemini/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-md2gemini/template

diff --git a/srcpkgs/python3-md2gemini/template b/srcpkgs/python3-md2gemini/template
new file mode 100644
index 000000000000..508f152fa939
--- /dev/null
+++ b/srcpkgs/python3-md2gemini/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-md2gemini'
+pkgname=python3-md2gemini
+version=1.8.1
+revision=1
+wrksrc="md2gemini-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-mistune2 python3-cjkwrap
+ python3-wcwidth"
+depends="python3-mistune2 python3-cjkwrap python3-wcwidth"
+checkdepends="$depends python3-pytest"
+short_desc="Converter from Markdown to the Gemini text format"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="LGPL-3.0-only"
+homepage="https://github.com/makeworld-the-better-one/md2gemini"
+distfiles="${PYPI_SITE}/m/md2gemini/md2gemini-${version}.tar.gz"
+checksum=3ef2bd2d9e2b4968a844a2858f721348429f3a0b5976bd1c324198538103ca55

From a1e07ef94f0381e62d05af44e7ef290208601ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 15 Oct 2021 13:50:16 +0200
Subject: [PATCH 1563/4088] doomretro: update to 4.3.

Closes: #33565 [via git-merge-pr]
---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 0c74762ad769..2df391db530b 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2.3
+version=4.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=6b81a3837993716ca5d311bfd61e3c6e08b382df8e8f2328a14a4b156918ea9e
+checksum=99e48dc66e8d69a806372643db3aa1ea3b1a68dcf891ec79b9c3261484e3181e

From a45d4cce48a6bd22e0b0e8548748a6f86da4dd2a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 15 Oct 2021 09:17:38 -0400
Subject: [PATCH 1564/4088] python3-Pillow: update to 8.4.0.

---
 srcpkgs/python3-Pillow/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index 58a348c999e3..dcbda3c48536 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=8.3.2
-revision=2
+version=8.4.0
+revision=1
 wrksrc="Pillow-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,7 +15,7 @@ license="custom:PIL"
 homepage="https://python-pillow.org"
 changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=dde3f3ed8d00c72631bc19cbfff8ad3b6215062a5eed402381ad365f82f0c18c
+checksum=b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed
 
 post_install() {
 	vlicense LICENSE

From 7bc740522cec7715f438146b3568ddc8edee6cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Schoentgen?= <contact@tiger-222.fr>
Date: Thu, 14 Oct 2021 16:29:16 +0200
Subject: [PATCH 1565/4088] httpie: update to 2.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/httpie/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template
index 28847684d9d2..86a86bfde078 100644
--- a/srcpkgs/httpie/template
+++ b/srcpkgs/httpie/template
@@ -1,18 +1,19 @@
 # Template file for 'httpie'
 pkgname=httpie
-version=2.5.0
-revision=2
+version=2.6.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests python3-requests-toolbelt
- python3-Pygments python3-pysocks python3-defusedxml"
-short_desc="Human-friendly command line HTTP client"
+ python3-Pygments python3-pysocks python3-defusedxml
+ python3-charset-normalizer"
+short_desc="Modern, user-friendly command-line HTTP client for the API era"
 maintainer="Mickaël Schoentgen <mickael@apible.io>"
 license="BSD-3-Clause"
 homepage="https://httpie.io/"
-changelog="https://raw.githubusercontent.com/httpie/httpie/${version}/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/httpie/httpie/master/CHANGELOG.md"
 distfiles="https://github.com/httpie/httpie/archive/${version}.tar.gz"
-checksum=66af56e0efc1ca6237323f1186ba34bca1be24e67a4319fd5df7228ab986faea
+checksum=3bcd9a8cb2b11299da12d3af36c095c6d4b665e41c395898a07f1ae4d99fc14a
 make_check=no # needs pytest_httpbin which is not packaged
 
 post_install() {

From 29d58e580af89a0a0f5a08ad1f6dac30a43da5d0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Oct 2021 13:26:42 +0200
Subject: [PATCH 1566/4088] python3-boto3: update to 1.18.62.

---
 srcpkgs/python3-boto3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 8bdbb542b350..381f66d226e2 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.44
-revision=2
+version=1.18.62
+revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=b7902551e67feda1e32460e11b2c39638aa58d3cd7bfa387fa678636e228ca8d
+checksum=983d7e16edd7f396655012e9ca09d25e908c3271403584eed18f1c2d0ca44205
 
 post_install() {
 	vlicense LICENSE

From cf592c8caa64f657277b8e43edfe62c961c643ce Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Oct 2021 13:32:53 +0200
Subject: [PATCH 1567/4088] angle-grinder: update to 0.18.0.

---
 srcpkgs/angle-grinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/angle-grinder/template b/srcpkgs/angle-grinder/template
index df684767c27a..519050eb4ff4 100644
--- a/srcpkgs/angle-grinder/template
+++ b/srcpkgs/angle-grinder/template
@@ -1,6 +1,6 @@
 # Template file for 'angle-grinder'
 pkgname=angle-grinder
-version=0.17.0
+version=0.18.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/rcoh/angle-grinder"
 distfiles="https://github.com/rcoh/angle-grinder/archive/v${version}.tar.gz"
-checksum=5a2054ba9eb5fcee1fef2d5fbbf1735e71bc563fc7b273890097f63297e64bf4
+checksum=7a282d9eff88bb2e224b02d80b887de92286e451abf8a193248d30136d08f4e0
 
 post_install() {
 	vlicense LICENSE

From d6d995757944d7f0cabaf2ebcc8b69a33c8f212b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Oct 2021 13:44:12 +0200
Subject: [PATCH 1568/4088] perl-local-lib: update to 2.000027.

---
 srcpkgs/perl-local-lib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-local-lib/template b/srcpkgs/perl-local-lib/template
index 986dda89585b..693dc6569f15 100644
--- a/srcpkgs/perl-local-lib/template
+++ b/srcpkgs/perl-local-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-local-lib'
 pkgname=perl-local-lib
-version=2.000024
-revision=2
+version=2.000027
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/local-lib"
 distfiles="${CPAN_SITE}/lib/HAARG/local-lib-${version}.tar.gz"
-checksum=2e9b917bd48a0615e42633b2a327494e04610d8f710765b9493d306cead98a05
+checksum=dfbb57ac39d9afcdaa26c3e20fdfd89bcc9f20eb622160944e38d61fb3fc00b1

From 5b8fcfeb3bdd526a988cffecee786b53e26101ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Oct 2021 13:44:39 +0200
Subject: [PATCH 1569/4088] cloud-hypervisor: update to 19.0.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 47d26eb8f6ab..90cfba9a93a7 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=18.0
+version=19.0
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=dabdd6d89bb308b49d1259d73d3844283ffae337e3c66a402c29e4afa738a27c
+checksum=5de5f3cb6081a60f7c0b3a79324d06a471fa8cd62ac71962b5be0fca7314385f
 
 post_install() {
 	vlicense LICENSE-APACHE

From 66a09f766523db5f99dbaa96e3563881aac66198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 15 Oct 2021 20:03:35 +0700
Subject: [PATCH 1570/4088] git: update to 2.33.1.

---
 ...-first-config-key-wins-regression-in.patch | 108 ------------------
 srcpkgs/git/template                          |   6 +-
 2 files changed, 3 insertions(+), 111 deletions(-)
 delete mode 100644 srcpkgs/git/patches/0001-send-email-fix-a-first-config-key-wins-regression-in.patch

diff --git a/srcpkgs/git/patches/0001-send-email-fix-a-first-config-key-wins-regression-in.patch b/srcpkgs/git/patches/0001-send-email-fix-a-first-config-key-wins-regression-in.patch
deleted file mode 100644
index 8b6bdc1efbcc..000000000000
--- a/srcpkgs/git/patches/0001-send-email-fix-a-first-config-key-wins-regression-in.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From b996f84989f78c8f6d2429b5f0b9785e13f7af23 Mon Sep 17 00:00:00 2001
-From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-Date: Mon, 6 Sep 2021 09:33:29 +0200
-Subject: [PATCH] send-email: fix a "first config key wins" regression in
- v2.33.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix a regression in my c95e3a3f0b8 (send-email: move trivial config
-handling to Perl, 2021-05-28) where we'd pick the first config key out
-of multiple defined ones, instead of using the normal "last key wins"
-semantics of "git config --get".
-
-This broke e.g. cases where a .git/config would have a different
-sendemail.smtpServer than ~/.gitconfig. We'd pick the ~/.gitconfig
-over .git/config, instead of preferring the repository-local
-version. The same would go for /etc/gitconfig etc.
-
-The full list of impacted config keys (the %config_settings values
-which are references to scalars, not arrays) is:
-
-    sendemail.smtpencryption
-    sendemail.smtpserver
-    sendemail.smtpserverport
-    sendemail.smtpuser
-    sendemail.smtppass
-    sendemail.smtpdomain
-    sendemail.smtpauth
-    sendemail.smtpbatchsize
-    sendemail.smtprelogindelay
-    sendemail.tocmd
-    sendemail.cccmd
-    sendemail.aliasfiletype
-    sendemail.envelopesender
-    sendemail.confirm
-    sendemail.from
-    sendemail.assume8bitencoding
-    sendemail.composeencoding
-    sendemail.transferencoding
-    sendemail.sendmailcmd
-
-I.e. having any of these set in say ~/.gitconfig and in-repo
-.git/config regressed in v2.33.0 to prefer the --global one over the
---local.
-
-To test this add a test of config priority to one of these config
-variables, most don't have tests at all, but there was an existing one
-for sendemail.8bitEncoding.
-
-The "git config" (instead of "test_config") is somewhat of an
-anti-pattern, but follows established conventions in
-t9001-send-email.sh, likewise with any other pattern or idiom in this
-test.
-
-The populating of home/.gitconfig and setting of HOME= is copied from
-a test in t0017-env-helper.sh added in 1ff750b128e (tests: make
-GIT_TEST_GETTEXT_POISON a boolean, 2019-06-21). This test fails
-without this bugfix, but now it works.
-
-Reported-by: Eli Schwartz <eschwartz@archlinux.org>
-Tested-by: Eli Schwartz <eschwartz@archlinux.org>
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-Signed-off-by: Junio C Hamano <gitster@pobox.com>
----
- git-send-email.perl   |  2 +-
- t/t9001-send-email.sh | 15 +++++++++++++++
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/git-send-email.perl b/git-send-email.perl
-index 5791138683..0a6dcc1f88 100755
---- a/git-send-email.perl
-+++ b/git-send-email.perl
-@@ -373,7 +373,7 @@ sub read_config {
- 			@$target = @values;
- 		}
- 		else {
--			my $v = $known_keys->{$key}->[0];
-+			my $v = $known_keys->{$key}->[-1];
- 			next unless defined $v;
- 			next if $configured->{$setting}++;
- 			$$target = $v;
-diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
-index 612de095fd..fd680a90ac 100755
---- a/t/t9001-send-email.sh
-+++ b/t/t9001-send-email.sh
-@@ -1533,6 +1533,21 @@ test_expect_success $PREREQ 'sendemail.8bitEncoding works' '
- 	test_cmp content-type-decl actual
- '
- 
-+test_expect_success $PREREQ 'sendemail.8bitEncoding in .git/config overrides --global .gitconfig' '
-+	clean_fake_sendmail &&
-+	git config sendemail.assume8bitEncoding UTF-8 &&
-+	test_when_finished "rm -rf home" &&
-+	mkdir home &&
-+	git config -f home/.gitconfig sendemail.assume8bitEncoding "bogus too" &&
-+	echo bogus |
-+	env HOME="$(pwd)/home" DEBUG=1 \
-+	git send-email --from=author@example.com --to=nobody@example.com \
-+			--smtp-server="$(pwd)/fake.sendmail" \
-+			email-using-8bit >stdout &&
-+	egrep "Content|MIME" msgtxt1 >actual &&
-+	test_cmp content-type-decl actual
-+'
-+
- test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
- 	clean_fake_sendmail &&
- 	git config sendemail.assume8bitEncoding "bogus too" &&
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 87923c5a6a81..80222b740753 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
-revision=3
+version=2.33.1
+revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From c8145d1a6a6cb79c17199e975b7552c1900608b1 Mon Sep 17 00:00:00 2001
From: Bikutoso <10584311+Bikutoso@users.noreply.github.com>
Date: Thu, 14 Oct 2021 22:43:07 +0200
Subject: [PATCH 1571/4088] gnome-mines: update to 40.0.

---
 srcpkgs/gnome-mines/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-mines/template b/srcpkgs/gnome-mines/template
index bb3377650691..34e6ee962211 100644
--- a/srcpkgs/gnome-mines/template
+++ b/srcpkgs/gnome-mines/template
@@ -1,13 +1,14 @@
 # Template file for 'gnome-mines'
 pkgname=gnome-mines
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME puzzle game where you locate mines in the ocean"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mines"
+changelog="https://gitlab.gnome.org/GNOME/gnome-mines/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7188130d6faee1b87ca92295da196ad27139801ca793ea6b0c665a9232404654
+checksum=1f79ba6c2ae4a56e5a0c23668d40f05cfcac68a2d848db1a1cf9920c779bc669

From 6ce0c1c76a865fbb89ff9c0a028a2c8bf6288d11 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 15 Oct 2021 13:37:56 +0300
Subject: [PATCH 1572/4088] ristretto: update to 0.12.0, adopt.

Also:
- add changelog (@Chocimier).
---
 srcpkgs/ristretto/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template
index 133562037853..e163a7ff724c 100644
--- a/srcpkgs/ristretto/template
+++ b/srcpkgs/ristretto/template
@@ -1,6 +1,6 @@
 # Template file for 'ristretto'
 pkgname=ristretto
-version=0.11.0
+version=0.12.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -8,8 +8,9 @@ hostmakedepends="intltool pkg-config"
 makedepends="exo-devel file-devel libexif-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Picture-viewer for the Xfce desktop environment"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/ristretto/start"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=877e30d412c8cbfa9706f4ac0cab1a478f5829beafb773addc7722ca0cb78823
+checksum=47032da8216a83c1cb349bece7521494e7509469a82236cfeadc0a8469451001

From 2c99cf01b536ad52740d2af38de7fe6a9db8b8c6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 15 Oct 2021 13:24:13 +0300
Subject: [PATCH 1573/4088] skype: update to 8.77.0.97.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 5ec5b68d6ea5..29473f724608 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.77.0.90
+version=8.77.0.97
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=045d13578149815a4f45566f9d7c2da988ae471276d6a5486aef8a4850ee004e
+checksum=abffa2e1237e3b6c2cb9e590a829d36a8d3162b22dd872086526586b36070e58
 repository="nonfree"
 nostrip="yes"
 

From e7f5273fabb992c48c2159de6b00d512e9634dc8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 15 Oct 2021 13:34:18 +0300
Subject: [PATCH 1574/4088] xfce4-whiskermenu-plugin: update to 2.6.1.

---
 srcpkgs/xfce4-whiskermenu-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index c15e16a4cc3c..f0cc74b0794c 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.6.0
+version=2.6.1
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin"
+homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3271f6a403b98ea2e2c9f82a279b9c190e742e8cf849822ab240caa51d83d466
+checksum=854e02701183d7ef4d2069785e53f9c312de0681f78807ef36b016506262ec72

From a0cab64d63b9c4815efbc16adbe1c9a8444a9b2d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 15 Oct 2021 08:44:58 +0400
Subject: [PATCH 1575/4088] nghttp2: update to 1.45.1.

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 86c5cb7639a7..da8b226cfa01 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,6 +1,6 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
-version=1.44.0
+version=1.45.1
 revision=1
 build_style=gnu-configure
 # build system errors out if python isn't available
@@ -14,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://nghttp2.org"
 distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
-checksum=5699473b29941e8dafed10de5c8cb37a3581edf62ba7d04b911ca247d4de3c5d
+checksum=abdc4addccadbc7d89abe27c4d6427d78e57d139f69c1f45749227393c68bf79
 python_version=3
 
 post_install() {

From 0504cf93d52238dec8f05a7161bad45adabb5100 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 15 Oct 2021 08:16:48 +0400
Subject: [PATCH 1576/4088] python3-regex: update to 2021.10.8.

---
 srcpkgs/python3-regex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 68fbfc2b03c4..802eb45c4ff2 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.28
-revision=2
+version=2021.10.8
+revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=f585cbbeecb35f35609edccb95efd95a3e35824cd7752b586503f7e6087303f1
+checksum=26895d7c9bbda5c52b3635ce5991caa90fbb1ddfac9c9ff1c7ce505e2282fb2a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 6ea307c20f631a6fda11d69b59d8fc57db6ee890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 14 Oct 2021 18:21:22 +0200
Subject: [PATCH 1577/4088] xbps-src: improve error message on dependencies
 installation

Message contained one of many packages to install,
incorrectly suggesting that this is problematic one.
Remove that. List of packages is printed on previous line.
---
 common/xbps-src/shutils/build_dependencies.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index d60ee556de24..e4e2210d4e56 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -69,8 +69,8 @@ setup_pkg_depends() {
 # -1     (255): unexpected error.
 
 install_pkg_from_repos() {
-    local cross="$1" rval tmplogf cmd
-    shift
+    local cross="$1" target="$2" rval tmplogf cmd
+    shift 2
 
     [ $# -eq 0 ] && return 0
 
@@ -91,7 +91,7 @@ install_pkg_from_repos() {
            ;;
         *)
            [ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps
-           msg_red "$pkgver: failed to install '$1' dependency! (error $rval)\n"
+           msg_red "$pkgver: failed to install $target dependencies! (error $rval)\n"
            cat $tmplogf
            rm -f $tmplogf
            msg_error "Please see above for the real error, exiting...\n"
@@ -411,7 +411,7 @@ install_pkg_deps() {
             echo "=> $pkgver: installing host dependencies: ${host_binpkg_deps[@]} ..."
             [[ $NOCOLORS ]] || printf "\033[m"
         fi
-        install_pkg_from_repos "" "${host_binpkg_deps[@]}"
+        install_pkg_from_repos "" host "${host_binpkg_deps[@]}"
     fi
 
     if [[ ${binpkg_deps} ]]; then
@@ -421,7 +421,7 @@ install_pkg_deps() {
             echo "=> $pkgver: installing target dependencies: ${binpkg_deps[@]} ..."
             [[ $NOCOLORS ]] || printf "\033[m"
         fi
-        install_pkg_from_repos "$cross" "${binpkg_deps[@]}"
+        install_pkg_from_repos "$cross" target "${binpkg_deps[@]}"
     fi
 
     return 0

From cc29aedc4dd43029a255260aae464508c58007b3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 15 Oct 2021 19:12:54 +0200
Subject: [PATCH 1578/4088] linux5.4: update to 5.4.153.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index a431a16b557c..a30054749ddb 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.152
+version=5.4.153
 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=8044c7134c5eed21af9662f1c5399a5d8781b5bc2d8979e9ad06b4435a0a5ed5
+checksum=6d9f07c9d611e5a7317eb6d5114880bad5c2dc1ac48d89f861b887d2f4295f49
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From c32d63fcff6a840d2eb1e10fc294074004cc9c64 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 15 Oct 2021 19:16:03 +0200
Subject: [PATCH 1579/4088] linux4.19: update to 4.19.211.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 1b0298f63b59..d306170dd8c0 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.210
+version=4.19.211
 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=9ba722594a5a5444df19510925df7b6b76cbf20ab4dc54e57f1c3e4da4116133
+checksum=fb48a4580a99fcad03145246f597c251a1d8690322e6d925590be9e2f42b7ed4
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From c23b1ac303526859a18a08af280d8d0b990fd1c3 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Fri, 15 Oct 2021 16:28:59 +0530
Subject: [PATCH 1580/4088] Komikku: update to 0.35.1.

---
 srcpkgs/Komikku/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 1202ed9de47d..429ab6dd4ff2 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.34.1
-revision=2
+version=0.35.1
+revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
@@ -16,4 +16,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=21c805affc26a8bdadaa35818152ad6ca8fab37ef5422298e8a4b791d88c8951
+checksum=107dcb99fad250e431050fd9aa10f0a0d64c5321282e23b6545e491eb5a931f5

From d9f89d4ef5bcaf0492332ee9eaf619d2eddba6ba Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Wed, 13 Oct 2021 13:52:53 -0500
Subject: [PATCH 1581/4088] libXfixes: update to 6.0.0

Also don't use variable in homepage
---
 srcpkgs/libXfixes/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index 9d37caec3926..173c075e99f5 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -1,16 +1,16 @@
-# Template build file for 'libXfixes'.
+# Template file for 'libXfixes'
 pkgname=libXfixes
-version=5.0.3
-revision=3
+version=6.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libX11-devel"
 short_desc="Xfixes library and extension of X RandR from modular X.org"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="${XORG_SITE}"
 license="MIT"
+homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6
+checksum=a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c
 
 post_install() {
 	vlicense COPYING

From 46663803c9dfe1d4e2acb5ac68deb636f98e144a Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Fri, 15 Oct 2021 19:27:08 +0100
Subject: [PATCH 1582/4088] moby: update to 20.10.9

---
 srcpkgs/moby/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 50e198d91574..9f23fabe2ab4 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -1,8 +1,8 @@
 # Template file for 'moby'
 pkgname=moby
-version=20.10.6
+version=20.10.9
 revision=1
-_libnetwork_commit=b3507428be5b458cb0e2b4086b13531fb0706e46
+_libnetwork_commit=64b7a4574d1426139437d20e81c0b6d391130ec8
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
@@ -12,11 +12,11 @@ depends="containerd iptables xz"
 short_desc="Container engine for the Docker ecosystem"
 maintainer="PWA COLLECTIVE <pwa@cya.cx>"
 license="Apache-2.0"
-homepage="http://www.docker.io"
+homepage="https://www.docker.com"
 distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
- https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-checksum="fd7f5571b1f64f26b5ca520a3e1fefb33c190f3732b931051c23a76bdba5000e
- 90a8dc84bc5d2d74dee0b2c3544f8786598ff85e9fc9f6a55a15b60b7cd78d63"
+ https://github.com/moby/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="359e8854d0d51bc884d434f182f64ca62f25fbbe7b9c6a336eb09f212fe8cc9a
+ ede21e645ff6552b3a508f6186d3f34d267015ec0f96eefecf6d08c03cbd2987"
 system_groups="docker"
 
 _moby_builddir="moby-$version"

From dd620ebf44ab4c0a9cdf956f52b09a057da75fab Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Fri, 15 Oct 2021 19:26:58 +0100
Subject: [PATCH 1583/4088] docker-cli: update to 20.10.9

---
 srcpkgs/docker-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 4393e5a39acf..62f52b9d91e9 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-cli'
 pkgname=docker-cli
-version=20.10.8
+version=20.10.9
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -14,9 +14,9 @@ depends="git"
 short_desc="Command-line interface for the Docker daemon"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
-homepage="http://www.docker.io"
+homepage="https://www.docker.com"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=cde34bbefd70fa27b44dfa904c40db84b89abf237e5267dcd08603b459a89253
+checksum=d91010813824070dd2380013c8f343e61e6dda170f7853f024bda39b432b64ba
 system_groups="docker"
 
 pre_build() {

From 50d55e31f25875bdf748c04f90b5f36bb6e85010 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 15 Oct 2021 23:31:31 +0200
Subject: [PATCH 1584/4088] torbrowser-launcher: fix launch with python 3.10

---
 srcpkgs/torbrowser-launcher/patches/python310.patch | 12 ++++++++++++
 srcpkgs/torbrowser-launcher/template                |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/torbrowser-launcher/patches/python310.patch

diff --git a/srcpkgs/torbrowser-launcher/patches/python310.patch b/srcpkgs/torbrowser-launcher/patches/python310.patch
new file mode 100644
index 000000000000..2c0485dc12d7
--- /dev/null
+++ b/srcpkgs/torbrowser-launcher/patches/python310.patch
@@ -0,0 +1,12 @@
+--- a/torbrowser_launcher/__init__.py
++++ b/torbrowser_launcher/__init__.py
+@@ -90,8 +90,8 @@ def main():
+     desktop = app.desktop()
+     window_size = gui.size()
+     gui.move(
+-        (desktop.width() - window_size.width()) / 2,
+-        (desktop.height() - window_size.height()) / 2,
++        (desktop.width() - window_size.width()) // 2,
++        (desktop.height() - window_size.height()) // 2,
+     )
+     gui.show()
diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template
index 5101f30bd950..bf22f0fd02b5 100644
--- a/srcpkgs/torbrowser-launcher/template
+++ b/srcpkgs/torbrowser-launcher/template
@@ -1,7 +1,7 @@
 # Template file for 'torbrowser-launcher'
 pkgname=torbrowser-launcher
 version=0.3.5
-revision=2
+revision=3
 archs="i686 x86_64" # limited by Tor Browser itself
 build_style=python3-module
 hostmakedepends="gettext python3-distro python3-setuptools"

From a09bd1312b02e406928e5f248687ca67ee2d556e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Oct 2021 17:19:57 -0300
Subject: [PATCH 1585/4088] treewide: ignore alpha/beta/dev/rc versions in
 update-check

---
 srcpkgs/bochs/update                            | 1 +
 srcpkgs/cppcms/update                           | 1 +
 srcpkgs/crypto++/update                         | 3 ++-
 srcpkgs/geos/update                             | 1 +
 srcpkgs/git-review/update                       | 2 +-
 srcpkgs/gource/update                           | 1 +
 srcpkgs/gpsd/update                             | 1 +
 srcpkgs/guilt/update                            | 2 +-
 srcpkgs/jupyterlab/update                       | 1 +
 srcpkgs/pasmo/update                            | 1 +
 srcpkgs/picard/update                           | 1 +
 srcpkgs/portage/update                          | 1 +
 srcpkgs/proftpd/update                          | 1 +
 srcpkgs/pysolfc-cardsets/update                 | 1 +
 srcpkgs/python-MarkupSafe/update                | 1 +
 srcpkgs/python-mock/update                      | 1 +
 srcpkgs/python-parsing/update                   | 1 +
 srcpkgs/python-pluggy/update                    | 1 +
 srcpkgs/python-pyglet/update                    | 2 +-
 srcpkgs/python-pyserial/update                  | 1 +
 srcpkgs/python-pytest/update                    | 2 +-
 srcpkgs/python-rdflib/update                    | 1 +
 srcpkgs/python3-WTForms/update                  | 1 +
 srcpkgs/python3-ansible-lint/update             | 1 +
 srcpkgs/python3-apsw/update                     | 3 +--
 srcpkgs/python3-babelfish/update                | 1 +
 srcpkgs/python3-cheetah3/update                 | 2 +-
 srcpkgs/python3-click/update                    | 2 +-
 srcpkgs/python3-defusedxml/update               | 1 +
 srcpkgs/python3-docutils/update                 | 1 +
 srcpkgs/python3-google-api-core/update          | 1 +
 srcpkgs/python3-google-auth/update              | 1 +
 srcpkgs/python3-googleapis-common-protos/update | 1 +
 srcpkgs/python3-httpx/update                    | 1 +
 srcpkgs/python3-jsonschema/update               | 1 +
 srcpkgs/python3-mistune/update                  | 1 +
 srcpkgs/python3-olefile/update                  | 1 +
 srcpkgs/python3-plotly/update                   | 1 +
 srcpkgs/python3-poetry-core/update              | 1 +
 srcpkgs/python3-pyudev/update                   | 1 +
 srcpkgs/python3-seaborn/update                  | 1 +
 srcpkgs/python3-sympy/update                    | 1 +
 srcpkgs/python3-tldextract/update               | 1 +
 srcpkgs/python3-tzlocal/update                  | 2 +-
 srcpkgs/python3-wrapt/update                    | 1 +
 srcpkgs/rdiff-backup/update                     | 1 +
 srcpkgs/spiped/update                           | 1 +
 srcpkgs/textadept/update                        | 2 ++
 srcpkgs/tsocks/update                           | 1 +
 srcpkgs/valgrind/update                         | 1 +
 50 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/bochs/update
 create mode 100644 srcpkgs/cppcms/update
 create mode 100644 srcpkgs/geos/update
 create mode 100644 srcpkgs/gource/update
 create mode 100644 srcpkgs/gpsd/update
 create mode 100644 srcpkgs/jupyterlab/update
 create mode 100644 srcpkgs/pasmo/update
 create mode 100644 srcpkgs/picard/update
 create mode 100644 srcpkgs/portage/update
 create mode 100644 srcpkgs/proftpd/update
 create mode 100644 srcpkgs/pysolfc-cardsets/update
 create mode 100644 srcpkgs/python-MarkupSafe/update
 create mode 100644 srcpkgs/python-mock/update
 create mode 100644 srcpkgs/python-pluggy/update
 create mode 100644 srcpkgs/python-pyserial/update
 create mode 100644 srcpkgs/python-rdflib/update
 create mode 100644 srcpkgs/python3-WTForms/update
 create mode 100644 srcpkgs/python3-ansible-lint/update
 create mode 100644 srcpkgs/python3-babelfish/update
 create mode 100644 srcpkgs/python3-defusedxml/update
 create mode 100644 srcpkgs/python3-docutils/update
 create mode 100644 srcpkgs/python3-google-api-core/update
 create mode 100644 srcpkgs/python3-google-auth/update
 create mode 100644 srcpkgs/python3-googleapis-common-protos/update
 create mode 100644 srcpkgs/python3-httpx/update
 create mode 100644 srcpkgs/python3-jsonschema/update
 create mode 100644 srcpkgs/python3-mistune/update
 create mode 100644 srcpkgs/python3-olefile/update
 create mode 100644 srcpkgs/python3-plotly/update
 create mode 100644 srcpkgs/python3-poetry-core/update
 create mode 100644 srcpkgs/python3-pyudev/update
 create mode 100644 srcpkgs/python3-seaborn/update
 create mode 100644 srcpkgs/python3-sympy/update
 create mode 100644 srcpkgs/python3-tldextract/update
 create mode 100644 srcpkgs/python3-wrapt/update
 create mode 100644 srcpkgs/rdiff-backup/update
 create mode 100644 srcpkgs/spiped/update
 create mode 100644 srcpkgs/textadept/update
 create mode 100644 srcpkgs/tsocks/update
 create mode 100644 srcpkgs/valgrind/update

diff --git a/srcpkgs/bochs/update b/srcpkgs/bochs/update
new file mode 100644
index 000000000000..67f5f18ac902
--- /dev/null
+++ b/srcpkgs/bochs/update
@@ -0,0 +1 @@
+ignore="*.pre[1-9]"
diff --git a/srcpkgs/cppcms/update b/srcpkgs/cppcms/update
new file mode 100644
index 000000000000..bc1da0f1cc9f
--- /dev/null
+++ b/srcpkgs/cppcms/update
@@ -0,0 +1 @@
+ignore="*.beta[1-9]"
diff --git a/srcpkgs/crypto++/update b/srcpkgs/crypto++/update
index 947c5e1eb6c8..949da7e641c2 100644
--- a/srcpkgs/crypto++/update
+++ b/srcpkgs/crypto++/update
@@ -1 +1,2 @@
-pkgname=cryptopp
+site="https://github.com/weidai11/cryptopp/tags"
+pattern="CRYPTOPP_\K[0-9_]+"
diff --git a/srcpkgs/geos/update b/srcpkgs/geos/update
new file mode 100644
index 000000000000..c5c74d95c8a1
--- /dev/null
+++ b/srcpkgs/geos/update
@@ -0,0 +1 @@
+ignore="*beta[1-9] *rc[1-9]"
diff --git a/srcpkgs/git-review/update b/srcpkgs/git-review/update
index 2c857beffb29..6e16f5da3819 100644
--- a/srcpkgs/git-review/update
+++ b/srcpkgs/git-review/update
@@ -1 +1 @@
-ignore="*a*"
+ignore="*a[1-9] *rc[1-9]"
diff --git a/srcpkgs/gource/update b/srcpkgs/gource/update
new file mode 100644
index 000000000000..640e24a6b38f
--- /dev/null
+++ b/srcpkgs/gource/update
@@ -0,0 +1 @@
+ignore="*.win32 *.win64"
diff --git a/srcpkgs/gpsd/update b/srcpkgs/gpsd/update
new file mode 100644
index 000000000000..af894a945853
--- /dev/null
+++ b/srcpkgs/gpsd/update
@@ -0,0 +1 @@
+ignore="*~dev"
diff --git a/srcpkgs/guilt/update b/srcpkgs/guilt/update
index 1d7fd733345e..ab5184756bb1 100644
--- a/srcpkgs/guilt/update
+++ b/srcpkgs/guilt/update
@@ -1,3 +1,3 @@
 site="http://repo.or.cz/guilt.git/refs/"
 pattern="tags/v\K[\d\.rc-]+"
-ignore="*-rc"
+ignore="*-rc[1-9]"
diff --git a/srcpkgs/jupyterlab/update b/srcpkgs/jupyterlab/update
new file mode 100644
index 000000000000..0e9c1b22de7e
--- /dev/null
+++ b/srcpkgs/jupyterlab/update
@@ -0,0 +1 @@
+ignore="*a[0-9]* *b[0-9]* *rc[0-9]*"
diff --git a/srcpkgs/pasmo/update b/srcpkgs/pasmo/update
new file mode 100644
index 000000000000..b0bb408b2db9
--- /dev/null
+++ b/srcpkgs/pasmo/update
@@ -0,0 +1 @@
+ignore="*.beta[1-9]* 0.6.0.200[67]*"
diff --git a/srcpkgs/picard/update b/srcpkgs/picard/update
new file mode 100644
index 000000000000..c3d5dd21bebd
--- /dev/null
+++ b/srcpkgs/picard/update
@@ -0,0 +1 @@
+ignore="*b[1-9]"
diff --git a/srcpkgs/portage/update b/srcpkgs/portage/update
new file mode 100644
index 000000000000..e8ef37b21056
--- /dev/null
+++ b/srcpkgs/portage/update
@@ -0,0 +1 @@
+ignore="3.x.xx"
diff --git a/srcpkgs/proftpd/update b/srcpkgs/proftpd/update
new file mode 100644
index 000000000000..3179cf0a4f4f
--- /dev/null
+++ b/srcpkgs/proftpd/update
@@ -0,0 +1 @@
+ignore="*rc[1-9]"
diff --git a/srcpkgs/pysolfc-cardsets/update b/srcpkgs/pysolfc-cardsets/update
new file mode 100644
index 000000000000..81dde09eb9c5
--- /dev/null
+++ b/srcpkgs/pysolfc-cardsets/update
@@ -0,0 +1 @@
+ignore="*PRE"
diff --git a/srcpkgs/python-MarkupSafe/update b/srcpkgs/python-MarkupSafe/update
new file mode 100644
index 000000000000..6e16f5da3819
--- /dev/null
+++ b/srcpkgs/python-MarkupSafe/update
@@ -0,0 +1 @@
+ignore="*a[1-9] *rc[1-9]"
diff --git a/srcpkgs/python-mock/update b/srcpkgs/python-mock/update
new file mode 100644
index 000000000000..21e9eecbf240
--- /dev/null
+++ b/srcpkgs/python-mock/update
@@ -0,0 +1 @@
+ignore="[4-9]*" # v4+ doesn't work with Python 2
diff --git a/srcpkgs/python-parsing/update b/srcpkgs/python-parsing/update
index da36a6f466d0..3fe9488cc307 100644
--- a/srcpkgs/python-parsing/update
+++ b/srcpkgs/python-parsing/update
@@ -1,2 +1,3 @@
 site=https://github.com/pyparsing/pyparsing/releases
 pkgname=pyparsing
+ignore="*a[1-9] *b[1-9] *rc[1-9]"
diff --git a/srcpkgs/python-pluggy/update b/srcpkgs/python-pluggy/update
new file mode 100644
index 000000000000..9399cb78422a
--- /dev/null
+++ b/srcpkgs/python-pluggy/update
@@ -0,0 +1 @@
+ignore="[1-9]*" # 1.0.0 dropped Python 2 support
diff --git a/srcpkgs/python-pyglet/update b/srcpkgs/python-pyglet/update
index bf2498e49864..b6e21e1ea9cf 100644
--- a/srcpkgs/python-pyglet/update
+++ b/srcpkgs/python-pyglet/update
@@ -1 +1 @@
-ignore="*.*.*a* *.*.*b* *.*.*rc*"
+ignore="*.*.*a* *.*.*b* *.*.*rc* *.*.*dev*"
diff --git a/srcpkgs/python-pyserial/update b/srcpkgs/python-pyserial/update
new file mode 100644
index 000000000000..5731a163e9c7
--- /dev/null
+++ b/srcpkgs/python-pyserial/update
@@ -0,0 +1 @@
+ignore="*b[0-9]"
diff --git a/srcpkgs/python-pytest/update b/srcpkgs/python-pytest/update
index 2638b2b10b6e..1ee159b4f4d9 100644
--- a/srcpkgs/python-pytest/update
+++ b/srcpkgs/python-pytest/update
@@ -1 +1 @@
-ignore="5.*"
+ignore="*rc[1-9] [5-9].*"
diff --git a/srcpkgs/python-rdflib/update b/srcpkgs/python-rdflib/update
new file mode 100644
index 000000000000..323b3ae35615
--- /dev/null
+++ b/srcpkgs/python-rdflib/update
@@ -0,0 +1 @@
+ignore="*a[0-9] *b[0-9] *rc[1-9]"
diff --git a/srcpkgs/python3-WTForms/update b/srcpkgs/python3-WTForms/update
new file mode 100644
index 000000000000..c94d83e1b1b5
--- /dev/null
+++ b/srcpkgs/python3-WTForms/update
@@ -0,0 +1 @@
+ignore="*a[1-9]"
diff --git a/srcpkgs/python3-ansible-lint/update b/srcpkgs/python3-ansible-lint/update
new file mode 100644
index 000000000000..deb78f510de5
--- /dev/null
+++ b/srcpkgs/python3-ansible-lint/update
@@ -0,0 +1 @@
+ignore="*a[0-9] *a[0-9].dev* *rc[0-9]"
diff --git a/srcpkgs/python3-apsw/update b/srcpkgs/python3-apsw/update
index d23091c828c6..0d2934a3c1ce 100644
--- a/srcpkgs/python3-apsw/update
+++ b/srcpkgs/python3-apsw/update
@@ -1,2 +1 @@
-pkgname=apsw
-pattern='[\d.]+-r\d+'
+pattern='tag/\K[\d.r-]+'
diff --git a/srcpkgs/python3-babelfish/update b/srcpkgs/python3-babelfish/update
new file mode 100644
index 000000000000..5731a163e9c7
--- /dev/null
+++ b/srcpkgs/python3-babelfish/update
@@ -0,0 +1 @@
+ignore="*b[0-9]"
diff --git a/srcpkgs/python3-cheetah3/update b/srcpkgs/python3-cheetah3/update
index e9b0a0a5ea4c..ac19609a1520 100644
--- a/srcpkgs/python3-cheetah3/update
+++ b/srcpkgs/python3-cheetah3/update
@@ -1 +1 @@
-ignore="*b*"
+ignore="*a[0-9] *b[0-9]"
diff --git a/srcpkgs/python3-click/update b/srcpkgs/python3-click/update
index ee07b72ffd43..9bad5ab59057 100644
--- a/srcpkgs/python3-click/update
+++ b/srcpkgs/python3-click/update
@@ -1 +1 @@
-ignore="*dev*"
+ignore="*.dev[0-9] *a[1-9] *rc[1-9]"
diff --git a/srcpkgs/python3-defusedxml/update b/srcpkgs/python3-defusedxml/update
new file mode 100644
index 000000000000..3179cf0a4f4f
--- /dev/null
+++ b/srcpkgs/python3-defusedxml/update
@@ -0,0 +1 @@
+ignore="*rc[1-9]"
diff --git a/srcpkgs/python3-docutils/update b/srcpkgs/python3-docutils/update
new file mode 100644
index 000000000000..c98867f3ce5f
--- /dev/null
+++ b/srcpkgs/python3-docutils/update
@@ -0,0 +1 @@
+ignore="*b[0-9] *b[0-9].dev[0-9]"
diff --git a/srcpkgs/python3-google-api-core/update b/srcpkgs/python3-google-api-core/update
new file mode 100644
index 000000000000..eb2e3389a13f
--- /dev/null
+++ b/srcpkgs/python3-google-api-core/update
@@ -0,0 +1 @@
+ignore="*a[1-9] *b[1-9] *.dev[0-9]"
diff --git a/srcpkgs/python3-google-auth/update b/srcpkgs/python3-google-auth/update
new file mode 100644
index 000000000000..eb2e3389a13f
--- /dev/null
+++ b/srcpkgs/python3-google-auth/update
@@ -0,0 +1 @@
+ignore="*a[1-9] *b[1-9] *.dev[0-9]"
diff --git a/srcpkgs/python3-googleapis-common-protos/update b/srcpkgs/python3-googleapis-common-protos/update
new file mode 100644
index 000000000000..d412ccb64d11
--- /dev/null
+++ b/srcpkgs/python3-googleapis-common-protos/update
@@ -0,0 +1 @@
+ignore="*.dev[1-9]"
diff --git a/srcpkgs/python3-httpx/update b/srcpkgs/python3-httpx/update
new file mode 100644
index 000000000000..5731a163e9c7
--- /dev/null
+++ b/srcpkgs/python3-httpx/update
@@ -0,0 +1 @@
+ignore="*b[0-9]"
diff --git a/srcpkgs/python3-jsonschema/update b/srcpkgs/python3-jsonschema/update
new file mode 100644
index 000000000000..c94d83e1b1b5
--- /dev/null
+++ b/srcpkgs/python3-jsonschema/update
@@ -0,0 +1 @@
+ignore="*a[1-9]"
diff --git a/srcpkgs/python3-mistune/update b/srcpkgs/python3-mistune/update
new file mode 100644
index 000000000000..6e16f5da3819
--- /dev/null
+++ b/srcpkgs/python3-mistune/update
@@ -0,0 +1 @@
+ignore="*a[1-9] *rc[1-9]"
diff --git a/srcpkgs/python3-olefile/update b/srcpkgs/python3-olefile/update
new file mode 100644
index 000000000000..d412ccb64d11
--- /dev/null
+++ b/srcpkgs/python3-olefile/update
@@ -0,0 +1 @@
+ignore="*.dev[1-9]"
diff --git a/srcpkgs/python3-plotly/update b/srcpkgs/python3-plotly/update
new file mode 100644
index 000000000000..6e16f5da3819
--- /dev/null
+++ b/srcpkgs/python3-plotly/update
@@ -0,0 +1 @@
+ignore="*a[1-9] *rc[1-9]"
diff --git a/srcpkgs/python3-poetry-core/update b/srcpkgs/python3-poetry-core/update
new file mode 100644
index 000000000000..c94d83e1b1b5
--- /dev/null
+++ b/srcpkgs/python3-poetry-core/update
@@ -0,0 +1 @@
+ignore="*a[1-9]"
diff --git a/srcpkgs/python3-pyudev/update b/srcpkgs/python3-pyudev/update
new file mode 100644
index 000000000000..033870855f60
--- /dev/null
+++ b/srcpkgs/python3-pyudev/update
@@ -0,0 +1 @@
+ignore="*.dev*"
diff --git a/srcpkgs/python3-seaborn/update b/srcpkgs/python3-seaborn/update
new file mode 100644
index 000000000000..0b13e605d463
--- /dev/null
+++ b/srcpkgs/python3-seaborn/update
@@ -0,0 +1 @@
+ignore="*rc[0-9]"
diff --git a/srcpkgs/python3-sympy/update b/srcpkgs/python3-sympy/update
new file mode 100644
index 000000000000..3179cf0a4f4f
--- /dev/null
+++ b/srcpkgs/python3-sympy/update
@@ -0,0 +1 @@
+ignore="*rc[1-9]"
diff --git a/srcpkgs/python3-tldextract/update b/srcpkgs/python3-tldextract/update
new file mode 100644
index 000000000000..3179cf0a4f4f
--- /dev/null
+++ b/srcpkgs/python3-tldextract/update
@@ -0,0 +1 @@
+ignore="*rc[1-9]"
diff --git a/srcpkgs/python3-tzlocal/update b/srcpkgs/python3-tzlocal/update
index e9b0a0a5ea4c..7ce87e7b5b04 100644
--- a/srcpkgs/python3-tzlocal/update
+++ b/srcpkgs/python3-tzlocal/update
@@ -1 +1 @@
-ignore="*b*"
+ignore="*a[1-9] *b[1-9]"
diff --git a/srcpkgs/python3-wrapt/update b/srcpkgs/python3-wrapt/update
new file mode 100644
index 000000000000..3179cf0a4f4f
--- /dev/null
+++ b/srcpkgs/python3-wrapt/update
@@ -0,0 +1 @@
+ignore="*rc[1-9]"
diff --git a/srcpkgs/rdiff-backup/update b/srcpkgs/rdiff-backup/update
new file mode 100644
index 000000000000..b1f15713c9e3
--- /dev/null
+++ b/srcpkgs/rdiff-backup/update
@@ -0,0 +1 @@
+ignore="*a[0-9] *b[0-9] *.dev[0-9] *rc[0-9]"
diff --git a/srcpkgs/spiped/update b/srcpkgs/spiped/update
new file mode 100644
index 000000000000..2ed4658c5818
--- /dev/null
+++ b/srcpkgs/spiped/update
@@ -0,0 +1 @@
+ignore="*a *b"
diff --git a/srcpkgs/textadept/update b/srcpkgs/textadept/update
new file mode 100644
index 000000000000..ab9a307aafa1
--- /dev/null
+++ b/srcpkgs/textadept/update
@@ -0,0 +1,2 @@
+site="https://github.com/orbitalquark/textadept/tags"
+pattern="/archive/refs/tags/textadept_\K[\d.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/tsocks/update b/srcpkgs/tsocks/update
new file mode 100644
index 000000000000..cf70c87305b8
--- /dev/null
+++ b/srcpkgs/tsocks/update
@@ -0,0 +1 @@
+ignore="*[Bb]eta*"
diff --git a/srcpkgs/valgrind/update b/srcpkgs/valgrind/update
new file mode 100644
index 000000000000..5762808020c2
--- /dev/null
+++ b/srcpkgs/valgrind/update
@@ -0,0 +1 @@
+ignore="*.RC[1-9]"

From 984587eef4529f147c78e8b657725fa58e2e3a71 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 4 Oct 2021 20:37:11 +0200
Subject: [PATCH 1586/4088] cryptsetup: update to 2.4.1.

---
 srcpkgs/cryptsetup/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 949a2ce214a3..94f6260a1e00 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,14 +1,14 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
-version=2.3.6
+version=2.4.1
 revision=1
 build_style=gnu-configure
-configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
- --enable-cryptsetup-reencrypt --enable-libargon2"
+configure_args="--with-crypto_backend=openssl --enable-cryptsetup-reencrypt
+ --enable-libargon2 $(vopt_enable pwquality)"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
 makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
- libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
+ libargon2-devel libssh-devel $(vopt_if pwquality libpwquality-devel)"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.com/cryptsetup/cryptsetup"
 changelog="https://gitlab.com/cryptsetup/cryptsetup/raw/master/docs/v${version}-ReleaseNotes"
 distfiles="${KERNEL_SITE}/utils/cryptsetup/v${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f
+checksum=a356a727a83a464ade566e95239622a22dbe4e0f482b198fdb04ab0d3a5a9c5f
 make_check=extended
 subpackages="libcryptsetup cryptsetup-devel"
 
@@ -32,12 +32,13 @@ post_patch() {
 	fi
 }
 
-case $XBPS_TARGET_MACHINE in
-	*-musl)
-		configure_args+=" --enable-static-cryptsetup"
-		subpackages+=" cryptsetup-static"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" --enable-static-cryptsetup"
+	subpackages+=" cryptsetup-static"
+
+	makedepends+=" argp-standalone"
+	LDFLAGS+=" -largp"
+fi
 
 cryptsetup-static_package() {
 	short_desc+=" - static cryptsetup"

From d4cf57cd4192589ec821cdc2f82959f53edceb4b Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 15 Oct 2021 13:33:28 +0200
Subject: [PATCH 1587/4088] vscode: update to 1.61.1

disable-crash-reporter.patch:
- removed defunct part (which would yield false for a < b === undefined)
---
 srcpkgs/vscode/patches/disable-crash-reporter.patch | 13 -------------
 srcpkgs/vscode/template                             |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch
index 17c0b0db545c..d91f6895969c 100644
--- a/srcpkgs/vscode/patches/disable-crash-reporter.patch
+++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch
@@ -54,18 +54,5 @@ index ad838aa245e..e6319e100b9 100644
  // Set logs path before app 'ready' event if running portable
  // to ensure that no 'logs' folder is created on disk at a
  // location outside of the portable directory
-diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
-index 1d71361b942..6452f501e34 100644
---- a/src/vs/code/electron-main/app.ts
-+++ b/src/vs/code/electron-main/app.ts
-@@ -992,7 +992,7 @@ export class CodeApplication extends Disposable {
- 			if (argvJSON['enable-crash-reporter'] === undefined) {
- 				const telemetryConfig = getTelemetryLevel(this.configurationService);
- 				const enableCrashReporterSetting = telemetryConfig >= TelemetryLevel.ERROR;
--				const enableCrashReporter = typeof enableCrashReporterSetting === 'boolean' ? enableCrashReporterSetting : true;
-+				const enableCrashReporter = typeof enableCrashReporterSetting === 'boolean' ? enableCrashReporterSetting : false;
- 				const additionalArgvContent = [
- 					'',
- 					'	// Allows to disable crash reporting.',
 -- 
 2.32.0
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 102635ef5d5d..84657a597108 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.61.0
+version=1.61.1
 revision=1
 _electronver=13.3.0
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=68bff7284804054cdd38ae3984ecb2a23af86668e23ec2335440dc56a2d1e82a
+checksum=e0aadb434252fd5f7a2ebf979d7e4db138148327c641a0214725eae1c22459c3
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 1ece58d6c934e7421c80d90227926abde8b03e3e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 15 Oct 2021 08:19:44 +0400
Subject: [PATCH 1588/4088] osinfo-db: update to 20211013.

---
 srcpkgs/osinfo-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 622ac2d0d8c0..0f757e1128ac 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210903
+version=20211013
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=30e7d3f21bc0d3a24fd23da29f6364afe896d7c9e2dfb39f0999ffc6b7730834
+checksum=c2e47e9432048f3016e36803eef3dd482d12ee32360c22958f8ab6f4323a692c
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From 8ac227f75df9dca61cad61f10782fa2f543e278e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 15 Oct 2021 07:54:00 +0400
Subject: [PATCH 1589/4088] calibre: update to 5.29.0.

---
 srcpkgs/calibre/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index dfe669acc496..8d55162c2ccb 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.28.0
-revision=2
+version=5.29.0
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=e8021131c8e4f77580560d70a0d49acb1acabfb40e3d91274214df925d5f3ada
+checksum=f729871294c70d43373401a8792113cca44b2a024b458e1e1258ba37995b66e8
 lib32disabled=yes
 nocross=yes
 

From ce9340f08ec89ea4b6e4f8ee15ea3b6417c50d4d Mon Sep 17 00:00:00 2001
From: Vilhelm Bergsoe <vilhelmbergsoe@gmail.com>
Date: Mon, 11 Oct 2021 15:48:59 +0200
Subject: [PATCH 1590/4088] libinput: update to 1.19.1

---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..ab2b0db758ef 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.19.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0bdcf5b1783b737854b7af1ca22df67bc36a6fe7c9cfa71f01e9149f9220446d
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"

From fb52c4fc654b40602fe67b45c54abd460c800b02 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 15 Oct 2021 16:47:02 -0700
Subject: [PATCH 1591/4088] quodlibet: patch for python 3.10

---
 .../quodlibet/patches/collections_abc.patch   | 103 ++++++++++++++++++
 srcpkgs/quodlibet/template                    |   4 +-
 2 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/quodlibet/patches/collections_abc.patch

diff --git a/srcpkgs/quodlibet/patches/collections_abc.patch b/srcpkgs/quodlibet/patches/collections_abc.patch
new file mode 100644
index 000000000000..60cf01bb04b4
--- /dev/null
+++ b/srcpkgs/quodlibet/patches/collections_abc.patch
@@ -0,0 +1,103 @@
+Upstream: yes
+
+commit d4e05aef03fe9775de9c00f2730d89815450022e
+Author: LuK1337 <priv.luk@gmail.com>
+Date:   Sat Sep 11 11:46:46 2021 +0200
+
+    Finish up collections -> collections.abc migration
+    
+    This lets us start QuodLibet on Python 3.10 ^.^
+
+diff --git a/quodlibet/packages/raven/context.py b/quodlibet/packages/raven/context.py
+index 272259a3b..2a3eab4a7 100644
+--- a/quodlibet/packages/raven/context.py
++++ b/quodlibet/packages/raven/context.py
+@@ -7,7 +7,10 @@ raven.context
+ """
+ from __future__ import absolute_import
+ 
+-from collections import Mapping, Iterable
++try:
++    from collections import abc
++except ImportError:
++    import collections as abc  # type: ignore
+ from threading import local
+ from weakref import ref as weakref
+ 
+@@ -30,7 +33,7 @@ def get_active_contexts():
+         return []
+ 
+ 
+-class Context(local, Mapping, Iterable):
++class Context(local, abc.Mapping, abc.Iterable):
+     """
+     Stores context until cleared.
+ 
+diff --git a/quodlibet/player/gstbe/util.py b/quodlibet/player/gstbe/util.py
+index 2611f8120..7439b716a 100644
+--- a/quodlibet/player/gstbe/util.py
++++ b/quodlibet/player/gstbe/util.py
+@@ -6,7 +6,10 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ 
+-import collections
++try:
++    from collections import abc
++except ImportError:
++    import collections as abc  # type: ignore
+ import subprocess
+ from enum import Enum
+ from typing import Iterable, Tuple
+@@ -183,7 +186,7 @@ def GStreamerSink(pipeline_desc):
+     return pipe, pipeline_desc
+ 
+ 
+-class TagListWrapper(collections.Mapping):
++class TagListWrapper(abc.Mapping):
+     def __init__(self, taglist, merge=False):
+         self._list = taglist
+         self._merge = merge
+diff --git a/quodlibet/util/collection.py b/quodlibet/util/collection.py
+index b726f98e9..83646b8af 100644
+--- a/quodlibet/util/collection.py
++++ b/quodlibet/util/collection.py
+@@ -24,7 +24,10 @@ from quodlibet.formats._audio import (TAG_TO_SORT, NUMERIC_ZERO_DEFAULT,
+                                       AudioFile)
+ from quodlibet.formats._audio import PEOPLE as _PEOPLE
+ from quodlibet.pattern import Pattern
+-from collections import Iterable
++try:
++    from collections import abc
++except ImportError:
++    import collections as abc  # type: ignore
+ 
+ from quodlibet.util import is_windows
+ from quodlibet.util.path import escape_filename, unescape_filename, limit_path
+@@ -332,7 +335,7 @@ class Album(Collection):
+ 
+ @hashable
+ @total_ordering
+-class Playlist(Collection, Iterable):
++class Playlist(Collection, abc.Iterable):
+     """A Playlist is a `Collection` that has list-like features
+     Songs can appear more than once.
+     """
+diff --git a/quodlibet/util/collections.py b/quodlibet/util/collections.py
+index ba9d5c1a4..f0b83b5e9 100644
+--- a/quodlibet/util/collections.py
++++ b/quodlibet/util/collections.py
+@@ -9,7 +9,12 @@
+ 
+ from __future__ import absolute_import
+ 
+-from collections import MutableSequence, defaultdict
++try:
++    from collections.abc import MutableSequence
++except ImportError:
++    from collections import MutableSequence
++from collections import defaultdict
++from typing import Any
+ 
+ from .misc import total_ordering
+ 
diff --git a/srcpkgs/quodlibet/template b/srcpkgs/quodlibet/template
index 0253eb320bfe..e37fb6dd9057 100644
--- a/srcpkgs/quodlibet/template
+++ b/srcpkgs/quodlibet/template
@@ -1,9 +1,8 @@
 # Template file for 'quodlibet'
 pkgname=quodlibet
 version=4.4.0
-revision=2
+revision=3
 build_style=python3-module
-pycompile_module="quodlibet"
 hostmakedepends="intltool python3-devel"
 depends="desktop-file-utils gst-plugins-bad1 gst-plugins-base1 gst-plugins-good1
  gst-plugins-ugly1 gtk+3 hicolor-icon-theme python3-dbus python3-feedparser
@@ -14,3 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://quodlibet.readthedocs.io/en/latest/"
 distfiles="https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"
 checksum=a03318d2767e4959551763d0a87fad977387af712608fe572714176a24bbf367
+make_check=no  # requires X server

From 3155936746084a50747187cb959d825d433b9ca8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 11 Oct 2021 19:40:40 -0400
Subject: [PATCH 1592/4088] python3-frozendict: update to 2.0.6.

---
 .../python3-frozendict/patches/build-py.patch | 13 +++++++++++
 srcpkgs/python3-frozendict/template           | 22 ++++++++++++-------
 2 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/python3-frozendict/patches/build-py.patch

diff --git a/srcpkgs/python3-frozendict/patches/build-py.patch b/srcpkgs/python3-frozendict/patches/build-py.patch
new file mode 100644
index 000000000000..4ec531e6aa66
--- /dev/null
+++ b/srcpkgs/python3-frozendict/patches/build-py.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 462ee99..c287130 100755
+--- a/setup.py
++++ b/setup.py
+@@ -157,7 +157,7 @@ common_setup_args = dict(
+     keywords = keywords,
+ )
+ 
+-custom_arg = None
++custom_arg = "py"
+ 
+ if len(argv) > 1 and (argv[1] == "py" or argv[1] == "c_debug"):
+     custom_arg = argv[1]
diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 274f14db49f9..479b6b47a656 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,19 +1,25 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=1.2
-revision=4
+version=2.0.6
+revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
-pycompile_module="frozendict"
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Immutable mapping for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/slezica/python-frozendict"
+license="LGPL-3.0-only"
+homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=774179f22db2ef8a106e9c38d4d1f8503864603db08de2e33be5b778230f6e45
+checksum=3f00de72805cf4c9e81b334f3f04809278b967d2fed84552313a0fcce511beb1
 
-post_install() {
-	vlicense LICENSE.txt
+pre_patch() {
+	# remove c implementation tests
+	cd test
+	rm c_only.py
+	rm test_frozendict_c.py
+	rm test_frozendict_c_subclass.py
+	rm test_coold.py
+	rm test_coold_subclass.py
 }

From 9e47e5926a6676c504214daf3ee067a9fb6ddcbb Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Fri, 15 Oct 2021 17:10:10 +0100
Subject: [PATCH 1593/4088] asciinema: update to 2.1.0

---
 srcpkgs/asciinema/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/asciinema/template b/srcpkgs/asciinema/template
index dd608d6e935b..cb770bbe7667 100644
--- a/srcpkgs/asciinema/template
+++ b/srcpkgs/asciinema/template
@@ -1,10 +1,10 @@
 # Template file for 'asciinema'
 pkgname=asciinema
-version=2.0.2
-revision=5
+version=2.1.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="$hostmakedepends"
+depends="python3"
 checkdepends="python3-nose"
 short_desc="Record and share your terminal sessions, the right way"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://asciinema.org/"
 changelog="https://raw.githubusercontent.com/asciinema/asciinema/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/a/asciinema/asciinema-${version}.tar.gz"
-checksum=32f2c1a046564e030708e596f67e0405425d1eca9d5ec83cd917ef8da06bc423
+checksum=7bdb358c1f6d61b07169c5476b2f9607ce66da12e78e4c17b7c898d72402cddc

From f390c69d6cc797ea6e436f0d67e58001a1b9f07d Mon Sep 17 00:00:00 2001
From: tuxliban <tenshalito@gmail.com>
Date: Sun, 10 Oct 2021 00:56:22 -0500
Subject: [PATCH 1594/4088] ueberzug: update to 18.1.9

---
 srcpkgs/ueberzug/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ueberzug/template b/srcpkgs/ueberzug/template
index dd815ee12c0b..1513cebd909e 100644
--- a/srcpkgs/ueberzug/template
+++ b/srcpkgs/ueberzug/template
@@ -1,7 +1,7 @@
 # Template file for 'ueberzug'
 pkgname=ueberzug
-version=18.1.8
-revision=2
+version=18.1.9
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libX11-devel libXext-devel"
@@ -11,7 +11,8 @@ maintainer="mustaqim <mustaqim@pm.me>"
 license="GPL-3.0-only"
 homepage="https://github.com/seebye/ueberzug"
 distfiles="https://github.com/seebye/ueberzug/archive/${version}.tar.gz"
-checksum=a9fbe22e2ad59f42b148f184af808d6106ae504d9b19797385f2714a6351dbcb
+checksum=d2b8e7c39e72aa88891f7204441e5482d9b89bb900efe4ac9a230f84437897bb
+make_check=no # doesn't include a test suite
 
 case $XBPS_TARGET_MACHINE in
 	x86_64*) depends+=" python3-pillow-simd" ;;

From 47c94993097a33bc4758fb5549a34beb00439732 Mon Sep 17 00:00:00 2001
From: Vilhelm Bergsoe <vilhelmbergsoe@gmail.com>
Date: Mon, 11 Oct 2021 21:12:02 +0200
Subject: [PATCH 1595/4088] blender: update to 2.93.5

---
 srcpkgs/blender/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 024a132f1edb..655bc672b771 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,6 +1,6 @@
 # Template file for 'blender'
 pkgname=blender
-version=2.93.4
+version=2.93.5
 revision=1
 archs="x86_64* ppc64*"
 build_style="cmake"
@@ -24,9 +24,9 @@ depends="desktop-file-utils hicolor-icon-theme"
 short_desc="3D graphics creation suite"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.blender.org"
-distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=e5c1419cf2d3af0ac4cb90217df05e1a149040739b8c02dcfaaf2c2061487fb2
+homepage="https://www.blender.org"
+distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
+checksum=d22df1babec8b6ecfe5d3344885288c57afca95ca9185f3fe165220810475cbb
 python_version=3
 CXXFLAGS="-DNDEBUG"
 CFLAGS="$CXXFLAGS"

From 56bba016478d991d9b074a4b7c566ef17737dc6d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Fri, 15 Oct 2021 19:31:05 +0300
Subject: [PATCH 1596/4088] geany-plugins: fix compilation

Applied patch from PR https://github.com/geany/geany-plugins/pull/1053
to fix compilation issue #33568

Fixes: #33568
---
 srcpkgs/geany-plugins/patches/pr-1053.patch | 40 +++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/geany-plugins/patches/pr-1053.patch

diff --git a/srcpkgs/geany-plugins/patches/pr-1053.patch b/srcpkgs/geany-plugins/patches/pr-1053.patch
new file mode 100644
index 000000000000..7731b62abcd1
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/pr-1053.patch
@@ -0,0 +1,40 @@
+From ad50d3ed2ddfe11cd07954786b96725602fb4ddd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexander=20F=2E=20R=C3=B8dseth?= <rodseth@gmail.com>
+Date: Tue, 5 Jan 2021 12:57:27 +0100
+Subject: [PATCH] Use stdbool.h istead of redefining bool
+
+Redefining bool causes errors when used together with ie. GCC 10.2.0
+---
+ pretty-printer/src/PrettyPrinter.h | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/pretty-printer/src/PrettyPrinter.h b/pretty-printer/src/PrettyPrinter.h
+index 268986e95..4200db612 100644
+--- a/pretty-printer/src/PrettyPrinter.h
++++ b/pretty-printer/src/PrettyPrinter.h
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <stdbool.h>
+ 
+ #ifdef HAVE_GLIB
+ #include <glib.h>
+@@ -52,15 +53,13 @@
+ #define TRUE !(FALSE)
+ #endif
+ 
+-typedef unsigned int bool;
+-
+ /*========================================== STRUCTURES =======================================================*/
+ 
+ /**
+  * The PrettyPrintingOptions struct allows the programmer to tell the
+  * PrettyPrinter how it must format the XML output.
+  */
+-typedef struct 
++typedef struct
+ {
+       const char* newLineChars;                                                             /* char used to generate a new line (generally \r\n) */
+       char indentChar;                                                                      /* char used for indentation */
+

From 2a66ee9cb1aa4fd6c38a6bd971450da777325a90 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 16 Oct 2021 16:42:09 +0300
Subject: [PATCH 1597/4088] rssguard: update to 4.0.4.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index cf0e72fd8ac6..77cc91684c71 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.0.3
+version=4.0.4
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=86ec7dbe6f7e4ac31b0e3153c4da344d50dc517391e8ed15de08e1126d132244
+checksum=9154a9c674b35f68486ca7e024265e044b7c7971485bafbe9b6ebbdf27463489
 
 post_install() {
 	# Install rssguard icon manually

From f5dab59d1f301a3b251ec21fd045797b446b63a7 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Fri, 15 Oct 2021 21:21:33 +0530
Subject: [PATCH 1598/4088] legendary: update to 0.20.16.

---
 srcpkgs/legendary/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/legendary/template b/srcpkgs/legendary/template
index e19b04603006..ae35ba48ccae 100644
--- a/srcpkgs/legendary/template
+++ b/srcpkgs/legendary/template
@@ -1,14 +1,14 @@
 # Template file for 'legendary'
 pkgname=legendary
-version=0.20.12
-revision=2
+version=0.20.16
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-requests python3-wheel"
+depends="python3-requests"
 short_desc="Free and open-source replacement for the Epic Games Launcher"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/derrod/legendary"
 distfiles="https://github.com/derrod/legendary/archive/${version}.tar.gz"
-checksum=7b73c50a00092896e3b77eb3a693dfb6e258a804fde92dc7b9b402ebc92f99d7
+checksum=116efe7455a8e40235862912fbe1d532db8a1b3fa23c1e8b3628bde42aee89dd
 make_check=no # doesn't contain any tests

From 3e29f442a1fbd0e46dca79a31d3e3a11f167e6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 16 Oct 2021 12:33:57 -0300
Subject: [PATCH 1599/4088] flintlib: update to 2.8.2.

---
 srcpkgs/flintlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index 831602166916..d255014d7e89 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -1,6 +1,6 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=2.8.1
+version=2.8.2
 revision=1
 wrksrc="flint-${version}"
 build_style=configure
@@ -11,7 +11,7 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://flintlib.org"
 distfiles="https://flintlib.org/flint-${version}.tar.gz"
-checksum=edfdda7a7cb847db4e55e050349259cbc9778589686007fb45602d36ecfb427e
+checksum=4e878577dc1e17b27887272ff1dff1721189b078d36682c5ceb71b34cd1b3484
 
 build_options="ntl"
 desc_option_ntl="enable NTL support"

From 898d797f92cb91b25b910e394fa6957f1f5d1187 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Oct 2021 12:37:50 +0200
Subject: [PATCH 1600/4088] fzf: update to 0.27.3.

---
 srcpkgs/fzf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 5bacbb59790d..8c312d3399a2 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.27.2
+version=0.27.3
 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=7798a9e22fc363801131456dc21026ccb0f037aed026d17df60b1178b3f24111
+checksum=a0ad8dc6dd5c7a0c87ad623c0d9164cc2861489b76cb7a8b66f51cb4f9a81254
 
 post_install() {
 	cd ${wrksrc}

From 1af8846ff371d6751abf52a6f3ab287bc6e3b29f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Oct 2021 21:54:22 +0200
Subject: [PATCH 1601/4088] New package: gnushogi-1.4.2

---
 srcpkgs/gnushogi/patches/gcc-10-globals.patch | 86 +++++++++++++++++++
 srcpkgs/gnushogi/template                     | 20 +++++
 2 files changed, 106 insertions(+)
 create mode 100644 srcpkgs/gnushogi/patches/gcc-10-globals.patch
 create mode 100644 srcpkgs/gnushogi/template

diff --git a/srcpkgs/gnushogi/patches/gcc-10-globals.patch b/srcpkgs/gnushogi/patches/gcc-10-globals.patch
new file mode 100644
index 000000000000..f173bfcc6067
--- /dev/null
+++ b/srcpkgs/gnushogi/patches/gcc-10-globals.patch
@@ -0,0 +1,86 @@
+Patch from https://salsa.debian.org/debian/gnushogi/-/commit/ae9ff5c5d4a047e895030add12cc0e75480026b5
+
+Index: gnushogi-1.4.2/gnushogi/commondsp.c
+===================================================================
+--- gnushogi-1.4.2.orig/gnushogi/commondsp.c
++++ gnushogi-1.4.2/gnushogi/commondsp.c
+@@ -53,6 +53,7 @@ char mvstr[4][6];
+ char *InPtr;
+ int InBackground = false;
+ 
++unsigned short MV[MAXDEPTH];
+ 
+ #if defined(BOOKTEST)
+ 
+@@ -2034,7 +2035,7 @@ InputCommand(char *command)
+         {
+             int i;
+ 
+-            printf(" %6d ", MSCORE);
++            printf(" %6d ", 0);
+ 
+             for (i = 1; MV[i] > 0; i++)
+             {
+Index: gnushogi-1.4.2/gnushogi/cursesdsp.c
+===================================================================
+--- gnushogi-1.4.2.orig/gnushogi/cursesdsp.c
++++ gnushogi-1.4.2/gnushogi/cursesdsp.c
+@@ -62,18 +62,12 @@
+ 
+ #define FLUSH_SCANW fflush(stdout), scanw
+ 
+-int mycnt1, mycnt2;
+-
+ #define MARGIN (5)
+ #define TAB (58)
+ 
+ #define VIR_C(s)  ((flag.reverse) ? (NO_COLS - 1 - column(s)) : column(s))
+ #define VIR_R(s)  ((flag.reverse) ? (NO_ROWS - 1 - row(s)) : row(s))
+ 
+-unsigned short MV[MAXDEPTH];
+-int MSCORE;
+-char *DRAW;
+-
+ /* Forward declarations. */
+ /* FIXME: change this name, puh-leeze! */
+ 
+Index: gnushogi-1.4.2/gnushogi/globals.c
+===================================================================
+--- gnushogi-1.4.2.orig/gnushogi/globals.c
++++ gnushogi-1.4.2/gnushogi/globals.c
+@@ -201,3 +201,6 @@ char *DRAW;
+ char *DRAW_REPETITION = "Repetition";
+ char *DRAW_MAXMOVES = "Max Moves";
+ char *DRAW_JUSTDRAW = "Drawn game!";
++
++int mycnt1, mycnt2;
++
+Index: gnushogi-1.4.2/gnushogi/gnushogi.h
+===================================================================
+--- gnushogi-1.4.2.orig/gnushogi/gnushogi.h
++++ gnushogi-1.4.2/gnushogi/gnushogi.h
+@@ -685,8 +685,6 @@ extern long znodes;
+ extern char ColorStr[2][10];
+ 
+ extern char mvstr[4][6];
+-extern unsigned short MV[MAXDEPTH];
+-extern int MSCORE;
+ extern int mycnt1, mycnt2;
+ extern short ahead;
+ extern struct leaf rootnode;
+Index: gnushogi-1.4.2/gnushogi/rawdsp.c
+===================================================================
+--- gnushogi-1.4.2.orig/gnushogi/rawdsp.c
++++ gnushogi-1.4.2/gnushogi/rawdsp.c
+@@ -44,11 +44,6 @@
+ #include "gnushogi.h"
+ #include "rawdsp.h"
+ 
+-unsigned short MV[MAXDEPTH];
+-int MSCORE;
+-
+-int mycnt1, mycnt2;
+-char *DRAW;
+ extern char *InPtr;
+ extern short pscore[];
+ 
diff --git a/srcpkgs/gnushogi/template b/srcpkgs/gnushogi/template
new file mode 100644
index 000000000000..c3f29d9c407d
--- /dev/null
+++ b/srcpkgs/gnushogi/template
@@ -0,0 +1,20 @@
+# Template file for 'gnushogi'
+pkgname=gnushogi
+version=1.4.2
+revision=1
+build_style=gnu-configure
+short_desc="GNU Shogi (Japanese chess)"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/gnushogi/"
+distfiles="${GNU_SITE}/gnushogi/${pkgname}-${version}.tar.gz"
+checksum=1ecc48a866303c63652552b325d685e7ef5e9893244080291a61d96505d52b29
+disable_parallel_build=yes
+nocross=yes
+
+do_install() {
+	make -C gnushogi prefix=${DESTDIR}/usr install
+	vmkdir usr/share
+	mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share/man
+	mv ${DESTDIR}/usr/info ${DESTDIR}/usr/share/info
+}

From a4394b82adf9ec8a48e7eaca52ccadcebfc438ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Oct 2021 21:54:25 +0200
Subject: [PATCH 1602/4088] New package: xshogi-1.4.2

---
 srcpkgs/xshogi/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/xshogi/template

diff --git a/srcpkgs/xshogi/template b/srcpkgs/xshogi/template
new file mode 100644
index 000000000000..710a2f974f51
--- /dev/null
+++ b/srcpkgs/xshogi/template
@@ -0,0 +1,18 @@
+# Template file for 'xshogi'
+pkgname=xshogi
+version=1.4.2
+revision=1
+build_style=gnu-configure
+makedepends="libXaw-devel"
+depends="gnushogi"
+short_desc="X11 user interface for GNU Shogi (Japanese chess)"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later, MIT"
+homepage="https://www.gnu.org/software/gnushogi/"
+distfiles="${GNU_SITE}/gnushogi/${pkgname}-${version}.tar.gz"
+checksum=2e2f1145e3317143615a764411178f538bd54945646b14fc2264aaeaa105dab6
+
+post_install() {
+	rm -r ${DESTDIR}/usr/share/doc
+	vlicense README.xboard
+}

From 975c07eccb0b7bce267b8cc37a080e1c472044c3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Oct 2021 07:12:01 +0200
Subject: [PATCH 1603/4088] lilypond: update to 2.23.4

---
 srcpkgs/lilypond/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 80a20a244970..b600f727146a 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.3
+version=2.23.4
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -17,7 +17,7 @@ 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.23/lilypond-${version}.tar.gz"
-checksum=8a833696f7c6d2d4b4ae162ffd0836216c63c3765ea14069d6632d320d6bc308
+checksum=e300cfd7b94d81f1fb782ffee2aca8249002ece2f4868004274cebde32764b1e
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then

From f82b22b25f40313cac07795c409d45fea7f25ecd Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Oct 2021 07:12:40 +0200
Subject: [PATCH 1604/4088] lilypond-doc: udpate to 2.23.4

---
 srcpkgs/lilypond-doc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index b9fcfd6b818a..a4d97e19b579 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.23.3
+version=2.23.4
 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="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=51b8f3c4a541f64c7a06b07fb25e987517198d77396652edc022fd787b4baf1c
+checksum=b53eed66e8797e45743e3cf507d8395e597f1b4549e8cf2de1804edbbb456a04
 
 do_install() {
 	vmkdir usr

From 043a5c15dcaf0f135903c52aa7aeff285223bb04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Oct 2021 23:26:42 +0200
Subject: [PATCH 1605/4088] New package: fairy-stockfish-14

---
 .../fairy-stockfish/patches/makefile.patch    | 32 ++++++++++++++
 srcpkgs/fairy-stockfish/template              | 43 +++++++++++++++++++
 srcpkgs/fairy-stockfish/update                |  2 +
 3 files changed, 77 insertions(+)
 create mode 100644 srcpkgs/fairy-stockfish/patches/makefile.patch
 create mode 100644 srcpkgs/fairy-stockfish/template
 create mode 100644 srcpkgs/fairy-stockfish/update

diff --git a/srcpkgs/fairy-stockfish/patches/makefile.patch b/srcpkgs/fairy-stockfish/patches/makefile.patch
new file mode 100644
index 000000000000..7f6d25fe3d45
--- /dev/null
+++ b/srcpkgs/fairy-stockfish/patches/makefile.patch
@@ -0,0 +1,32 @@
+--- Fairy-Stockfish-fairy_sf_14/src/Makefile.orig
++++ Fairy-Stockfish-fairy_sf_14/src/Makefile
+@@ -359,29 +359,10 @@
+ 
+ ifeq ($(COMP),gcc)
+ 	comp=gcc
+-	CXX=g++
+ 	CXXFLAGS += -Wextra -Wshadow
+ 	ifeq ($(largeboards),no)
+ 		CXXFLAGS += -pedantic
+ 	endif
+-
+-	ifeq ($(arch),$(filter $(arch),armv7 armv8))
+-		ifeq ($(OS),Android)
+-			CXXFLAGS += -m$(bits)
+-			LDFLAGS += -m$(bits)
+-		endif
+-	else
+-		CXXFLAGS += -m$(bits)
+-		LDFLAGS += -m$(bits)
+-	endif
+-
+-	ifeq ($(arch),$(filter $(arch),armv7))
+-		LDFLAGS += -latomic
+-	endif
+-
+-	ifneq ($(KERNEL),Darwin)
+-	   LDFLAGS += -Wl,--no-as-needed
+-	endif
+ endif
+ 
+ ifeq ($(COMP),mingw)
diff --git a/srcpkgs/fairy-stockfish/template b/srcpkgs/fairy-stockfish/template
new file mode 100644
index 000000000000..ad091a69bca5
--- /dev/null
+++ b/srcpkgs/fairy-stockfish/template
@@ -0,0 +1,43 @@
+# Template file for 'fairy-stockfish'
+pkgname=fairy-stockfish
+version=14
+revision=1
+#_net_file= No redistributable NNUE available.
+wrksrc="Fairy-Stockfish-fairy_sf_${version}"
+build_wrksrc=src
+build_style=gnu-makefile
+make_build_target=build
+make_build_args="nnue=yes largeboards=yes all=yes"
+make_use_env=yes
+hostmakedepends="tar"
+short_desc="Free UCI chess variant engine (supporting Xiangqi, Shogi, ...)"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/ianfab/Fairy-Stockfish"
+distfiles="https://github.com/ianfab/Fairy-Stockfish/archive/fairy_sf_${version}.tar.gz"
+checksum=db5e96cf47faf4bfd4a500f58ae86e46fee92c2f5544e78750fc01ad098cbad2
+
+LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
+
+# We know how to optimize ourselves
+make_build_args="optimize=no "
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) make_build_args+="ARCH=x86-64" ;;
+	i686*) make_build_args+="ARCH=x86-32" ;;
+	aarch64*) make_build_args+="ARCH=armv8" ;;
+	armv[56]*) make_build_args+="ARCH=general-32";;
+	armv7*) make_build_args+="ARCH=armv7" ;;
+	ppc64*) make_build_args+="ARCH=ppc-64" ;;
+	ppc*) make_build_args+="ARCH=ppc-32" ;;
+	*) broken="not supported" ;;
+esac
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -latomic"
+fi
+
+do_install() {
+	vbin stockfish fairy-stockfish
+}
diff --git a/srcpkgs/fairy-stockfish/update b/srcpkgs/fairy-stockfish/update
new file mode 100644
index 000000000000..5978b9bd4248
--- /dev/null
+++ b/srcpkgs/fairy-stockfish/update
@@ -0,0 +1,2 @@
+site="https://github.com/ianfab/Fairy-Stockfish/releases"
+pattern="sf_\K[\d\.]*(?=\.tar\.gz)"

From 6e9fe0efbde858581d9d7c8a341ec52fdd193b93 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 17 Oct 2021 00:47:52 +0200
Subject: [PATCH 1606/4088] miniflux: update to 2.0.33.

---
 srcpkgs/miniflux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index d34977b748c2..8f47ea18b63e 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.32
+version=2.0.33
 revision=1
 wrksrc="v2-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=58a7d81c3a33804c73a90d41fa2e2fa7a7d7111ff931489346ee42bc17b7dbaf
+checksum=b61c9ddb62be8f1cc15a70a1c916d55f8ac47299df9c2323552eb275a36d2cc3
 system_accounts="_miniflux"
 
 post_install() {

From e078fd234ebc10a3deb2c7f4161944aaaae9dadd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 17 Oct 2021 00:15:50 -0500
Subject: [PATCH 1607/4088] python3-httpx: update to 0.20.0.

---
 srcpkgs/python3-httpx/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template
index 1dbdd960e538..d6b50e864ef7 100644
--- a/srcpkgs/python3-httpx/template
+++ b/srcpkgs/python3-httpx/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-httpx'
 pkgname=python3-httpx
-version=0.19.0
-revision=2
+version=0.20.0
+revision=1
 wrksrc="httpx-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
 short_desc="Next generation HTTP client for Python"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="www.python-httpx.org"
 distfiles="${PYPI_SITE}/h/httpx/httpx-${version}.tar.gz"
-checksum=92ecd2c00c688b529eda11cedb15161eaf02dee9116712f621c70d9a40b2cdd0
-make_check=no # test environment requires old versions
+checksum=09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b
+make_check=no # no tests included
 
 post_install() {
 	vlicense LICENSE.md LICENSE

From 685dfe7bcd1bd9cba75ddf2ca48ec3b24d08c1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sun, 17 Oct 2021 13:53:37 +0200
Subject: [PATCH 1608/4088] picard: fix typeerrors with python 3.10

backport of 452bba954c30d5a642f03c02411529f511bda786 in the picard
upstream repository: https://github.com/metabrainz/picard

also add checkdepends, to pass tests
---
 ...0001-Fix-TypeErrors-with-Python-3.10.patch | 64 +++++++++++++++++++
 srcpkgs/picard/template                       |  3 +-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch

diff --git a/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch b/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch
new file mode 100644
index 000000000000..29afe48c07fd
--- /dev/null
+++ b/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch
@@ -0,0 +1,64 @@
+From 1a462bf718f9fc4b24a0c8daefe5c7d547712ae9 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Fri, 27 Aug 2021 00:43:48 +0200
+Subject: [PATCH] Fix TypeErrors with Python 3.10
+
+Without these changes, running Picard with Python 3.10 results in errors
+such as:
+  File "./picard/ui/coverartbox.py", line 74, in __init__
+    self.shadow = self.shadow.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
+TypeError: arguments did not match any overloaded call:
+  scaled(self, int, int, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float'
+  scaled(self, QSize, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float'
+---
+ picard/ui/coverartbox.py | 2 +-
+ picard/ui/itemviews.py   | 6 +++---
+ picard/util/__init__.py  | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py
+index 2457de5f..cd0cce2a 100644
+--- a/picard/ui/coverartbox.py
++++ b/picard/ui/coverartbox.py
+@@ -136,7 +136,7 @@ class CoverArtThumbnail(ActiveLabel):
+             event.acceptProposedAction()
+ 
+     def scaled(self, *dimensions):
+-        return (self.pixel_ratio * dimension for dimension in dimensions)
++        return (round(self.pixel_ratio * dimension) for dimension in dimensions)
+ 
+     def show(self):
+         self.set_data(self.data, True)
+diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
+index cddbf50a..bb88e984 100644
+--- a/picard/ui/itemviews.py
++++ b/picard/ui/itemviews.py
+@@ -137,9 +137,9 @@ def get_match_color(similarity, basecolor):
+     c1 = (basecolor.red(), basecolor.green(), basecolor.blue())
+     c2 = (223, 125, 125)
+     return QtGui.QColor(
+-        c2[0] + (c1[0] - c2[0]) * similarity,
+-        c2[1] + (c1[1] - c2[1]) * similarity,
+-        c2[2] + (c1[2] - c2[2]) * similarity)
++        int(c2[0] + (c1[0] - c2[0]) * similarity),
++        int(c2[1] + (c1[1] - c2[1]) * similarity),
++        int(c2[2] + (c1[2] - c2[2]) * similarity))
+ 
+ 
+ class MainPanel(QtWidgets.QSplitter):
+diff --git a/picard/util/__init__.py b/picard/util/__init__.py
+index e47af34c..d12ef890 100644
+--- a/picard/util/__init__.py
++++ b/picard/util/__init__.py
+@@ -333,7 +333,7 @@ def throttle(interval):
+             else:
+                 decorator.args = args
+                 decorator.kwargs = kwargs
+-                QtCore.QTimer.singleShot(r, later)
++                QtCore.QTimer.singleShot(int(r), later)
+                 decorator.is_ticking = True
+             mutex.unlock()
+ 
+-- 
+2.32.0
+
diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index 9692fc33773e..4e5a14dcf26c 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,7 +1,7 @@
 # Template file for 'picard'
 pkgname=picard
 version=2.5
-revision=3
+revision=4
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 make_install_args="--disable-autoupdate"
@@ -10,6 +10,7 @@ makedepends="python3-devel"
 depends="python3-PyQt5-multimedia chromaprint python3-mutagen
  python3-dateutil python3-discid desktop-file-utils
  hicolor-icon-theme"
+checkdepends="python3-pytest $depends"
 short_desc="MusicBrainz's audio tagger"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"

From db8820ab41a21bbe0d9f96a16b70046dd41ce853 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Oct 2021 14:57:05 +0200
Subject: [PATCH 1609/4088] python3-httpx: add a missing setuptools build dep

---
 srcpkgs/python3-httpx/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template
index d6b50e864ef7..9f2ce955f182 100644
--- a/srcpkgs/python3-httpx/template
+++ b/srcpkgs/python3-httpx/template
@@ -4,12 +4,13 @@ version=0.20.0
 revision=1
 wrksrc="httpx-${version}"
 build_style=python3-module
+hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Next generation HTTP client for Python"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
-homepage="www.python-httpx.org"
+homepage="https://www.python-httpx.org"
 distfiles="${PYPI_SITE}/h/httpx/httpx-${version}.tar.gz"
 checksum=09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b
 make_check=no # no tests included

From 50a32a988037cc756fef84956b696bbd418f1315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 17 Oct 2021 17:35:08 +0200
Subject: [PATCH 1610/4088] exiftool: update to 12.33.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index a2db2acb71da..c36916024f4d 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.32
+version=12.33
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=10eaa759349790a24f75670a6feccad4d22d15793ede3f2dae2a60a0362541b6
+checksum=8af7f07064b6c494c01ffa131c34a3ed312f409a6e1a9fedc83eda5ff99009ff

From 23100b07fe48b91fae8f495064bb58ceb1e2e925 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 25 Sep 2021 09:59:26 +0000
Subject: [PATCH 1611/4088] memcached: update to 1.6.10.

---
 srcpkgs/memcached/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template
index fd5b10dc71d7..f9379465cf5e 100644
--- a/srcpkgs/memcached/template
+++ b/srcpkgs/memcached/template
@@ -1,6 +1,6 @@
 # Template file for 'memcached'
 pkgname=memcached
-version=1.6.9
+version=1.6.10
 revision=1
 build_style=gnu-configure
 configure_args="--enable-seccomp"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="http://www.memcached.org"
 changelog="https://github.com/memcached/memcached/wiki/ReleaseNotes${version//./}"
 distfiles="http://memcached.org/files/${pkgname}-${version}.tar.gz"
-checksum=d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1
+checksum=ef46ac33c55d3a0f1c5ae8eb654677d84669913997db5d0c422c5eaffd694a92
 
 # Rebuild configure script, due to patching configure.ac
 pre_configure() {

From c9e530225070df2a29d4c81d96b0505482181e40 Mon Sep 17 00:00:00 2001
From: Javier Caballero Lloris <javiercaballero@iti.es>
Date: Tue, 21 Sep 2021 08:44:52 +0200
Subject: [PATCH 1612/4088] New package: zutty-0.9

Closes: #33042 [via git-merge-pr]
---
 srcpkgs/zutty/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/zutty/template

diff --git a/srcpkgs/zutty/template b/srcpkgs/zutty/template
new file mode 100644
index 000000000000..8f8d61745f7e
--- /dev/null
+++ b/srcpkgs/zutty/template
@@ -0,0 +1,29 @@
+# Template file for 'zutty'
+pkgname=zutty
+version=0.9
+revision=1
+build_style=waf3
+hostmakedepends="pkg-config"
+makedepends="python3-devel libglvnd-devel MesaLib-devel freetype-devel libXmu-devel"
+depends="font-misc-misc"
+short_desc="X terminal emulator rendering through OpenGL ES Compute Shaders"
+maintainer="Javier Caballero <jacallo@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://tomscii.sig7.se/zutty"
+distfiles="https://github.com/tomszilagyi/zutty/archive/refs/tags/${version}.tar.gz"
+checksum=9aaf115a806114a793a6a423384781cada7a767efc209b6c6a59f3eddc942c3e
+
+post_patch() {
+	vsed -i wscript -e "s|, '-march=native', '-mtune=native'||g"
+}
+
+post_install() {
+	# Copy icons
+	vinstall icons/zutty.svg 644 usr/share/icons/hicolor/scalable/apps
+	for _res in 16 32 48 64 128; do
+		vinstall icons/zutty_${_res}x${_res}.png 644 usr/share/icons/hicolor/${_res}x${_res}/apps zutty.png
+	done
+	# Copy desktop entry
+	vmkdir usr/share/applications/
+	vinstall icons/zutty.desktop 644 usr/share/applications
+}

From 7ab88bb7b4dc8db893bbb4a80505873cbd38c9af Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Sun, 17 Oct 2021 09:22:35 -0600
Subject: [PATCH 1613/4088] inxi: update to 3.3.07

---
 srcpkgs/inxi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template
index 87ebbdb9ff3a..5d91312a1dd0 100644
--- a/srcpkgs/inxi/template
+++ b/srcpkgs/inxi/template
@@ -1,6 +1,6 @@
 # Template file for 'inxi'
 pkgname=inxi
-version=3.3.04
+version=3.3.07
 revision=1
 wrksrc="inxi-${version}-1"
 depends="dmidecode file glxinfo pciutils perl usbutils xdpyinfo xprop xrandr
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://smxi.org/docs/inxi.htm"
 changelog="https://raw.githubusercontent.com/smxi/inxi/master/inxi.changelog"
 distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz"
-checksum=1f029f5f667e0396ab9f6ba2c51cf7937ea38bf504d1621a8c50e19205a7a671
+checksum=d470c25df84bf1566d04a60842bc006ec6baf62ac700672790d1c6c183dafcef
 
 do_install() {
 	vbin inxi

From 5ecb7781919e04637727088b2511beb7b855de58 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Sun, 17 Oct 2021 09:40:38 -0600
Subject: [PATCH 1614/4088] mu4e: update to 1.6.7

---
 srcpkgs/mu4e/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
index 0196c07c9d62..c5aa166c3006 100644
--- a/srcpkgs/mu4e/template
+++ b/srcpkgs/mu4e/template
@@ -1,6 +1,6 @@
 # Template file for 'mu4e'
 pkgname=mu4e
-version=1.6.6
+version=1.6.7
 revision=1
 wrksrc="mu-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=42cd3d20f2a670fe57bedcde049b6b2b030fe51c507fdfdfeb6aa865f1f443b5
+checksum=105df16df5fd6f54d5334cf68d8108f8b0593e37020b2fa8487c2e251ce9d9a2
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"
 

From 3212b858bdb410e7421621b4fb209068b9d995dd Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Sun, 17 Oct 2021 18:51:54 +0200
Subject: [PATCH 1615/4088] swirc: update to 3.3.2.

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 09ca153aa4d0..7cbd1631cc89 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,6 +1,6 @@
 # Template file for 'swirc'
 pkgname=swirc
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=configure
 configure_args="$(vopt_with notify libnotify)"
@@ -15,7 +15,7 @@ license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.nifty-networks.net/swirc"
 changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
 distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="6066d3e31bb8d7930989586f7a8ade0a04901bc77befe2bcf58d99689d304685"
+checksum="9c61a2ad1f31d254c0ec1b64bbbf0b42d554cb58b40379bf3dc74ecce1d24c70"
 
 build_options="notify"
 

From a6b568be772f15c060cff93762e03f7d11782065 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 17 Oct 2021 11:15:28 +0200
Subject: [PATCH 1616/4088] chroma: update to 0.9.4.

---
 srcpkgs/chroma/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 7fe912bf90a6..c4d778bf49a2 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,10 +1,10 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=0.9.2
+version=0.9.4
 revision=1
+build_wrksrc="cmd/chroma"
 build_style=go
-go_import_path="github.com/alecthomas/${pkgname}"
-go_package="${go_import_path}/cmd/chroma"
+go_import_path="github.com/alecthomas/chroma/cmd/chroma"
 go_ldflags="-X main.version=${version} -X main.date=$(date +%Y.%m.%d)"
 hostmakedepends="git"
 short_desc="General purpose syntax highlighter"
@@ -12,13 +12,13 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
 distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=a669dcfd1f53c36fd952e290ed19371f60fa4905a9abdedf9e4d70a38b0e61f8
+checksum=c13f99b0ce34cecfaaea448ad134e6293b316128a6b0f67af5e70cc6525f1b6e
 
 do_check() {
 	go test -v
 }
 
 post_install() {
-	vlicense COPYING
-	vdoc README.md
+	vlicense ../../COPYING
+	vdoc ../../README.md
 }

From bb3305e88e4f443d8cdadc42acf40ca1ffa23377 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 17 Oct 2021 00:59:57 +0200
Subject: [PATCH 1617/4088] htop: update to 3.1.1.

---
 srcpkgs/htop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index 6c583794d9ff..fbbba8420333 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -1,6 +1,6 @@
 # Template file for 'htop'
 pkgname=htop
-version=3.1.0
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-unicode --enable-sensors"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://htop.dev/"
 changelog="https://github.com/htop-dev/htop/blob/master/ChangeLog"
 distfiles="https://github.com/htop-dev/htop/archive/${version}.tar.gz"
-checksum=200a4f9331d0e5048bf9bda6a8dee38248c557e471b9e57ff3784853efd613a9
+checksum=b52280ad05a535ec632fbcd47e8e2c40a9376a9ddbd7caa00b38b9d6bb87ced6
 
 CFLAGS="-fcommon"
 

From e8c5661e800ac46ba2a74353eae268d13a44c6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 17 Oct 2021 17:27:45 +0200
Subject: [PATCH 1618/4088] papirus-folders: update to 1.11.0.

---
 srcpkgs/papirus-folders/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-folders/template b/srcpkgs/papirus-folders/template
index e3b7fa308dc1..9d22de188a12 100644
--- a/srcpkgs/papirus-folders/template
+++ b/srcpkgs/papirus-folders/template
@@ -1,6 +1,6 @@
 # Template file for 'papirus-folders'
 pkgname=papirus-folders
-version=1.10.0
+version=1.11.0
 revision=1
 build_style=gnu-makefile
 depends="papirus-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-folders"
 distfiles="https://github.com/PapirusDevelopmentTeam/papirus-folders/archive/v${version}.tar.gz"
-checksum=3abff1eab54abe4ad0191013d0ccb85a79968fbf594b6732fad0205771f94639
+checksum=2bf7f36573ba1f19c89ea2c8d731974f7d9a2f81eff3c377f82d4e0680a7476c
 
 post_install() {
 	vlicense LICENSE

From 0124b05baa4a3a617f29f6db91a8e052529219d7 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 17 Oct 2021 22:40:33 +0200
Subject: [PATCH 1619/4088] freeplane: update to 1.9.10.

---
 srcpkgs/freeplane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index ebc56f1ccd07..9d7210a3ccbb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.9
+version=1.9.10
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=448f9b5b414030dae36c68f93852900ceb7f431bb1d5b45d22efeac9421ad446
+checksum=be9686a5b3b0642215676c9771f30738e1bf6f10661f241559334ec4ef32cf87
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From 563961066a07afaf851ac1de3b2b0308069f293d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 17 Oct 2021 22:47:36 +0200
Subject: [PATCH 1620/4088] hopper: update to 4.9.3.

---
 srcpkgs/hopper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index bea20e43b198..e017cd6059bf 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.9.2
+version=4.9.3
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=5ec55e36be77e9f57000ecfb09f58998111640e2e98fa07b9c38716d69f9f557
+checksum=9b462341a92da25e7aba6dcca185495e974029578db34b07fad2e89dde7b1121
 
 archs="x86_64"
 restricted=yes

From c0656bafd1e4220a9191696edb2f75debac0443a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 17 Oct 2021 22:47:47 +0200
Subject: [PATCH 1621/4088] packer: update to 1.7.6.

---
 srcpkgs/packer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 807504824985..f3e4da0cf3d5 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.7.5
+version=1.7.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=9a8926eec2ec04d1fc51a3ef8b4952cec95af85fd1b661b3544730aa8a77cd6a
+checksum=2e414c4c7ae930f3d2851de39f31f159eb1b073401956a6856bd89d592664b50
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 3dd6cf9a8315fbf13e914b4e90a74a7723faa361 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Sat, 25 Sep 2021 21:26:36 +1000
Subject: [PATCH 1622/4088] New package: fsearch-0.1

---
 .../fsearch/patches/musl-no-malloc_trim.diff   | 13 +++++++++++++
 srcpkgs/fsearch/template                       | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/fsearch/patches/musl-no-malloc_trim.diff
 create mode 100644 srcpkgs/fsearch/template

diff --git a/srcpkgs/fsearch/patches/musl-no-malloc_trim.diff b/srcpkgs/fsearch/patches/musl-no-malloc_trim.diff
new file mode 100644
index 000000000000..fd6c7304fc32
--- /dev/null
+++ b/srcpkgs/fsearch/patches/musl-no-malloc_trim.diff
@@ -0,0 +1,13 @@
+diff -ruN fsearch-0.1/src/fsearch_database.c fsearch-0.1-musl/src/fsearch_database.c
+--- fsearch-0.1/src/fsearch_database.c	2021-09-25 02:41:49.000000000 +1000
++++ fsearch-0.1-musl/src/fsearch_database.c	2021-09-25 21:42:00.187684634 +1000
+@@ -1454,7 +1454,9 @@
+ 
+     g_clear_pointer(&db, free);
+ 
++#ifdef __GLIBC__
+     malloc_trim(0);
++#endif
+ 
+     g_debug("[db_free] freed");
+ }
diff --git a/srcpkgs/fsearch/template b/srcpkgs/fsearch/template
new file mode 100644
index 000000000000..9693a8e2777e
--- /dev/null
+++ b/srcpkgs/fsearch/template
@@ -0,0 +1,18 @@
+# Template file for 'fsearch'
+pkgname=fsearch
+version=0.1
+revision=1
+build_style=gnu-configure
+hostmakedepends="autogen automake libtool pkg-config autoconf-archive
+ intltool gettext-devel glib-devel"
+makedepends="gtk+3-devel"
+short_desc="Fast file search utility based on GTK+3"
+maintainer="a dinosaur <nick@a-dinosaur.com>"
+license="GPL-2.0-or-later"
+homepage="https://cboxdoerfer.github.io/fsearch/"
+distfiles="https://github.com/cboxdoerfer/fsearch/archive/v${version}.tar.gz"
+checksum=50287fb77e56d2451bd828f207e9a1e33958aea591ec030d47b8b67d4e6f0828
+
+pre_configure() {
+	./autogen.sh
+}

From 05485e8bddf5ca084535ccc09c3a2d18db11c609 Mon Sep 17 00:00:00 2001
From: Matthew Martin <phy1729@gmail.com>
Date: Sat, 19 Sep 2020 08:46:47 -0500
Subject: [PATCH 1623/4088] acpid: cleanup handler

* Use $( rather than `
* Use spaces consistently
* Quote all parameter expansions
* Use a parameter expansion rather than sed
* Use printf instead of echo
    echo with arguments is not well defined by POSIX. Additionally if the
    variable starts with -, the results are further undefined. Use printf to
    avoid all issues.
* Add screen brightness controls
* drop all dbus/xauth nonsense (by Piraty)

Closes: #25909 [via git-merge-pr]
---
 srcpkgs/acpid/files/handler.sh | 76 ++++++++++++++++++----------------
 srcpkgs/acpid/template         |  2 +-
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/acpid/files/handler.sh b/srcpkgs/acpid/files/handler.sh
index c2a12be13b1b..df6b28a09666 100644
--- a/srcpkgs/acpid/files/handler.sh
+++ b/srcpkgs/acpid/files/handler.sh
@@ -4,42 +4,38 @@
 # NOTE: This is a 2.6-centric script.  If you use 2.4.x, you'll have to
 #       modify it to not use /sys
 
-minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
-maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
-setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
+# $1 should be + or - to step up or down the brightness.
+step_backlight() {
+    for backlight in /sys/class/backlight/*/; do
+        [ -d "$backlight" ] || continue
+        step=$(( $(cat "$backlight/max_brightness") / 20 ))
+        printf '%s' "$(( $(cat "$backlight/brightness") $1 step ))" >"$backlight/brightness"
+    done
+}
 
-set $*
+minspeed=$(cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq)
+maxspeed=$(cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq)
+setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
 
-PID=$(pgrep dbus-launch)
-export USER=$(ps -o user --no-headers $PID)
-USERHOME=$(getent passwd $USER | cut -d: -f6)
-export XAUTHORITY="$USERHOME/.Xauthority"
-for x in /tmp/.X11-unix/*; do
-    displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
-    if [ x"$XAUTHORITY" != x"" ]; then
-        export DISPLAY=":$displaynum"
-    fi
-done
 
 case "$1" in
     button/power)
-        #echo "PowerButton pressed!">/dev/tty5
         case "$2" in
             PBTN|PWRF)
-		    logger "PowerButton pressed: $2, shutting down..."
-		    shutdown -P now
-		    ;;
-            *)      logger "ACPI action undefined: $2" ;;
+                logger "PowerButton pressed: $2, shutting down..."
+                shutdown -P now
+                ;;
+            *)  logger "ACPI action undefined: $2" ;;
         esac
         ;;
     button/sleep)
         case "$2" in
             SBTN|SLPB)
-		    # suspend-to-ram
-		    logger "Sleep Button pressed: $2, suspending..."
-		    zzz
-		    ;;
-            *)      logger "ACPI action undefined: $2" ;;
+                # suspend-to-ram
+                logger "Sleep Button pressed: $2, suspending..."
+                zzz
+                ;;
+            *)  logger "ACPI action undefined: $2" ;;
         esac
         ;;
     ac_adapter)
@@ -47,11 +43,11 @@ case "$1" in
             AC|ACAD|ADP0)
                 case "$4" in
                     00000000)
-                        echo -n $minspeed >$setspeed
+                        printf '%s' "$minspeed" >"$setspeed"
                         #/etc/laptop-mode/laptop-mode start
                     ;;
                     00000001)
-                        echo -n $maxspeed >$setspeed
+                        printf '%s' "$maxspeed" >"$setspeed"
                         #/etc/laptop-mode/laptop-mode stop
                     ;;
                 esac
@@ -75,16 +71,24 @@ case "$1" in
         esac
         ;;
     button/lid)
-	case "$3" in
-		close)
-			# suspend-to-ram
-			logger "LID closed, suspending..."
-			zzz
-			;;
-		open)	logger "LID opened" ;;
-		*) logger "ACPI action undefined (LID): $2";;
-	esac
-	;;
+        case "$3" in
+            close)
+                # suspend-to-ram
+                logger "LID closed, suspending..."
+                zzz
+                ;;
+            open)
+                logger "LID opened"
+                ;;
+            *)  logger "ACPI action undefined (LID): $2";;
+        esac
+        ;;
+    video/brightnessdown)
+        step_backlight -
+        ;;
+    video/brightnessup)
+        step_backlight +
+        ;;
     *)
         logger "ACPI group/action undefined: $1 / $2"
         ;;
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index 8312d0e4e15a..a45294f1c577 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,7 +1,7 @@
 # Template file for 'acpid'
 pkgname=acpid
 version=2.0.32
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 964311000af99f0b18a59d8f8cbdccb3647a0511 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 20 Sep 2021 21:30:53 +0300
Subject: [PATCH 1624/4088] acpid: update to 2.0.33.

Closes: #33038 [via git-merge-pr]
---
 srcpkgs/acpid/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index a45294f1c577..24be7ddd93a7 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,14 +1,14 @@
 # Template file for 'acpid'
 pkgname=acpid
-version=2.0.32
-revision=2
+version=2.0.33
+revision=1
 build_style=gnu-configure
-short_desc="The ACPI Daemon (acpid) With Netlink Support"
+short_desc="ACPI Daemon (acpid) With Netlink Support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/acpid2/"
 distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-${version}.tar.xz"
-checksum=f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e
+checksum=0856f71b3eb34a1b663d0a8e6363dfcbc519e63d847330498898658e2972dbe8
 conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
 
 post_install() {

From c836e91781be58c027645bf733613b21479bd077 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 25 Sep 2021 09:57:24 +0000
Subject: [PATCH 1625/4088] dateutils: update to 0.4.9.

By Piraty: fix tests.
- removing date wrapper to fix tests shouldn't interfere with
  package creation. it's only used in 90-set-timestamps and there it
  passes --date arg explicitly
- strptime.003 fails on musl. disable

Closes: #33103 [via git-merge-pr]
---
 srcpkgs/dateutils/template | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dateutils/template b/srcpkgs/dateutils/template
index df3cd26ca6d5..0f08283ec917 100644
--- a/srcpkgs/dateutils/template
+++ b/srcpkgs/dateutils/template
@@ -1,21 +1,37 @@
 # Template file for 'dateutils'
 pkgname=dateutils
-version=0.4.8
+version=0.4.9
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
+checkdepends="tzdata"
 short_desc="Nifty command line date and time utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.fresse.org/dateutils/"
 changelog="http://www.fresse.org/dateutils/changelog.html"
 distfiles="https://bitbucket.org/hroptatyr/dateutils/downloads/${pkgname}-${version}.tar.xz"
-checksum=3f7054a24cf3e3ea2c32a6b1f7474334c25b54e9c45c96b03f75eaaecc70c100
+checksum=790256d9949b96001fdcc3f7c42226dde4fcc87eb580717c7aabf51a1334c9c3
 
 post_extract() {
 	vsed -i '/sysctl\.h/d' build-aux/yuck.c
 }
 
+pre_configure() {
+	# date wrapper / SOURCE_DATE_EPOCH interferes with some tests
+	rm "${XBPS_WRAPPERDIR}"/date
+
+	if [ "$XBPS_TARGET_LIBC" != "glibc" ]; then
+		# disable failing test
+		# $ echo 1900-01-01 | strptime -i '%F'
+		# strptime: cannot make sense of `1900-01-01' using the given input formats
+		vsed -i test/Makefile.am \
+			-e '/strptime.003.ctst/d'
+		vsed -i test/Makefile.in \
+			-e 's/strptime.003.ctst//'
+	fi
+}
+
 post_install() {
 	vlicense LICENSE
 	rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE

From af26a99ec8ff4cce86aac6380a5419e4a8bf7858 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 16 Oct 2021 01:10:57 +0200
Subject: [PATCH 1626/4088] New package: python3-thefuzz-0.19.0

---
 srcpkgs/python3-thefuzz/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-thefuzz/template

diff --git a/srcpkgs/python3-thefuzz/template b/srcpkgs/python3-thefuzz/template
new file mode 100644
index 000000000000..30c936169ac9
--- /dev/null
+++ b/srcpkgs/python3-thefuzz/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-thefuzz'
+pkgname=python3-thefuzz
+version=0.19.0
+revision=1
+wrksrc="thefuzz-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Levenshtein"
+checkdepends="python3-pytest $depends python3-hypothesis python3-pycodestyle"
+short_desc="Fuzzy String Matching in Python"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-only"
+homepage="https://github.com/seatgeek/thefuzz"
+distfiles="https://github.com/seatgeek/thefuzz/archive/refs/tags/$version.tar.gz"
+checksum=0804e9c02a50b8bdfe94f043fb09defa8cf81400105812a556c477d823683d2e

From b247b60235baed15efa091b83e960b3ab81440be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 30 Sep 2021 07:59:55 +0200
Subject: [PATCH 1627/4088] New package: gnome-pass-search-provider-1.0.0

---
 .../patches/thefuzz.patch                     | 14 ++++++++++++++
 srcpkgs/gnome-pass-search-provider/template   | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 srcpkgs/gnome-pass-search-provider/patches/thefuzz.patch
 create mode 100644 srcpkgs/gnome-pass-search-provider/template

diff --git a/srcpkgs/gnome-pass-search-provider/patches/thefuzz.patch b/srcpkgs/gnome-pass-search-provider/patches/thefuzz.patch
new file mode 100644
index 000000000000..359f45832a91
--- /dev/null
+++ b/srcpkgs/gnome-pass-search-provider/patches/thefuzz.patch
@@ -0,0 +1,14 @@
+--- a/gnome-pass-search-provider.py
++++ b/gnome-pass-search-provider.py
+@@ -31,7 +31,10 @@ import re
+ import subprocess
+ 
+ from dbus.mainloop.glib import DBusGMainLoop
+-from fuzzywuzzy import process, fuzz
++try:
++    from thefuzz import fuzz, process
++except ModuleNotFoundError:
++    from fuzzywuzzy import fuzz, process
+ from gi.repository import GLib
+ from os import getenv, walk
+ from os.path import expanduser, join as path_join
diff --git a/srcpkgs/gnome-pass-search-provider/template b/srcpkgs/gnome-pass-search-provider/template
new file mode 100644
index 000000000000..76bb43b89926
--- /dev/null
+++ b/srcpkgs/gnome-pass-search-provider/template
@@ -0,0 +1,19 @@
+# Template file for 'gnome-pass-search-provider'
+pkgname=gnome-pass-search-provider
+version=1.0.0
+revision=1
+depends="python3-gobject python3-dbus python3-thefuzz pass GPaste"
+short_desc="Pass password manager search provider for gnome-shell"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/jle64/gnome-pass-search-provider"
+distfiles="https://github.com/jle64/gnome-pass-search-provider/archive/refs/tags/$version.tar.gz"
+checksum=cb6eb6bf1626a8bbc1b5dca71776e1ea855e14066c4fe07f8fe612334b7a59ea
+
+do_build() {
+	:
+}
+
+do_install() {
+	DATADIR="$DESTDIR/usr/share" LIBDIR="$DESTDIR/usr/lib/" ./install.sh
+}

From b28fbbf0a9a6316ffafaab7c8778d3ddc6d3cb38 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Thu, 14 Oct 2021 15:29:11 -0500
Subject: [PATCH 1628/4088] mesa: update to 21.2.4.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 88003e98c142..5a00a188eccf 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.2.3
+version=21.2.4
 revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=7245284a159d2484770e1835a673e79e4322a9ddf43b17859668244946db7174
+checksum=fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 5222cb63c93db418c4994438edec855ce5148ff9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 16 Oct 2021 00:25:43 +0200
Subject: [PATCH 1629/4088] apostrophe: update to 2.5.

---
 srcpkgs/apostrophe/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 69e39f1bff62..5453ded482b0 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,17 +1,16 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.4
-revision=3
+version=2.5
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
-hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
+hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1 webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/somas/apostrophe"
 distfiles="$homepage/-/archive/v$version/apostrophe-v$version.tar.bz2"
-checksum=63bdcca0887e678e9fee368470b3620a697655f18f7e0e65870890e1b8202a3a
+checksum=2a3d766d84165653f3060b63b6284e52720d68ccd4937e1c1e00d9cab5a47bdb

From 7ef825dd2c1ad092fe22a5b6c7b0d2e69e0d4b3c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 18 Oct 2021 03:17:35 +0200
Subject: [PATCH 1630/4088] mksh: disable tests to prevent them from suspending
 xbps-src

---
 srcpkgs/mksh/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index 52db7a04d004..314aa34a9e7d 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -12,6 +12,14 @@ changelog="https://www.mirbsd.org/mksh.htm#clog"
 distfiles="https://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-${version}.tgz"
 checksum=77ae1665a337f1c48c61d6b961db3e52119b38e58884d1c89684af31f87bc506
 
+# with the way xbps-src is currently designed, running the test suite will result
+# in the xbps-src process getting suspended during the run, with a message like
+# zsh: suspended (tty input)
+#
+# the only way around this would be to setsid() in xbps-uunshare/uchroot/etc
+#
+make_check=no
+
 register_shell="/bin/mksh"
 alternatives="
  sh:sh:/usr/bin/lksh

From dcada787c2827ba70c370be62e6da8f342762eb6 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 17 Oct 2021 19:05:41 -0500
Subject: [PATCH 1631/4088] void-release-keys: Add 20210930 key

---
 srcpkgs/void-release-keys/files/void-release-20210930.pub | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/void-release-keys/files/void-release-20210930.pub

diff --git a/srcpkgs/void-release-keys/files/void-release-20210930.pub b/srcpkgs/void-release-keys/files/void-release-20210930.pub
new file mode 100644
index 000000000000..30cf7ecd4e66
--- /dev/null
+++ b/srcpkgs/void-release-keys/files/void-release-20210930.pub
@@ -0,0 +1,2 @@
+untrusted comment: This key is only valid for images with date 20210930. public key
+RWQBGxJ8OlEt1kcyt9kYSbr9UVpXJsK6MJnl6BK/EqS2p83jUB9+WxJW

From aaa1fe0a3985ccb62796f23ff3e5a8e8245f0c21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 17 Oct 2021 16:08:20 -0300
Subject: [PATCH 1632/4088] linux5.14: update to 5.14.13.

---
 srcpkgs/linux5.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.14/template b/srcpkgs/linux5.14/template
index 3e2b044077bf..ae0fadb931cc 100644
--- a/srcpkgs/linux5.14/template
+++ b/srcpkgs/linux5.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.14'
 pkgname=linux5.14
-version=5.14.10
+version=5.14.13
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2
- 228de63ff070274902ef29c7d5229c6ea55860e95fbb36590f7b6930def14b17"
+ 48d9353cc3e67cd1ca9c1f4494ba882647463eb252ff737f95319fb8ae5a95a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From fd45bc463ffe9260cc5c55cda50302bca656d9dd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 17 Oct 2021 22:26:58 -0400
Subject: [PATCH 1633/4088] chezmoi: update to 2.7.1.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 20cbc8b0186b..e14c903277db 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.7.0
+version=2.7.1
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=93c838f450132cdc41f219cfc1eb764424c3b00e533fd9d6c217e4163529a9ee
+checksum=d80b301e1a25a67d9ada956a68532f0b23bd0627056c26685d977676d7bf7fe2
 
 export CGO_ENABLED=1
 

From 9852393404a0ccbf7966988715a44d53e12b646f Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sun, 17 Oct 2021 23:28:21 -0400
Subject: [PATCH 1634/4088] bitlbee-discord: add fix for glib >= 2.69

Fixes #33412
---
 .../bitlbee-discord/patches/glib-2.69.patch   | 28 +++++++++++++++++++
 srcpkgs/bitlbee-discord/template              |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/bitlbee-discord/patches/glib-2.69.patch

diff --git a/srcpkgs/bitlbee-discord/patches/glib-2.69.patch b/srcpkgs/bitlbee-discord/patches/glib-2.69.patch
new file mode 100644
index 000000000000..6eff3f5e106f
--- /dev/null
+++ b/srcpkgs/bitlbee-discord/patches/glib-2.69.patch
@@ -0,0 +1,28 @@
+From 607f9887ca85f246e970778e3d40aa5c346365a7 Mon Sep 17 00:00:00 2001
+From: Artem Savkov <asavkov@redhat.com>
+Date: Tue, 28 Sep 2021 18:38:48 +0200
+Subject: [PATCH] Fix empty gateway->path with glib > 2.68
+
+Starting with glib 2.69 g_match_info_fetch() returns an empty string
+instead of NULL in case when no match was found. Properly handle this
+case.
+
+Signed-off-by: Artem Savkov <asavkov@redhat.com>
+---
+ src/discord-http.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/discord-http.c b/src/discord-http.c
+index 83b92ce..80b3946 100644
+--- a/src/discord-http.c
++++ b/src/discord-http.c
+@@ -175,6 +175,9 @@ static void discord_http_gateway_cb(struct http_request *req)
+ 
+     if (dd->gateway->path == NULL) {
+       dd->gateway->path = g_strdup("/?encoding=json&v=6");
++    } else if (g_strcmp0(dd->gateway->path, "") == 0) {
++      g_free(dd->gateway->path);
++      dd->gateway->path = g_strdup("/?encoding=json&v=6");
+     }
+ 
+     g_match_info_free(match);
diff --git a/srcpkgs/bitlbee-discord/template b/srcpkgs/bitlbee-discord/template
index 4fda22d15710..daa18792b8a6 100644
--- a/srcpkgs/bitlbee-discord/template
+++ b/srcpkgs/bitlbee-discord/template
@@ -1,7 +1,7 @@
 # Template file for 'bitlbee-discord'
 pkgname=bitlbee-discord
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config glib-devel"
 makedepends="bitlbee-devel json-glib-devel"

From dc72ab1f9efc2015a697c76c0ef46bcb70b16710 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sun, 17 Oct 2021 14:50:41 -0600
Subject: [PATCH 1635/4088] dolphin-emu: update to 5.0.15260.

---
 srcpkgs/dolphin-emu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 5d575ba18627..c538c4b97548 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,8 +1,8 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.15105
+version=5.0.15260
 revision=1
-_dolphin_commit=4b8b53ac732645f6c0fd3f4b11733cb3d86c9c41
+_dolphin_commit=207c931a04c8e2629a735bc2b3f36b5c89365ca7
 _mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
@@ -22,7 +22,7 @@ license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
 distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
  https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="e339eee85cbc162e1eef6a90ab522760ef0e83640a4e6ca87b0e20e9f166773f
+checksum="84b21a6a14cf999e8c2bc44175f549aedaa4bd28a79eaa65afddd72f14905a3a
  d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 

From e5b679762f6a69198d5e5058e4fd936576d55b47 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 17 Oct 2021 00:52:56 +0200
Subject: [PATCH 1636/4088] yq-go: update to 4.13.4.

---
 srcpkgs/yq-go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 855a18fe069b..13d483113852 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.11.2
+version=4.13.4
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=910f64ceceabed5f63550a29923c158612be94f2855b0d10fdb549d8ad826a5f
+checksum=5d18ce2b2877a42a9765fceb7617f5aae3e0bc4e9f44c3048f9c9928a19bf965
 
 do_check() {
 	go test -v

From e040d42111e05a161aca563852b2c16265c0ea3a Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Fri, 15 Oct 2021 12:37:01 -0700
Subject: [PATCH 1637/4088] lavalauncher: update to 2.1.1.

---
 srcpkgs/lavalauncher/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lavalauncher/template b/srcpkgs/lavalauncher/template
index 554c7d2b6c8b..de8ef323ce2b 100644
--- a/srcpkgs/lavalauncher/template
+++ b/srcpkgs/lavalauncher/template
@@ -1,6 +1,6 @@
 # Template file for 'lavalauncher'
 pkgname=lavalauncher
-version=2.1.0
+version=2.1.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Jony <maybe-one-day-ubermensch@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://git.sr.ht/~leon_plickat/lavalauncher"
 distfiles="https://git.sr.ht/~leon_plickat/lavalauncher/archive/v${version}.tar.gz"
-checksum=4d51d857ddfc682cf7dbc4dcd60a776b6816610230afead4608fdd7693261274
+checksum=951edb0e00a118cd57d54349349d4898cfc18c6208a7c4d7f6e892eec1497c3b
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		configure_args="-Dc_args=-D__off64_t=off_t"

From 13f8f14873b4f1fb6aab1333f5e0c5d0f61ba5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 15 Oct 2021 12:14:34 +0200
Subject: [PATCH 1638/4088] tectonic: update to 0.8.0.

---
 srcpkgs/tectonic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..aa800bb97a09 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
-version=0.7.1
-revision=2
+version=0.8.0
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="MIT"
 homepage="https://tectonic-typesetting.github.io"
 distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=0082f3aca5e9e8cf827aacbe260383faf1e036d0e8d04a3aef11deeadfff2baf
+checksum=794cf34aee017b8a4288ed509a4e9d550a36aadc2bc0d35b1727d1135dac8e02
 
 post_install() {
 	vlicense LICENSE

From 2eca085f963e05f95acf8d9b413f815768953a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Oct 2021 18:36:46 +0700
Subject: [PATCH 1639/4088] ca-certificates: update to 20211016+3.71.

---
 srcpkgs/ca-certificates/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index b7026a0294b0..d328fae1eb72 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,6 +1,6 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20210119+3.71
+version=20211016+3.71
 revision=1
 _nss_version=${version#*+}
 bootstrap=yes
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, MPL-2.0"
 homepage="https://wiki.mozilla.org/NSS:Root_certs"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
  ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
-checksum="daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665
+checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88
  99acd315d9af35419cda4a6960f00a7d446bd231bd407174a7b07cb3dba0c253"
 
 post_extract() {
@@ -30,14 +30,9 @@ do_build() {
 }
 
 do_install() {
-	# Cleanup previous run failure
-	rm -f ${DESTDIR}/usr/sbin
 	vmkdir usr/share/${pkgname}
-	vmkdir usr/bin
-	ln -s bin ${DESTDIR}/usr/sbin
 	vmkdir etc/ssl/certs
-	make install DESTDIR=${DESTDIR}
-	rm -f ${DESTDIR}/usr/sbin
+	make install DESTDIR=${DESTDIR} SBINDIR=/usr/bin
 	vman sbin/update-ca-certificates.8
 	cd ${DESTDIR}/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf

From 0b64e9c9c9e3b3082b66101cbc7b8953df350f76 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 24 Apr 2021 00:25:24 +0300
Subject: [PATCH 1640/4088] freeciv: update to 2.6.5.

By ericonr:

- remove gtk2 version, since gtk2 is deprecated
- use '>=' instead of '-' for versioning, to avoid ambiguous parsing
---
 srcpkgs/freeciv/patches/QPainterPath.patch | 20 -------------
 srcpkgs/freeciv/template                   | 34 ++++++++++------------
 2 files changed, 15 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/freeciv/patches/QPainterPath.patch

diff --git a/srcpkgs/freeciv/patches/QPainterPath.patch b/srcpkgs/freeciv/patches/QPainterPath.patch
deleted file mode 100644
index ada7de6bea48..000000000000
--- a/srcpkgs/freeciv/patches/QPainterPath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/client/gui-qt/canvas.cpp	2020-02-15 16:49:02.000000000 +0100
-+++ b/client/gui-qt/canvas.cpp	2020-09-01 19:25:35.075928695 +0200
-@@ -18,6 +18,7 @@
- // Qt
- #include <QFontMetrics>
- #include <QPainter>
-+#include <QPainterPath>
- 
- // qt-client
- #include "canvas.h"
---- a/client/gui-qt/dialogs.cpp	2020-02-15 16:49:02.000000000 +0100
-+++ b/client/gui-qt/dialogs.cpp	2020-09-01 19:25:42.242929065 +0200
-@@ -24,6 +24,7 @@
- #include <QMessageBox>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadioButton>
- #include <QRect>
- #include <QSignalMapper>
diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index cb6434529441..2f6479b37d66 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,55 +1,51 @@
 # Template file for 'freeciv'
 pkgname=freeciv
-version=2.6.2
+version=2.6.5
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all
- --enable-client=all"
+configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
 hostmakedepends="pkg-config"
-makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel gtk+-devel
+makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel
  gtk+3-devel libXaw-devel libcurl-devel lua53-devel"
 short_desc="Free and Open Source empire-building strategy game - server/data"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://freeciv.org/"
+changelog="https://freeciv.fandom.com/wiki/NEWS-${version}"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e176c8f
+checksum=2e64e1c74dae12acb17bbf5daa980efc7e9fd57820afed5135319ca95291ec59
 
+_clients="gtk3,sdl2,xaw"
 subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
 if [ -z "$CROSS_BUILD" ]; then
+	_clients+=",qt"
 	makedepends+=" qt5-devel"
 	subpackages+=" freeciv-qt5"
 fi
+configure_args+=" --enable-client=${_clients}"
 
 post_install() {
-	rm ${DESTDIR}/usr/bin/*stub*
 	rm ${DESTDIR}/usr/lib/*.a
 }
 
 freeciv-gtk2_package() {
-	short_desc="Free and Open Source empire-building strategy game - GTK+ client"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		vmove "usr/bin/*gtk2*"
-		vmove "usr/share/appdata/*gtk2*"
-		vmove "usr/share/man/man6/*gtk2*"
-		vmove "usr/share/applications/*gtk2*"
-	}
+	build_style=meta
+	short_desc="Freeciv GTK+3 client (transitional dummy package)"
+	depends="freeciv-gtk3>=${version}_${revision}"
 }
 freeciv-gtk3_package() {
 	short_desc="Free and Open Source empire-building strategy game - GTK+3 client"
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/bin/*gtk3*"
 		vmove "usr/share/appdata/*gtk3*"
 		vmove "usr/share/man/man6/*gtk3*"
 		vmove "usr/share/applications/*gtk3*"
-		vmove "usr/share/applications/freeciv.desktop"
 	}
 }
 freeciv-qt5_package() {
 	short_desc="Free and Open Source empire-building strategy game - Qt5 client"
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/bin/*qt*"
 		vmove "usr/share/appdata/*qt*"
@@ -59,7 +55,7 @@ freeciv-qt5_package() {
 }
 freeciv-sdl_package() {
 	short_desc="Free and Open Source empire-building strategy game - SDL2 client"
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/bin/*sdl*"
 		vmove "usr/share/appdata/*sdl*"
@@ -69,7 +65,7 @@ freeciv-sdl_package() {
 }
 freeciv-xaw_package() {
 	short_desc="Free and Open Source empire-building strategy game - X11 client"
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/bin/*xaw*"
 		vmove "usr/share/man/man6/*xaw*"

From 03e56fb5c50c8ded371c16074d6d6588fab96cab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:20:44 +0200
Subject: [PATCH 1641/4088] okular: update to 21.08.2.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 42b302b751b9..a823de33185d 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=370ca3b90b8c4b44cee88f07e56cb1649c281c0ef110dce72e0ba00888ad61ee
+checksum=38ad86037dbc844ca07348d9bd353cfa77814cbae26f8273ad4fc3e500197678
 
 do_check() {
 	cd build

From f07c7e7e04b88d9d8c0ff908a5929603f300b6a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:20:45 +0200
Subject: [PATCH 1642/4088] libkexiv25: update to 21.08.2.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index a604339a48bc..a54541a7ed7f 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.1
+version=21.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=aa1332b4d6abb25372103af72008b7081fd09928a9d816daf8c595b5e39fd772
+checksum=6adfeed75f35e956dc602d97c033e15af33241200c7c51b7fdf66693d735ea6a
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From ae68602b1143ffc00796557186177115a686e085 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:24 +0200
Subject: [PATCH 1643/4088] akonadi-calendar: update to 21.08.2.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 1a9ec892a6ae..6c7cd6d91bce 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.1
+version=21.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=2220c2fc7381ea1f6019769aed940bbccb955c1afe365e00bacf4d93bdf215dd
+checksum=4affc8734320f6ffa68da92d54c505d0e90af55d72d1167f66397166325b8c4c
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 34fb4bd844457d3806980e7fa601b3b9e72acb10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:26 +0200
Subject: [PATCH 1644/4088] akonadi-contacts: update to 21.08.2.

---
 srcpkgs/akonadi-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ecb57d1048cd..2f2a88df81ce 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=cc6e84c8d9e8c336028472da3b218f15cecbeabd5709146a3b6f2df2a4f0528f
+checksum=6faff8beb673b0434c336b4f6183752337c6312fbc5cfd873b957cc04c60e2aa
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From 920a069743be1be2e69ddbd6d836c90d4e979096 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:28 +0200
Subject: [PATCH 1645/4088] akonadi-import-wizard: update to 21.08.2.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 80ac834a991f..454ef2a5e2b3 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=21.08.1
+version=21.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=1a5b4c675f34f267f2b00140b4d2997f68a351dc9a0749ba84ca1a2fa3fa16ec
+checksum=235b20605cc6e94a5207557482680e7ca54d5e71c84a9a7c4b6a5b426793eb41
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 45d374d2b6414da80295fc4de6c992407726cc21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:29 +0200
Subject: [PATCH 1646/4088] akonadi-mime: update to 21.08.2.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index bf7590a9bb81..70ae74251a13 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.1
+version=21.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=e5f3780096118ee42f4017f22d4780889f1da2f39e358ac3b610c78688089596
+checksum=a31b254e82f8096274e2c32a8a0ace98881b2bc36bf7bbe294b18b44bf117b3a
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From ddbf6f2c572f87753dbc2741780ed2cbbac0d9f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:31 +0200
Subject: [PATCH 1647/4088] akonadi-notes: update to 21.08.2.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index a488e30994bc..7c61c370ba0e 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.1
+version=21.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=70c0155df4f871bbc32db8bf7eb4fec507d6077abdf9a8f040c18d79fbbe83e4
+checksum=b8d20bcfdb0e2a381b3ca73cc4307754af77f96a7127a871e0146b05547a2964
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a9c92093cb16873a3a2694d273ce180532d74cd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:32 +0200
Subject: [PATCH 1648/4088] akonadi-search: update to 21.08.2.

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index c0630d96b745..5d7a5ca654a2 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.1
+version=21.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=d1d44870fd7b6e96b0915f26d0b5f7945887250a524329aea14d4d9486bebbf0
+checksum=c5c22e2307fb9b9b3e4a3bda47c1a3be15bb078f7a7627f6d90cfc91707237a8
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From cf12b9879667e5cc050fa798e7304a7ceccd6b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:34 +0200
Subject: [PATCH 1649/4088] calendarsupport: update to 21.08.2.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index b1773cb611e9..f3ff5065d92e 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.1
+version=21.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=7c6d2dc1300c232cce4d375e4619bbef228c471a2bd91c1e188530ff1a5f3559
+checksum=3312e1c147259822e834ae22365242d1d64dad5304dc2718eb94a4fb31c1f406
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 4141e50bd05e1fafe8e2787e7bf21d7c7c6f9e33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:35 +0200
Subject: [PATCH 1650/4088] grantleetheme: update to 21.08.2.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 919190cba98d..79a4d1e9ca8a 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.1
+version=21.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=953eec15e9b47f699d73b1a0346505c4801c1ef5a02ccc3ec8e115b438584c7f
+checksum=b3cd7a22090db107a18c3a7c847e8667f61e6eecb09a87236664211f844aa176
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 19e0c3cc03166cc74b0ba6e391f7747b36531afd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:37 +0200
Subject: [PATCH 1651/4088] kalarmcal: update to 21.08.2.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 7fa86c978d53..05b3f034245a 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.1
+version=21.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=ca9d7dd035064141b9ee7448947b50b9699a7b8f6c236f1ab93293e201cc1ee8
+checksum=30eec408e48cc8ef2a6d0d426cbc037bcfb657827cabf044065fd4b9d657ac75
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 7f0d19d6915faee879d6f91d4c849863850ae0b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:39 +0200
Subject: [PATCH 1652/4088] kcalutils: update to 21.08.2.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index fcfa78edf26b..68aa4eb3bf94 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.1
+version=21.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=d554a0cff84136eb5ef514a2e3a231079ba1bf13cea7d5a09799a2bdd17a2ff7
+checksum=dfa9d428501f5a6584f68c10d4210b14cb275d2978cc8d097dabf56fbebe6e4f
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 49a0a9de18ebe106272c2e99889f636fdb4c173c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:41 +0200
Subject: [PATCH 1653/4088] kdepim-runtime: update to 21.08.2.

---
 srcpkgs/kdepim-runtime/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 5ed800146536..f4df61a636af 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -8,13 +8,14 @@ hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin
  gettext qt5-qmake qt5-host-tools"
 makedepends="akonadi-calendar-devel akonadi-notes-devel knotifyconfig-devel
  pimcommon-devel kdav-devel libkgapi-devel kalarmcal-devel kmbox-devel
- qt5-networkauth-devel qca-qt5-devel qt5-webengine-devel"
+ qt5-networkauth-devel qca-qt5-devel qt5-webengine-devel
+ qt5-webchannel-devel"
 short_desc="KDE PIM runtime applications/libraries"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a9ee71148307ad532db409367b9742c05cb75d885fc2b52fffb740ed75d9262a
+checksum=98ba9d5bcd53371e6a157e65f8231241fd69c20427059a2ffce00987ccf1f46f
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From aeb8751eed1e8ac9c2a8ed2df22afcd06dfaf484 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:42 +0200
Subject: [PATCH 1654/4088] kimap: update to 21.08.2.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 735491f5ec94..eaaf28ff7f92 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.1
+version=21.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/kimap-${version}.tar.xz"
-checksum=14f627637bf843dab560650c8ebed428681407421b8448316fc1d8bc185768a5
+checksum=5dd42c72f83949293fda98ecb9c2439d4ddd0e9c1a2ecb6af11b83893f49b461
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From 0d5ba7dd0d7149130fd52d9ad3dc01ab972455ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:44 +0200
Subject: [PATCH 1655/4088] kldap: update to 21.08.2.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index bccdc1f67a02..4a05a93ebe21 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.1
+version=21.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=8f04badfb568f529e79b10040b8c0203c8c80bca80ff6caeea6dfc5c4d9b22d5
+checksum=7c7f241675dd768e20f8cd50f74a7c40658efc555af899ee128204cc932589ed
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From b985572ae20187743357154f1007d5e9c3867cd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:46 +0200
Subject: [PATCH 1656/4088] kmail: update to 21.08.2.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 1eb578a2d4d0..5f6361a43a2c 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.1
+version=21.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=595e895cb5ffc2e1e3d7da4a399477525fd66265bf09f67ae13b3b2b28620723
+checksum=e724656303129f2f4dab5f820284a381cc86b6dad662d7b8be0a4adc0f095e71

From 6f32a825dacc63b9e605176a1a3647b68afdaf4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:48 +0200
Subject: [PATCH 1657/4088] kmail-account-wizard: update to 21.08.2.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index ab28d684cf68..2aa9d9e2c113 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=21.08.1
+version=21.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=54cd5eb6388cb9fcf7a290200a9f3aca7af29ba2fd584b316785967bc62115f7
+checksum=2bf9538f3768b8df62fb148fecffdc55ae764309c23a20158885d8e165ba8429

From 5ae621374994674de761ef62ccbb1860c3dc83d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:49 +0200
Subject: [PATCH 1658/4088] kmailtransport: update to 21.08.2.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 638563ef2233..48a9db633912 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.1
+version=21.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/kmailtransport-${version}.tar.xz"
-checksum=bb81a2d35a8f99cdace182c1c125fc21795df01c1854877878c32282881ea07d
+checksum=bdaf4c209ebfad53050adf19b804dad958dceabc0ffd03585a2ff905ade2e660
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d8eb19ebdd1cd2ee20771471fe20080e41167281 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:51 +0200
Subject: [PATCH 1659/4088] kmbox: update to 21.08.2.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index e60fe0b36f59..aae083fbf770 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.1
+version=21.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=831bfd6f1399147eb6d62c80d454acd2ec3631f62e14932f86596b99a939fd08
+checksum=fec8bf59803a982589b18c866cd013506bc58ab64ae677105a0aff9499e8bb14
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 393f4c40e0b7d29fb802a5b2d802f32791f92360 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:52 +0200
Subject: [PATCH 1660/4088] kmime: update to 21.08.2.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index da0f5e735085..b65139eb9cb8 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.1
+version=21.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=5c2203ba1ad57cdec197369958c5c7adb6768d5170d6b321652c9a0776ac3a5f
+checksum=e47d6ae33a81d7747a9f6ec823f777e379969c6fec03a4e2911b3f734adde0b5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 994c2d7767d6f22d1e7e071b35a5aed973bc9e42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:54 +0200
Subject: [PATCH 1661/4088] kontactinterface: update to 21.08.2.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index e947ff0a2c03..b642276fd04b 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.1
+version=21.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=49f7030e6f87e2a9664fdbb17d0f9d600b222c43b9889d9f4e623080780e45d0
+checksum=8f5f0b86745273341b9f25bb24eb7bd12fe12894dce0886b47bf940f26655b71
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From ce05f4fe5f6978d2e9a9010ab7e95c6273b6fcca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:55 +0200
Subject: [PATCH 1662/4088] ksmtp: update to 21.08.2.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 6352e9d66dfb..4bfaecf07234 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.1
+version=21.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=66d1fc73cb88a9950c03fd30d7c90f1b69c9fbf30c9a2a35dcad5e28df31815e
+checksum=d00faa4d3d30ccb6e3007c578681403cf7da6fbfcf691b78a25e6d8e87886d21
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From be975bcb73abe0b30b2b283080ddc1d335829e19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:57 +0200
Subject: [PATCH 1663/4088] ktnef: update to 21.08.2.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index c340ba78578e..3669f10d19cc 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.1
+version=21.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=63cc0ba6d32241f2f71f8cb3bb13729254c488d955a7722def1163adb4269323
+checksum=17e3e588b3af2bb80f82d85f41e58ffaab9bd5174116820d957854e1d0788416
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 943d5e1307bec4d2b440cc4697b85772e34ef6fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:21:58 +0200
Subject: [PATCH 1664/4088] libgravatar: update to 21.08.2.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index d9b172f4b0f7..76ca55d0c5e0 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.1
+version=21.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=7bf14758f1ddf7583d89ac4768c2c2ce19a4d4d9c4ea037572dfd8059645b423
+checksum=418358a941a6dd5549cc31a2e6e9bf9ec02ad45634d92dec3acb6601645bee10
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 048fd2ede490764565e46e958842dc90607bc62f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:00 +0200
Subject: [PATCH 1665/4088] libkdepim: update to 21.08.2.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 9c3adcde9a23..33b3a53f1eec 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.1
+version=21.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=d0859436f3542e8097a61e7b63bbf8f81197b464c8ce6670822dcae0fe49eb83
+checksum=f0599557a0ca95f7998236d2e05b1321b8832aab688c4bc687ecf6f89f9b16c9
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 10703861f402bd76021b4741f4d1c5eae9e6b19b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:01 +0200
Subject: [PATCH 1666/4088] libkgapi: update to 21.08.2.

---
 srcpkgs/libkgapi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index f0c4dd850a7b..eb399db07b77 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,7 +1,7 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.1
-revision=2
+version=21.08.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
  gettext kcoreaddons"
@@ -11,7 +11,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=7e0f5943e210235f03d380bfe40ad6d2c48ddebc0c37240c105cad2201a19f93
+checksum=40e95815d7c84edc86748c1ea2dbcb1ca187448af2c9a76460f3e3b12352b68d
 
 do_check() {
 	:

From dbcddcee7f30c3190b91d3ef67d9bba0960111f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:03 +0200
Subject: [PATCH 1667/4088] libkleo: update to 21.08.2.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 7131e7c20f1f..304af6693e1f 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.1
+version=21.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=bf9ff39620e06303fba0d9bdf77c4dce19d52a1bcbf48bb014dc021c325336d8
+checksum=02030b82b4ab1a41489fa9ca0cb530540bad7279039fc6e07c45e984a5e8e392
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From edefad5bf6e17a7710a82585699dcab605074f24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:05 +0200
Subject: [PATCH 1668/4088] kleopatra: update to 21.08.2.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index c0ee0ec3e722..567cf16dc24a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fd5747063654ef5a1a64f33e0344c0e5bacdfa2422c3ffa9155970b6236a32c8
+checksum=c9de8fe61cbdeb61f11be221c526c445fbfeb7016632bd34fa1827ca7b07a4fa
 
 do_check() {
 	dbus-run-session ninja -C build test

From 70a04c605b65dd8be88bb06b39c0a4fe70577af2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:06 +0200
Subject: [PATCH 1669/4088] libksieve: update to 21.08.2.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index f40090ba62a6..435aa454090a 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.1
+version=21.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=7700c60142f6dfef0f65801a1fe7a753f2627bd23fa47f0040ae9cf225ebc994
+checksum=1e84e5b584613eb45aff46bdf34dc6277490a07c4b821457c71eb98a8202abcb
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 8c5dd20ed06e5ee0b337f853cde06adeddef069f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:08 +0200
Subject: [PATCH 1670/4088] mailcommon: update to 21.08.2.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 2de3d5599542..4029de89af1f 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=fc07f8153528a941850888679cbe02a27ee2c2ded09981fa469f40a515f618e4
+checksum=7f67ff6f21cf7630b40d126bb894f884c281f525db459afd35e9c4e172ff0c34
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 775daffe013fe68ba4ec29c94d479adde70b4a96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:10 +0200
Subject: [PATCH 1671/4088] mailimporter: update to 21.08.2.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 0c23a2fa3091..7391d799c4b1 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=cea27f3fd0095884d937cd7e4b094f983746497abaac2f7c2e816adbd68f7116
+checksum=87d38324b6af3d001006703f912a5ad74ff0a83bed79d109e421f3afe15ba06d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a506ea309bb502f1b81e8931934e3e4ad61bedb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:13 +0200
Subject: [PATCH 1672/4088] messagelib: update to 21.08.2.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 3dfd204f57a6..748a742dae52 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=f188a42175b56e7da0c76d05984a2113dd87c0a7cff827cdf0bbf81e99c274e4
+checksum=19fa3efd33cd220cec416f553f944e64127e423d45404412875d9c15c98c5d3f
 
 #TODO: fix build without qca-qt5
 

From bbc9394e889dd9e08ed6cb4c5a8d7854320c8b2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:14 +0200
Subject: [PATCH 1673/4088] pimcommon: update to 21.08.2.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 1c67040f106f..535f87a90107 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=664113437f048e5687eb2bc1e11263647d2d1d87567d37da8c730b1b37a4e98c
+checksum=8f8324fda5dbc3edf62f2e48f8b92e23a4972c447dcb199d6910f59f6f5f971c
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 1f451623e42db0971e4dd4cab69476ec6586ce3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:16 +0200
Subject: [PATCH 1674/4088] kpimtextedit: update to 21.08.2.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index c79b53ea6d6b..13509e35b75c 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.1
+version=21.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=253b9d0aaf0ad606ad37af3d7880a4285c9ab10332a2ef84982baafb80db4afd
+checksum=f0b0c84c0154259f7eb099e69b645c3c53d8531314e44e8540b02a94d24b876c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 91b4cf95adb03a39ea8c171124689602ce84840a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:17 +0200
Subject: [PATCH 1675/4088] kidentitymanagement: update to 21.08.2.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 927f80530832..c1af80922eba 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.1
+version=21.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=e6ac20e931b894daa6506b65ad65151f07e9a32bdc808569a7327dc0c7f81376
+checksum=acf09a276fa2b0e126e82bcbde3ff87e3fd4e23b5b95e6c0aaa0ea2038d05c4d
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 6cb5baa48647565f3ff44b6029fb978c095ff66c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:19 +0200
Subject: [PATCH 1676/4088] akonadi5: update to 21.08.2.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 2100a3a096ec..8de6ecc0eb61 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.1
+version=21.08.2
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,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=a6d588534579dc6dc4e19399215a1c9e6b802591cdd2165f064359deebd04b09
+checksum=4203976a5fc3f8737441bcc1a745f3f5651171a1f2572e9e5f5020057193904b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From cb877d2413ba44440772bc9253fce5cad02bbd26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:22:21 +0200
Subject: [PATCH 1677/4088] pim-data-exporter: update to 21.08.2.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 898d031dcb1c..2bcc747f8ea0 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=adf67a01dd44357e11c068d0865891a6bef2529f70127c3a8b087300d281a7ef
+checksum=aea82b27211049de93260bd3e3689c642b9e88dda658b27dfce4b5c9a7332952

From 56e0de17d830266eadd05ba8e301e4f5ccc88ce2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:43:51 +0200
Subject: [PATCH 1678/4088] dolphin: update to 21.08.2.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index dbbd088b623a..abce1e0d005c 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.1
+version=21.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=6e5dce2629f8333b426074d0f35dc96d40b528948db101443f8270ea554cb3ee
+checksum=4256d5077cc83f8025838b59f4dafabb16ed800bcb58761f312f6a8cdcc551a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From 5c8c65001c87d6ca32e2be38e206fb74eb66b13b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:43:53 +0200
Subject: [PATCH 1679/4088] dolphin-plugins: update to 21.08.2.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 8c3b3ca26c10..d793647a93ee 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.1
+version=21.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=39234026a703e7a1275950334ce31b924571ea27b1d538eeb3b2014fc7c9d53e
+checksum=c72a2ba9fb2199092c8806a9819b3c5706d983db7f763f1962b8933655bde808

From b463067cbe82e6251053b328cb703b29eb50d6c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:43:55 +0200
Subject: [PATCH 1680/4088] khelpcenter: update to 21.08.2.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index c760aa227b7a..35f6eea8ff61 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.1
+version=21.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=7ea486e4e4b8a88c9d16b89a3182bdb1abc0352b8aa12a3b189b2cb2267a5e25
+checksum=56774ad5a77a9acae39b375e488d2853b0c4797c0fa1a5536dc67bc3ce0f7547
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From bf04fbebb940d20b6a32ca74de35b272ed8893e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:43:57 +0200
Subject: [PATCH 1681/4088] kate5: update to 21.08.2.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index b0c2883b693b..0c749af46dd3 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.1
+version=21.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=1fccbe483c2562fd870288f01ebb39578880e28fd05193edda45ae573a72334d
+checksum=d68898759dd2538051124681e5928ef5fb163ca61b6cd8f59ee056cc068ea6b2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 84aad0e735f4bde99fac0339ec8e72f9e5b0cc00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:43:59 +0200
Subject: [PATCH 1682/4088] konsole: update to 21.08.2.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b3664260d789..c3e339655d15 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5b3ac5407f0c975ce00a2543e59c7e5b795c214db2747281af6b2a4e57f6e46c
+checksum=2f1284ac12c7f3c05351f0a6004f3504efb4c014ea36426ed1c017a49f7a17d2
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From 01eb72b03aea44f5be4417dc3926d69b7dc33d22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:00 +0200
Subject: [PATCH 1683/4088] baloo-widgets5: update to 21.08.2.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 6970cb49b0f6..a6ad1e90fa5b 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.1
+version=21.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=0d721f49a7e486c93df802834b6f62e82c9fa707d17ba3ab1fb673badf85c005
+checksum=5d212156b9f39aa4111b7bb0974e1bfcacb90f30d3f9cdd308a6f700f1c668ba
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From 5526393cfcb734c15c794e86d79bb45d0cf52af6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:02 +0200
Subject: [PATCH 1684/4088] kio-extras: update to 21.08.2.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 129ccb6b2334..4edd1b75875b 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=08198b6ae5b91b23403b7fd7d0482ac699285221dd9a101f8bff99c218688f72
+checksum=640092d134657feabe87cea79cd1a6caaccd09aa620089289bd461506c62651c

From c1efd23c3bbd859684fdca153e5094ace22b9f0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:18 +0200
Subject: [PATCH 1685/4088] kde5-baseapps: update to 12.08.2.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 9e1f55b44416..33eb3f5b05f0 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.1
+version=12.08.2
 revision=1
 build_style=meta
 depends="

From 0d78331faf60574688146e150a180e7a5b1c1ea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:19 +0200
Subject: [PATCH 1686/4088] dolphin: update to 12.08.2.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index abce1e0d005c..893141056ac2 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.2
+version=12.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=4256d5077cc83f8025838b59f4dafabb16ed800bcb58761f312f6a8cdcc551a1
+checksum=
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From cfc72d97dd1cf2156a118b1ed92fd71c965ab9d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:21 +0200
Subject: [PATCH 1687/4088] dolphin-plugins: update to 12.08.2.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index d793647a93ee..a71b75693827 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.2
+version=12.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=c72a2ba9fb2199092c8806a9819b3c5706d983db7f763f1962b8933655bde808
+checksum=

From b7b96ee61edf235eb26554038ce95835399cea99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:27 +0200
Subject: [PATCH 1688/4088] kde5-baseapps: update to 21.08.2.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 33eb3f5b05f0..57ecf91968fa 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=12.08.2
+version=21.08.2
 revision=1
 build_style=meta
 depends="

From ddff7ca050ad5a0849e048d7dc58ae0b4a457ad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:29 +0200
Subject: [PATCH 1689/4088] dolphin: update to 21.08.2.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 893141056ac2..abce1e0d005c 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=12.08.2
+version=21.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=
+checksum=4256d5077cc83f8025838b59f4dafabb16ed800bcb58761f312f6a8cdcc551a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From 8abc8599781144b6c23dea2e1cf3dc64010a29bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:31 +0200
Subject: [PATCH 1690/4088] dolphin-plugins: update to 21.08.2.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index a71b75693827..d793647a93ee 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=12.08.2
+version=21.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=
+checksum=c72a2ba9fb2199092c8806a9819b3c5706d983db7f763f1962b8933655bde808

From f847fdc2cbecbf4a1d787fe8dbc494b3bd94e0df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:54 +0200
Subject: [PATCH 1691/4088] spectacle: update to 21.08.2.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 2889e5fd4b23..71647a6ee88c 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd805571343668959924af6834e07b5503e331ece1f099d6901c244efd1b492f
+checksum=30cb4ac4eccbc8d08818e9506e6b3342e3afa92b2f48af4c4c67d4899d65a954

From 3be2d94c521b2042f7e7be87120fe428515aa74a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:44:55 +0200
Subject: [PATCH 1692/4088] libkipi5: update to 21.08.2.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 288adfe88cb0..45820d806cb5 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.1
+version=21.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=ba8a2957763318136f3e60af45f738799be2aae196fa5e73e50d49dff14ba78c
+checksum=90eb5f3b61b86b766d8c8da181b928d333d0df2dd34418553a3e11db9e52918c
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From cd8499cc9b1c6d0df388c38e1e7e1d5ca52be029 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:23 +0200
Subject: [PATCH 1693/4088] ark: update to 21.08.2.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index df9aa7809a90..47019c138e7a 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=60db7649f94a8a083f22a04a2c86263b8af27a1a033908c92c623cf8231e43eb
+checksum=2f941c247cd30517a7aa765ed547d98a92d588c4445a7376f99e1f903168bf43
 
 do_check() {
 	cd build

From 8b82de307fc3df341b1bd2dd254eb1709693f8c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:26 +0200
Subject: [PATCH 1694/4088] elisa: update to 21.08.2.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 4a323127bf49..04e2cf379181 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.1
+version=21.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=f9f92b3e167bf385a6579875edc3358f4ffb2b072d1ab985afed15dea32a798a
+checksum=65ecf7e97f2755c202acc914a04d986633fc350648af44787fca2da0763b9193
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From c4af2d8cebd4623fe58fcd858f36bbce393b0477 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:28 +0200
Subject: [PATCH 1695/4088] kdeconnect: update to 21.08.2.

---
 srcpkgs/kdeconnect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 8ef29c8e1ad2..fc3a59ad628a 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.1
+version=21.08.2
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -19,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=6330f74b432ecead1f99f8c74dcc24fd97672ca7009267569ff3bceeb3fedc06
+checksum=dbfd0eeef729be25b72f238a750d991db5e1fdeab386a0dea55172f00a1dbb25
 python_version=3

From 8a4d976408170773ec3b2cfb1db8b6bac7f3f63c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:29 +0200
Subject: [PATCH 1696/4088] kdegraphics-thumbnailers: update to 21.08.2.

---
 srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb66cda635bd..afdd9c1c2cc2 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9ef6ece5dd587ba501a2c344479cc9f03fb7e01807436ba7f0fb75b3adee0d43
+checksum=e2a090b49319aea7dee072a683bffb97a4968f2e8b2586b58e990ae5889dc188

From ac6dab5286e9d379742be6a7d82d8ec8f47689c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:31 +0200
Subject: [PATCH 1697/4088] knights: update to 21.08.2.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 3589f3fd5f82..f726a6bb2c8a 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.1
+version=21.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=a1f10a63fe7ba7c9d03c141d3ce13bc669c5ddf8d2ee0d966f6426c37db600d4
+checksum=1f2080d98e57a6bf748e8401ceb52d98232f3e1b6e844158386624fb75b4e26c

From 860e940d3114a684a105813490d0d9b53edbf9ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:33 +0200
Subject: [PATCH 1698/4088] kqtquickcharts: update to 21.08.2.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 4274c00b0629..e4a32c9bce0f 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.1
+version=21.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=d0e89c034a9fec0130b55086692d8bd56056c796f0977bdb1ffe6339fcef153e
+checksum=164accd3d41ed98601816c0d7f06fa21e8f965aa83ba6f3f39b29e4d11e29d11
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8982f544aadf3912cc6cc4bd0c5f64829ed8d6f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:49 +0200
Subject: [PATCH 1699/4088] akregator: update to 21.08.2.

---
 srcpkgs/akregator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 1932ccbee5b2..b008d05663cf 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/internet/akregator"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6df9ea5bf442eef839b67d830389ae787746d1c8d7f20e02299a3dadedaeed18
+checksum=b9b8458152664b92316482f150d8ac214f879646124f5dfe0b8df1d8b39b1397

From f5f8d804bfe63f4fab511cc45701db00f5b96f14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:50 +0200
Subject: [PATCH 1700/4088] eventviews: update to 21.08.2.

---
 srcpkgs/eventviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index 08ee15533de0..0b05ce1c83e8 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,6 +1,6 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5a182810cf05c119cf2f6667e99aba0abc1649e28179d8aa1e2b17e68b6e3e1b
+checksum=b28f3a6823194a6a64d8e6043ff4c8ec1897e47b3cc4404cda4aceafec842a34
 
 eventviews-devel_package() {
 	short_desc+=" - development"

From 9624dab269d379603955392fd43ecfadfffca237 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:51 +0200
Subject: [PATCH 1701/4088] incidenceeditor: update to 21.08.2.

---
 srcpkgs/incidenceeditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 392efcadcb50..3e32345f49a4 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,6 +1,6 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=809d5d2423c6838ef4f26f353fa47c213c65e54eec31aebc0283649e2b5f337c
+checksum=181d4e32ef7e8c8a83f3fbc5d24c4d3e777ee810ecc9e5de3f8355e2fe1c3f77
 
 incidenceeditor-devel_package() {
 	short_desc+=" - development"

From ed346e3e0c10bf8ec3c84f7390f4c4e75b3b43c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:53 +0200
Subject: [PATCH 1702/4088] kaddressbook: update to 21.08.2.

---
 srcpkgs/kaddressbook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index a6fe9833994a..3673f4ccc59a 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,6 +1,6 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kaddressbook"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c2db9596b4fc56afe2582789c7ddb4a74ac75265ec07a1b879a13312f0a611fa
+checksum=e2d833394ab1f0163c111499663f305bd94ddb53ea7758c1962354757f186ddf

From 058f75cba4fde8f81f5afc5c2d97d639bcb6c2fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:55 +0200
Subject: [PATCH 1703/4088] kalarm: update to 21.08.2.

---
 srcpkgs/kalarm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index dc0b4fe7b9bb..383f3cd9656b 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kalarm"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b027fbc459df72a65dab16f14fce277287b67d863b625518c23da9efdb90b2d6
+checksum=c5bde9166a453ba9a82c7107f7fd27f3aa9d41649490b1c723cf923a04e09c19

From 6a346ec00162330e5ff166813420b11f99549555 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:57 +0200
Subject: [PATCH 1704/4088] kget: update to 21.08.2.

---
 srcpkgs/kget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index 4568cd0da436..2739dae1811c 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kget"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0597001e067280ba4952f68077cb856047c91fe6891a46e8b28f8ef77434804c
+checksum=d0c40b968d184f1a45e83dc26ac7e4a2a9761196bc7c3e8cc85d9539ed380086

From f20528a1669e96b6eae9daa37be45ccb5e39528b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:45:59 +0200
Subject: [PATCH 1705/4088] knotes: update to 21.08.2.

---
 srcpkgs/knotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index 1299248f809b..a4d4c2a9e30e 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,6 +1,6 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://apps.kde.org/knotes/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fbed9c7a7170b53a4f77446adeb235c9cd73d2ce8cfe89ab385f7f01dc1965ab
+checksum=2925bac240c3c0d660d657fdcb947239ed08f321b6438e13508fc5c5efac79bc

From ee4d5376781981691c2e3c8d02429a2e97602352 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:46:01 +0200
Subject: [PATCH 1706/4088] konqueror: update to 21.08.2.

---
 srcpkgs/konqueror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index 2fcd0b4aa49f..a00072960d7f 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/internet/org.kde.konqueror"
 distfiles="${KDE_SITE}/release-service/${version}/src/konqueror-${version}.tar.xz"
-checksum=cefb3157b94f983c70ad6fe03cc99f71e3cfb26bb995e4d4e85b876be4e1964a
+checksum=57ca516fde6def2912939360f1da05f8cded79cccc66404fc0a43aa0b00db46c
 
 do_check() {
 	:

From 9d3ff67826c24dbe81fc5ce700d6eb12fd67f74b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:46:02 +0200
Subject: [PATCH 1707/4088] kontact: update to 21.08.2.

---
 srcpkgs/kontact/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index 2c0693c16528..ad23a66bbbf8 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kontact"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ef67bb6b97d07b5f4f6e8fd199cf787eb0b4f2f2e5d4ab8392dfc2c3eacc1eab
+checksum=5268e2ba5c8fd1afc011a4d207539adb176b25b416e305d39c261dbf5c3feda8

From bd72a0e81a9711eda2b7b9640cfa1bb8a4d23299 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:46:04 +0200
Subject: [PATCH 1708/4088] korganizer: update to 21.08.2.

---
 srcpkgs/korganizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index 1ce1cb316f05..13dfbc934a5b 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,6 +1,6 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.korganizer"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f57cb016c9931b7d555b548758a251643fc4915df506c3fee6ee691c328dbfb4
+checksum=67f5b87dc717c6cd1e71c8f7c8ddfbb603c77a8861cf0d3007ffe1decbfbf947

From 1b18e9601d8ea1d9461c6e2b9c56ea90e322e466 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:46:06 +0200
Subject: [PATCH 1709/4088] krdc: update to 21.08.2.

---
 srcpkgs/krdc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index 806dac706a32..b19a9e8ab082 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.krdc"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=30613cf039b5e385e00a1442289e5b17e265ca8bce3487d1063cf290e2e84149
+checksum=6d593dff61ed091f3188b76f49685ef01c74b6021656169de5a4814cf472377f
 
 krdc-devel_package() {
 	short_desc+=" - development files"

From 8dedc1954a5fa0dd38c2fb23706d6ef073bb0c10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:46:07 +0200
Subject: [PATCH 1710/4088] krfb: update to 21.08.2.

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..b8ea4ebe9b98 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=0b1f4281c5af3eecd257aaabb2824be646e045228e7391a3fa668acb400bc2c2

From c93088516c504e9dcee9b7ec81e9c4405ea1de2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:46:19 +0200
Subject: [PATCH 1711/4088] ktuberling: update to 21.08.2.

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index db5756160a79..16ca3ede4ff3 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=89748bacc65b8ea7ee78ce266f7e2c2878788d6cf275c756ecd011e82c396ab8
+checksum=ce74c06fd7c328c46782e0fc0d15a70efd2d6459b5f57f426e21f001e086fb40

From 9e8fc88527971dd9dd4ee73df45f9800f1b9abae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 12:46:20 +0200
Subject: [PATCH 1712/4088] libktorrent: update to 21.08.2.

---
 srcpkgs/libktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index 4e775d8f5b4a..47289212a9d0 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python3 doxygen"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/en/ktorrent"
 distfiles="${KDE_SITE}/release-service/${version}/src/libktorrent-${version}.tar.xz"
-checksum=3d6c68af94e2596035315d5682dd832c0bc3022558fdab1bca3991077640a878
+checksum=7492cfa722a9e4f786dbcc1d7cc115e69711f5c10778be306003f87794053d9b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 9f27c3801550aaa00ca7ad0e8cbfe374f66c9f59 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 17 Oct 2021 14:40:57 +0200
Subject: [PATCH 1713/4088] graphviz: update to 2.49.2.

---
 srcpkgs/graphviz/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index 7091b2ca6c66..ed491b555026 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,8 +1,9 @@
 # Template file for 'graphviz'
 pkgname=graphviz
-version=2.49.1
+version=2.49.2
 revision=1
 build_style=gnu-configure
+configure_args="--enable-lefty"
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config python3"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
@@ -15,7 +16,7 @@ license="EPL-1.0"
 homepage="http://www.graphviz.org"
 changelog="https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md"
 distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz"
-checksum=f62f644aa9b9c03cb14f0dc351a28525c055cd7951614c0b7efa6af66d4a8fb7
+checksum=3d61cfc53e16b28be4df2c0ecfbc8b9dade07180fa83cef91b66270d14fb903b
 
 # `make check` is broken:
 # https://gitlab.com/graphviz/graphviz/-/issues/2112

From be7d5b48c298e1c69b66855e758c9a5afaee930c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Oct 2021 17:33:53 +0200
Subject: [PATCH 1714/4088] cfssl: provide version information.

---
 srcpkgs/cfssl/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index a49575535ed4..1596ee4656c7 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,10 +1,11 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."
+go_ldflags="-X github.com/cloudflare/cfssl/cli/version.version=${version}"
 short_desc="CFSSL: Cloudflare's PKI and TLS toolkit"
 maintainer="hanspolo <itself@hanspolo.net>"
 license="BSD-2-Clause"

From dcc2191ff446fe40a25607cb8dae0f45e758244c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 18 Oct 2021 12:24:42 -0500
Subject: [PATCH 1715/4088] nvidia390: add patch for linux5.14

---
 srcpkgs/nvidia390/files/linux-5.14.patch | 77 ++++++++++++++++++++++++
 srcpkgs/nvidia390/template               |  7 ++-
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia390/files/linux-5.14.patch

diff --git a/srcpkgs/nvidia390/files/linux-5.14.patch b/srcpkgs/nvidia390/files/linux-5.14.patch
new file mode 100644
index 000000000000..ebf6c1a8bd36
--- /dev/null
+++ b/srcpkgs/nvidia390/files/linux-5.14.patch
@@ -0,0 +1,77 @@
+Taken from https://build.opensuse.org/package/view_file/X11:Drivers:Video/nvidia-gfxG04/kernel-5.14.patch?rev=233
+Credit to Stefan Dirsch <sndirsch@suse.com>
+
+--- a/VIDIA-Linux-x86_64-390.144-no-compat32/kernel/conftest.sh	2021-08-31 16:58:57.799629833 +0200
++++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/conftest.sh	2021-08-31 18:00:09.257825534 +0200
+@@ -4493,6 +4493,30 @@ compile_test() {
+             fi
+         ;;
+ 
++        drm_device_has_pdev)
++            #
++            # Determine if the 'drm_device' structure has a 'pdev' field.
++            #
++            # Removed by commit b347e04452ff ("drm: Remove pdev field from
++            # struct drm_device") in v5.14-rc1.
++            #
++            CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
++            #include <drm/drmP.h>
++            #endif
++
++            #if defined(NV_DRM_DRM_DEVICE_H_PRESENT)
++            #include <drm/drm_device.h>
++            #endif
++
++            int conftest_drm_device_has_pdev(void) {
++                return offsetof(struct drm_device, pdev);
++            }"
++
++            compile_check_conftest "$CODE" "NV_DRM_DEVICE_HAS_PDEV" "" "types"
++        ;;
++
++
+     esac
+ }
+ 
+--- a/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/nvlink_linux.c	2021-08-31 16:58:57.787629590 +0200
++++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/nvlink_linux.c	2021-08-31 17:51:49.207744327 +0200
+@@ -597,7 +597,7 @@ void NVLINK_API_CALL nvlink_sleep(unsign
+         // the requested timeout has expired, loop until less
+         // than a jiffie of the desired delay remains.
+         //
+-        current->state = TASK_INTERRUPTIBLE;
++        set_current_state(TASK_INTERRUPTIBLE);
+         do
+         {
+             schedule_timeout(jiffies);
+--- a/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/os-interface.c	2021-08-31 16:58:57.787629590 +0200
++++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/os-interface.c	2021-08-31 17:51:58.043922420 +0200
+@@ -580,7 +580,7 @@ NV_STATUS NV_API_CALL os_delay(NvU32 Mil
+         // the requested timeout has expired, loop until less
+         // than a jiffie of the desired delay remains.
+         //
+-        current->state = TASK_INTERRUPTIBLE;
++        set_current_state(TASK_INTERRUPTIBLE);
+         do
+         {
+             schedule_timeout(jiffies);
+--- a/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c	2021-08-31 16:58:57.783629508 +0200
++++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c	2021-08-31 17:56:41.345633279 +0200
+@@ -811,7 +811,9 @@ static void nv_drm_register_drm_device(c
+ 
+     dev->dev_private = nv_dev;
+     nv_dev->dev = dev;
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
+     dev->pdev = pdev;
++#endif
+ 
+     /* Register DRM device to DRM sub-system */
+ 
+--- a/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm.Kbuild	2021-08-31 16:58:57.783629508 +0200
++++ b/NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm.Kbuild	2021-08-31 17:53:18.265539346 +0200
+@@ -102,3 +102,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_dr
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_atomic_check_has_atomic_state_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_plane_atomic_check_has_atomic_state_arg
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 26f3786e98b6..74287815c7c5 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.144
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -39,6 +39,11 @@ do_extract() {
 	cd ${_pkg}
 }
 
+do_patch() {
+	cd "${wrksrc}/${_pkg}"
+	patch -Np2 < $FILESDIR/linux-5.14.patch
+}
+
 pre_install() {
 	cd ${_pkg}
 	cp nvidia_icd.json.template nvidia_icd.json

From 7f60bb87500167db90a81d3a9d9b7d0160263a64 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 18 Oct 2021 16:43:42 -0300
Subject: [PATCH 1716/4088] AppStream: update to 0.14.6.

---
 srcpkgs/AppStream/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 0400bc24a904..9cba83f64c24 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.14.4
+version=0.14.6
 revision=1
 wrksrc="appstream-${version}"
 build_style=meson
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=80f95cd7a1e6275bd0973bf39f543bd0f240f638d0ea7b171d8bc1dbe99e107c
+checksum=fd71649aeefe1cb561f1921193b253033d21566bdcce849c93e37fdb21113560
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

From 3f17a662c781ccd8738ce21c3dc1614e0eccbf16 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 18 Oct 2021 13:44:00 +0200
Subject: [PATCH 1717/4088] ModemManager: update to 1.18.2.

---
 srcpkgs/ModemManager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index b7014e42572c..3bef68402b45 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,6 +1,6 @@
 # Template file for 'ModemManager'
 pkgname=ModemManager
-version=1.18.0
+version=1.18.2
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -19,7 +19,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/ModemManager/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=48ede5b4f9fb2678a86f5aca74ae3bb32dcb35c61543afb30f20c184f8a69e5d
+checksum=374be158ae1c1fb38a29eef1cc3cdf89ff3536b48ff1320d208ab204ea6c5f8a
 
 build_options="gir"
 build_options_default="gir"

From 7739eaaa919bbadd2478c881cb02a0aa30741236 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Mon, 18 Oct 2021 17:50:23 -0500
Subject: [PATCH 1718/4088] void-release-keys: Import 20210930 minisign key

---
 srcpkgs/void-release-keys/files/void-release-20210930.pub | 4 ++--
 srcpkgs/void-release-keys/template                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/void-release-keys/files/void-release-20210930.pub b/srcpkgs/void-release-keys/files/void-release-20210930.pub
index 30cf7ecd4e66..035d9bc72456 100644
--- a/srcpkgs/void-release-keys/files/void-release-20210930.pub
+++ b/srcpkgs/void-release-keys/files/void-release-20210930.pub
@@ -1,2 +1,2 @@
-untrusted comment: This key is only valid for images with date 20210930. public key
-RWQBGxJ8OlEt1kcyt9kYSbr9UVpXJsK6MJnl6BK/EqS2p83jUB9+WxJW
+untrusted comment: minisign public key 2DDAD7D879020384
+RWSEAwJ52NfaLd6eT11x7dDsUPRLz4Xfiz7jH/1a3bl6nfbKTDCve/lz
diff --git a/srcpkgs/void-release-keys/template b/srcpkgs/void-release-keys/template
index 4ad46b1289df..04bcfe567589 100644
--- a/srcpkgs/void-release-keys/template
+++ b/srcpkgs/void-release-keys/template
@@ -1,7 +1,7 @@
 # Template file for 'void-release-keys'
 pkgname=void-release-keys
 version=1
-revision=3
+revision=4
 short_desc="Void Linux Release Keys"
 maintainer="Void Release Engineering <releases@voidlinux.org>"
 license="Public Domain"

From 0dc86b56aa2fe395eb2fcadd0279a7563056a814 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Oct 2021 11:26:57 +0200
Subject: [PATCH 1719/4088] automake: update to 1.16.5

---
 srcpkgs/automake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template
index 8cfdccb2b91a..c6e0657bfe9e 100644
--- a/srcpkgs/automake/template
+++ b/srcpkgs/automake/template
@@ -1,7 +1,7 @@
 # Template file for 'automake'
 # NOTE: also update common/environment/configure/automake when updating!
 pkgname=automake
-version=1.16.4
+version=1.16.5
 revision=1
 build_style=gnu-configure
 make_check_args="${makejobs}"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnu.org/software/automake"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d
+checksum=f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469
 
 pre_check() {
 	# taken from http://www.linuxfromscratch.org/lfs/view/development/chapter06/automake.html

From 46cb2a78bc4521347070eb2a554f30e853a4eaea Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 18 Oct 2021 19:49:03 -0400
Subject: [PATCH 1720/4088] hexchat-python3: missing dependency & files

- Was missing a dependency on python3-cffi
- The associated python module had been left
  in the main package.
---
 srcpkgs/hexchat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 9f11a75d3adc..97937999bb0d 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,7 +1,7 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.16.0
-revision=2
+revision=3
 build_style=meson
 configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
@@ -49,9 +49,10 @@ hexchat-perl_package() {
 hexchat-python3_package() {
 	lib32disabled=yes
 	short_desc+=" - Python3 plugin"
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision} python3-cffi"
 	pkg_install() {
 		vmove usr/lib/hexchat/plugins/python.so
+		vmove usr/lib/hexchat/python
 	}
 }
 

From de10a1207c3f5771b27260b3d5b8052586ec8fc5 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Mon, 18 Oct 2021 16:32:00 -0600
Subject: [PATCH 1721/4088] mbuffer: update to 20211018

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index 9c3946022199..f6c86fb6d268 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,6 +1,6 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
-version=20211004
+version=20211018
 revision=1
 build_style=gnu-configure
 hostmakedepends="which"
@@ -11,5 +11,5 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.maier-komor.de/mbuffer.html"
 distfiles="https://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"
-checksum=2a8b6b3466d41e6c0dde32ce09eec672525ca9a5cf4150b9a0e9f5c65ee89942
+checksum=e240c1e4e4ac14c28be8c660ec47d44ce16b1e8ec92aa907ad13004ffd5db6e3
 conf_files="/etc/mbuffer.rc"

From 112b470bcd3addc3439ea13fe4bdf1349cddc581 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Mon, 18 Oct 2021 16:57:55 +0300
Subject: [PATCH 1722/4088] python3-babelfish: update to 0.6.0.

---
 srcpkgs/python3-babelfish/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-babelfish/template b/srcpkgs/python3-babelfish/template
index 5a7b7aceb2b0..d49b7c7b23c2 100644
--- a/srcpkgs/python3-babelfish/template
+++ b/srcpkgs/python3-babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-babelfish'
 pkgname=python3-babelfish
-version=0.5.5
-revision=5
+version=0.6.0
+revision=1
 wrksrc="babelfish-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="BSD-3-Clause"
 homepage="https://github.com/Diaoul/babelfish"
 distfiles="${PYPI_SITE}/b/babelfish/babelfish-${version}.tar.gz"
-checksum=8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104
+checksum=2dadfadd1b205ca5fa5dc9fa637f5b7933160a0418684c7c46a7a664033208a2
 
 post_install() {
 	vlicense LICENSE

From 0f684a18e4ecbbb52c7b3feb73d46e8305467cc0 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 19 Oct 2021 12:38:10 +0200
Subject: [PATCH 1723/4088] i3: update to 4.20.

---
 srcpkgs/i3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index f0a69f731b1b..27128cb5025d 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,6 +1,6 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.19.2
+version=4.20
 revision=1
 build_style=meson
 hostmakedepends="pkg-config perl"
@@ -14,7 +14,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-3-Clause"
 homepage="https://i3wm.org/"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.xz"
-checksum=8a6ee177689dcf22964d20b6093014ee4fa0419345d3fd515d5512d9980bb279
+checksum=8cf4f174f6cf554f38563380681abe25868e9955883791e0986ecd89c53ac322
 
 do_check() {
 	: "Michael disables tests in Debian rules, too"

From 8812b49305c89c436c0481f9026dc179822c5827 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 19 Oct 2021 09:23:25 -0400
Subject: [PATCH 1724/4088] synapse: update to 1.45.0.

---
 srcpkgs/synapse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 752e4cf5bbdb..fd8f0541c5b9 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.44.0
-revision=2
+version=1.45.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=7a7cfcff7e11a9dbb253665d52adcd97bfa5ad0a44e17379a1caacc7ff5e42cc
+checksum=9df83d58da8f2afa811c8091cad26081dea5a27af3e317d9a06b671d62a3f5f2
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 0c209dc87f9b1de559cd65c15f1cf4cd1c2b304d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Oct 2021 10:30:00 -0400
Subject: [PATCH 1725/4088] python3-watchdog: update to 2.1.6.

---
 srcpkgs/python3-watchdog/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-watchdog/template b/srcpkgs/python3-watchdog/template
index ab3eb772c7da..6ed0ea824391 100644
--- a/srcpkgs/python3-watchdog/template
+++ b/srcpkgs/python3-watchdog/template
@@ -1,15 +1,20 @@
 # Template file for 'python3-watchdog'
 pkgname=python3-watchdog
-version=0.9.0
-revision=5
+version=2.1.6
+revision=1
 wrksrc="watchdog-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-yaml python3-argh python3-pathtools"
+depends="python3-yaml python3-argh python3-pathtools"
+checkdepends="python3-pytest $depends"
 short_desc="Python3 API and shell utilities to monitor file system events"
 maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
 license="Apache-2.0"
 homepage="http://github.com/gorakhargosh/watchdog"
 distfiles="${PYPI_SITE}/w/watchdog/watchdog-${version}.tar.gz"
-checksum=965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d
+checksum=a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7
 conflicts="python-watchdog>=0"
+
+pre_check() {
+	vsed -e '/--cov/d' -i setup.cfg
+}

From 18b35c677f0bace40158000da13d38d78c7e60fe Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 19 Oct 2021 20:06:45 +0200
Subject: [PATCH 1726/4088] autofs: update to 5.1.8.

---
 srcpkgs/autofs/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index b306368242d3..6ec782cccbb9 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,6 +1,6 @@
 # Template file for 'autofs'
 pkgname=autofs
-version=5.1.7
+version=5.1.8
 revision=1
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/daemons/autofs"
 distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
-checksum=a36b268611b79b07051749870ba540b139938efc84bc0293244c483e94f9ced7
+checksum=b33d1059855664b20eeda26f3e28ff518fb0c3d58f565570af2ae569dc73c0fd
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc"
 
@@ -22,9 +22,8 @@ if [ -z "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" != "musl" ]; then
 fi
 
 pre_configure() {
-	sed -i 's,nfs/nfs.h,linux/nfs.h,g' */*.[ch]
-	sed -i 's,__S_IEXEC,S_IXUSR,g' */*.[ch]
-	# chmod +x configure
+	vsed -i 's,nfs/nfs.h,linux/nfs.h,g' */*.[ch]
+	vsed -i 's,__S_IEXEC,S_IXUSR,g' */*.[ch]
 }
 
 pre_build() {

From ad0c5ea0b5547052924ebb2b1c0016b14e31e8b7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 19 Oct 2021 20:11:19 +0200
Subject: [PATCH 1727/4088] linux5.4: update to 5.4.154.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index a30054749ddb..f09fc50fcce8 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.153
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=6d9f07c9d611e5a7317eb6d5114880bad5c2dc1ac48d89f861b887d2f4295f49
+checksum=058994f4666b6b0474a4d5228583e394594e406783b7e93d487c2a66c35f3c06
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From a240bb0dc7abf6db14468b49cb2511d78d792af2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 19 Oct 2021 20:13:46 +0200
Subject: [PATCH 1728/4088] linux4.19: update to 4.19.212.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index d306170dd8c0..f3bb9c0ca266 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.211
+version=4.19.212
 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=fb48a4580a99fcad03145246f597c251a1d8690322e6d925590be9e2f42b7ed4
+checksum=5cefdb78ddd29ae5ccda7da803da07d7cc80d68d2f6de967b61712d87f1db643
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 0ba7cd69c9e6fe8b39a3df232629ff16b072bdf8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 19 Oct 2021 23:55:56 +0200
Subject: [PATCH 1729/4088] libmd: update to 1.0.4.

---
 srcpkgs/libmd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmd/template b/srcpkgs/libmd/template
index 6c708785d350..51ea5f1d5d61 100644
--- a/srcpkgs/libmd/template
+++ b/srcpkgs/libmd/template
@@ -1,6 +1,6 @@
 # Template file for 'libmd'
 pkgname=libmd
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=gnu-configure
 short_desc="Message Digest functions from BSD systems"
@@ -8,7 +8,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause, BSD-2-Clause, ISC, Beerware, custom:Public Domain"
 homepage="https://www.hadrons.org/software/libmd/"
 distfiles="https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz"
-checksum=5a02097f95cc250a3f1001865e4dbba5f1d15554120f95693c0541923c52af4a
+checksum=f51c921042e34beddeded4b75557656559cf5b1f2448033b4c1eec11c07e530f
 
 post_install() {
 	vlicense COPYING

From d83f2c9b1971fe9abb75905e2af63854b8706cd7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 20 Oct 2021 00:16:40 +0200
Subject: [PATCH 1730/4088] knot: update to 3.1.3.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index c2485c19162d..2bcb3fd04d32 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=580087695df350898b2da8a5c2bdf1dc5eb262ed5ff2cb1538cee480a50fa094
+checksum=a3fc448cbce3209575f93a3cf1224fa37802fc6606f7c7d4bb3aa6dbeaed2c64
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 7308cf0794ee057132f8db6d43a3c837875a12b9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 20 Oct 2021 00:17:25 +0200
Subject: [PATCH 1731/4088] knot-resolver: update to 5.4.2.

---
 srcpkgs/knot-resolver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index a113d52ce4ae..fc56c00f9742 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.1
+version=5.4.2
 revision=1
 build_style=meson
 configure_args="
@@ -19,7 +19,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=fb8b962dd9ef744e2551c4f052454bc2a30e39c1f662f4f3522e8f221d8e3d66
+checksum=ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From 55edef2ca937695b26c8d068864ac1b85c741ea4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 20 Oct 2021 01:41:05 +0200
Subject: [PATCH 1732/4088] flatpak: update to 1.12.2.

---
 srcpkgs/flatpak/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 837b31416b34..87f767dff60f 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.12.1
+version=1.12.2
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -23,7 +23,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/raw/master/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=23893bca7fee82692c43cb692dbec36ea9d5339508c19d3925eac6f06414c857
+checksum=df1eb464f9142c11627f99f04f6a5c02c868bbb145489b8902cb6c105e774b75
 
 build_options="gir"
 build_options_default="gir"

From 75fd49eccc97dcb41d95799f8147f35cece1fe86 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Tue, 19 Oct 2021 22:17:02 +0200
Subject: [PATCH 1733/4088] seatd: update to 0.6.3.

---
 srcpkgs/seatd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index 96080de6af74..c619787ae3eb 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -1,17 +1,17 @@
 # Template file for 'seatd'
 pkgname=seatd
-version=0.5.0
+version=0.6.3
 revision=1
 build_style=meson
 configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"
-maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://kl.wtf/projects/seatd/"
 distfiles="https://git.sr.ht/~kennylevinsen/seatd/archive/${version}.tar.gz"
-checksum=274b56324fc81ca6002bc1cdd387668dee34a6e1063e5f3896805c3770948988
+checksum=5226850c163b485aebe71da0d3f4941761637e146a5c9393cb40c52617ad84a8
 system_groups=_seatd
 
 build_options="elogind"

From 977f056d672f87c8aa3246f2876a73ae7bd829ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 19 Oct 2021 20:17:59 -0400
Subject: [PATCH 1734/4088] chezmoi: update to 2.7.2.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index e14c903277db..5edb3dfec0da 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.7.1
+version=2.7.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=d80b301e1a25a67d9ada956a68532f0b23bd0627056c26685d977676d7bf7fe2
+checksum=0c02b70735ad7d8703b973644473228ca423eb1d01221dfd03f52cfd39b028ab
 
 export CGO_ENABLED=1
 

From 1fb8ed0df1dbde9293210f5e20f9d702a3b7fdc6 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 19 Oct 2021 19:44:34 +0200
Subject: [PATCH 1735/4088] remmina: update to 1.4.21.

---
 srcpkgs/remmina/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index e197e3e17dff..f32ced492ddf 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,6 +1,6 @@
 # Template file for 'remmina'
 pkgname=remmina
-version=1.4.20
+version=1.4.21
 revision=1
 wrksrc="Remmina-v${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://remmina.org"
 changelog="https://gitlab.com/Remmina/Remmina/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/Remmina/Remmina/-/archive/v${version}/Remmina-v${version}.tar.bz2"
-checksum=1778c6be04a45c67a5a825772d8491f1ed7b13c32f324aacb268f13d30b068a5
+checksum=766d72c4fcdb4a84a02bbf2cc22ea866742c1fcddc2781cbe7ec20402dee2189
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From 7ccfe02171276bb28829571f66c34780af4f3412 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 19 Oct 2021 20:34:43 -0400
Subject: [PATCH 1736/4088] zim: update to 0.74.2

---
 srcpkgs/zim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template
index ad7b7f1cc9c8..a6848a9f459c 100644
--- a/srcpkgs/zim/template
+++ b/srcpkgs/zim/template
@@ -1,7 +1,7 @@
 # Template file for 'zim'
 pkgname=zim
-version=0.74.1
-revision=2
+version=0.74.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-gobject python3-xdg gtk+3"
 depends="python3-gobject python3-xdg gtk+3 desktop-file-utils"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="http://zim-wiki.org/"
 changelog="https://raw.githubusercontent.com/zim-desktop-wiki/zim-desktop-wiki/master/CHANGELOG.md"
 distfiles="https://zim-wiki.org/downloads/zim-${version}.tar.gz"
-checksum=7ec748e308cf99d6c053a96e6945e422534fb2ad1387a3e444337e0860ed4b33
+checksum=b59c41969a6cda72d38523aadd6278da2510e0d1b52dbe3addbbc343e7636490

From 70d635cd93bd244f98297df2294e34ea93d08ac4 Mon Sep 17 00:00:00 2001
From: Javier Caballero <jacallo@protonmail.com>
Date: Tue, 19 Oct 2021 12:20:54 +0200
Subject: [PATCH 1737/4088] zutty: update to 0.10

---
 srcpkgs/zutty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zutty/template b/srcpkgs/zutty/template
index 8f8d61745f7e..b9fd40465216 100644
--- a/srcpkgs/zutty/template
+++ b/srcpkgs/zutty/template
@@ -1,6 +1,6 @@
 # Template file for 'zutty'
 pkgname=zutty
-version=0.9
+version=0.10
 revision=1
 build_style=waf3
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Javier Caballero <jacallo@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://tomscii.sig7.se/zutty"
 distfiles="https://github.com/tomszilagyi/zutty/archive/refs/tags/${version}.tar.gz"
-checksum=9aaf115a806114a793a6a423384781cada7a767efc209b6c6a59f3eddc942c3e
+checksum=a9604f4089a70fbd02ccd8b13b096309e0758b97bd3fa04ec912e2444acba79f
 
 post_patch() {
 	vsed -i wscript -e "s|, '-march=native', '-mtune=native'||g"

From 61012c83fd465cda8988c099b798d54b2f48fa87 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Mon, 18 Oct 2021 23:52:25 -0500
Subject: [PATCH 1738/4088] loksh: update to 7.0

---
 srcpkgs/loksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index 327ac3a7583d..634269418f41 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
 # Template file for 'loksh'
 pkgname=loksh
-version=6.9
+version=7.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="custom:Public Domain"
 homepage="https://github.com/dimkr/loksh"
 distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz"
-checksum=1633048cd5f1270c5fa28ab49d9cb9f7e8305ab6880601b0c15b88ecb92450f9
+checksum=413275c9a259629bbdb4ce97c610c45bc14a589f73cd51571ed82eec58e45840
 register_shell="/bin/loksh"
 
 alternatives="

From f7966706a5302f950b2d8d20b84d1f7b00eb7678 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Oct 2021 12:28:25 +0300
Subject: [PATCH 1739/4088] notcurses: update to 2.4.7.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0f401a0f8770..e4e63c33efc2 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.4.5
+version=2.4.7
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=e006c8d0a19d148d1fa779803e19145a7d8c5f1bf1f8e9e5d2c14a5e0d860343
+checksum=c79d960acc5233b8c61f45e4abad8037015258d697685ed106483692402b657f
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From cdcb212339aada6613864299cfaaa519049bd6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 20 Oct 2021 12:45:53 +0700
Subject: [PATCH 1740/4088] chroot-git: update to 2.33.1, allow git-clone local
 repository

---
 srcpkgs/chroot-git/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index cda37b356a55..66a46988cdcd 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
-revision=2
+version=2.33.1
+revision=1
 bootstrap=yes
 wrksrc="git-${version}"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
@@ -39,6 +39,8 @@ do_configure() {
 	GIT_PROVE_OPTS = $makejobs
 	# firstword (uname -m)
 	HOST_CPU = ${XBPS_TARGET_MACHINE%-musl}
+	SKIP_DASHED_BUILT_INS = Yes
+	gitexecdir = libexec/chroot-git
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -62,4 +64,8 @@ do_check() {
 
 do_install() {
 	vbin git chroot-git
+	vmkdir usr/libexec/chroot-git
+	ln -s ../../bin/chroot-git $DESTDIR/usr/libexec/chroot-git/git
+	ln -s git $DESTDIR/usr/libexec/chroot-git/git-upload-pack
+	ln -s git $DESTDIR/usr/libexec/chroot-git/git-receive-pack
 }

From d5c5f5e37f0039a1886379cceef2c6507d41bfe1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Oct 2021 13:55:10 +0200
Subject: [PATCH 1741/4088] perl-local-lib: update to 2.000028.

---
 srcpkgs/perl-local-lib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-local-lib/template b/srcpkgs/perl-local-lib/template
index 693dc6569f15..9990e7e7c0d4 100644
--- a/srcpkgs/perl-local-lib/template
+++ b/srcpkgs/perl-local-lib/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-local-lib'
 pkgname=perl-local-lib
-version=2.000027
+version=2.000028
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-checkdepends="$hostmakedepends"
 depends="$hostmakedepends"
+checkdepends="$hostmakedepends"
 short_desc="Create and use a local lib/ for perl modules with PERL5LIB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/local-lib"
 distfiles="${CPAN_SITE}/lib/HAARG/local-lib-${version}.tar.gz"
-checksum=dfbb57ac39d9afcdaa26c3e20fdfd89bcc9f20eb622160944e38d61fb3fc00b1
+checksum=408317d67a59f9f91e23e3000b82de4f529cf9cf0896e228f3a27d6f607bfe3d

From 6eea6bcbd90785ad76e86bb6ee1e97667f630d59 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Oct 2021 13:57:41 +0200
Subject: [PATCH 1742/4088] linux5.10: update to 5.10.75.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a523e44201d4..61e8572fd164 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.73
+version=5.10.75
 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=edb228032b23efa14077a68d968bc5b0d4026c1d1ef8bb958547a87ccb030e76
+checksum=0a2b2f5fefb90773190aaef4726ac363e03992aedc424b0a57eca092d084304b
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 9e3f663efdd46650a1831bb5c059fab92d953e4d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Oct 2021 14:01:09 +0200
Subject: [PATCH 1743/4088] janet: update to 1.18.1.

---
 srcpkgs/janet/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 5b88d6aa70f8..373b1475e233 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -8,8 +8,9 @@ short_desc="Dynamic Lisp dialect and bytecode VM"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://janet-lang.org/"
+changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=f2d751b3b6e1a1712aae0f639be7a76764469303a55ae5d8881d6535dbe3bd0e
+checksum=bfc29c11a070cc175666f74eb99ea992276d6e269701ba9558a72cef05ac80b4
 
 post_install() {
 	vlicense LICENSE

From 4afcd127100a770c458e99bddc6f166f0e1255e0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Oct 2021 14:15:40 +0200
Subject: [PATCH 1744/4088] New package: dune-2.9.1

---
 srcpkgs/dune/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/dune/template

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
new file mode 100644
index 000000000000..98a4c9a1324c
--- /dev/null
+++ b/srcpkgs/dune/template
@@ -0,0 +1,22 @@
+# Template file for 'dune'
+pkgname=dune
+version=2.9.1
+revision=1
+build_style=gnu-makefile
+make_build_target="release"
+makedepends="ocaml"
+depends="ocaml"
+short_desc="Composable build system for OCaml"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://dune.build/"
+distfiles="https://github.com/ocaml/dune/archive/refs/tags/${version}.tar.gz"
+checksum=493f8c95697620b1e84278dcf9b4466f63f0858b227417e87ec75d102af620c4
+nocross="ocaml"
+
+post_install() {
+	vmkdir usr/share
+	mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share
+	rm -r ${DESTDIR}/usr/doc
+	vlicense LICENSE.md
+}

From 5149f679edb612bcffc83d7edfbc7b4912f9fe91 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Oct 2021 17:05:39 +0200
Subject: [PATCH 1745/4088] coq: update to 8.14.0.

---
 srcpkgs/coq/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 503d994b5ff5..88bbe0631db0 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,14 +1,14 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.13.2
-revision=3
-hostmakedepends="camlp5 ocaml ocaml-findlib ocaml-num ocaml-zarith"
+version=8.14.0
+revision=1
+hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only"
 homepage="https://coq.inria.fr"
 distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=1e7793d8483f1e939f62df6749f843df967a15d843a4a5acb024904b76e25a14
+checksum=b1501d686c21836302191ae30f610cca57fb309214c126518ca009363ad2cd3c
 nopie=yes
 nocross=yes
 
@@ -18,13 +18,16 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 do_configure() {
-	./configure -prefix ${DESTDIR}/usr -coqide no
+	./configure -prefix /usr -coqide no
 }
 
 do_build() {
-	make
+	# can't find dllzarith.so else; also disable fatal deprecations
+	export OCAMLPARAM='I=/usr/lib/ocaml/zarith,_,w=-D'
+	dune build --display=short -p coq-core,coq-stdlib
 }
 
 do_install() {
-	make install
+	dune install coq-core coq-stdlib --prefix=/usr --destdir="$DESTDIR" \
+		--mandir=/usr/share/man --docdir=/usr/share/doc
 }

From f1452227538c5477bf02bc6c0d8737aaaea023ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Oct 2021 17:05:52 +0200
Subject: [PATCH 1746/4088] mathcomp: rebuild for coq-8.14.0.

---
 srcpkgs/mathcomp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index f2a424aacb92..68ce0bb70b22 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.12.0
-revision=5
+revision=6
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From b0267d242fbe3121495aa8cfc1aa34432fdc7ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Priner?= <jan@priner.net>
Date: Wed, 20 Oct 2021 20:01:14 +0200
Subject: [PATCH 1747/4088] New package: aspell-sk-2.01.2

---
 srcpkgs/aspell-sk/template | 13 +++++++++++++
 srcpkgs/aspell-sk/update   |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/aspell-sk/template
 create mode 100644 srcpkgs/aspell-sk/update

diff --git a/srcpkgs/aspell-sk/template b/srcpkgs/aspell-sk/template
new file mode 100644
index 000000000000..482afc262cd4
--- /dev/null
+++ b/srcpkgs/aspell-sk/template
@@ -0,0 +1,13 @@
+# Template file for 'aspell-sk'
+pkgname=aspell-sk
+version=2.01.2
+revision=1
+wrksrc="aspell6-sk-${version%.*}-${version##*.}"
+build_style=configure
+hostmakedepends="aspell-devel which"
+short_desc="Slovak dictionary for aspell"
+maintainer="Ján Priner <jan@priner.net>"
+license="LGPL-2.1-only, GPL-2.0-only, MPL-1.1"
+homepage="http://aspell.net/"
+distfiles="${GNU_SITE}/aspell/dict/sk/aspell6-sk-${version%.*}-${version##*.}.tar.bz2"
+checksum=c6a80a2989c305518e0d71af1196b7484fda26fe53be4e49eec7b15b76a860a6
diff --git a/srcpkgs/aspell-sk/update b/srcpkgs/aspell-sk/update
new file mode 100644
index 000000000000..930c9c56fce7
--- /dev/null
+++ b/srcpkgs/aspell-sk/update
@@ -0,0 +1 @@
+pattern="aspell6-sk-\K[\d.-]+(?=\.)"

From f85c5a305dd0179eae5a2becbbd4263a05186f53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:18:59 +0200
Subject: [PATCH 1748/4088] attica: update to 5.87.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 3bfa3b071fa6..311bb161e6d8 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=992ffe3743588b81a63dcb3886d406f63800423bd442e3b99058bfc80f0e467f
+checksum=b8a1a8427b721221a975eb5f078864246cdcbbfd97ca4e48d17280c72bcd4e72
 
 do_check() {
 	cd build

From 91f3a38c6842d669f02dfd125b47a3f43c5ab061 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:00 +0200
Subject: [PATCH 1749/4088] baloo5: update to 5.87.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index b47b17d471fb..ea9c3085f85f 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.86.0
+version=5.87.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=47ce609d9eb17375c5b0bbe3fc5d0137b3fc6c097bd1d942399ad42ff7ffa97c
+checksum=8b6b55a300acb33d51ebda930c53fea2c393032d897d4c084d016b3a8d85a540
 
 do_check() {
 	cd build

From e09787641ace75d024e2b666575c859d0a61df78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:02 +0200
Subject: [PATCH 1750/4088] bluez-qt5: update to 5.87.0.

---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index e9060287aed5..aa78fa25442a 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.86.0
+version=5.87.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d40edef8b29014fb18e8b2e81514c76fe46ebbbee109397611b18d58c52061fe
+checksum=9fa942a16768bea53bbdaa6563ca0a7f04cee1820318e04c04abbdd6621e13ea
 
 do_check() {
 	cd build

From 5690888f819b86dc92d450e9de88103b568cb2fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:03 +0200
Subject: [PATCH 1751/4088] breeze-icons: update to 5.87.0.

---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index e8a460e765b1..aa3fc924de21 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bcf6b3d09db3b61f4a6cc009acf202a097a57fd360bd5e4316a902f7754aeeb6
+checksum=10154828dfa90bc157e32092b91022aea3c01e92aba7c320a261816532b1c7a5
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From 38246a4b2023bd58527f2f477e3fb2bf89bfe9a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:05 +0200
Subject: [PATCH 1752/4088] extra-cmake-modules: update to 5.87.0.

---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index a4209640fb14..5979c837715c 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aacc5ccdc5799efe34e2dae33418c379466caf7c9802b78348ccfb5782fe6ab5
+checksum=541ca70d8e270614d19d8fd9e55f97b55fa1dc78d6538c6f6757be372ef8bcab
 python_version=3
 
 do_check() {

From d9bf0e63f4b299ad97a76ffd6d014cfbab87e2dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:06 +0200
Subject: [PATCH 1753/4088] frameworkintegration: update to 5.87.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index c2fad4862641..e0dc0749c593 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d44677cc3dff45584ab0fef72671a16dc0b45382dcb408e56c094f5feb352669
+checksum=8b0290d739b0d27f07a0aaa1c267a2b37614aa9847fec7c4cc4b21e11fee6fad
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 1af22d5aa89fb3c8020b93e43b80bbd0d147c228 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:08 +0200
Subject: [PATCH 1754/4088] kactivities5-stats: update to 5.87.0.

---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index ec3cb0fcf000..2a55999870c4 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.86.0
+version=5.87.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=3047fa192dd9af3cca372bb176e4ba00719ee2c373b3accb41bb5ab9fd91949b
+checksum=0604179842ab3a44018335769bf6b8981c1d1d40a176ad6db694f1c7ddfaf2d8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 284ff7d7fffe6a5ce1dc2612865be987fd57d362 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:09 +0200
Subject: [PATCH 1755/4088] kactivities5: update to 5.87.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 585f7b301bf2..84c839d3dbc9 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.86.0
+version=5.87.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=65d0b354b0f2fc51eaed94d64a7549ebec8f57a4de807a14799d3781fb2cb7e6
+checksum=e956e96a103f82ae62c62acc4ada41e116098781c7314bac65bc81d3d37bd6fa
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From ec720a697344c454fec63452354d19ac8c31582f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:11 +0200
Subject: [PATCH 1756/4088] kapidox: update to 5.87.0.

---
 srcpkgs/kapidox/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 5c5378e4415a..2791ebc2c660 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,7 +1,7 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.86.0
-revision=2
+version=5.87.0
+revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
 makedepends="python3-Jinja2 python3-yaml"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a50744b5247349a3beef4324c367c476597f53b73cb3b4de32fe21cfc1e7288
+checksum=4aee0c6676b5607153e4b1011448d5ff991c4769563552274fdc584a6252d447
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 7abe624140217335cd0449f0b76e0ae58d4ac08b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:12 +0200
Subject: [PATCH 1757/4088] karchive: update to 5.87.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 94549e894b25..4a89961ed108 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=13bfb0a07171bab829c3cb6760d60817608ba95802a4dfe0327cb2afb4616e9d
+checksum=103f2e8a60b50683ed626d3c9c29c99ced3c55d20a9f5d1cfd0a576e7dc61c35
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 381d1f2c67d70817576f7c69fc19f4101291c119 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:14 +0200
Subject: [PATCH 1758/4088] kauth: update to 5.87.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index b00964f6edd1..95a754df190d 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a63d6f8bcfa6b2ee80a215d65d6c51a251b64450ce14567e5a045919be0e2e9c
+checksum=f1d1c00af4d6ac139b34073bb5c308de9f5f81d5bb75a3a3ffc05ab10f2278bd
 
 do_check() {
 	cd build

From 1bd93a99e4d1e4f56b7f1e2a799aee72f7d661ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:15 +0200
Subject: [PATCH 1759/4088] kbookmarks: update to 5.87.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index cd9fe2cd4a2e..30191bc9990c 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=500a1a750ee8222999e8d6cd8108f881fcd91bd109804d46bf31412b194906a8
+checksum=dd268cb6d437cf74e46468561db465b32dac4e9c93a17113e83be1a62fd09c4e
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 819b26ae9e6e4084bb86befd52d3113f1955e1b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:17 +0200
Subject: [PATCH 1760/4088] kcalendarcore: update to 5.87.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 14a0e81bed19..258d0c686f4c 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9639ed7a650e3471d58b9fdb864975e365350c3198d89dcb101ea312d40cb2b4
+checksum=166054f2a4975263e83f00110d4345c53ce82bc63b9789618231b9dc1be0e245
 replaces="kcalcore>=0"
 
 do_check() {

From 223067b4d3814e90903e2f285adc20762973c8e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:18 +0200
Subject: [PATCH 1761/4088] kcmutils: update to 5.87.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 6112f9c7eb4d..82c8d6c5bc82 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a88797e60401a3524752df1bf5205a4bafac5d826e26df2c4d691fcd33e4ca4c
+checksum=30cccaf9a5e6f7505b3f5628d274bb8d07c46d42da758616e670cdfa848bec26
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 9f6f21e60b93cf3ee5b552ce8f41e156b9c4f4e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:19 +0200
Subject: [PATCH 1762/4088] kcodecs: update to 5.87.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index fbcb824d1962..807d2fd16e14 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2096cb5799732b3a953bacb6fcb0319b43f8a933d78691b9df28b50166b42b33
+checksum=0752156e85320731776f727ff171b2308e0f0c511efc4f2158dd763ed75368b9
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 194c0ceacfe73da6aef22c5f4de4c18f11c506bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:21 +0200
Subject: [PATCH 1763/4088] kcompletion: update to 5.87.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 58e92af9d79d..0661ff0c978d 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dec689554239e05186fe1114467732b939849a649f9526112954a8f599ba86a6
+checksum=7780670b0a1e62975a01d8b30f6bdefd820b6cd7543e29852f8e19fedad38995
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From 03419eea89fa564cc9c0a64f21234bc16d0a99bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:22 +0200
Subject: [PATCH 1764/4088] kconfig: update to 5.87.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 6420c0f09c42..c6c6d29b5716 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c177b3d6fb2761133042a1adcbc0eebe52719730333e2089424a5edd21e60417
+checksum=345bf5a68de968c3301aec16e1ec6eebd1c575a891464784aa0e177771e917d1
 
 do_check() {
 	cd build

From 7a3f25a408321e02e1c42de5957b844ee1f582af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:24 +0200
Subject: [PATCH 1765/4088] kconfigwidgets: update to 5.87.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 1a0d2075a107..c5bc4cb235f1 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e64c07ea6b8786365fd4ac174f9b29d1c3da58329184c27909c81c281c33044d
+checksum=04b5e518e25ba967d15d705a6170d16ccc34d918c9135f1117551d7429b6a3a2
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 8d3cd9a2c9ee3860d867a64bade263ffc7742e73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:25 +0200
Subject: [PATCH 1766/4088] kcontacts: update to 5.87.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 2eecb9a2b505..916ac01f74bb 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81b5bc05d6ff721cc16f92938dda505a1e0ba5c46c557e37f981b65309fdb3a3
+checksum=9bd17db7b520df1f3a45f26e40312cdf18158e66f610d656cfe214dd768efe0b
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 97c95158b11547913a02b5d7d9e737d583087b86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:26 +0200
Subject: [PATCH 1767/4088] kcoreaddons: update to 5.87.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index bff838d767a3..fdf957957345 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c63f3ebea0cf6c53334ad5a28ed2d278700a6d0e01a841ee8df5fa8c27729cd9
+checksum=d29fe93b58fec0edb3387d5bf5290366e64a5975df44c1b062cc4e29cfbfeda6
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 7055be34efe62a216acc175892635ac64a222d11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:28 +0200
Subject: [PATCH 1768/4088] kcrash: update to 5.87.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index efe7a209538d..a73a34ae0c5e 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b9e511f7d910a3a148e5fa9ff93012d9b318f71bf1568100c9e7734614c3d1b3
+checksum=5908d771dcd1387941424369ca3ae974de91910a37987d8ab69458bc8b6d88d0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From e7dadaf2bd043225930ba79830c066055403ce2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:29 +0200
Subject: [PATCH 1769/4088] kdav: update to 5.87.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 668f98f22dfc..eb71a3475129 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c3e5561f152cf8dcd47e30b7a03c292e8fba7fb4220c8a3d6e27709b4e5dfef2
+checksum=bfccf61a54c7ddf10448ce735ac414ad26c5c39c1f762b0a7f85e2db38786169
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a681d731ce99784b40c64bcb418f5753a6723cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:30 +0200
Subject: [PATCH 1770/4088] kdbusaddons: update to 5.87.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 9e6a0e613fca..8021ab7930a0 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bf24adf65457e4dbcba5309605aae67c73ee465cd8c83bddb5884e9af58ea050
+checksum=d75ca847fef7f324f97e7b3cdb45f7fa3cc2c36bd44ca35062589534d5ceb593
 
 do_check() {
 	cd build

From 201c0f865ef2914b3cd2e2306fee7975d2dc6c99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:32 +0200
Subject: [PATCH 1771/4088] kdeclarative: update to 5.87.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f70d7b4edd1a..9267372d08a8 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2dc9ace34de78e4eb78d6132578126b25cc67dce63c5f3adb535355f2335edb4
+checksum=6792f8ee5e255159d302ba8257b91e52a4ac5815fb7413fd73788f893555a47f
 
 do_check() {
 	cd build

From dca5b47b33c26cf9db4853e8ad7d64d50298050a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:33 +0200
Subject: [PATCH 1772/4088] kded: update to 5.87.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 75e42ff717f9..8d65bb958d88 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dc77534c1612b1232bcc52431bbdc8a4a46b095c90ba60c09a01e6404118a36a
+checksum=256bcaee8101bd3c9ec239bc3853fd8f7d5a98383858e509809a572a5a0bbca1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From cbf5d906ae557217f4b5d1cb335813a1be25f2b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:35 +0200
Subject: [PATCH 1773/4088] kdelibs4support: update to 5.87.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index bdce2bef92e6..2c8e92d25029 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=901d001d15c4963fd0b2431c823a038d3b0ea6333dbdcb27117deb6979dc42eb
+checksum=4e0ad7ecfafb1663b1eaa0e37068da0bb52d958687b5a1ac6f309fd49c397c9e
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From b9e746b20c78bb1d80bb86e8b425f36e13aab618 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:36 +0200
Subject: [PATCH 1774/4088] kdesignerplugin: update to 5.87.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index bf89eee6863a..377717bcc1eb 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=b4c35a1c5a3f62de0f728dde64142e811e01dd0bcb0605cf68924d17b3896e90
+checksum=a92af15be904629fc98c21fa31f132d3697f62df33af5e37f3ac70f3369e2c8b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 07b944bcb492aebc6845c13eabcd52cddb45b238 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:38 +0200
Subject: [PATCH 1775/4088] kdesu: update to 5.87.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index e836800af275..2b540003d685 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=88f6f6eae168dde81d52255c1fb80178ae101c6840892bea644137fac18bb521
+checksum=795a4f2a8b7b530dfcd40021d506d0e4e6acd05acf1a7c08704102b0181c6b15
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 403c5d9547844c4978cfb71d7aa637686ff93143 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:39 +0200
Subject: [PATCH 1776/4088] kdewebkit: update to 5.87.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index e1cc94311e6d..33e1b4ca728f 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=616ffeef4dfebe81d0b6e64ad90de9fb2cac8aa0c0d4ece9e44fd68419dd7a6f
+checksum=9bfd758cdb443eb15c46b7990d5dcef690c75b3c83c19c99dfe23a6b9446a7a8
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 86e88d886eda12a5facfbfac0878520c7cd47066 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:40 +0200
Subject: [PATCH 1777/4088] kdnssd: update to 5.87.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 635bcd06662d..e2ec00ba808f 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=72e44e60b74954b30acdf20a07ad0fe339cddd726df5c68b8c138edac797a3a0
+checksum=dc3693968a0e699617fa2191add6114e39a3a01e9b6dcb90ff6a878acb8948e7
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 7a8f51fc9733c2065011b65d7a40a6dc5c7d04c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:42 +0200
Subject: [PATCH 1778/4088] kdoctools: update to 5.87.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 435c1faac2ba..ebcabd8e61e0 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9dd2a9e3930875f95b1d8e907fdc01c19d19f484d6e70c19c8f26c9aaac4b18e
+checksum=fa0e84b1298f2d85ac31cf3fdc4282b463f43a68483795de3098ec5a76e4a555
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From 04b258fa27e6658fa0cd2aff2341806f2b970b34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:43 +0200
Subject: [PATCH 1779/4088] kemoticons: update to 5.87.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 3812153d539e..90b95dbe0b19 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad2729ef49fd18a0d743e4137d9033246b1b3ffc599d219d768c6bb54ba7cf52
+checksum=befc25576de12ebf7a167f754bf962a504f7049a22c60c40aab6a70e34375045
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 6cb7fef93eb2fd649937a00ffc91e92e6b408486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:45 +0200
Subject: [PATCH 1780/4088] kfilemetadata5: update to 5.87.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index b4cd7e858bb3..eafb144b2aa5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.86.0
+version=5.87.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=6a72d90c6f0017cfaeea372817a4d271eaf3cc42fd09a1bab04790136d5251cf
+checksum=51703dab11c7847180ce1d0ca62d3bc7ed3dba3992a4ef3ec2081596ef7f04da
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 2decbb9424c2c9dc11d006dbad8d55a4169bcdd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:46 +0200
Subject: [PATCH 1781/4088] kglobalaccel: update to 5.87.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 680dd2148bc4..339c46f0cdae 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92c17c821143d7314264446c9df7596dad29c51c79ab6596280103e8ba61c172
+checksum=502e7f16eed132837e87c469cbdda474cd0d396075e6c519557b526f70af66f2
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From f430e9ff1701d640d634394f6dc713c64822d530 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:47 +0200
Subject: [PATCH 1782/4088] kguiaddons: update to 5.87.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index b0084a240f38..7ec31b64b3b7 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f9834bb3d9c83ca78b45bfa70bb02aa6b4c76ba472dd886b03febc75ba43e7f
+checksum=90067fd81f6f25b0c5a1284c993fd04ea7212e33cf678744076935e484e808cd
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From c39de2076baa0909f15a2c602d97ce3dbe310f6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:49 +0200
Subject: [PATCH 1783/4088] kholidays: update to 5.87.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 26fbfe2b1bab..7783a6a7b1e5 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=673d53f079c0338193f0467816650653c2394563548e96cc10d39afc15bd0bdb
+checksum=f5bfb0cd8668ceab5494bc72ee59a4e2a97ab735813ba1b70b34735ee70e45b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 95e6e5429b02aaac74bd825b0cc9b443b5d983b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:51 +0200
Subject: [PATCH 1784/4088] khtml: update to 5.87.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index e1f77b396233..09e209e8046e 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=146e0c7f9c460f5b38da129d2e312703a703c95d2d5e2b58cd5806a2088306a3
+checksum=ced877bde898192bf96694c0c8598197d29931782ed8f2409f1165c2bffdb7cb
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 447162309381a4fe820b436f4f21666a42d88c73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:52 +0200
Subject: [PATCH 1785/4088] ki18n: update to 5.87.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index d0e339df8436..6503d8c0493f 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b8d9ea53b75e79a5b003af89771371d0748cdfe9dd0b3ae7209aa959ce41bcd1
+checksum=115e79ec5cc4825a1f9f6783f6e6da0d56d02feddc89f51ce9e7c205199c250d
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From ed4aaf11cf746e7177b09f099174d7eaa15cc58d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:53 +0200
Subject: [PATCH 1786/4088] kiconthemes: update to 5.87.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 397aca393e0f..2e5f19bb7b6c 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0613de454b07961d75e5e36a0c799e58b318c13e74e524474fa3b0668ad540e9
+checksum=471ac6e36661d95d6ae966bb0357478dad2ae876b1f5e092e71d9a36fc589011
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From a48220796bbea62c15cb4e92a9d4a52686f5bd72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:55 +0200
Subject: [PATCH 1787/4088] kidletime: update to 5.87.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index c09f9570c1d7..0c4a1f4e3c0e 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5b5f3436f7639d86f7b8cafc50771d3933c3fe972bb15ab0f8ec0f97200bb383
+checksum=1707318cc5b3b88558607fdb9e81d8dc0f817fa50ebd41e9ac8db014053017d4
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 59b5363e1ebe78b970046b9e611dbb87b0d0612b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:56 +0200
Subject: [PATCH 1788/4088] kimageformats: update to 5.87.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index cd9a46c6d0e6..6c24357528f3 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a5b92d6ea22911a68c3fc52913fc0840e4bd5943779c504ad4bcd620a0b9a985
+checksum=af6efb6232b8de670691f1983c26e385a64c9f5339d67ae004e97f6864c19830

From 2cb570bdb2ba561cc1308191a84862db30073da7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:19:58 +0200
Subject: [PATCH 1789/4088] kinit: update to 5.87.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8885548380fe..75863a15a2db 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=270a391b20b7ca4b747115ee99f1a5508ecd02dfbc1efefe81e79cd03be2d568
+checksum=ba07d4bd871d0ed0e758fb8d74f68e08e1a68aae71312c105e4fe908b7d76510
 
 kinit-devel_package() {
 	short_desc+=" - development"

From 5a3ff232c7e1a9d25242d14d855c3440710a6bb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:00 +0200
Subject: [PATCH 1790/4088] kio: update to 5.87.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 289c36c3a700..6911c8d6ed42 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d699faf3561c08c0cfee507c9a009b8be1ceacadce67c22151c4879d33cf7e06
+checksum=b91ed59de09c3b69c1eb50e6df2e087d912bda06a5d394763aa6e2e936cebc6b
 
 do_check() {
 	cd build

From 3c51f44906637ce86de8411f8c62fda233ea2c92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:01 +0200
Subject: [PATCH 1791/4088] kirigami2: update to 5.87.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index be2f9d92ac67..850779f941c5 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=ceec43a85c5d80b0fea3859bb0c152ead1209d0a62232832ce06be223b8c7de6
+checksum=f1876cc3d0774ea3a6f44f177ea5d86742f952eab4d2ac4498a1b5b0ac0572f3
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From f8daf66467a2e7234e6fc70d11f049a7c52a2b0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:03 +0200
Subject: [PATCH 1792/4088] kitemmodels: update to 5.87.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 3f297d88acc4..f1f1da35f174 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4fd951a84e6c634601b90802f8ab903cd187643785d8bb3e5556af77f586f216
+checksum=22f139281ba32a15d3721168dc08e496d80f9894182967ac455873bbdc45a7e3
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From e16840e7e6d00b924d057987d37882c981c9a4cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:04 +0200
Subject: [PATCH 1793/4088] kitemviews: update to 5.87.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 64317f84660d..da5e3632bdfa 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6c261b76d9eebf665624691db664936d155cdf55ac70a7a2ad1f2ab360ff5d7
+checksum=6f51463ae83f40df23d86037c5cda11caa862651178d796ca02e0de6ad482fdb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From c7236bbb9f3edee5dd29dbe1abade16f9b6c6192 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:05 +0200
Subject: [PATCH 1794/4088] kjobwidgets: update to 5.87.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 0e90dc48cd4a..2676389cc98f 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6b18a885e9eaa221309272d19a7c88fcd21ed85a6f83ec44b3ea12277c0ba74a
+checksum=e56b845f6b609255420f6558d58b844dff68a35d67b67d78b98919f67c230f68
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 5dc9659596c45d67055707a69b498f43262d3ca9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:07 +0200
Subject: [PATCH 1795/4088] kjs: update to 5.87.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 38ec01e3181d..f1df50e28152 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=e2e13dc5136714f48159b83d568f855dbd49a5e9a1dffe4ca97d2bdf85fa653e
+checksum=e879d3f1df4facb42abc87c0fa5a8958d4ea63962d2ff19caf56cc319f841cc6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 35593b49cef4e3aae1d55d761063aa61048d931f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:08 +0200
Subject: [PATCH 1796/4088] kjsembed: update to 5.87.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2aa9f9626d1b..18c65e10a9c6 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=b734c14e69f1acf4708bbb801f3c3b8981f178b8baae994e9065782089805ae1
+checksum=fb45291488b2701401d6af0bcd9c85664fcf3d21c7b83f28c4a26f34cf300b49
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 806ed1f1b11b42f44deb4a18e47ea1f0ded56b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:10 +0200
Subject: [PATCH 1797/4088] kmediaplayer: update to 5.87.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index b6cee97f8330..aa5ae2daf50b 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=24abfad30bf92999e6086f2f13aee2333459cfd8c561872e75a906bb587a4ba0
+checksum=08dc7bd0da35fa6612bbdb8f9f1dc83550a6112370a77563da48564ef0593557
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From c335fe580bc90cb1978e207025b8e93607190c9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:11 +0200
Subject: [PATCH 1798/4088] knewstuff: update to 5.87.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 0a08c8fd428f..ff9d5e5581ba 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26f8b88add9050201e7871349adb3996d75d1ab047aa1a24279743e1425b75b0
+checksum=98f483edc5ac72cf70b40e9b9c571482d258f114ce0a75e47866d09147a6d176
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From caad86a6f45731ee42756c037e1a31ffb80ffa03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:13 +0200
Subject: [PATCH 1799/4088] knotifications: update to 5.87.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 8ea3d638e80d..744fc9c4fa85 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ea178707fe6d402aa576f651502d82107b216c664992f5c160ba521e645d5034
+checksum=830583877f13dfd8c7fc512151ab23b7a34fa0a8229e144b1bff5b1a2253f90f
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 54da7f6ed621538cc61a6482144c7f4699607615 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:14 +0200
Subject: [PATCH 1800/4088] knotifyconfig: update to 5.87.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 4883a87fb8eb..989cf70a5746 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da8510aa59d3f26900ff89b94d7c8affdeb2b297fbe9ade53e8dde1303d48bea
+checksum=f03d30525b7fcdcf81071f647cef66c9306ede76ead6e546edb108f3e4f7a549
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 83cca95d8afd01d0cd075ec836b4cf293a3f865e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:15 +0200
Subject: [PATCH 1801/4088] kpackage: update to 5.87.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 6f52a0d349bc..5a0c1833861a 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2b3ca304ed7397f03aa71d5cfc11a7877e9fe9f8fb72aad26e80ee2f0815a2cf
+checksum=5eb749573a5ab5e2489d7409a11a616629f97f6e5e98cfea0164d6ee5790b0b6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From a71211db7af03e9d5723bb62b8c03c018dd53c7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:17 +0200
Subject: [PATCH 1802/4088] kparts: update to 5.87.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 0f62f2ea7022..de1567c81806 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=40bd41a970c9a85d38a31e243f4db49b867e75b509d2c6591a4c7d1eb2720120
+checksum=f12dd7de3aa7a7130240e2e29354bb3738fe559989a61638b876c3a9f3f6b24a
 
 do_check() {
 	: # test can not find packages assets?!

From cf887cbd62a6f58bd12ec7b277f5364e68d8f54e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:18 +0200
Subject: [PATCH 1803/4088] kpeople: update to 5.87.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 14d182842f3d..8af9b62ab559 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d0e11c56966c34a55c86de5e90d738c28c23a133844dca6dc2624d5a63d079f9
+checksum=2aa8a2304fcc30595736c4e810467777e5bbce3e301af4439669ffecbbb35800
 
 do_check() {
 	cd build

From 844b3eabaeabbbac74a89f686a86f2c6121c378d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:19 +0200
Subject: [PATCH 1804/4088] kplotting: update to 5.87.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 6a15e8754d93..9095a8374d17 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce4e24d85274565f409451d4ccc25b0d8755e7c63b0eed9b0f5ff6b3351209b
+checksum=bfd3feafc5a2ea0e68df8feca1d2ad8ce17f509e2189a904fad036da33cee6da
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From d2b2d86d09956d8d08ae3888c884246bf168e656 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:21 +0200
Subject: [PATCH 1805/4088] kpty: update to 5.87.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 48ad46b45afb..45ad74fc7a0d 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754accb56308b4c07a38294d3e873d90ec9471448a572a05ed2a8d298615ece5
+checksum=918acfe51a0b895a64d858c84eb16a659c2a76f92c731a5dbdeb813a8aa4a2e1
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 332c20352e19ac23bc02c680322599c7e1fe7e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:22 +0200
Subject: [PATCH 1806/4088] kquickcharts: update to 5.87.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 8a347cb0f52a..d65b81fa6cea 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=07437496afc19263268f937d5b24a303fbd19356d3367f5f03e0a2342df30db0
+checksum=6833af044f9150fba61ac09fa5cd2d67860f9c7c6ed0625d8dee2618398da4b7
 
 do_check() {
 	cd build

From d5463946c8e8ae37da550d9a53bf122b7cb00a61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:24 +0200
Subject: [PATCH 1807/4088] kross: update to 5.87.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 21926ee1ca8f..4015c0fb4e82 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ae3d01e229893bbe97442e8ad151ff84ab0011158d5b58849e70a01ecb60fdf4
+checksum=d0dd2d2a065245e2deef1d4ae6d5da0191f2ff66ecc8fd8a27060cb28ea1deda
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f5c14dd05d746485d454dc1d547dd0173fa855be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:25 +0200
Subject: [PATCH 1808/4088] krunner: update to 5.87.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index b1475d6389f1..9c61999b1775 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5161b7d62ded9299c9e08c994a1e74880445e6a84c46709961d55e51bf0ea39d
+checksum=3aac094456fc3da851f58842604a28bebafaf4ef05359aa102e3f6e4a272f879
 
 do_check() {
 	cd build

From a137174f381212a0a806814602ec09ec9aa78f28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:26 +0200
Subject: [PATCH 1809/4088] kservice: update to 5.87.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index c0241bf6014e..a8e0b367a03a 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=46e1a212d8e0be9f046543b4284ea5e6ed7ba4aabff564b3992bdff6affbd93a
+checksum=b657640c4d93bb18af16b3053f7e7532e89021ba079de079f21cffc521666e28
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 0ab23fd1af2f14fc7742b4e6634d9cb36db226e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:28 +0200
Subject: [PATCH 1810/4088] ksolid: update to 5.87.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 0c8ac6c2f4cb..5d36eeb018c1 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.86.0
+version=5.87.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a0862c0c78102705be5f36b2b45e2e2ceb0d7e443dc3251dbd7baf03f3218b6d
+checksum=2a63b8a5866ee206337c1c7c6dfd62fe110dd9e6cf0197521a4992eb3361ac7e
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 81f20c975e8c19ec52abd6de6d0f04dd981fb3f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:30 +0200
Subject: [PATCH 1811/4088] ktexteditor: update to 5.87.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index eb6205633deb..94d3a8058b65 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6283fee0dbf2e342b227026a98acfb5eecfe54dc26791e22a77271b07542eeb8
+checksum=2f1f552f57c33dc213320d61c8b5e8470aa75e08aaf80c563773dcfd85e3b68d
 
 do_check() {
 	cd build

From fa62b4b3531dab0dbc47ee697935f2bc3a38c1c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:31 +0200
Subject: [PATCH 1812/4088] ktextwidgets: update to 5.87.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index cb80a285d8ed..9a4c34885e83 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d61fbad6bf7ce7890d94ba15d4ae257f4af4a8465f8ce78c6ffb787827c1bcc1
+checksum=d9a5d3049ec1aab8a74fb1f83f998566195544024f33a92f45d938c911c7f511
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 7cd21fa19ba7d8f39c9b78399b5105ef40251a86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:32 +0200
Subject: [PATCH 1813/4088] kunitconversion: update to 5.87.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 6c39b9b2841c..626aac2a36b8 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fc94a03f67120338a1f0585ff41b6fea44d99cae0f7c4df84f8859b1ab3f7ceb
+checksum=90fc2f3b69fd6705454e83bfc5451b1059f33bddca1749e29113641b81debeac
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 3a817d50f3d35b4b551c79a69639644ab174b576 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:34 +0200
Subject: [PATCH 1814/4088] kwallet: update to 5.87.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 92869a853b7c..58998bdbc360 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bf2454166bbc007893355ad0351fc40b0daa94b0402a14b9ffdb9859297ad1c
+checksum=59f13a6c9e0933e3e54c62a77717aa182be573f890a09e34369043e3208f58a8
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From f765eb717c6d4476c3d3a4381a08001703e3bf30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:35 +0200
Subject: [PATCH 1815/4088] kwayland: update to 5.87.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index accff3535ab9..fb34fbf5803c 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=863b41de1b3a22d129b01a05b15fd113bf56f4c703dd9addef49c54c3b253da3
+checksum=ac3aab3018e0910213c44a2ad219fd551d3ad2cbb1010adc20720db6f3a5990e
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From b61942543e9d03aba9955b95409bd3a6f80194e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:37 +0200
Subject: [PATCH 1816/4088] kwidgetsaddons: update to 5.87.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0c3b54c676..730a231f7900 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3fbeb744246aae6cc5c4bb0f7cd53f3976d75ea568aacad7d09c92b8b0f795fb
+checksum=2b119b3f886131009d24e139a313fb27c2ed3f681534d9297ade40153b4dfb01
 
 do_check() {
 	cd build

From 357bdd69e13cdd3418dc479ef36811468db740a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:38 +0200
Subject: [PATCH 1817/4088] kwindowsystem: update to 5.87.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 4699d6deb8ec..f17c6ebbde7f 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=86b88730c9a6f971ad0c8115879e9777ae503bef13323ffb53e42b2442936595
+checksum=424962f23bd03188ef2bb5854e77cac90b6b70632fcc1ccbed86bc72b9bab567
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 7164cbb9a5e676010bd4101dc02dbfb2d7da46ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:40 +0200
Subject: [PATCH 1818/4088] kxmlgui: update to 5.87.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 20154332d2b9..8193262f893e 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10dcee6b2e1a7808f9087861968c5918f43f8778e6e4b7b98069dfab3b9e1379
+checksum=b1185b12fe79efac59fe17398d6640c61e571575ca0d25ea80f15d2d33d0daf2
 
 do_check() {
 	cd build

From e3b688512e8e60123b5f6ace61f5f0621235a981 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:41 +0200
Subject: [PATCH 1819/4088] kxmlrpcclient: update to 5.87.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 9cfdec1868d2..94753a1f6a15 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d852eab538b2a2dc1921b9ebcd7b89a5f246a67a7d5e083440c550c7992f5b8d
+checksum=a7298f56d5b3997b3765116ec1e3f09e315b21ca004c0d03e0c3894289fe850e
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From b3ab32f0c744e566796706694e2d1559268c8d1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:42 +0200
Subject: [PATCH 1820/4088] modemmanager-qt5: update to 5.87.0.

---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index 05dc69abf528..fa633204a812 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.86.0
+version=5.87.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a34ec0f65280437842dc3b391045412df7ab2f69eb70c5d03772bb9cf8e8ab5d
+checksum=33834799edfb33f015a884830b56014830fc34229fee36e27c2335084546e9a9
 
 do_check() {
 	cd build

From dc7689f8cd80d2a4be114c4c5b7a2f686612de22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:20:44 +0200
Subject: [PATCH 1821/4088] networkmanager-qt5: update to 5.87.0.

---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index eea0b71842b9..f4dbf9aeea45 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.86.0
+version=5.87.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=5bdcabf2dbf476c3f1253097efa4ac37274b7aa2e68545fb0f630c66db733fc0
+checksum=bed4f9300adda630311721b50a5f306b55ac4ac720132675f0d955842aeb9a28
 
 do_check() {
 	cd build

From 2cb6fe3205c496d9d6fb253290f76fe55070d225 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:18 +0200
Subject: [PATCH 1822/4088] oxygen-icons5: update to 5.87.0.

---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index d0bcc72aecac..2a435f96ec18 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a2acd0ae5fde26f4d9ac32c0e18ec48f99b881e91e35adfc75a0b01ab8e1f6d1
+checksum=d50c6615f03e22fd1551137430fddcd38b6942aaf77570c765814e6baad8fd56
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 44db23ed17db35af9d31ceda3b3a4f82aabe9f3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:20 +0200
Subject: [PATCH 1823/4088] plasma-framework: update to 5.87.0.

---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 57936e20b720..cdc267b104ee 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=304715e0261370a97bc15b8fc57f2d4b9145787ba133fbdd078308c031eeae9d
+checksum=4b2ad68437b22647d4c29813176b9e1a199e78b1d49f64959b36a325cf22fcf8
 
 do_check() {
 	cd build

From b756bde312764ad82f6a372f7dada0072331e9c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:21 +0200
Subject: [PATCH 1824/4088] prison: update to 5.87.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index fceda931097d..a8366261631f 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=2252f6c4778bfbe85eba0cbe3b18f66e1c879b40ea73cf5db87f34c4d5e851dc
+checksum=07694637a1463882b4108fa6c8283324b35ffe471c27cfaa25fb0cf589b7686d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 357c84899e54a3cca50feee8700d89e9aabde1c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:23 +0200
Subject: [PATCH 1825/4088] purpose: update to 5.87.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 67e15374f1b8..618128e2ca10 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6722e6fbef07d57742951a15dd2b7e8235a72aebc48b1e26df2721633d8cbba3
+checksum=4dc3c6984216fbfd00f4754832e75cc51a90f426ce7d39611137f451a1a8b735
 
 do_check() {
 	cd build

From 673a7a3d10891174c5a2cc7f46c98c1f27be8397 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:24 +0200
Subject: [PATCH 1826/4088] qqc2-desktop-style: update to 5.87.0.

---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index d61c662a6949..e8a0aa3cf21e 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=db52cdee3888b81af3bf4fbbf4f47968bfb774b57c5f3b73cf0aef052990a8f9
+checksum=07ab65d080f7f3a6d9076d90b72e9dfb3f3a6caa4e01472a1d261ef7cacb240a
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9dccb0e3199546ec01395c01e09c505bce3af634 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:26 +0200
Subject: [PATCH 1827/4088] sonnet: update to 5.87.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index da24f9b630ce..1822741cf867 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=12fcb1bab11cde11b14eb20a415bc5112170f68e90ca05a36885b8b05a16a367
+checksum=1ad6fe55c06eeed600511be34a374aa46e1cb1e5fea8007255468fa1679289b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From 7b3d6fea0964f65f17f6a5137bac36e1d1c5eb17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:27 +0200
Subject: [PATCH 1828/4088] syndication: update to 5.87.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 1f974d102d40..cd9069184b6f 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=ee34b1fd872fd6a1badc4f7ea880abfb6b0e61374f4b117fa3a1e38ed79b6b8e
+checksum=7a21f7c335425421695fcb290a3f5037d8b4c9b946377b7200f3e357f5407af5
 
 syndication-devel_package() {
 	short_desc+=" - development"

From fb697f0c16771eaa8f1cb481a22af99d55846907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:29 +0200
Subject: [PATCH 1829/4088] syntax-highlighting: update to 5.87.0.

---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 16e7aece8277..8c9a261f250d 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e300a5eb56c57b7a576059337c29aba7191c4971a4b9f5c739e211b83791010d
+checksum=26625bea8cd015520c74375ce9e5a23e13daf5bd6cf4502adb9f4fd9f0a81c91
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From b5ce21c68c7693b8f4a4faa5ce8bd009d3610632 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 17:21:30 +0200
Subject: [PATCH 1830/4088] threadweaver: update to 5.87.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 82bae91520f4..d9d9649c912f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.86.0
+version=5.87.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=84dcbe648e2960084b13ad59a88dd7ed7fee0305351b015345d59848072e64be
+checksum=904db85af3f4cf5a7b0125264926d83405489feec66cacf675c67019c5fe17bf
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 5b9ea24c1c1de960a76559b714d82747e7aaa95f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:00:59 +0200
Subject: [PATCH 1831/4088] bluedevil: update to 5.23.1

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 5103871f4a23..57947bd524ec 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a21094de5445e662786ab7ce7274106f9bd8a25233de363eea73403ce62fcc05
+checksum=2a3f42ee03d342673ac5ab4f91fd858f5d0003b798257d6cb7304c79c40eb4bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 5d7fda0401207027f620e57bd22cb65baa384be9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:00 +0200
Subject: [PATCH 1832/4088] breeze-gtk: update to 5.23.1

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index f4098a22eafe..ce4918174377 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c23bd1810cc491264b376f2e0187c48b4d979e2aaded7061792c35c54fd22e52
+checksum=50667357732aced49eec270e875546bf56a4e3a945d575c2d95a946aa055d287
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 53ec72a061abce262935bca7e07ad7c0fc9fa68f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:09 +0200
Subject: [PATCH 1833/4088] breeze: update to 5.23.1

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 0ccfbb038680..590391710055 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3fc4ca04cc0df694ab90fa4f9e8ca72512adae2c0320ce3f9702dddda029426
+checksum=ac11dc5f9347d870cbe33f2452bbc738e92e9d3dfc2dc8c2f5c0896476181481
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From bec388cc8b1d02b44864bbc4629eea405d219b07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:11 +0200
Subject: [PATCH 1834/4088] kactivitymanagerd: update to 5.23.1

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 5f3f89b22c02..1d021ff9618c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=22ab64377d595e0384285d95fe21464ab63a7644d2303cc0002b495f85412a19
+checksum=eabc518b1476f17257c6f42c986611604903aa9efc42d35fd9d3fd15839fea09

From 0802b1798eb3f88adfc018ea95b21258e0dfa5d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:12 +0200
Subject: [PATCH 1835/4088] kde-cli-tools: update to 5.23.1

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 50e5c22637bf..36d980ff6e80 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90cb373ea112b844541d9c52000635b02ccdf2fe2da0fc7901b1a5a8b8df45ca
+checksum=da1a08c54b3e085916c5157e1339ccb397e41dbfd68ce3334591e0ddbed0a7e2
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 59d4c0b5443c0377bf3751fcd9de0fa0d26f530b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:13 +0200
Subject: [PATCH 1836/4088] kde-gtk-config5: update to 5.23.1

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2b35f789a070..bb1b0f47bd99 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.5
+version=5.23.1
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=daf8ca2d5e3e3986a478238bcc6d22cc750e20ea37ce198e1f7ef1d88c971e6c
+checksum=7dd978c591892052e79c19190fde98cca8a6e57da5a4bf72253262c36c36573c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From cc8b12ec77e30acb7b7e70b06ff8747ec40aabd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:14 +0200
Subject: [PATCH 1837/4088] kdecoration: update to 5.23.1

---
 common/shlibs                | 2 +-
 srcpkgs/kdecoration/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6b97d658c44a..86b2920c2bbe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -935,7 +935,7 @@ libsuil-0.so.0 suil-0.6.4_1
 libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
-libkdecorations2private.so.8 kdecoration-5.21.0_1
+libkdecorations2private.so.9 kdecoration-5.23.0_1
 libGlacier2.so.37 libIce-3.7.5_2
 libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_2
 libIce.so.37 libIce-3.7.5_2
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 012710d99d3f..4e77671eb171 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b577202eefaad7b95e701c1ce14108fbfe4ae6fd73ce46c369a2a7a329211bef
+checksum=1587aeab3743cb426318d4639e53b81c6227d114fc96b082b897cde6a2b0c327
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 275a7d188b390deec2c1eec3f5a1251be5a98e2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:15 +0200
Subject: [PATCH 1838/4088] kdeplasma-addons5: update to 5.23.1

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 91c16ea3d2fe..20d038f8c366 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.5
+version=5.23.1
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=6240bb29e3e23374e193659b50b21ddf1448b3f5f88fb15094d029d6b1643103
+checksum=84ee5a39458f767cb0f1304bcffa556e99119b7d6ae7556b0c310c2284ccd988
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 425ddbbca47f6c6597ba25b6c3a0bb77a7762d9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:16 +0200
Subject: [PATCH 1839/4088] kgamma5: update to 5.23.1

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 4a593f0786c7..2a7917237030 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0210777ada99795086d7ec348143e4f0e48089dd15fd30f09eb68d3739275054
+checksum=cf756d0ad3ae1803830372a2b1ce7c9e23533bd7aa4aa0ddc1a1d8fe60c3a585
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From 8a050ce65cbf872c0a6c043cdef40e585786b28a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:18 +0200
Subject: [PATCH 1840/4088] khotkeys: update to 5.23.1

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index dcab98ae6b5f..75764b01232c 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64e1c561ca124209a6be7647aa400f2b8ce67dd6fa578442d551d2ba0e4e17d0
+checksum=dae80968b6d2310b6eaad2e0786adb7a9047d4e9fe8fa5bf71586796f9bbe84f
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 387b8117b25fe146794b4f2c626d8d0734dc5db6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:19 +0200
Subject: [PATCH 1841/4088] kinfocenter: update to 5.23.1

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 3968a1b20e53..0e806b6f1327 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=951e42305ce4aaf709fca5e211e9fc4f2ddbbdba2417192f755a190fe325b9df
+checksum=e12f892612a4be07945b85df90463f7e0c36d24159393d4f60279aa97605c904
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 729c0668e7a0ea1f6ecacf8499ff44a5dcd97482 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:20 +0200
Subject: [PATCH 1842/4088] kmenuedit: update to 5.23.1

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index cdc25285a0c3..3f303705fe04 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1ad7f0e64b5088e16f61150d5936ece570410b17fb32d02bb7ec71d420c0c8c6
+checksum=f34227aba3af95ac1d24b00cb587590490c4b9b9ca83d0c66d302ea74eaf9188

From 10a2cf61fce00d6918795796b639f81ff997f90b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:22 +0200
Subject: [PATCH 1843/4088] kscreen: update to 5.23.1

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 14f331208e4a..be1bd4870afd 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6bfab1f10532599e16d1112e794626b105b4c80c41659665ffdf710bc29d1e60
+checksum=af143f2d3b25478437ff894b0afe094a69df8dab055bba3c6311d0735f431fc9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 2c6564929a8a4bde947cb80aa9a8c8d6a6cbe428 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:23 +0200
Subject: [PATCH 1844/4088] kscreenlocker: update to 5.23.1

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index d25c3b71b51d..1c9408bcbc9a 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=28edcf841db79554ac113c8619d20f978b2ab81bfd5d5be25f973506f262f180
+checksum=a0c41353285b41372eecce77d643e3332a34a391c52fb44064498f4321abb563
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 94ea0ca1b2bf70e57a1f636b172cae3f0a11acc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:25 +0200
Subject: [PATCH 1845/4088] ksshaskpass: update to 5.23.1

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 07e767350dd8..fe1bf64603d7 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f7dd2fa8d28ac4a673a9af0694f73c96caea63ae96ad836b9aa7a8055067e245
+checksum=c1ab89e8c5f592a3bf54d6ee3ff733e8406a865ff126b9c5440638a14b0aeb2b
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 398e6f07b1c0d953b70f9a2578a89b902e472a91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:27 +0200
Subject: [PATCH 1846/4088] ksystemstats: update to 5.23.1

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 6a86a197e5cc..14b5c023b9c3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=683df0bb88d237a4dffe0b438c1796db4bb4d267d42d6363fc491a69f98265b1
+checksum=e603659096d6f1da02dd8aa68f7ed211c0ce84f49450c8d769e567480f786a7e

From 38a15ed01345110dc9206c0ec42ed3608447c0cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:28 +0200
Subject: [PATCH 1847/4088] kwallet-pam: update to 5.23.1

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 897ff27145e7..f423dc38c98a 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d8a2a7408e8eefa2b3cc1aa22d130f90ae4bd67c716f290f295a05d5de14320f
+checksum=63661188dae40e708e516de2611cf05e1d899a0f060995b27067107aa0645e0a

From 38f54c5a72979db1719c5414766422766dec84b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:30 +0200
Subject: [PATCH 1848/4088] kwayland-integration: update to 5.23.1

---
 srcpkgs/kwayland-integration/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 17972be987c9..c70e37cf48a1 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,14 +1,16 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake"
-makedepends="kidletime-devel kwayland-devel kwindowsystem-devel kguiaddons-devel"
+hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake wayland-devel
+ pkg-config wayland-protocols qt5-wayland-devel"
+makedepends="kidletime-devel kwayland-devel kwindowsystem-devel kguiaddons-devel
+ libxkbcommon-devel"
 short_desc="Integration plugins for Kwayland"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4cbc301227a507fb2ac42e08130c79ff58a9905ebd444ddd64c78bb1e834fb4d
+checksum=f73510f65bff5dac0b9eb1715af58f7a95f312a9dbe816d853e78a9539c10d6a

From 38748a2cf79d45cb0733779299c5a83b6097dabf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:32 +0200
Subject: [PATCH 1849/4088] kwayland-server: update to 5.23.1

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 6fe1dca2a419..5e02e4650920 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dd64bdd629b239621d687d8deceff6e0da88542c6b67140c5ff8b654155bf39d
+checksum=ebad1a6dc1bf246cab9ca8ba0a13edd578646cb333ce09303d79d78727a59d57
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 1e89c5dc8134f674eebd5ce5b729ab71845e1290 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:39 +0200
Subject: [PATCH 1850/4088] kwin: update to 5.23.1

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 2d60057a4d64..fad81d40eb75 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=128daed41c1b9e65ddad3fe2ce3aea821ef54af520d3d39cde059b2c2bfcf5a3
+checksum=5838d7ab84babc5bd3cb3df9f7e38fc01c98ba1bf584b6d43e4528dd03598b31
 
 build_options="pipewire"
 build_options_default="pipewire"

From 5c9d51e28efbe6c0ee53fcddd7f40a0ec1e74307 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:40 +0200
Subject: [PATCH 1851/4088] kwrited: update to 5.23.1

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 4ed126bc8391..67cfc3b7a1f8 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=63bd95099452951dba9e10a5ba15c4b6693cc44fb3ce99b7cb45638890748e09
+checksum=f31247382fb8b1d9246a16552a3d9b577e24428af39bdb042bfd42ee5c254f9b

From ebf447b6686cd7490b02360ae3c8859a8a8639ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:42 +0200
Subject: [PATCH 1852/4088] layer-shell-qt: update to 5.23.1

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 1804109f5756..5a448c062bd7 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffcc705ae4fadabc3422b8331a8d6334e2ce197ca6fadd7343c0a48927d32f45
+checksum=c79c2306ee9f6a672612b37f28074609748f5570b7785d4096e5573f12fb9e0a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bd72005dfcc560714d8365ccf829ef9a524a5488 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:44 +0200
Subject: [PATCH 1853/4088] libkscreen: update to 5.23.1

---
 srcpkgs/libkscreen/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 5bb47f2e21fd..d31ef9ecfd74 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,17 +1,18 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
+hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel
+ plasma-wayland-protocols qt5-wayland wayland-devel"
 makedepends="qt5-tools-devel qt5-x11extras-devel libXrandr-devel kwayland-devel"
 short_desc="KDE screen management software"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5b4fcaebacc3a4cb62e599a796dca89a30c5ac10937ba3ef9a28998c84ca16e3
+checksum=3930d578f55e5d5be95da1f3fe298b15623afcea0a9c73005cb983589204d043
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 2a500b4a6def5f8aaa4ea1fd069e14f6c9c0639b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:46 +0200
Subject: [PATCH 1854/4088] libksysguard: update to 5.23.1

---
 srcpkgs/libksysguard/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 59526e6d938d..05747bcecf8c 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,18 +1,18 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
 makedepends="plasma-framework-devel qt5-webchannel-devel knewstuff-devel
- libcap-devel libnl3-devel
+ libcap-devel libnl3-devel libsensors-devel
  $(vopt_if webengine 'qt5-webengine-devel qt5-location-devel')"
 short_desc="KDE libksysguard"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a522ab976baafa8c1b80cbfe6a4d7718aa8c8623f84294d25c5d43429dd472c2
+checksum=083ddf436a9678e6e3d9c900d2c974586a313e58f60a32b7cb6600338ec78189
 
 build_options="webengine"
 

From b075fd790dc5453026e33f5ada927168adf2008a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:48 +0200
Subject: [PATCH 1855/4088] milou: update to 5.23.1

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 7e573744006c..7eb77a9751fd 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f7c22b46d9a5081206f78e9964f515055876b7b4e9e6075d5fcc50b85c783fb4
+checksum=8f91c04785af3ed86ddf1fce18fe67f5b70cabf0827750cdec119e496723ff10
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 4cda7243bcdcca1c938708d24b65283e3e556c83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:51 +0200
Subject: [PATCH 1856/4088] oxygen: update to 5.23.1

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 309ff9855ef6..36d8627aeeef 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0c3bb29ce140b00e1c95a0a1cb39c662d935f7216e61810837097a39516ec43b
+checksum=2ea0ca8d889cc10f0d3c60217655b35b8417347243af9239a6b6998bb20bb237

From 7be641e50f048d532885fb321c8c593eef2ae7c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:52 +0200
Subject: [PATCH 1857/4088] plasma-browser-integration: update to 5.23.1

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 4b92192ac763..d6f7811a453a 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ef1c9440392f028167ed5c158fe7395324f70b94056d03fe2534c9b1a267ffe
+checksum=dd6477ffd0eddb70086fbf3e9c8f63845f6d552a06c22fb32846be068cf74af9
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 98ccb52a186a00341e1018c47e552ec65fd7aed2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:55 +0200
Subject: [PATCH 1858/4088] plasma-desktop: update to 5.23.1

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e3a3f52775ed..e016cb09e6bc 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4532accca913cb2551fdbdb865fd0c50cff76f690c9cfa8fa2ad627ddadacce
+checksum=ee6c6af0926ea3c6edd808f2962ef6579953c82e0d08ac053fbc8f012b9c4e80
 replaces="user-manager>=0"
 python_version=3

From 742455c85b57a5efbe52cc4706168158f87757ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:57 +0200
Subject: [PATCH 1859/4088] plasma-disks: update to 5.23.1

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index fae4473d0ee6..bed7970624f8 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=70e18612c00a4c6cb07621c5c902b2298ba69649bd3cec91ae7999dbfa0eb492
+checksum=b83b021f43f3b7736fc0908dae7efd5526474879f03e340eb13441f2dbd39a85

From ca03c65b14014c324801ea0b9f703dbee2003ba2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:58 +0200
Subject: [PATCH 1860/4088] plasma-firewall: update to 5.23.1

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 53347205b2fb..54f62e43ed2d 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ef5a50b38752599d2760470df68423b76687bab3e9a7f25a7655a63a142c31a6
+checksum=1cccf92f94a7c7fa17f9893128b69006707e21c2a168fa60e5ce31dfa719cb18

From 82886506d27dd9598ab6c87ab49e7cff6573a16a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:01:59 +0200
Subject: [PATCH 1861/4088] plasma-integration: update to 5.23.1

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 92749903f9a8..1f6146b4ea50 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=28c743f1a911042dac1dd86ae615748b7b5422e8d4b47bff34d31cf4bdb6f270
+checksum=ca2b3487de16646bc5d2120adfd9d58cee69570a0eb64630ea075a93cdddcb71

From 9c659a3e75d78e215961511a00f2f548d22cd7a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:00 +0200
Subject: [PATCH 1862/4088] plasma-nm: update to 5.23.1

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f1f494ac7188..f14493c8dfcc 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7fab9fa175a7b0caf21ff19dddda9d1ea4d05cd3962fe1a2c726404203b9fc49
+checksum=d1d578c0386c2506f2cf361cd81f7060e6edcc7546d1716fb7299e34332f5063
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From bb59ca8dce845937e41566a1e83137549b93ad30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:01 +0200
Subject: [PATCH 1863/4088] plasma-pa: update to 5.23.1

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 5342e6181551..07470b2d2db0 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40ade6a4f7b19ae378d0db621f238f5c197d7a1a78379b5c92e9a1a88929b5ab
+checksum=a79f1971a5acdeccb9e7363560b1828f35cac4faeb3c8036d8cdd1243565a57e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 1569ea7efd6c37e4f2218b9461fbdc77229cc6e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:03 +0200
Subject: [PATCH 1864/4088] plasma-sdk: update to 5.23.1

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 2592358e3e7a..75d0651b6e02 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4df9655a53f8cf227ca2097555c1ada9118a7d866bf075d6dc53548969db753f
+checksum=00d7389635c3a97e7f3badc3a25a6b3b1e200ad9e18f709cf31e3ed352e61eeb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From bfc9583bebe6fb46812cd221fc9c12472615aaf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:04 +0200
Subject: [PATCH 1865/4088] plasma-systemmonitor: update to 5.23.1

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 969ccde22628..3496b630a45b 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dd9eaaeba11da2d9640873882ed4aa573c2b3fc2f5640783965992ceda1647a3
+checksum=c8212484044840119f939ff2fcacea6a3d02c25a171a75c68145cf88be9c19cf

From 37c34901fd33a71cb97164dc4e25559f0fd2c7e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:05 +0200
Subject: [PATCH 1866/4088] plasma-thunderbolt: update to 5.23.1

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index aa797cc8cbe9..e9ff3bb397e4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ac52399979e7ba36ad74349680caa3c088d5a411fd0f9452f745bda683b0328f
+checksum=0a5c5f1ac69d63b533acc1171e726043542f17ccad019b530c03e31a9ece118d
 
 do_check() {
 	: # Requires running dbus and bolt services

From 2f0d717eded70a4814f5d7a46104700b6c4551c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:06 +0200
Subject: [PATCH 1867/4088] plasma-vault: update to 5.23.1

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 4337641a0067..416b4d2f85ab 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4091679106a73c2d1ea4c76048258ce9bbbba326a1cdff359514dba7d29de9aa
+checksum=c5abe2e90c29e2a76c4fd276ad2efd0a296da7ed641ca8f401e95d446a5b8c4f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 9ce8612aa1d6be763da37e942414f41b182bdc17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:15 +0200
Subject: [PATCH 1868/4088] plasma-workspace-wallpapers: update to 5.23.1

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 6f6fd1e41303..d94bdc0b70f4 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=be214397f580adff039f28b37758b5a19da01f35ef5ee9ddb3fe93c0f116a8c0
+checksum=fb26b880b60e893f08f51e17a845d6e252ce744441947e6e6119913689edf4aa

From d959aa2e402705c9511ba7123a016d47a8393671 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:18 +0200
Subject: [PATCH 1869/4088] plasma-workspace: update to 5.23.1

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 93de1b363f46..747f7cc5d1ab 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f22e12dea303478d949f69b88fcf30787ef7f5d098be55595ec562aee4b13606
+checksum=fbf979f857b3cdcc8fe6dc45c3a1d9dfe297e1120aa551a02faa339abb81efad
 
 build_options="pipewire"
 build_options_default="pipewire"

From 04c10b10ad12748eea33f90c591a263e6e2c127e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:19 +0200
Subject: [PATCH 1870/4088] polkit-kde-agent: update to 5.23.1

---
 srcpkgs/polkit-kde-agent/patches/cross.patch | 27 --------------------
 srcpkgs/polkit-kde-agent/template            |  4 +--
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/polkit-kde-agent/patches/cross.patch

diff --git a/srcpkgs/polkit-kde-agent/patches/cross.patch b/srcpkgs/polkit-kde-agent/patches/cross.patch
deleted file mode 100644
index 5a211fbbdfb7..000000000000
--- a/srcpkgs/polkit-kde-agent/patches/cross.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/CMakeLists.txt	2018-07-31 15:01:17.000000000 +0200
-+++ b/CMakeLists.txt	2018-07-31 15:01:17.000000000 +0200
-@@ -49,6 +49,12 @@
- 
- find_package(PolkitQt5-1 REQUIRED 0.103.0)
- 
-+if (NOT IS_ABSOLUTE "${POLKITQT-1_INCLUDE_DIR}")
-+  set(POLKITQT-1_INCLUDE_DIR "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_INCLUDE_DIR}")
-+  set(POLKITQT-1_AGENT_LIBRARY "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_AGENT_LIBRARY}")
-+  set(POLKITQT-1_CORE_LIBRARY "${POLKITQT-1_INSTALL_DIR}/${POLKITQT-1_CORE_LIBRARY}")
-+endif()
-+
- include_directories(
-                     ${POLKITQT-1_INCLUDE_DIR}
-                     ${CMAKE_CURRENT_SOURCE_DIR}
---- a/CMakeLists.txt	2018-08-27 14:58:54.560731243 +0200
-+++ b/CMakeLists.txt	2018-08-27 14:58:54.560731243 +0200
-@@ -82,7 +81,8 @@
-     KF5::I18n
-     KF5::Crash
-     KF5::IconThemes
--    ${POLKITQT-1_LIBRARIES}
-+    ${POLKITQT-1_AGENT_LIBRARY}
-+    ${POLKITQT-1_CORE_LIBRARY}
- )
- 
- configure_file(polkit-kde-authentication-agent-1.desktop.cmake ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop)
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 36add963a150..925e5fc8dceb 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.5
+version=5.23.1
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=60e3ea544b2b609351961fe7f299b79c9f8ff89b911b63490fa0d3afd5222ba8
+checksum=416617237e045567daf830e23c0d3f32f3b4d9891e9a61888f735f494ccbf529

From dde33b3de289cb95dfcadefb09334750108c94dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:20 +0200
Subject: [PATCH 1871/4088] powerdevil: update to 5.23.1

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 77b5bec39cd7..10c2722b5eb2 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=597301e6520c17131c98a98960a1e3b7827e63ab9efed0fea5340203133f1c9f
+checksum=721a5938d6cb0439943fa912b9f360b9b563a91ceff138869636f2ef45edc096

From 5329558ec86f54dcdaa9f587bb0a3d83d548b85c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:21 +0200
Subject: [PATCH 1872/4088] sddm-kcm: update to 5.23.1

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index bcef3a2965e0..d9d54c3d93c3 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4669a40fe4380f65dfff509b00fe1dfd026507ae50fc5fa8daeea7b68c207798
+checksum=b72629f744d9859f93d097d7272d63543b97e0ff4c5774dadcd935838cf48044

From 17a75d662a8b4ad29d14bc617b14eadaa0e28381 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:23 +0200
Subject: [PATCH 1873/4088] systemsettings: update to 5.23.1

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index f3a4921b3124..33335ef56cd5 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cc7978faa1c3fcf75584a09459e69e665c17514dcf59e07287e1d80aadb975bb
+checksum=7cd451319125c7b56c6f13c65462136179c39f607cc4d4e66b90079a72df6e54

From 10d267861917d21707b41f4a5c652d886af4b34e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Oct 2021 20:02:24 +0200
Subject: [PATCH 1874/4088] xdg-desktop-portal-kde: update to 5.23.1

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index d7c74c41b487..88ee52c0e8cf 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.5
+version=5.23.1
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=861d71bd0146c5c67d5c1774506fd201ed5be1e706d5cc9a05be0428136ca601
+checksum=f7664cc4c0ea7fcd93a15d35fc5f5b5f5c8910c07204fad35783f9d3acc1f2ae

From 680de74e40c7f8331b63890480272b142650f82f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 19 Oct 2021 17:21:29 +0200
Subject: [PATCH 1875/4088] kde5: update to 5.23.0.

---
 srcpkgs/kde5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template
index 892b6bac2618..444bfa8cbb20 100644
--- a/srcpkgs/kde5/template
+++ b/srcpkgs/kde5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5'
 pkgname=kde5
-version=5.22.0
+version=5.23.0
 revision=1
 build_style=meta
 depends="bluedevil>=${version}

From e2093aadca5175d9a997ea58494ea18f7b8687aa Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 19 Oct 2021 21:38:55 +0200
Subject: [PATCH 1876/4088] google-chrome: update to 95.0.4638.54

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 8e543b6e248b..ec8e421212eb 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=94.0.4606.81
+version=95.0.4638.54
 revision=1
 _channel=stable
 archs="x86_64"
@@ -19,7 +19,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=bfe97cd8d9f941e4a1e73f53d9de6bb54e73a007ee4ce5d4e94a9a65ae2d7fb4
+checksum=2a90957a8104649bda067b62d87380ad6e5d5ff8cd52f47cf8d39acfbf93c955
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 50bd888c2396526283447e124da788384c9b92fe Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 19 Oct 2021 21:52:29 +0200
Subject: [PATCH 1877/4088] vscode: update to 1.61.2

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 84657a597108..35151cf029b7 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.61.1
+version=1.61.2
 revision=1
 _electronver=13.3.0
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=e0aadb434252fd5f7a2ebf979d7e4db138148327c641a0214725eae1c22459c3
+checksum=8854cb40d508ad30f3c83a5f6d9ef3072b82593a28c28ad7e7f62937217003ed
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From ee726008a5b52d80ae54aaaa5e46095f0a3c6417 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Wed, 20 Oct 2021 19:26:05 +1000
Subject: [PATCH 1878/4088] saml2aws: update to 2.33.0

---
 srcpkgs/saml2aws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..43cd823b7b57 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.33.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b4f158d27b0572830160819286a7d753cc16ce0f6c6316565df2f6e3dfeddcc7
 
 post_install() {
 	vlicense LICENSE.md

From 790dade4e33960db233d87ff62b837520def187b Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 20 Oct 2021 09:39:45 +0200
Subject: [PATCH 1879/4088] stern: update to 1.20.1.

---
 srcpkgs/stern/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index c17f74d22e78..6665b697ee89 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,6 +1,6 @@
 # Template file for 'stern'
 pkgname=stern
-version=1.19.0
+version=1.20.1
 revision=1
 build_style=go
 go_import_path="github.com/stern/stern"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://github.com/stern/stern"
 distfiles="https://github.com/stern/stern/archive/v${version}.tar.gz"
-checksum=1f19f9ec21f07317ce53b333b9633b6b91392f5af6b0fff2657ee1b2a0bae707
+checksum=941bd4754b0efa9d0692edcae2eb97362f6caa5ccc5aba1be6b4aab0c579bf47
 
 # fix: collect2: fatal error: cannot find 'ld'
 LDFLAGS="-fuse-ld=bfd"

From a4756d2448e8da0a0872d8899afe891b574f644d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Oct 2021 11:34:50 -0400
Subject: [PATCH 1880/4088] slit: update to 1.3.0

---
 srcpkgs/slit/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index 688e249ff422..3f669892ac84 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,17 +1,16 @@
 # Template file for 'slit'
 pkgname=slit
-version=1.2.0
-revision=3
+version=1.3.0
+revision=1
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"
-short_desc="A modern PAGER for viewing logs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Modern PAGER for viewing logs"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
-hostmakedepends="git"
 homepage="https://github.com/tigrawap/slit"
 distfiles="https://github.com/tigrawap/slit/archive/${version}.tar.gz"
-checksum=95b8e70f7978f1800070f59c46e6f19ac648dc2067fd30b6da568916ca7e7861
+checksum=052b8d91d7158336adb4d04e5cf127be41d1c408aa896bfa6cc7fa1a0a16d014
 
 post_install() {
 	vlicense LICENSE

From 08cb36bdd7a1c777a5f1a53d8a223f08ee205f75 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Oct 2021 22:04:34 -0400
Subject: [PATCH 1881/4088] frp: update to 0.37.1

---
 srcpkgs/frp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 81df470c9a15..41aab974f044 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,6 +1,6 @@
 # Template file for 'frp'
 pkgname=frp
-version=0.34.1
+version=0.37.1
 revision=1
 build_style=go
 go_import_path=github.com/fatedier/frp
@@ -10,7 +10,7 @@ maintainer="Anachron <gith@cron.world>"
 license="Apache-2.0"
 homepage="https://github.com/fatedier/frp"
 distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz"
-checksum=a47f952cc491a1d5d6f838306f221d6a8635db7cf626453df72fe6531613d560
+checksum=e2c1f93d504ae3bbe3407aaec43efa5c5f09b6d1a35306b58808c4f36b53f396
 
 conf_files="/etc/frp/*.ini"
 

From 3da8cfd217818779a1d9bdc1f11ffdf1eb5aa6a8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Oct 2021 22:44:03 -0400
Subject: [PATCH 1882/4088] gifsicle: update to 1.93

---
 srcpkgs/gifsicle/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gifsicle/template b/srcpkgs/gifsicle/template
index 9844c5783405..50313417e864 100644
--- a/srcpkgs/gifsicle/template
+++ b/srcpkgs/gifsicle/template
@@ -1,15 +1,15 @@
 # Template file for 'gifsicle'
 pkgname=gifsicle
-version=1.92
+version=1.93
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Command-line tool for information about GIF images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.lcdf.org/gifsicle/"
-distfiles="https://github.com/kohler/gifsicle/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f8a944f47faa9323bcc72c6e2239e0608bf30693894aee61512aba107a4c6b55
+distfiles="https://github.com/kohler/gifsicle/archive/refs/tags/v${version}.tar.gz"
+checksum=941c0b1c3ebc748949a0d14363f0fb3c9d2c06ee122b3548315b9233eb956d88
 
 pre_configure() {
 	autoreconf -fi

From bd894e20e1daba59370b6ee01b9bff2361c6cdb5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Oct 2021 13:02:38 +0200
Subject: [PATCH 1883/4088] python3-pyinfra: update to 1.4.17.

---
 srcpkgs/python3-pyinfra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 118590b5fdea..a3601516c126 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.16
-revision=2
+version=1.4.17
+revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=48e065c5ece08dd4c83d81ce915d5c7262b0e2f32619f5228084479c6204303b
+checksum=cfaa82e45aebf74f2299e3b72d0347521a0b9fe38589930d33c46805015d99d5
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 23e0a0f6f7cc38b525d1c57d913596222f0871b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 Oct 2021 09:20:01 -0400
Subject: [PATCH 1884/4088] python3-numpy: update to 1.21.3.

---
 srcpkgs/python3-numpy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4376f301edad..8f08cc746ecf 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
-revision=2
+version=1.21.3
+revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=21240294ff9f6312118c3ac7541d84df351b23d3d131756f9955892794211608
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"

From 25213dd1757e18046bd212a7e57ae77891efa055 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 Oct 2021 09:34:18 -0400
Subject: [PATCH 1885/4088] python3-pandas: update to 1.3.4.

---
 srcpkgs/python3-pandas/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index b843b4d69b56..4283d0a0b44e 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.3
-revision=2
+version=1.3.4
+revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=8bb288dae5b49a981723dea5826875cdb1b57a242630b0df242e12caf358835e
+checksum=dd0fa7107ed4540e5a0cf8ca2a81852b14a8bf1f6b0f38f1c3a99f7441133ddb
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From f4d26bdd635d43d934139f212d7e23269409680e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 Oct 2021 09:35:27 -0400
Subject: [PATCH 1886/4088] python3-pyopencl: update to 2021.2.9.

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index bd6fbdd3e632..a2d740626c6f 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2021.2.8
+version=2021.2.9
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=15809b5d2b9a86ad01e31d176c00415436805ac884c4d197d9263bfe98280d76
+checksum=51425e65ec49c738eefe21b1eeb1f39245b01cc0ddfd495fbe1f8df33dbc6c9e
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From 583986200d61c0c1a25a00055e1d2413ddc8aa83 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Thu, 21 Oct 2021 17:27:56 +0200
Subject: [PATCH 1887/4088] clib: update to 2.7.0.

---
 srcpkgs/clib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clib/template b/srcpkgs/clib/template
index 6e3bf69b149d..f348fa17325f 100644
--- a/srcpkgs/clib/template
+++ b/srcpkgs/clib/template
@@ -1,6 +1,6 @@
 # Template file for 'clib'
 pkgname=clib
-version=2.5.0
+version=2.7.0
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,7 +10,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/clibs/clib"
 distfiles="https://github.com/clibs/clib/archive/${version}.tar.gz"
-checksum=74643374883651a272ed8ac8e8a6789c0b4a4b13e20a9d45798fd770821e620d
+checksum=99640506e1cf69d69451dc5d0db2d8fd169ff8247bda8c6d01dd66e9471ac6a0
 
 post_install() {
 	vlicense LICENSE

From 15d55d39b4afe2b84289440a476ef0ddb04e36bd Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 21 Oct 2021 18:28:45 +0200
Subject: [PATCH 1888/4088] dbeaver: update to 21.2.3.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d35379bbcaff..596d64f3f2c3 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.2.2
+version=21.2.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=955046eec4a77085b74ac40e40c1754fad8642dd8b8cb99896d10d3b81731e52
+checksum=ea3bbbad9d09962fb2711309b56e74c75e973028cea395e3e27e454e831bb676
 nopie=true
 
 do_build() {

From 5a22c97a790f016c976b2f1c0b451ee3b58f5516 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 21 Oct 2021 14:00:15 -0400
Subject: [PATCH 1889/4088] hyperfine: update to 1.12.0

---
 srcpkgs/hyperfine/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template
index 1a4203f3e0eb..c574b537292d 100644
--- a/srcpkgs/hyperfine/template
+++ b/srcpkgs/hyperfine/template
@@ -1,15 +1,15 @@
 # Template file for 'hyperfine'
 pkgname=hyperfine
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=cargo
 short_desc="Command-line benchmarking tool"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/sharkdp/hyperfine"
-changelog="https://github.com/sharkdp/hyperfine/releases"
-distfiles="https://github.com/sharkdp/hyperfine/archive/v${version}.tar.gz"
-checksum=740f4826f0933c693fb281e3542d312da9ccc8fd68cebe883359a8085ddd77e9
+changelog="https://raw.githubusercontent.com/sharkdp/hyperfine/master/CHANGELOG.md"
+distfiles="https://github.com/sharkdp/hyperfine/archive/refs/tags/v${version}.tar.gz"
+checksum=2120870a97e68fa3426eac5646a071c9646e96d2309220e3c258bf588e496454
 
 post_install() {
 	vlicense LICENSE-MIT

From b7d49573e15424ff1a97658e08208cf41bdf7d19 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 21 Oct 2021 20:13:32 +0200
Subject: [PATCH 1890/4088] blueman: update to 2.2.2.

---
 srcpkgs/blueman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index 36e8644e5bcd..60abad4af4a7 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -1,7 +1,7 @@
 # Template file for 'blueman'
 pkgname=blueman
-version=2.2.1
-revision=2
+version=2.2.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool iproute2 pkg-config python3-Cython"
@@ -13,7 +13,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/blueman-project/blueman"
 distfiles="https://github.com/blueman-project/blueman/releases/download/${version}/blueman-${version}.tar.xz"
-checksum=fcc10a2259bef2c5ac63f577010d76caed460d68810b7f70fecf056bf10a1a72
+checksum=19ed59b1a134f584fc005f47295fef640a9709fd9b9b2307388e112a32ecd0f6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel python3-devel"

From aa2d7bc3fd9ec9dc7d3abf43d1b1ff16db95de26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 21 Oct 2021 21:32:06 +0200
Subject: [PATCH 1891/4088] ppsspp: update to 1.12.3.

---
 srcpkgs/ppsspp/patches/system-zstd.patch | 43 ++++++++++++++++++++++++
 srcpkgs/ppsspp/template                  | 29 +++++++---------
 2 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/ppsspp/patches/system-zstd.patch

diff --git a/srcpkgs/ppsspp/patches/system-zstd.patch b/srcpkgs/ppsspp/patches/system-zstd.patch
new file mode 100644
index 000000000000..9cd2d27e0db1
--- /dev/null
+++ b/srcpkgs/ppsspp/patches/system-zstd.patch
@@ -0,0 +1,43 @@
+
+diff '--color=auto' -rupN libretro-ppsspp.orig/CMakeLists.txt libretro-ppsspp/CMakeLists.txt
+--- libretro-ppsspp.orig/CMakeLists.txt	2021-10-01 17:28:30.046655852 +0200
++++ libretro-ppsspp/CMakeLists.txt	2021-10-01 17:30:38.698699237 +0200
+@@ -151,6 +151,7 @@ option(USE_MINIUPNPC "Build with miniUPn
+ option(USE_SYSTEM_SNAPPY "Dynamically link against system snappy" ${USE_SYSTEM_SNAPPY})
+ option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG})
+ option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_LIBZIP})
++option(USE_SYSTEM_ZSTD "Dynamically link against system zstd" ${USE_SYSTEM_ZSTD})
+ option(USE_SYSTEM_LIBSDL2 "Dynamically link against system SDL2" ON)
+ option(USE_SYSTEM_LIBPNG "Dynamically link against system libpng" ON)
+ option(USE_ASAN "Use address sanitizer" OFF)
+@@ -1976,8 +1977,20 @@ if(ANDROID)
+ 	endif()
+ endif()
+ 
+-set(CoreExtraLibs ${CoreExtraLibs} armips libzstd_static)
+-include_directories(ext/zstd/lib)
++set(CoreExtraLibs ${CoreExtraLibs} armips)
++
++find_package(PkgConfig)
++if(PKG_CONFIG_FOUND)
++	pkg_check_modules(ZSTD libzstd)
++endif()
++if(ZSTD_FOUND AND USE_SYSTEM_ZSTD)
++	include_directories(${ZSTD_INCLUDE_DIRS})
++	target_link_libraries(${CoreLibName} ${ZSTD_LIBRARIES})
++else()
++	add_subdirectory(ext/zstd/build/cmake EXCLUDE_FROM_ALL)
++	include_directories(ext/zstd/lib)
++	set(CoreExtraLibs ${CoreExtraLibs} libzstd_static)
++endif()
+ 
+ # needed for VK_USE_PLATFORM_XCB_KHR only
+ #if(VULKAN AND NOT WIN32)
+diff '--color=auto' -rupN libretro-ppsspp.orig/ext/CMakeLists.txt libretro-ppsspp/ext/CMakeLists.txt
+--- libretro-ppsspp.orig/ext/CMakeLists.txt	2021-10-01 17:28:30.136664237 +0200
++++ libretro-ppsspp/ext/CMakeLists.txt	2021-10-01 17:30:45.282654341 +0200
+@@ -22,4 +22,3 @@ add_subdirectory(SPIRV-Cross-build)
+ if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO)
+ 	add_subdirectory(discord-rpc-build)
+ endif()
+-add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index eaf14bc7cf14..38308424f58b 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,19 +1,18 @@
 # Template file for 'ppsspp'
 pkgname=ppsspp
-version=1.11.3
+version=1.12.3
 revision=1
-_lang_commit=6bd5b4bc983917ea8402f73c726b46e36f3de0b4
-_glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
-_SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
+_glslang_commit=dc11adde23c455a24e13dd54de9b4ede8bdd7db8
+_SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
 _armips_commit=7885552b208493a6a0f21663770c446c3ba65576
-_discord_rpc_commit=3d3ae7129d17643bc706da0a2eea85aafd10ab3a
-_miniupnp_commit=7e229ddd635933239583ab190d9b614bde018157
+_discord_rpc_commit=963aa9f3e5ce81a4682c6ca3d136cddda614db33
+_miniupnp_commit=3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e
 build_style=cmake
 configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON
- -DUSING_QT_UI=$(vopt_if qt ON OFF)"
+ -DUSING_QT_UI=$(vopt_if qt ON OFF) -DUSE_SYSTEM_ZSTD=ON"
 hostmakedepends="pkg-config python3 $(vopt_if qt qt5-host-tools)"
 makedepends="zlib-devel glew-devel ffmpeg-devel libzip-devel
- snappy-devel rapidjson libpng-devel
+ snappy-devel rapidjson libpng-devel libzstd-devel
  $(vopt_if sdl2 SDL2-devel) $(vopt_if wayland wayland-devel)
  $(vopt_if qt 'qt5-devel qt5-multimedia-devel')"
 depends="desktop-file-utils"
@@ -23,19 +22,17 @@ license="GPL-2.0-or-later"
 homepage="https://www.ppsspp.org/"
 distfiles="
  https://github.com/hrydgard/ppsspp/archive/v${version}.tar.gz
- https://github.com/hrydgard/ppsspp-lang/archive/${_lang_commit}.tar.gz
  https://github.com/hrydgard/glslang/archive/${_glslang_commit}.tar.gz
  https://github.com/KhronosGroup/SPIRV-Cross/archive/${_SPIRV_Cross_commit}.tar.gz
  https://github.com/Kingcom/armips/archive/${_armips_commit}.tar.gz
  https://github.com/discordapp/discord-rpc/archive/${_discord_rpc_commit}.tar.gz
  https://github.com/hrydgard/miniupnp/archive/${_miniupnp_commit}.tar.gz"
-checksum="503f046fa68e4be24d08822b0aa2280e653ad513d9a12c77a59809467b95c516
- b6e9fe4a7daa2dd8d4f3cc74cbafc5382f7df90303af3a3c18d25ec4492d8899
- 699e177e0022f17c204e3542bbf7fcb6843923095968edc1ebbc5124e85a2bdf
- 456b1e2a75a8e82985ce22f4707570c7aa1fc50d4119cba1a641e8b233ecde26
+checksum="c9458ab1946d7d665465f69aafdf8598179852fefdcd7aef9050f7278193bec5
+ 32edc362238d5b1136b2b40b0abdeef5a832e599554d2fcf75d7b08e4b0ed0bb
+ 9423aebd6ea4251c6ea736f0291066eb2b99b6f923151edd1a78ce9c29b46757
  f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d
- 20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e
- 6819f0984fa647f69a74831a2333859a07099f64098ce58c35d8604d19532d3d"
+ 8f4115999391f95f443615fc5b13cb2398926ac4c418d3d34ff5735f71c6faea
+ 1b1d2897f66835ea5eeec5851fe8757aca5afd86984107dcdc0e4b1ce2f2f8be"
 
 # ppsspp always tries to compile x86 unittest
 # https://gist.github.com/Johnnynator/e18d59274451cff890b7235009d2e93d
@@ -50,8 +47,6 @@ build_options="wayland qt sdl2"
 build_options_default="sdl2"
 
 post_extract() {
-	rmdir -v ${wrksrc}/assets/lang
-	mv ${wrksrc}/../ppsspp-lang-${_lang_commit} ${wrksrc}/assets/lang
 	rmdir -v ${wrksrc}/ext/armips
 	mv ${wrksrc}/../armips-${_armips_commit} ${wrksrc}/ext/armips
 	rmdir -v ${wrksrc}/ext/glslang

From fd6e253a1639d2079aabb736702b3187b80c982d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 22 Oct 2021 03:34:02 -0300
Subject: [PATCH 1892/4088] linux5.14: update to 5.14.14.

---
 srcpkgs/linux5.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.14/template b/srcpkgs/linux5.14/template
index ae0fadb931cc..c637523b1e93 100644
--- a/srcpkgs/linux5.14/template
+++ b/srcpkgs/linux5.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.14'
 pkgname=linux5.14
-version=5.14.13
+version=5.14.14
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2
- 48d9353cc3e67cd1ca9c1f4494ba882647463eb252ff737f95319fb8ae5a95a8"
+ 980f6c10adfb866ec6060fc28a1adc4b2d766ccdf9062a3c6bf618eb16d752d3"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From ddf44079a4a5a73e3d2af9373b8f3bfca918eaae Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 21 Oct 2021 23:28:12 -0400
Subject: [PATCH 1893/4088] subfinder: update to 2.4.9

---
 srcpkgs/subfinder/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index 029dcdd93b5b..9c5ac3e7269e 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,17 +1,17 @@
 # Template file for 'subfinder'
 pkgname=subfinder
-version=2.4.5
-revision=2
-build_style=go
+version=2.4.9
+revision=1
 build_wrksrc=v2
+build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"
 go_package="./cmd/subfinder"
 short_desc="Passive subdomain discovery tool"
 maintainer="w. fnintr <wfnintr@null.net>"
 license="MIT"
 homepage="https://github.com/projectdiscovery/subfinder"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=1adbd9c180f7ca6378796748491e23a808e423268bc61fe63af0206877f0ba68
+distfiles="https://github.com/projectdiscovery/subfinder/archive/refs/tags/v${version}.tar.gz"
+checksum=0163626e69aa4ea4642633ab447ca2afcf2e06f7aec16c2aa95ec5ce301250cf
 
 post_install() {
 	vlicense ../LICENSE.md

From e8cd910350a7cf91164e8ac012994c1df2db6824 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 21 Oct 2021 21:41:13 -0400
Subject: [PATCH 1894/4088] just: update to 0.10.2

---
 srcpkgs/just/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 087f95b40364..a8428aac9af2 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.9.2
+version=0.10.2
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -8,8 +8,9 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
-distfiles="https://github.com/casey/just/archive/v${version}.tar.gz"
-checksum=0f064d0ea9f3d8bbcd84c5e6a85243738bdb6f49d059f589fd6928c64ea6fb64
+distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz"
+checksum=7be0c7f895191407c70affedc8640fcbc64b50cf72d4d301a1f2391e12478f14
+make_check=ci-skip  # test fails when run as root
 
 # Fix failing test
 pre_check() {

From 3593aed42cd93877b9441c5074aa0d80675781db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 18 Oct 2021 16:15:53 -0300
Subject: [PATCH 1895/4088] thunderbird: update to 91.2.0.

---
 srcpkgs/thunderbird/files/mozconfig           |   1 -
 .../patches/avoid-redefinition.patch          |  15 ++
 srcpkgs/thunderbird/patches/fix-cross.patch   |  16 ---
 .../patches/fix-fortify-inline.patch          |  11 --
 .../thunderbird/patches/fix-wasm-arm.patch    |  15 --
 .../patches/fix-webrtc-glibcisms.patch        |   4 +-
 .../patches/musl-rust.configure.patch         |  26 ----
 .../thunderbird/patches/rust-configure.patch  | 132 ++++++++++++++----
 .../thunderbird/patches/rust-has-i128.patch   |  21 ---
 .../thunderbird/patches/sandbox-fork.patch    |   4 +-
 srcpkgs/thunderbird/patches/sndio.patch       |  14 +-
 srcpkgs/thunderbird/template                  |   7 +-
 12 files changed, 133 insertions(+), 133 deletions(-)
 create mode 100644 srcpkgs/thunderbird/patches/avoid-redefinition.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-cross.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-fortify-inline.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-wasm-arm.patch
 delete mode 100644 srcpkgs/thunderbird/patches/musl-rust.configure.patch
 delete mode 100644 srcpkgs/thunderbird/patches/rust-has-i128.patch

diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig
index b30e8fc4886d..44c45a8f6f30 100644
--- a/srcpkgs/thunderbird/files/mozconfig
+++ b/srcpkgs/thunderbird/files/mozconfig
@@ -32,6 +32,5 @@ ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=comm/mail
-ac_add_options --enable-calendar
 
 ac_add_options --allow-addon-sideload
diff --git a/srcpkgs/thunderbird/patches/avoid-redefinition.patch b/srcpkgs/thunderbird/patches/avoid-redefinition.patch
new file mode 100644
index 000000000000..867d37c62a90
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/avoid-redefinition.patch
@@ -0,0 +1,15 @@
+Author: Rasmus Thomsen <oss@cogitri.dev>
+Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
+(linux/if.h), leading to redefinitions. We need to include net/if.h before
+linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
+Upstream: No
+--- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:32.359751046 +0200
++++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
+@@ -31,6 +31,7 @@
+ */
+ 
+ #if defined(LINUX)
++#include <net/if.h>
+ #include "addrs-netlink.h"
+ #include <csi_platform.h>
+ #include <assert.h>
diff --git a/srcpkgs/thunderbird/patches/fix-cross.patch b/srcpkgs/thunderbird/patches/fix-cross.patch
deleted file mode 100644
index fad8f9060c46..000000000000
--- a/srcpkgs/thunderbird/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
-
---- a/third_party/rust/glslopt/build.rs
-+++ b/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/thunderbird/patches/fix-fortify-inline.patch b/srcpkgs/thunderbird/patches/fix-fortify-inline.patch
deleted file mode 100644
index 2498c57fc738..000000000000
--- a/srcpkgs/thunderbird/patches/fix-fortify-inline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-@@ -27,8 +27,5 @@
- typedef int16_t    int16;
- typedef unsigned short ushort;
- typedef unsigned long  ulong;
--#ifndef __GNUC_STDC_INLINE__
--#define inline
--#endif
- 
- #endif /* _SDP_OS_DEFS_H_ */
diff --git a/srcpkgs/thunderbird/patches/fix-wasm-arm.patch b/srcpkgs/thunderbird/patches/fix-wasm-arm.patch
deleted file mode 100644
index a6035e876163..000000000000
--- a/srcpkgs/thunderbird/patches/fix-wasm-arm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -243,9 +243,9 @@
- // If you run into compile problems on a tier-3 platform, you can disable the
- // emulation here.
- 
--#if defined(__linux__) && defined(__arm__)
--#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#endif
-+// #if defined(__linux__) && defined(__arm__)
-+// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-+// #endif
- 
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
- #  include <sys/user.h>
diff --git a/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
index 70910da5861e..5d17021a99f4 100644
--- a/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
@@ -1,5 +1,5 @@
---- a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:20:52.298793223 +0100
-+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+--- a/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:20:52.298793223 +0100
++++ b/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
 @@ -14,7 +14,7 @@
  #ifndef __GLIBC_PREREQ
  #define __GLIBC_PREREQ(a, b) 0
diff --git a/srcpkgs/thunderbird/patches/musl-rust.configure.patch b/srcpkgs/thunderbird/patches/musl-rust.configure.patch
deleted file mode 100644
index 0b2f7dee1d3c..000000000000
--- a/srcpkgs/thunderbird/patches/musl-rust.configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/build/moz.configure/rust.configure	2019-10-28 12:05:04.930404603 +0700
-+++ b/build/moz.configure/rust.configure	2019-10-28 12:09:42.742338957 +0700
-@@ -297,11 +297,20 @@
-                     suffix = 'hf'
-                 else:
-                     suffix = ''
-+
-+                narrowed = []
-                 for p in prefixes:
-                     for c in candidates:
--                        if c.rust_target.startswith('{}-'.format(p)) and \
--                                c.rust_target.endswith(suffix):
--                            return c.rust_target
-+                        if c.rust_target.startswith('{}-'.format(p)):
-+                            narrowed.append(c.rust_target)
-+
-+                for target in narrowed:
-+                    if target.endswith(host_or_target.raw_os):
-+                        return target
-+
-+                for target in narrowed:
-+                    if target.endswith(suffix):
-+                        return target
- 
-             # See if we can narrow down on the exact alias
-             narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch
index 07b98d6c7cae..61fb2ba891d9 100644
--- a/srcpkgs/thunderbird/patches/rust-configure.patch
+++ b/srcpkgs/thunderbird/patches/rust-configure.patch
@@ -1,42 +1,112 @@
 Mozilla rustc check does not support crossbuild: let's remove it
 Remove calls to unwrap_rustup, they fail if rustup isn't present
 
---- a/build/moz.configure/rust.configure	2019-10-17 04:19:59.000000000 +0700
-+++ b/build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
-@@ -78,9 +78,6 @@
- 
+Do not try to figure out the rust target as it is broken on musl
+instead use what is set in RUST_TARGET
+
+Skip extra checks on cross builds (broken for arm*)
+
+--- a/build/moz.configure/rust.configure	2020-12-12 01:35:33.000000000 +0100
++++ b/build/moz.configure/rust.configure	2020-12-15 19:45:16.467750787 +0100
+@@ -91,9 +91,6 @@
      return unwrap
  
--rustc = unwrap_rustup(rustc, 'rustc')
--cargo = unwrap_rustup(cargo, 'cargo')
+ 
+-rustc = unwrap_rustup(rustc, "rustc")
+-cargo = unwrap_rustup(cargo, "cargo")
 -
  
- set_config('CARGO', cargo)
- set_config('RUSTC', rustc)
-@@ -348,26 +345,6 @@
+ set_config("CARGO", cargo)
+ set_config("RUSTC", rustc)
+@@ -260,7 +257,9 @@
+         data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+     return data
+ 
+-
++@imports('os')
++@imports(_from='mozbuild.util', _import='ensure_unicode')
++@imports(_from='mozbuild.util', _import='system_encoding')
+ def detect_rustc_target(
+     host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -382,12 +381,12 @@
+ 
+         return None
+ 
+-    rustc_target = find_candidate(candidates)
++    rustc_target = os.environ['RUST_TARGET']
  
-             os.write(in_fd, source)
-             os.close(in_fd)
+     if rustc_target is None:
+         die("Don't know how to translate {} for rustc".format(host_or_target.alias))
+ 
+-    return rustc_target
++    return ensure_unicode(rustc_target, system_encoding)
+ 
+ 
+ @imports("os")
+@@ -410,35 +409,6 @@
+ 
+         os.write(in_fd, ensure_binary(source))
+         os.close(in_fd)
 -
--            cmd = [
--                rustc,
--                '--crate-type', 'staticlib',
--                target_arg,
--                '-o', out_path,
--                in_path,
--            ]
+-        cmd = [
+-            rustc,
+-            "--crate-type",
+-            "staticlib",
+-            target_arg,
+-            "-o",
+-            out_path,
+-            in_path,
+-        ]
 -
--            def failed():
--                die(dedent('''\
--                Cannot compile for {} with {}
--                The target may be unsupported, or you may not have
--                a rust std library for that target installed. Try:
+-        def failed():
+-            die(
+-                dedent(
+-                    """\
+-            Cannot compile for {} with {}
+-            The target may be unsupported, or you may not have
+-            a rust std library for that target installed. Try:
 -
--                  rustup target add {}
--                '''.format(host_or_target.alias, rustc, rustc_target)))
--            check_cmd_output(*cmd, onerror=failed)
--            if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
--                failed()
-         finally:
-             os.remove(in_path)
-             os.remove(out_path)
+-              rustup target add {}
+-            """.format(
+-                        host_or_target.alias, rustc, rustc_target
+-                    )
+-                )
+-            )
+-
+-        check_cmd_output(*cmd, onerror=failed)
+-        if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
+-            failed()
+     finally:
+         os.remove(in_path)
+         os.remove(out_path)
+@@ -462,28 +432,7 @@
+         host, compiler_info, arm_target, rust_supported_targets
+     )
+     if rustc_target != rustc_host:
+-        if host.alias == rustc_target:
+-            configure_host = host.alias
+-        else:
+-            configure_host = "{}/{}".format(host.alias, rustc_target)
+-        die(
+-            dedent(
+-                """\
+-        The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
+-
+-        You can solve this by:
+-        * Set your configure host to match the rust compiler host by editing your
+-        mozconfig and adding "ac_add_options --host={rustc}".
+-        * Or, install the rust toolchain for {configure}, if supported, by running
+-        "rustup default stable-{rustc_target}"
+-        """.format(
+-                    rustc=rustc_host,
+-                    configure=configure_host,
+-                    rustc_target=rustc_target,
+-                )
+-            )
+-        )
+-    assert_rust_compile(host, rustc_target, rustc)
++        return rustc_host
+     return rustc_target
+ 
+ 
diff --git a/srcpkgs/thunderbird/patches/rust-has-i128.patch b/srcpkgs/thunderbird/patches/rust-has-i128.patch
deleted file mode 100644
index c25a185c1c11..000000000000
--- a/srcpkgs/thunderbird/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
-
---- a/third_party/rust/num-traits/build.rs	2020-02-14 23:57:25.985355610 +0100
-+++ b/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/thunderbird/patches/sandbox-fork.patch b/srcpkgs/thunderbird/patches/sandbox-fork.patch
index 328943cb0013..d4584e74b91c 100644
--- a/srcpkgs/thunderbird/patches/sandbox-fork.patch
+++ b/srcpkgs/thunderbird/patches/sandbox-fork.patch
@@ -2,12 +2,14 @@ make SYS_fork non-fatal, musl uses it for fork(2)
 
 --- a/security/sandbox/linux/SandboxFilter.cpp
 +++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -1253,6 +1253,8 @@
+@@ -1420,6 +1420,10 @@
          // usually do something reasonable on error.
        case __NR_clone:
          return ClonePolicy(Error(EPERM));
++#  ifdef __NR_fork
 +      case __NR_fork:
 +        return Error(ENOSYS);
++#  endif
  
  #  ifdef __NR_fadvise64
        case __NR_fadvise64:
diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch
index 959fc1ec913a..68628bea8d8f 100644
--- a/srcpkgs/thunderbird/patches/sndio.patch
+++ b/srcpkgs/thunderbird/patches/sndio.patch
@@ -42,11 +42,11 @@
  if CONFIG['OS_TARGET'] == 'Darwin':
 --- a/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
 +++ b/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
-@@ -210,6 +210,7 @@
+@@ -88,6 +88,7 @@
  @old_configure_options(
-     '--cache-file',
-     '--datadir',
-+    '--enable-sndio',
-     '--enable-crashreporter',
-     '--enable-dbus',
-     '--enable-debug-js-modules',
+     "--cache-file",
+     "--datadir",
++    "--enable-sndio",
+     "--enable-crashreporter",
+     "--enable-dbus",
+     "--enable-debug-js-modules",
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..b8cb35ad19e9 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=91.2.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=30476803f0bd4a46d2516ac5cbb831fc580b81d5d704af17c7df81e2bb6ee075
 
 lib32disabled=yes
 
@@ -159,6 +159,7 @@ 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
 
@@ -179,6 +180,8 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' '
 	./mach build
 }
 do_install() {
+	export MACH_USE_SYSTEM_PYTHON=1
+	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
 	DESTDIR="$DESTDIR" ./mach install
 
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences

From c3054698c0cdd380c7b2792f67860a9f4931974e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 21 Oct 2021 11:48:43 -0300
Subject: [PATCH 1896/4088] thunderbird-i18n: update to 91.2.0.

Remove -si language pack, no longer provided by upstream.
---
 srcpkgs/thunderbird-i18n-si       |   1 -
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 2 files changed, 55 insertions(+), 58 deletions(-)
 delete mode 120000 srcpkgs/thunderbird-i18n-si

diff --git a/srcpkgs/thunderbird-i18n-si b/srcpkgs/thunderbird-i18n-si
deleted file mode 120000
index b0de05225517..000000000000
--- a/srcpkgs/thunderbird-i18n-si
+++ /dev/null
@@ -1 +0,0 @@
-thunderbird-i18n
\ No newline at end of file
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..b63aad16f02f 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=91.2.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -59,7 +59,6 @@ _languages=(
 	'rm     "Romansh"'
 	'ro     "Romanian"'
 	'ru     "Russian"'
-	'si     "Sinhala"'
 	'sk     "Slovak"'
 	'sl     "Slovenian"'
 	'sq     "Albanian"'
@@ -96,58 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="c39c8f12193e2cd4436dc5e627db6abdba4dd6916f301c9ca29017288912da40
+ 99422da35e94debbe7a4148a6964b52cc6e259c2bafa8509d208fe7229f49042
+ 22ed9e041b919972d044340d756a114c179fc5c271929b2f2568d05b47487679
+ 526116a63bcc2ad7b7f338df80218a9999151adcc756a54dde10172b68ec90b1
+ 0244961120886427939556da9702792a75b409929ed85a3aa03d42955aa50e29
+ 463ff55ea0039f2931db3660269ea7c9f3b13e1fe437841763e76e74c2685746
+ 318cb2bec65c9a2a32fbc6f2f295d6ea5eb852f0a3fbd43ca21c62e4b70eac7f
+ 812143b553d097b323e2d18a0f26610c191427f7ffc2532cb47a0abf34a4c5c8
+ f5e2b7cc99e9af6ff70364045580a2c95efe44c7958e3d69b7a589a6a967aebc
+ 1f68904a07d2ad29843955affbb4fe5f0fd216c1566ffaa1eec15126eee08b96
+ 0ceec7f6c36c6ead466254a9a3c760340ba775b4ae49fbba12f7d35e5d62c01b
+ b9f1efb44cac93ab386d0c5ee17e1b12afac6e2545ca79aa5420b549dba3ea1f
+ 4b4e66f78acae65501e45473a2f543418ca66026f67466ebba1cfc9f5b345651
+ d6146644061cb17220ca0303cc69ce1a273c3228b997f0afed1dc0f6e4e153a3
+ 4b921c5df6511161000ea3dbc56a5443b0a2a74bd879baa3fddc767023c96d70
+ 9a340cbca2cef685e8087f2a4f75702796c71c28503bddf28dccbdbeee874716
+ 36bd723b1276f8990d5ae254ae9da6c73b120f50d16e41b1e5041e2b774060a6
+ 035515699058710f5e8fc0f6c2438a786113d408bf6bad5deefa6d3d90a05c20
+ e81ea7f58e24511145b26f4431f1ffaac672002535ccb7e1a215f0740e194185
+ fada43e831a17cf80a6c6774c77a39d21e53b3ae1bc8ca28da1480ac165667e6
+ 8b724d589d4aa55f9a7a4ca5c1c87c5e206d091fb7684d7244b079fe8cea14e1
+ e9fa6a49ab325e1beb83826900d6686400cc7c0c0da9063b35dc2ebea61f5b31
+ 3f4a614257488838e9f87e251390430e3532436b2cfa34dfb5f3b9cc6d6a1860
+ 2f08437a7fbdfc24da9a6af8616844dd6eea85bb7f4addc7125c639da668813b
+ f001d540394a4a5cf302b7839a5cf5d567ca9b27967b25354c62d2f735961f51
+ e5e33b6ed69c5c1f2af21844e303bbf4a934c8688f15ffc8ddddfa6137458030
+ 5330a0c860a04cf92ece2b7d54b234e9055f6eb74d9789fd1246b7c19768d6d2
+ 34c5405a5d93de7dee5c7e1cad3f47afcdaa34308643341b463e315d2d002a56
+ 90f88de2ae7db2005b908f9ef6158d00188c6cd9da59a4d50a446248b479fe60
+ d3e65a3635ad983ddefecd87aa315cbfcf61226bb000b8108eda33fd0dec0e78
+ d866790db8dfe8c3180caa5dfe49f7b2a5604b2648de44a585564a0b14ac5880
+ 406d5acca84aa87b108eff1d30b9b82f309166b485225315bb9f6289eb61864d
+ f4de71597d928710babb63668744570289f64c81f87f2a51498391587ad56efa
+ ce3219f61a47550a7f7b4b4d6aacff96cb7aacbd002106b05507aaa9c2e911ab
+ ee2634b1cedd03445a4bf69802c19b82b0eaaaf04c05f48c89fbef62877bf6ba
+ 73a7f172c24232ccb1baa4a84aa02127319cf5c0a3822b2d2443c81ddcae7b21
+ 162835dc0225b72eb15c088ca237e99cc6b0eb29f750417766f441e20fc64bc9
+ f14aeadadd0f714e4c5dd0b355abd9c6db519191b59231c121539d561d3c3d83
+ 74a91082371432730ab1174c037d222e0c6ad055478303442b9a41ce34123193
+ e6ef01427d4f2f6c567c57eafad50b4b5662d21c9299c90821eea15e8ba6f6e4
+ 3e57081fa2cfc4072d0b5c5236dbdc5759464e5d2fa768e205e99eba0855c651
+ 236cd697f44dc476891b7ef950e52172d59b9216102121d974b617f893449114
+ b372e3140e728bcb67e11e432544afcf21d7bb93afd4f16829956b9a8dffd6b7
+ 141a05223d1c09184ed63d027d55afd9c039e99cffdeb537b53735ad1179ceba
+ cd4786ce7355699e947ccdd1dfa7598c072c9d2c7fb530e7b7dd4225d42eb556
+ 3e11591505e1b9f11ab3019a05da0698a8af208539188bd99c38095c890cad77
+ 25c2f0364798e6461aff8ad187c67116c5e6303aa93c7cee97d02e4040d773b3
+ 054b03d96c485d27938424ab816707cc8661a8cc8c8ea76f1ef122463ee9fe76
+ c39f9034eeb8ec8ada0169cbc036fe5849b887953f42daf1e7e8c1a0e33b93ed
+ 1bb9a0b873e371a9a718f04fc3c5c94be380fb5c433808ff2a22f5bab95dc664
+ 046cbb2767026be1c49158e23c683fa0761078c88e22ef4f8ccc27fc962f27fe
+ 12e52f54b04d9ba41634e029b2b4edf6a4a753c583af189dd07b8d0f47d72253
+ 0faeb87c9803ac28b66f059f9e8cef8347b4c81aee039ac18043f8bba56c9a0b
+ 2e9a3736d33c083d846ef17476986fead36ce7e978dbfd3eba15265838d3db08"

From 63c7eeb196bdc483571f21a61557794b30d558a8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 21 Oct 2021 21:55:29 -0400
Subject: [PATCH 1897/4088] pango: update to 1.48.10, adopt

---
 srcpkgs/pango/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index cefda30988a2..56c758fbee44 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,6 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.48.9
+version=1.48.10
 revision=1
 build_style=meson
 build_helper=gir
@@ -9,12 +9,12 @@ hostmakedepends="glib-devel help2man pkg-config"
 makedepends="fribidi-devel harfbuzz-devel libXft-devel libthai-devel"
 checkdepends="dejavu-fonts-ttf liberation-fonts-ttf cantarell-fonts"
 short_desc="Library for layout and rendering of text"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a913657d3fe5aa04c03958a3b5d3fc859e891b75cd81b873a819330f6c0872aa
+checksum=21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98
 
 # Package build options
 build_options="gir"

From cf30bbe02cfb36d46e0c24df9b597b254ec0d1de Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Mon, 18 Oct 2021 21:33:41 +0200
Subject: [PATCH 1898/4088] qtractor: update to 0.9.24, enable VST3 support,
 adopt

---
 srcpkgs/qtractor/template | 57 ++++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index 8ea7f5fcd6e2..b9df4028f2ac 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -1,25 +1,50 @@
 # Template file for 'qtractor'
 pkgname=qtractor
-version=0.9.21
+version=0.9.24
 revision=1
+_vst3sdk_tag=3.7.3_build_20
 wrksrc="qtractor-qtractor_${version//./_}"
-build_style=gnu-configure
-build_helper=qmake
-configure_args="--enable-debug ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake
- ac_cv_libsuil_gtk2_in_qt5=yes ac_cv_libsuil_x11_in_qt5=yes"
-hostmakedepends="automake pkg-config qt5-qmake qt5-host-tools"
-makedepends="dssi-devel jack-devel ladspa-sdk liblo-devel libmad-devel
- libsamplerate-devel lilv-devel qt5-tools-devel qt5-x11extras-devel
- rubberband-devel sratom-devel suil-devel vamp-plugin-sdk-devel"
+create_wrksrc=yes
+build_wrksrc="qtractor-qtractor_${version//./_}"
+build_style=cmake
+configure_args="-DCONFIG_VST3SDK=$XBPS_BUILDDIR/$build_wrksrc/vst3sdk"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="aubio-devel dssi-devel jack-devel ladspa-sdk liblo-devel
+ libmad-devel libsamplerate-devel libsndfile-devel libvorbis-devel lilv-devel
+ qt5-tools-devel qt5-x11extras-devel rubberband-devel sratom-devel suil-devel"
 depends="desktop-file-utils dssi hicolor-icon-theme jack lv2"
 short_desc="Audio/MIDI multi-track sequencer application written in C++/Qt"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://qtractor.org"
+maintainer="Matthias von Faber <mvf@gmx.eu>"
+# qtractor is GPL-2.0-or-later. VST3SDK is GPL-3.0-only, with some parts BSD-3-Clause.
+license="GPL-3.0-only, BSD-3-Clause"
+homepage="https://qtractor.org"
 changelog="https://raw.githubusercontent.com/rncbc/qtractor/master/ChangeLog"
-distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.tar.gz"
-checksum=3e8c89d6d6a7a8d84280b5254020515640ef61b8ec356d8aaa3e0da118738daa
+distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.tar.gz
+ https://github.com/steinbergmedia/vst3sdk/archive/v$_vst3sdk_tag.tar.gz>vst3sdk-v${_vst3sdk_tag}.tar.gz
+ https://github.com/steinbergmedia/vst3_base/archive/v$_vst3sdk_tag.tar.gz>vst3_base-v${_vst3sdk_tag}.tar.gz
+ https://github.com/steinbergmedia/vst3_pluginterfaces/archive/v$_vst3sdk_tag.tar.gz>vst3_pluginterfaces-v${_vst3sdk_tag}.tar.gz
+ https://github.com/steinbergmedia/vst3_public_sdk/archive/v$_vst3sdk_tag.tar.gz>vst3_public_sdk-v${_vst3sdk_tag}.tar.gz"
+checksum="724b80587f844cfc7c58c22d69d6ff1cd30c7752c2116e55837f468edb6bf4d1
+ 815e51e84e6ed900f6103f00e847bee175c2dc95b16a73ae60719daa0e24ad95
+ d69d28a6a932d3c946749c9aeb6220b028d7af7ab10f83e4e732e760347fe796
+ 313f3e8c8f080d514763b3e88964a0820851d81f1159219628e1ed188fdb7303
+ 63cd7e3bf0be8ec9b3934ebdc145e13af84004c988071ecbed1aa5c8f8277d80"
 
-pre_configure() {
-	autoreconf -if
+post_extract() {
+	cd $wrksrc
+	ln -s vst3sdk-$_vst3sdk_tag vst3sdk
+	for src_dest in \
+	 vst3_base-$_vst3sdk_tag:vst3sdk/base \
+	 vst3_pluginterfaces-$_vst3sdk_tag:vst3sdk/pluginterfaces \
+	 vst3_public_sdk-$_vst3sdk_tag:vst3sdk/public.sdk
+	do
+		_src=${src_dest%:*}
+		_dst=${src_dest#*:}
+		rmdir $_dst
+		ln -sr $wrksrc/$_src $_dst
+	done
+}
+
+post_install() {
+	vlicense ../vst3sdk/base/LICENSE.txt VST3SDK-LICENSE.txt
 }

From cf180d07459c77ff46abaa296d42f37c57aa22fa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 22 Oct 2021 07:40:13 -0500
Subject: [PATCH 1899/4088] yara: update to 4.1.3.

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index e319355c73b1..f4dcddc35692 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=90ffe4e1d6f498dd4d39d19bc6858fd058aaf77586595773804a9bf03c737002
+checksum=3610ddd0c3645b8b9cfa7cfbafc0146f2df751ad8d6cd261a638bfff81efbc32
 
 pre_configure() {
 	autoreconf -fi

From 2c5dfa22034b8341e3be2e85c07aceed0a399ba3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 22 Oct 2021 07:40:16 -0500
Subject: [PATCH 1900/4088] python3-yara: update to 4.1.3.

---
 srcpkgs/python3-yara/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index d98797f45c7b..fcbbb46b64a7 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yara'
 pkgname=python3-yara
-version=4.1.2
-revision=2
+version=4.1.3
+revision=1
 wrksrc="yara-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="http://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz"
-checksum=e1192180f16be8b2c2a693cd38d2fb31900c5b344db1beb9f96bd6ee00741dbb
+checksum=009273c362d2f552ae784a297e4f0bd21ec5c51abd7e07fedb408156ffa2da8b

From ac7dca6e0a329cf8c457a287c973a78708f10b44 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 22 Oct 2021 07:43:36 -0500
Subject: [PATCH 1901/4088] python3-colorclass: patch for py3.10 collections

---
 .../python3-colorclass/patches/fix-collections.patch  | 11 +++++++++++
 srcpkgs/python3-colorclass/template                   |  5 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-colorclass/patches/fix-collections.patch

diff --git a/srcpkgs/python3-colorclass/patches/fix-collections.patch b/srcpkgs/python3-colorclass/patches/fix-collections.patch
new file mode 100644
index 000000000000..8bb61beef859
--- /dev/null
+++ b/srcpkgs/python3-colorclass/patches/fix-collections.patch
@@ -0,0 +1,11 @@
+--- a/colorclass/codes.py
++++ b/colorclass/codes.py
+@@ -1,7 +1,7 @@
+ """Handles mapping between color names and ANSI codes and determining auto color codes."""
+ 
+ import sys
+-from collections import Mapping
++from collections.abc import Mapping
+ 
+ BASE_CODES = {
+     '/all': 0, 'b': 1, 'f': 2, 'i': 3, 'u': 4, 'flash': 5, 'outline': 6, 'negative': 7, 'invis': 8, 'strike': 9,
diff --git a/srcpkgs/python3-colorclass/template b/srcpkgs/python3-colorclass/template
index 9dd543eb5a1c..eeae14b7452d 100644
--- a/srcpkgs/python3-colorclass/template
+++ b/srcpkgs/python3-colorclass/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-colorclass'
 pkgname=python3-colorclass
 version=2.2.0
-revision=4
+revision=5
 wrksrc="colorclass-${version}"
 build_style=python3-module
-pycompile_module="colorclass"
 hostmakedepends="python3-setuptools"
 checkdepends="python3-pytest python3-docopt"
 short_desc="Colorful worry-free console applications"
@@ -12,7 +11,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="https://github.com/Robpol86/colorclass"
 distfiles="https://github.com/Robpol86/colorclass/archive/v${version}.tar.gz"
-checksum=@4b1dff3a5736f909f229429396131365d31cffac0c497bdf46a1fa61e8c2d6f7
+checksum=7a0e9ac5df5c669e678e99e36731fcdc8eccd755c78dc66f46ab78fe858c159f
 
 post_install() {
 	vlicense LICENSE

From 842cc1c0022900867290d03cca5e05d1bbc6c54e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 22 Oct 2021 07:48:01 -0500
Subject: [PATCH 1902/4088] peframe: fix for py3.10

---
 srcpkgs/peframe/patches/fix-for-py3.10.patch | 11 +++++++++++
 srcpkgs/peframe/template                     |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/peframe/patches/fix-for-py3.10.patch

diff --git a/srcpkgs/peframe/patches/fix-for-py3.10.patch b/srcpkgs/peframe/patches/fix-for-py3.10.patch
new file mode 100644
index 000000000000..4c74d8ec8ec4
--- /dev/null
+++ b/srcpkgs/peframe/patches/fix-for-py3.10.patch
@@ -0,0 +1,11 @@
+--- a/peframe/modules/features.py
++++ b/peframe/modules/features.py
+@@ -18,7 +18,7 @@
+ 		delta[x - key_len] ^= delta[x]
+ 		 
+ 	""" return the delta as a string """
+-	return delta.tostring()[:-key_len]
++	return delta.tobytes()[:-key_len]
+  
+ def get_xor(filename, search_string=False):
+ 	xorsearch_custom = False
diff --git a/srcpkgs/peframe/template b/srcpkgs/peframe/template
index 61123e4a0993..8e39757fa5e9 100644
--- a/srcpkgs/peframe/template
+++ b/srcpkgs/peframe/template
@@ -1,9 +1,8 @@
 # Template file for 'peframe'
 pkgname=peframe
 version=6.0.3
-revision=4
+revision=5
 build_style="python3-module"
-pycompile_module="peframe"
 hostmakedepends="python3-setuptools"
 depends="python3-pefile python3-magic python3-M2Crypto python3-virustotal-api
  python3-yara python3-oletools"
@@ -13,3 +12,4 @@ license="GPL-2.0-only"
 homepage="https://github.com/guelfoweb/peframe"
 distfiles="https://github.com/guelfoweb/peframe/archive/${version}.tar.gz"
 checksum=75a4c75755b02a6500e9dd651ccd3e8737a7f90dffe113879e3fd2fc0582742d
+make_check=no # does not include tests

From 0fbb30f021c396d87e30b6c2efd3bb36e79ecf53 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Fri, 22 Oct 2021 14:25:11 +0200
Subject: [PATCH 1903/4088] vips: update to 8.11.4.

---
 srcpkgs/vips/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..f690885252cd 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.4
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -39,11 +39,11 @@ makedepends="
  tiff-devel
 "
 short_desc="Fast image processing with low memory needs"
-maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=5043f38828a0ff9f2275f9252f69e14f701ef11f55786cda8aa6ce2c4fbed2f7
 python_version=3
 
 build_options="gir hdf5"

From 0f610452c842c7b23ccc0846c09192f65d624a85 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Fri, 22 Oct 2021 14:07:33 +0200
Subject: [PATCH 1904/4088] fuzzel: update to 1.6.4.

---
 srcpkgs/fuzzel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 79411f98d311..a56253c9af30 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.3
+version=1.6.4
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config scdoc wayland-devel"
 makedepends="cairo-devel fcft-devel librsvg-devel libpng-devel
  libxkbcommon-devel pixman-devel tllist wayland-devel wayland-protocols"
 short_desc="Application launcher for wlroots based Wayland compositors"
-maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=5debf6e7cfad8f7b21fbf7c5c2f4f22bd9f6f8273f4b658def4fce70e8c4a3a0
+checksum=69d519c2dbcd53dc6a8e45f81f1240a2ea3ac9f420fffca8fcfce59001d443d7
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 895bb7d55f52de432fb6cfb365ccc88548251ad5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 22 Oct 2021 07:08:45 -0400
Subject: [PATCH 1905/4088] synapse: update to 1.45.1.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index fd8f0541c5b9..ca626b475adc 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.45.0
+version=1.45.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=9df83d58da8f2afa811c8091cad26081dea5a27af3e317d9a06b671d62a3f5f2
+checksum=61f279dd7260285fb6e6b89ceb8d314590309905415defb8aa9ff31d2a5374a6
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From cf236cd20848694d4dc975c28e49c26d10326f1b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Oct 2021 15:57:31 +0200
Subject: [PATCH 1906/4088] libavif: update to 0.9.3.

---
 common/shlibs            | 2 +-
 srcpkgs/libavif/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86b2920c2bbe..775868629d3e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4030,4 +4030,4 @@ libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
-libavif.so.12 libavif-0.9.2_1
+libavif.so.13 libavif-0.9.3_1
diff --git a/srcpkgs/libavif/template b/srcpkgs/libavif/template
index f3d9508bc045..8b62eac56af1 100644
--- a/srcpkgs/libavif/template
+++ b/srcpkgs/libavif/template
@@ -1,6 +1,6 @@
 # Template file for 'libavif'
 pkgname=libavif
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 configure_args="-DAVIF_BUILD_APPS=ON -DAVIF_BUILD_GDK_PIXBUF=ON
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/AOMediaCodec/libavif"
 distfiles="https://github.com/AOMediaCodec/libavif/archive/refs/tags/v${version}.tar.gz"
-checksum=d6607d654adc40a392da83daa72a4ff802cd750c045a68131c9305639c10fc5c
+checksum=bcd9a1f57f982a9615eb7e2faf87236dc88eb1d0c886f3471c7440ead605060d
 
 post_install() {
 	vlicense LICENSE

From 212dbf2d80323c4e69ca15359ff12033518906eb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 22 Oct 2021 16:53:01 +0200
Subject: [PATCH 1907/4088] linux5.4: update to 5.4.155.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index f09fc50fcce8..06efdae03094 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.154
+version=5.4.155
 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=058994f4666b6b0474a4d5228583e394594e406783b7e93d487c2a66c35f3c06
+checksum=cc0c0f902748d251cb22d0e69e3b8d260c447eb0072ef853da15da6cce775038
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 2773046741a92af3dc0dadc0e4d1ee749ada666b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 22 Oct 2021 16:55:52 +0200
Subject: [PATCH 1908/4088] linux4.19: update to 4.19.213.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index f3bb9c0ca266..de0d1afffda7 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.212
+version=4.19.213
 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=5cefdb78ddd29ae5ccda7da803da07d7cc80d68d2f6de967b61712d87f1db643
+checksum=38f28c1cd6db0b54ee37a14fd17db651fe68704d08f95e141b14d32b872f4e98
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 014d0c4cb14915ce2b9fbd6d2ff8ee3f4adf6fdc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 22 Oct 2021 10:09:20 +0200
Subject: [PATCH 1909/4088] minikube: update to 1.23.0.

---
 srcpkgs/minikube/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index eaef07bd086b..ea3f4261aed4 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,6 +1,6 @@
 # Template file for 'minikube'
 pkgname=minikube
-version=1.19.0
+version=1.23.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://github.com/kubernetes/minikube"
 changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELOG.md"
 distfiles="https://github.com/kubernetes/minikube/archive/v$version.tar.gz"
-checksum=89647d2bba64061154ffc15cf393df1834a9f860b618f699e84696992a1654b3
+checksum=c40e43a4944cf434e03d2ce520c330bdca209fb08428601e1d453ea124a9c2b3
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
@@ -26,13 +26,14 @@ pre_configure() {
 pre_build() {
 	local storage_provisioner_tag= iso_version=
 
-	make pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
 	storage_provisioner_tag=$(sed -n '/^STORAGE_PROVISIONER_TAG/s/.*=\W*//p' Makefile)
 	iso_version=$(sed -n '/^ISO_VERSION/s/.*=\W*//p' Makefile)
 
 	go_ldflags+="
-		-X k8s.io/minikube/pkg/version.isoVersion=$iso_version
-		-X k8s.io/minikube/pkg/version.storageProvisionerVersion=$storage_provisioner_tag
+	 -X k8s.io/minikube/pkg/drivers/kvm.version=${version}
+	 -X k8s.io/minikube/pkg/version.version=${version}
+	 -X k8s.io/minikube/pkg/version.isoVersion=${iso_version}
+	 -X k8s.io/minikube/pkg/version.storageProvisionerVersion=${storage_provisioner_tag}
 	"
 }
 

From 4996d308c872936fd8c61d18b32328f825f8c46b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 22 Oct 2021 14:14:00 -0400
Subject: [PATCH 1910/4088] python3-pandas: package broken on x86_64, try
 rebuilding

---
 srcpkgs/python3-pandas/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 4283d0a0b44e..74962d1466c3 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
 version=1.3.4
-revision=1
+revision=2
 wrksrc="pandas-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"

From 16c7023dd709d6b2695402ddc9de52439a8590ba Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 22 Oct 2021 21:12:08 +0200
Subject: [PATCH 1911/4088] plocate: update to 1.1.12.

---
 srcpkgs/plocate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 893f4e3c19ad..681a766400e4 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,6 +1,6 @@
 # Template file for 'plocate'
 pkgname=plocate
-version=1.1.11
+version=1.1.12
 revision=1
 build_style=meson
 configure_args="
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://plocate.sesse.net/"
 changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=e79cc6656c4bcbb25eb59ae8dcfbd5a1494061c6e80c38dc54ab25c7e1b88e4f
+checksum=a11d25ad118f5a534dc079150667f92c9a1844f12eb290df3ce9383c51e555b5
 
 system_accounts="_plocate"
 

From 8ee7fc2ab2430041b7c7135d3ddc164e84f8d63c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 22 Oct 2021 21:14:18 +0200
Subject: [PATCH 1912/4088] libite: update to 2.4.1.

---
 srcpkgs/libite/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libite/template b/srcpkgs/libite/template
index 87ef4ae653da..505dcef122dc 100644
--- a/srcpkgs/libite/template
+++ b/srcpkgs/libite/template
@@ -1,6 +1,6 @@
 # Template file for 'libite'
 pkgname=libite
-version=2.4.0
+version=2.4.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ license="MIT, ISC, BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/troglobit/libite"
 changelog="https://raw.githubusercontent.com/troglobit/libite/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/libite/archive/v${version}.tar.gz"
-checksum=5fe375f1350c487337502c7fb6e8a67ff0fb275d7b3934e196fe250ac0a7ad72
+checksum=5c5e8a75a45910a5313ec43268c5c0dda9282777a90f9a857293e26ee0696598
 
 pre_configure() {
 	./autogen.sh
@@ -23,7 +23,7 @@ post_install() {
 
 pre_check() {
 	# avoid installing which for testing a which function
-	vsed -e 's;/usr/bin/which;/usr/bin/id;' -i tests/which.c
+	vsed -e 's;/usr/bin/which;/usr/bin/id;' -i test/which.c
 }
 
 libite-devel_package() {

From 0f68da80e2e7c233886b773bfbcd03c336b990fc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 22 Oct 2021 21:15:15 +0200
Subject: [PATCH 1913/4088] openradtool: update to 0.13.9.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..51078a394335 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.9
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=9371577b5ffac498422edc964102b77819c9768e225f354d9cd796cf87d9977f
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 0a0cf82887ee355e0e2683810b545a6e647e2012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 21 Oct 2021 20:32:45 +0200
Subject: [PATCH 1914/4088] bash: disable test suspending xbps-src

---
 srcpkgs/bash/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index 9e93ac43a00f..c13fef6e2bd2 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -56,6 +56,11 @@ post_patch() {
 }
 
 do_check() {
+	# when xbps-src is run from interactive shell, this tests receives SIGTTIN,
+	# and suspends xbps-src
+	sed -i tests/read2.sub -e '/read -t 2 a < \/dev\/tty/,/echo $a/ d'
+	sed -i tests/read.right -e '/timeout 1: ok/,+1 d'
+	sed -i tests/read.right -e '/read2.sub: line 36: read:/s/ 36:/ 27:/'
 	make tests
 }
 

From dfa941a95f2bbb2076c56161df536daf93e21598 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 21 Oct 2021 14:42:34 -0400
Subject: [PATCH 1915/4088] gifsicle: subsume "Gifsicle"

---
 srcpkgs/Gifsicle          |  1 +
 srcpkgs/Gifsicle/template | 13 -------------
 srcpkgs/Gifsicle/update   |  2 --
 srcpkgs/gifsicle/template |  8 +++++++-
 4 files changed, 8 insertions(+), 16 deletions(-)
 create mode 120000 srcpkgs/Gifsicle
 delete mode 100644 srcpkgs/Gifsicle/template
 delete mode 100644 srcpkgs/Gifsicle/update

diff --git a/srcpkgs/Gifsicle b/srcpkgs/Gifsicle
new file mode 120000
index 000000000000..a986d20bd79b
--- /dev/null
+++ b/srcpkgs/Gifsicle
@@ -0,0 +1 @@
+gifsicle
\ No newline at end of file
diff --git a/srcpkgs/Gifsicle/template b/srcpkgs/Gifsicle/template
deleted file mode 100644
index 3bc86a181323..000000000000
--- a/srcpkgs/Gifsicle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'Gifsicle'
-pkgname=Gifsicle
-version=1.92
-revision=1
-wrksrc="gifsicle-${version}"
-build_style=gnu-configure
-makedepends="libX11-devel"
-short_desc="Command-line GIF manipulation tool"
-maintainer="ColdPhoenix <coldphoenix@interia.pl>"
-license="GPL-2.0-only"
-homepage="https://www.lcdf.org/gifsicle"
-distfiles="${homepage}/gifsicle-${version}.tar.gz"
-checksum=5ab556c01d65fddf980749e3ccf50b7fd40de738b6df679999294cc5fabfce65
diff --git a/srcpkgs/Gifsicle/update b/srcpkgs/Gifsicle/update
deleted file mode 100644
index 53252e972a5b..000000000000
--- a/srcpkgs/Gifsicle/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://www.lcdf.org/gifsicle/changes.html"
-pattern='<b>\K[0-9\.]+(?=</b>)'
\ No newline at end of file
diff --git a/srcpkgs/gifsicle/template b/srcpkgs/gifsicle/template
index 50313417e864..d466886ae54e 100644
--- a/srcpkgs/gifsicle/template
+++ b/srcpkgs/gifsicle/template
@@ -1,7 +1,7 @@
 # Template file for 'gifsicle'
 pkgname=gifsicle
 version=1.93
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Command-line tool for information about GIF images"
@@ -14,3 +14,9 @@ checksum=941c0b1c3ebc748949a0d14363f0fb3c9d2c06ee122b3548315b9233eb956d88
 pre_configure() {
 	autoreconf -fi
 }
+
+Gifsicle_package() {
+	depends="gifsicle"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 022561035a5a58954075e5b9d62e4ee35c3c8ac1 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Fri, 22 Oct 2021 22:04:07 +0300
Subject: [PATCH 1916/4088] lf: update to r26.

---
 srcpkgs/lf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 0a8c8b3c01d4..896673e297d6 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r25
+version=r26
 revision=1
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/gokcehan/lf"
 distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=a4590c046ac2c2b338de64aad5b6bf76cbad11b5503d141677536ecef7019119
+checksum=dccd1ad67d2639e47fe0cbc93d74f202d6d6f0c3759fb0237affb7b1a2b1379e
 
 post_install() {
 	vlicense LICENSE

From 9996f0cde5f14d030ced4cd0ae7ccf9e9e2edc6f Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Wed, 20 Oct 2021 20:25:23 -0700
Subject: [PATCH 1917/4088] zoom: update to 5.8.0.16

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 450e146d94da..ec2aa182857a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.31792.0820
+version=5.8.0.16
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=271e09c29ea9c67799aa808e4d3e7963ad90e73880d1a5ec3e3afceaeda1e362
+checksum=cdf94c3ef9ee8d8694a71ff305f4e25cb7d0d1076a7f4dfa4ca33e949dcb5bdf
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 7fa4d8cf1895af02a1d186c9509274ba4b345081 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 22 Oct 2021 22:10:44 +0200
Subject: [PATCH 1918/4088] teams-bin: update to 1.4.00.26453.

---
 srcpkgs/teams-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/teams-bin/template b/srcpkgs/teams-bin/template
index 142717fcb698..43a0d6e8d907 100644
--- a/srcpkgs/teams-bin/template
+++ b/srcpkgs/teams-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'teams-bin'
 pkgname=teams-bin
-version=1.4.00.13653
+version=1.4.00.26453
 revision=1
 archs="x86_64"
 short_desc="Official Microsoft Teams client"
@@ -8,7 +8,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:Proprietary"
 homepage="https://teams.microsoft.com/downloads"
 distfiles="https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"
-checksum=5b4217fab3df145b1a37c53d138d87713786f290805a90fc276434770692a4cf
+checksum=ee15b57793aa6b79ccda744d5232da670335abd931bae2a020f5043a129ab859
 
 repository=nonfree
 restricted=yes

From 06f2555250f54fe3d787aa6f9169f178709dd3c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 12:18:16 +0200
Subject: [PATCH 1919/4088] New package: wike-1.6.0

---
 srcpkgs/wike/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/wike/template

diff --git a/srcpkgs/wike/template b/srcpkgs/wike/template
new file mode 100644
index 000000000000..088b54e97534
--- /dev/null
+++ b/srcpkgs/wike/template
@@ -0,0 +1,14 @@
+# Template file for 'wike'
+pkgname=wike
+version=1.6.0
+revision=1
+wrksrc="Wike-$version"
+build_style=meson
+hostmakedepends="pkg-config glib-devel gettext"
+depends="python3-gobject python3-requests gtk+3 libhandy1 webkit2gtk"
+short_desc="Wikipedia Reader for the GNOME Desktop"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/hugolabe/Wike"
+distfiles="https://github.com/hugolabe/Wike/archive/refs/tags/$version.tar.gz"
+checksum=6244e99fe456684f3b0b495bb3da1db403f6c8067f0c2e564476df4603c54ccd

From e51ba4afb08b1f9a145106eafcaa7bafd2811838 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 22 Oct 2021 22:43:18 +0200
Subject: [PATCH 1920/4088] python3-mccabe: fix typo in the maintainer field

---
 srcpkgs/python3-mccabe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mccabe/template b/srcpkgs/python3-mccabe/template
index f19e5e6d32e6..0c5c6ad89001 100644
--- a/srcpkgs/python3-mccabe/template
+++ b/srcpkgs/python3-mccabe/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-mccabe'
 pkgname=python3-mccabe
 version=0.6.1
-revision=6
+revision=7
 wrksrc="mccabe-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="McCabe complexity checker for Python3"
-maintainer="Michal Vasilek <michal@vasilek>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/mccabe"
 distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"

From 1777cda4e82a812d09830f48ff5915ac31ffe70a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Oct 2021 23:48:48 -0400
Subject: [PATCH 1921/4088] mdcat: update to 0.23.2

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df5560b34d8c..bbd815ce7258 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,6 +1,6 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.23.0
+version=0.23.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
@@ -12,7 +12,7 @@ license="MPL-2.0"
 homepage="https://github.com/lunaryorn/mdcat"
 changelog="https://raw.githubusercontent.com/lunaryorn/mdcat/main/CHANGELOG.md"
 distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=9fba4fe06f8970a70ca75666f8245181583a6ba5fb11536ae7e572f74c9d1f4c
+checksum=354f1bea0a53c5547693b7de9731d6e2648a0da10aa485ca16e4e643e49be14c
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From b658c3e90569b28e2ecf3ce1ba076a026deb9a8f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 22 Oct 2021 22:24:09 +0200
Subject: [PATCH 1922/4088] xfce4-terminal: fix homepage and ignore development
 releases

---
 srcpkgs/xfce4-terminal/template | 4 ++--
 srcpkgs/xfce4-terminal/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xfce4-terminal/update

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 475efb6ae6e7..b25c1f0ab755 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -10,6 +10,6 @@ depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"
 short_desc="Modern terminal emulator primarly for the Xfce desktop environment"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=7a3337c198e01262a0412384823185753ac8a0345be1d6776a7e9bbbcbf33dc7
diff --git a/srcpkgs/xfce4-terminal/update b/srcpkgs/xfce4-terminal/update
new file mode 100644
index 000000000000..5636324afbce
--- /dev/null
+++ b/srcpkgs/xfce4-terminal/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"

From e66009464b27258bb6182744e9d59904acfbbfa3 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 22 Oct 2021 22:25:04 +0200
Subject: [PATCH 1923/4088] go-for-it: update to 1.9.5.

---
 srcpkgs/go-for-it/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go-for-it/template b/srcpkgs/go-for-it/template
index 938a12fea435..6a6f95bf454a 100644
--- a/srcpkgs/go-for-it/template
+++ b/srcpkgs/go-for-it/template
@@ -1,6 +1,6 @@
 # Template file for 'go-for-it'
 pkgname=go-for-it
-version=1.9.2
+version=1.9.5
 revision=1
 wrksrc="Go-For-It-${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-only"
 homepage="https://github.com/JMoerman/Go-For-It"
 distfiles="https://github.com/JMoerman/Go-For-It/archive/${version}.tar.gz"
-checksum=0cc4f9a61fe4efa18bf81cccef0e0a737b4c58f0ed0b8ea9cc6976d5621d2430
+checksum=3cdf7d396737eb8a6f6bff8fbfbc8b5c870cf4ed6def2ab84dab26b777998302

From 7a5e01867c89b07e5d1279402be4b7229938abee Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 22 Oct 2021 23:07:06 +0200
Subject: [PATCH 1924/4088] acpid: fix backlight stepping for low values of
 max_brightness

appearently, max_brightness can be as low as 15, which makes the integer
division round down to 0.

Fixes: c101203b25 ("acpid: cleanup handler")
Reported-by: slotThe <soliditsallgood@mailbox.org>
Signed-off-by: Piraty <piraty1@inbox.ru>
---
 srcpkgs/acpid/files/handler.sh | 1 +
 srcpkgs/acpid/template         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/acpid/files/handler.sh b/srcpkgs/acpid/files/handler.sh
index df6b28a09666..1ff368bc1ebe 100644
--- a/srcpkgs/acpid/files/handler.sh
+++ b/srcpkgs/acpid/files/handler.sh
@@ -9,6 +9,7 @@ step_backlight() {
     for backlight in /sys/class/backlight/*/; do
         [ -d "$backlight" ] || continue
         step=$(( $(cat "$backlight/max_brightness") / 20 ))
+        [ "$step" -gt "1" ] || step=1 #fallback if gradation is too low
         printf '%s' "$(( $(cat "$backlight/brightness") $1 step ))" >"$backlight/brightness"
     done
 }
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index 24be7ddd93a7..ba9f0dc442b6 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,7 +1,7 @@
 # Template file for 'acpid'
 pkgname=acpid
 version=2.0.33
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="ACPI Daemon (acpid) With Netlink Support"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7655e363db867126a23df349c65ab7cd78e60c16 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 19 Oct 2021 12:39:33 +0200
Subject: [PATCH 1925/4088] i3-gaps: update to 4.20.

Closes: #33635 [via git-merge-pr]
---
 srcpkgs/i3-gaps/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index cf193f45eb6c..8ad27a261f40 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,7 +1,7 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.19.1
-revision=2
+version=4.20
+revision=1
 wrksrc="i3-${version}"
 build_style=meson
 configure_args="-Dmans=true"
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=97f33544f0a64a325b7b98cd4ad17dcf6f2c8ead1350d378154b76af1798e8fc
+checksum=6ae967b31b35bdf0856faae49f66db95e77aa55266764950f9665dfce16cdfbf
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"

From 0cf23c29f2b86e80b9ed01efba4254e3cd7b558f Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Fri, 15 Oct 2021 13:46:51 +0530
Subject: [PATCH 1926/4088] mpd: update to 0.23.2.

---
 srcpkgs/mpd/template | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index e7d50ea115bf..1ee87bc617be 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.11
+version=0.23.2
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -15,20 +15,22 @@ configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsndio=$(vopt_if sndio enabled disabled) -Dpulse=$(vopt_if pulseaudio enabled disabled)
  -Dwavpack=$(vopt_if wavpack enabled disabled) -Dcdio_paranoia=$(vopt_if cdio enabled disabled)
  -Dopenal=$(vopt_if openal enabled disabled) -Dshout=$(vopt_if shoutcast enabled disabled)
- -Dio_uring=$(vopt_if io_uring enabled disabled)"
+ -Dio_uring=$(vopt_if io_uring enabled disabled) -Dopenmpt=$(vopt_if openmpt enabled disabled)
+ -Dpipewire=$(vopt_if pipewire enabled disabled)"
 conf_files="/etc/mpd.conf"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
- libupnp-devel mpg123-devel opus-devel yajl-devel
- zziplib-devel libsoxr-devel audiofile-devel twolame-devel
- $(vopt_if io_uring 'liburing-devel')
+ libnpupnp-devel mpg123-devel opus-devel yajl-devel
+ zziplib-devel libsoxr-devel audiofile-devel twolame-devel fmt-devel
+ $(vopt_if io_uring 'liburing-devel') $(vopt_if pipewire 'pipewire-devel')
  $(vopt_if cdio 'libcdio-paranoia-devel') $(vopt_if shoutcast 'libshout-devel')
  $(vopt_if jack 'jack-devel') $(vopt_if lame 'lame-devel')
  $(vopt_if libao 'libao-devel') $(vopt_if mpcdec 'libmpcdec-devel')
  $(vopt_if pulseaudio 'pulseaudio-devel') $(vopt_if sndio 'sndio-devel')
- $(vopt_if wavpack 'wavpack-devel') $(vopt_if openal 'libopenal-devel')"
+ $(vopt_if wavpack 'wavpack-devel') $(vopt_if openal 'libopenal-devel')
+ $(vopt_if openmpt 'libopenmpt-devel')"
 depends="libcap-progs"
 checkdepends="gtest-devel"
 short_desc="Flexible, powerful, server-side application for playing music"
@@ -37,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=143f7f34aaee6e87888f3dd35d49aade6656052651b960ca42b46cbb518ca0a0
+checksum=74ec75689746baaeab7c65d70019f96f70b31b658cb25cfd2ebcca03f65acddf
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
@@ -49,11 +51,14 @@ make_dirs="
  /var/lib/mpd/playlists 0755 mpd mpd"
 
 # Package build options
-build_options="jack lame mpcdec pulseaudio libao wavpack sndio cdio openal shoutcast io_uring"
+build_options="jack lame mpcdec pulseaudio libao wavpack sndio cdio openal shoutcast io_uring
+	openmpt pipewire"
 desc_option_cdio="Enable libcdio_paranoia input plugin"
 desc_option_openal="Enable OpenAL output plugin"
 desc_option_io_uring="Enable support for using liburing"
-build_options_default="jack pulseaudio libao sndio cdio shoutcast"
+desc_option_pipewire="Enable Pipewire output plugin"
+desc_option_openmpt="Enable OpenMPT decoder plugin"
+build_options_default="jack pulseaudio libao sndio cdio shoutcast pipewire"
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtest=true"

From 6e849e8aaee6e2830ae90352a90a49280563e956 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 22 Oct 2021 23:17:28 +0200
Subject: [PATCH 1927/4088] yt-dlp: update to 2021.10.22.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 7fd4f85e5467..66678b44c731 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2021.10.10
+version=2021.10.22
 revision=1
 wrksrc="$pkgname"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=6d8faf0b6fced99213eeaa5450c2c9e4acbee78081a9f5c04933ea0d316994fb
+checksum=075d7e04fb8882bd4722859e93d0eb465a8f7c13921fd091ed3791be2b670476
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 7e0c7b567c965da89e034dbc2d7a753a9dc5e795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 22 Oct 2021 19:07:26 -0300
Subject: [PATCH 1928/4088] thunderbird: try to fix build on i686.

---
 srcpkgs/thunderbird/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b8cb35ad19e9..9063ead6161b 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -39,6 +39,12 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
+# try to minimize memory usage via debug symbols
+# 'LLVM ERROR: out of memory' while compiling gtkrust
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+	nodebug=yes
+fi
+
 # we need this because cargo verifies checksums of all files in vendor
 # crates when it builds and gives us no way to override or update the
 # file sanely... so just clear out the file list
@@ -135,11 +141,11 @@ do_build() {
 
 	# work around large debug symbols on 32-bit hosts
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
-		export CFLAGS="${CFLAGS/-g/-g1}"
-		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+		echo "ac_add_options --disable-debug" >>.mozconfig
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
-		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		vsed -i 's/debug_info = "2"/debug_info = "0"/' \
 		build/moz.configure/toolchain.configure
 	fi
 

From 03d4d8f2ca7f4beb704627cdd31ba798a252ea43 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 22 Oct 2021 18:06:32 -0400
Subject: [PATCH 1929/4088] gthumb: update to 3.12.0

---
 srcpkgs/gthumb/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template
index ed6afee1b837..13fb63a7fb13 100644
--- a/srcpkgs/gthumb/template
+++ b/srcpkgs/gthumb/template
@@ -1,20 +1,21 @@
 # Template file for 'gthumb'
 pkgname=gthumb
-version=3.10.2
-revision=2
+version=3.12.0
+revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel"
 makedepends="webkit2gtk-devel json-glib-devel libsecret-devel librsvg-devel
  libwebp-devel exiv2-devel gtk+3-devel libraw-devel libchamplain-devel
- colord-devel gsettings-desktop-schemas-devel $(vopt_if brasero brasero-devel)
- $(vopt_if clutter 'clutter-devel clutter-gtk-devel') $(vopt_if gstreamer gstreamer1-devel)
- $(vopt_if soup libsoup-devel)"
+ colord-devel gsettings-desktop-schemas-devel libheif-devel
+ $(vopt_if brasero brasero-devel) $(vopt_if clutter 'clutter-devel clutter-gtk-devel')
+ $(vopt_if gstreamer gstreamer1-devel) $(vopt_if soup libsoup-devel)"
 short_desc='Image viewer and browser for the GNOME Desktop'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 license="GPL-2.0-or-later"
-homepage="http://live.gnome.org/gthumb"
+homepage="https://wiki.gnome.org/action/show/Apps/Gthumb"
+changelog="https://gitlab.gnome.org/GNOME/gthumb/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz"
-checksum=fdeae42818378f9b3cab00604eeeb5b7c0a7a5ecfe69de08b993867746435c93
+checksum=3deffc030384e64b57361c437c79b481ae1489ef44c87ae856e81bb10d8e383f
 
 LDFLAGS="-fPIC"
 

From bfcbe2fdc8e6eae71b9d88a4800f9d76fa4b09e4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 21 Oct 2021 00:13:28 +0200
Subject: [PATCH 1930/4088] chromium: update to 95.0.4638.54.

---
 .../chromium-i686-vaapi-fpermissive.patch     |  22 -
 .../files/musl-patches/resolver.patch         |  13 +-
 .../musl-patches/xxx-ppc64le-support.patch    |  16 +-
 .../chromium-94-CustomSpaces-include.patch    |  24 -
 .../patches/chromium-95-harfbuzz-3.patch      |  31 +
 .../patches/chromium-95-quiche-include.patch  |  25 +
 .../chromium-i686-vaapi-fpermissive.patch     |  23 +
 .../fix-bits-stdint-intn-include.patch        |  11 +
 .../patches/ozone-x11-fix-VA-API.patch        | 671 ++++++++++++++++++
 srcpkgs/chromium/template                     |  13 +-
 10 files changed, 778 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/chromium/files/i686-patches/chromium-i686-vaapi-fpermissive.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-95-harfbuzz-3.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-95-quiche-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/chromium/patches/fix-bits-stdint-intn-include.patch
 create mode 100644 srcpkgs/chromium/patches/ozone-x11-fix-VA-API.patch

diff --git a/srcpkgs/chromium/files/i686-patches/chromium-i686-vaapi-fpermissive.patch b/srcpkgs/chromium/files/i686-patches/chromium-i686-vaapi-fpermissive.patch
deleted file mode 100644
index b4d8787c4798..000000000000
--- a/srcpkgs/chromium/files/i686-patches/chromium-i686-vaapi-fpermissive.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- media/gpu/vaapi/BUILD.gn.orig	2019-06-18 11:48:14.000000000 -0400
-+++ media/gpu/vaapi/BUILD.gn	2019-07-02 18:34:00.607864854 -0400
-@@ -11,6 +11,10 @@
- 
- assert(use_vaapi)
- 
-+config("vaapi_permissive") {
-+  cflags = [ "-fpermissive" ]
-+}
-+
- generate_stubs("libva_stubs") {
-   extra_header = "va_stub_header.fragment"
-   sigs = [ "va.sigs" ]
-@@ -89,6 +93,8 @@
-     deps += [ "//media/gpu/linux" ]
-   }
- 
-+  configs += [ ":vaapi_permissive" ]
-+
-   if (use_x11) {
-     configs += [ "//build/config/linux:x11" ]
-     deps += [ "//ui/gfx/x" ]
diff --git a/srcpkgs/chromium/files/musl-patches/resolver.patch b/srcpkgs/chromium/files/musl-patches/resolver.patch
index fb8b0ddccda6..091d3f3e88ef 100644
--- a/srcpkgs/chromium/files/musl-patches/resolver.patch
+++ b/srcpkgs/chromium/files/musl-patches/resolver.patch
@@ -51,10 +51,12 @@
      UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
                            dns_config_.has_value());
      if (!dns_config_.has_value())
-@@ -486,20 +480,11 @@
+--- net/dns/public/resolv_reader.cc.orig
++++ net/dns/public/resolv_reader.cc
+@@ -20,19 +20,10 @@
+ namespace net {
  
- std::unique_ptr<struct __res_state>
- DnsConfigServiceLinux::ResolvReader::GetResState() {
+ std::unique_ptr<struct __res_state> ResolvReader::GetResState() {
 -  auto res = std::make_unique<struct __res_state>();
 -  memset(res.get(), 0, sizeof(struct __res_state));
 -
@@ -67,9 +69,8 @@
 +  return nullptr;
  }
  
- void DnsConfigServiceLinux::ResolvReader::CloseResState(
-     struct __res_state* res) {
+ void ResolvReader::CloseResState(struct __res_state* res) {
 -  res_nclose(res);
  }
  
- DnsConfigServiceLinux::DnsConfigServiceLinux()
+ absl::optional<std::vector<IPEndPoint>> GetNameservers(
diff --git a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
index 9ea233ba6256..681b1f011c31 100644
--- a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/partition_alloc_config.h	2021-05-25 00:05:31.000000000 +0200
-+++ -	2021-05-26 22:23:47.172940826 +0200
-@@ -88,7 +88,8 @@
- // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
- // the next pointer shadow for the smallest bucket.
- #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
--    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
-+    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig
++++ base/allocator/partition_allocator/partition_alloc_config.h
+@@ -114,7 +114,8 @@
+ // platforms complicates things. Note that Chromium is not officially supported
+ // on any big endian architecture as well.
+ #if !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
+-    defined(ARCH_CPU_LITTLE_ENDIAN)
++    defined(ARCH_CPU_LITTLE_ENDIAN) && \
 +    !defined(__powerpc64__)
  #define PA_HAS_FREELIST_HARDENING
  #endif
diff --git a/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
deleted file mode 100644
index 01757758c1e2..000000000000
--- a/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4eeacdaa57b29a079fe09315eb22557c06aa522e Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 13 Aug 2021 12:57:42 +0000
-Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces
-
----
- .../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h      | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-index df0465a..640cb33 100644
---- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-+++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-@@ -5,6 +5,7 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
- 
-+#include <memory>
- #include <vector>
- 
- #include "third_party/blink/renderer/platform/platform_export.h"
--- 
-2.31.1
-
diff --git a/srcpkgs/chromium/patches/chromium-95-harfbuzz-3.patch b/srcpkgs/chromium/patches/chromium-95-harfbuzz-3.patch
new file mode 100644
index 000000000000..33fe9556aaf3
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-95-harfbuzz-3.patch
@@ -0,0 +1,31 @@
+From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001
+From: Dominik Röttsches <drott@chromium.org>
+Date: Tue, 28 Sep 2021 15:31:50 +0000
+Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38 (80 commits)
+
+Fixed: 1252284
+Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
+Auto-Submit: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Calder Kitagawa <ckitagawa@chromium.org>
+Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#925776}
+
+(only components/paint_preview/common/subset_font.cc)
+---
+
+diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
+index 45daea7b1..43a448e 100644
+--- a/components/paint_preview/common/subset_font.cc
++++ b/components/paint_preview/common/subset_font.cc
+@@ -79,7 +79,7 @@
+   // Retain all variation information for OpenType variation fonts. See:
+   // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
+   hb_set_t* skip_subset =
+-      hb_subset_input_no_subset_tables_set(input.get());  // Owned by |input|.
++      hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG);
+   hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r'));
+   hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r'));
+   hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));
diff --git a/srcpkgs/chromium/patches/chromium-95-quiche-include.patch b/srcpkgs/chromium/patches/chromium-95-quiche-include.patch
new file mode 100644
index 000000000000..4bbd45cfc094
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-95-quiche-include.patch
@@ -0,0 +1,25 @@
+From a9d986203bcfbaab84f270c1dc6c3abb4c450ee1 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 17 Sep 2021 14:57:33 +0000
+Subject: [PATCH] IWYU: add stddef.h for size_t in WindowManager
+
+---
+ net/third_party/quiche/src/http2/adapter/window_manager.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/third_party/quiche/src/http2/adapter/window_manager.h b/net/third_party/quiche/src/http2/adapter/window_manager.h
+index f15982d..5a7701e 100644
+--- a/net/third_party/quiche/src/http2/adapter/window_manager.h
++++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
+@@ -1,6 +1,8 @@
+ #ifndef QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
+ #define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
+ 
++#include <stddef.h>
++
+ #include <functional>
+ 
+ #include "common/platform/api/quiche_export.h"
+-- 
+2.32.0
+
diff --git a/srcpkgs/chromium/patches/chromium-i686-vaapi-fpermissive.patch b/srcpkgs/chromium/patches/chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..77c0b58c94e1
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,23 @@
+--- a/media/gpu/vaapi/BUILD.gn.orig
++++ b/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,12 @@
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  if (target_cpu == "x86") {
++    cflags = [ "-fpermissive" ]
++  }
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -90,6 +96,7 @@
+   configs += [
+     "//build/config/linux/libva",
+     "//third_party/libvpx:libvpx_config",
++    ":vaapi_permissive",
+   ]
+ 
+   deps = [
diff --git a/srcpkgs/chromium/patches/fix-bits-stdint-intn-include.patch b/srcpkgs/chromium/patches/fix-bits-stdint-intn-include.patch
new file mode 100644
index 000000000000..978cd6a493d6
--- /dev/null
+++ b/srcpkgs/chromium/patches/fix-bits-stdint-intn-include.patch
@@ -0,0 +1,11 @@
+--- a/ui/ozone/platform/wayland/host/wayland_window.cc.orig
++++ b/ui/ozone/platform/wayland/host/wayland_window.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "ui/ozone/platform/wayland/host/wayland_window.h"
+ 
+-#include <bits/stdint-intn.h>
++#include <stdint.h>
+ #include <wayland-cursor.h>
+ #include <algorithm>
+ #include <memory>
diff --git a/srcpkgs/chromium/patches/ozone-x11-fix-VA-API.patch b/srcpkgs/chromium/patches/ozone-x11-fix-VA-API.patch
new file mode 100644
index 000000000000..61d72bfb0137
--- /dev/null
+++ b/srcpkgs/chromium/patches/ozone-x11-fix-VA-API.patch
@@ -0,0 +1,671 @@
+From a4de986102a45e29c3ef596f22704bdca244c26c Mon Sep 17 00:00:00 2001
+From: Maksim Sisov <msisov@igalia.com>
+Date: Fri, 17 Sep 2021 08:45:55 +0000
+Subject: [PATCH] ozone/x11: fix VA-API.
+
+This patch fixes VA-API usage with Ozone/X11 backend (which
+is our default backend now as X11 has been deprecated -
+crrev.com/c/3114071)).
+
+non-Ozone X11 is disabled now and Ozone is always used
+on Linux. However, VA-API implementation is not Ozone friendly
+yet and requires major refactoring. But given that VA-API
+implementation on Linux worked only with X11, it's fine for
+now to change USE_X11 and !IsUsingOzonePlatform to
+BUILDFLAG(OZONE_PLATFORM_X11) and fail VA-API initialization
+in VADisplayState::Initialize for Ozone/Linux other than
+non-X11 backends.
+
+Bug: 1121948
+Change-Id: If85d289235e6d358103d9fa2bbe0f741fb599a26
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3141878
+Commit-Queue: Maksim Sisov <msisov@igalia.com>
+Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
+Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
+Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
+Reviewed-by: Alexander Dunaev <adunaev@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#922466}
+---
+ media/BUILD.gn                                |  3 -
+ media/gpu/BUILD.gn                            |  5 +-
+ media/gpu/args.gni                            | 13 +++-
+ media/gpu/vaapi/BUILD.gn                      |  8 +-
+ media/gpu/vaapi/va_stub_header.fragment       |  6 +-
+ media/gpu/vaapi/vaapi_picture_factory.cc      | 72 ++++++++----------
+ .../vaapi_picture_native_pixmap_angle.cc      |  2 -
+ media/gpu/vaapi/vaapi_picture_tfp.cc          |  2 -
+ .../vaapi/vaapi_video_decode_accelerator.cc   |  9 +--
+ ...vaapi_video_decode_accelerator_unittest.cc | 11 +--
+ media/gpu/vaapi/vaapi_wrapper.cc              | 76 +++++++++----------
+ media/gpu/vaapi/vaapi_wrapper.h               |  8 +-
+ ui/ozone/platform/x11/ozone_platform_x11.cc   |  3 +
+ ui/ozone/public/ozone_platform.h              | 10 +++
+ 14 files changed, 108 insertions(+), 120 deletions(-)
+
+diff --git a/media/BUILD.gn b/media/BUILD.gn
+index dbee1d4338..d5c158c08f 100644
+--- a/media/BUILD.gn
++++ b/media/BUILD.gn
+@@ -130,9 +130,6 @@ component("media") {
+     public_deps += [ "//media/base/mac" ]
+   }
+ 
+-  if (use_x11) {
+-    deps += [ "//ui/base/x" ]
+-  }
+   if (use_ozone) {
+     deps += [ "//ui/ozone" ]
+   }
+diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
+index c7499485ac..3fedc78948 100644
+--- a/media/gpu/BUILD.gn
++++ b/media/gpu/BUILD.gn
+@@ -20,6 +20,7 @@ buildflag_header("buildflags") {
+     "USE_VAAPI_IMAGE_CODECS=$use_vaapi_image_codecs",
+     "USE_V4L2_CODEC=$use_v4l2_codec",
+     "USE_LIBV4L2=$use_v4lplugin",
++    "USE_VAAPI_X11=$use_vaapi_x11",
+   ]
+ }
+ 
+@@ -215,9 +216,7 @@ component("gpu") {
+       "windows/supported_profile_helpers.cc",
+       "windows/supported_profile_helpers.h",
+     ]
+-    configs += [
+-      "//third_party/khronos:khronos_headers",
+-    ]
++    configs += [ "//third_party/khronos:khronos_headers" ]
+     public_deps += [ "//media/base/win:media_foundation_util" ]
+     deps += [
+       "//gpu/ipc/common:common",
+diff --git a/media/gpu/args.gni b/media/gpu/args.gni
+index 4004937949..2f53843918 100644
+--- a/media/gpu/args.gni
++++ b/media/gpu/args.gni
+@@ -3,7 +3,15 @@
+ # found in the LICENSE file.
+ 
+ import("//build/config/chromeos/ui_mode.gni")
+-import("//build/config/ui.gni")
++import("//build/config/ozone.gni")
++
++declare_args() {
++  # Indicates if X11 VA-API-based hardware acceleration is to be used.
++  # See also the comment near the |use_vaapi| arg.
++  use_vaapi_x11 =
++      is_linux && ozone_platform_x11 && !is_chromecast && !is_chromeos_lacros &&
++      (target_cpu == "x86" || target_cpu == "x64")
++}
+ 
+ declare_args() {
+   # Indicates if V4L plugin is used.
+@@ -21,8 +29,7 @@ declare_args() {
+   # is typically the case on x86-based ChromeOS devices.
+   # VA-API should also be compiled by default on x11-using linux devices
+   # using x86/x64.
+-  use_vaapi =
+-      is_linux && use_x11 && (target_cpu == "x86" || target_cpu == "x64")
++  use_vaapi = use_vaapi_x11
+ 
+   # Indicates if ChromeOS protected media support exists. This is used
+   # to enable the CDM daemon in Chrome OS as well as support for
+diff --git a/media/gpu/vaapi/BUILD.gn b/media/gpu/vaapi/BUILD.gn
+index b11d2c60fa..0c2520dd6b 100644
+--- a/media/gpu/vaapi/BUILD.gn
++++ b/media/gpu/vaapi/BUILD.gn
+@@ -17,7 +17,7 @@ assert(use_vaapi)
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+-  if (use_x11) {
++  if (use_vaapi_x11) {
+     sigs += [ "va_x11.sigs" ]
+   }
+   if (is_chromeos_ash) {
+@@ -131,14 +131,14 @@ source_set("vaapi") {
+     ]
+   }
+ 
+-  if (use_x11 || use_ozone || use_egl) {
++  if (use_ozone || use_egl) {
+     sources += [
+       "vaapi_picture_native_pixmap.cc",
+       "vaapi_picture_native_pixmap.h",
+     ]
+   }
+ 
+-  if (use_x11) {
++  if (use_vaapi_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
+       "vaapi_picture_native_pixmap_angle.cc",
+@@ -197,7 +197,7 @@ source_set("common") {
+     deps += [ "//ui/ozone" ]
+   }
+ 
+-  if (use_x11) {
++  if (use_vaapi_x11) {
+     deps += [ "//ui/gfx/x" ]
+   }
+ 
+diff --git a/media/gpu/vaapi/va_stub_header.fragment b/media/gpu/vaapi/va_stub_header.fragment
+index bed198484d..e8c46c5e81 100644
+--- a/media/gpu/vaapi/va_stub_header.fragment
++++ b/media/gpu/vaapi/va_stub_header.fragment
+@@ -1,12 +1,14 @@
+ // The extra include header needed in the generated stub file for defining
+ // various libva types.
+ 
++#include "media/gpu/buildflags.h"
++
+ extern "C" {
+ 
+ #include <va/va_drm.h>
+ #include <va/va.h>
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+ #include <va/va_x11.h>
+-#endif
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+ 
+ }
+diff --git a/media/gpu/vaapi/vaapi_picture_factory.cc b/media/gpu/vaapi/vaapi_picture_factory.cc
+index 719035b87c..9c7d7387d2 100644
+--- a/media/gpu/vaapi/vaapi_picture_factory.cc
++++ b/media/gpu/vaapi/vaapi_picture_factory.cc
+@@ -10,13 +10,13 @@
+ #include "ui/base/ui_base_features.h"
+ #include "ui/gl/gl_bindings.h"
+ 
+-#if defined(USE_X11)
+-#include "media/gpu/vaapi/vaapi_picture_native_pixmap_angle.h"
+-#include "media/gpu/vaapi/vaapi_picture_tfp.h"
+-#endif
+ #if defined(USE_OZONE)
+ #include "media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.h"
+-#endif
++#endif  // defined(USE_OZONE)
++#if BUILDFLAG(USE_VAAPI_X11)
++#include "media/gpu/vaapi/vaapi_picture_native_pixmap_angle.h"
++#include "media/gpu/vaapi/vaapi_picture_tfp.h"
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+ #if defined(USE_EGL)
+ #include "media/gpu/vaapi/vaapi_picture_native_pixmap_egl.h"
+ #endif
+@@ -46,15 +46,13 @@ VaapiPictureFactory::VaapiPictureFactory() {
+   vaapi_impl_pairs_.insert(
+       std::make_pair(gl::kGLImplementationEGLGLES2,
+                      VaapiPictureFactory::kVaapiImplementationDrm));
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+   vaapi_impl_pairs_.insert(
+       std::make_pair(gl::kGLImplementationEGLANGLE,
+                      VaapiPictureFactory::kVaapiImplementationAngle));
+-  if (!features::IsUsingOzonePlatform()) {
+-    vaapi_impl_pairs_.insert(
+-        std::make_pair(gl::kGLImplementationDesktopGL,
+-                       VaapiPictureFactory::kVaapiImplementationX11));
+-  }
++  vaapi_impl_pairs_.insert(
++      std::make_pair(gl::kGLImplementationDesktopGL,
++                     VaapiPictureFactory::kVaapiImplementationX11));
+ #endif
+ 
+   DeterminePictureCreationAndDownloadingMechanism();
+@@ -96,19 +94,19 @@ VaapiPictureFactory::GetVaapiImplementation(gl::GLImplementation gl_impl) {
+ }
+ 
+ uint32_t VaapiPictureFactory::GetGLTextureTarget() {
+-#if defined(USE_OZONE)
+-  if (features::IsUsingOzonePlatform())
+-    return GL_TEXTURE_EXTERNAL_OES;
+-#endif
++#if BUILDFLAG(USE_VAAPI_X11)
+   return GL_TEXTURE_2D;
++#else
++  return GL_TEXTURE_EXTERNAL_OES;
++#endif
+ }
+ 
+ gfx::BufferFormat VaapiPictureFactory::GetBufferFormat() {
+-#if defined(USE_OZONE)
+-  if (features::IsUsingOzonePlatform())
+-    return gfx::BufferFormat::YUV_420_BIPLANAR;
+-#endif
++#if BUILDFLAG(USE_VAAPI_X11)
+   return gfx::BufferFormat::RGBX_8888;
++#else
++  return gfx::BufferFormat::YUV_420_BIPLANAR;
++#endif
+ }
+ 
+ void VaapiPictureFactory::DeterminePictureCreationAndDownloadingMechanism() {
+@@ -116,51 +114,43 @@ void VaapiPictureFactory::DeterminePictureCreationAndDownloadingMechanism() {
+ #if defined(USE_OZONE)
+     // We can be called without GL initialized, which is valid if we use Ozone.
+     case kVaapiImplementationNone:
+-      if (features::IsUsingOzonePlatform()) {
+-        create_picture_cb_ = base::BindRepeating(
+-            &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapOzone>);
+-        needs_vpp_for_downloading_ = true;
+-      }
+-
+-      // This is reached by unit tests which don't require create_picture_cb_
+-      // to be initialized or called.
++      create_picture_cb_ = base::BindRepeating(
++          &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapOzone>);
++      needs_vpp_for_downloading_ = true;
+       break;
+ #endif  // defined(USE_OZONE)
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+     case kVaapiImplementationX11:
+-      DCHECK(!features::IsUsingOzonePlatform());
+       create_picture_cb_ =
+           base::BindRepeating(&CreateVaapiPictureNativeImpl<VaapiTFPPicture>);
+       // Neither VaapiTFPPicture or VaapiPictureNativePixmapAngle needs the VPP.
+       needs_vpp_for_downloading_ = false;
+       break;
+     case kVaapiImplementationAngle:
+-      DCHECK(!features::IsUsingOzonePlatform());
+       create_picture_cb_ = base::BindRepeating(
+           &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapAngle>);
+       // Neither VaapiTFPPicture or VaapiPictureNativePixmapAngle needs the VPP.
+       needs_vpp_for_downloading_ = false;
+       break;
+-#endif  // defined(USE_X11)
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+     case kVaapiImplementationDrm:
+ #if defined(USE_OZONE)
+-      if (features::IsUsingOzonePlatform()) {
+-        create_picture_cb_ = base::BindRepeating(
+-            &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapOzone>);
+-        needs_vpp_for_downloading_ = true;
+-        break;
+-      }
+-#endif  // defined(USE_OZONE)
+-#if defined(USE_EGL)
++      create_picture_cb_ = base::BindRepeating(
++          &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapOzone>);
++      needs_vpp_for_downloading_ = true;
++      break;
++#elif defined(USE_EGL)
+       create_picture_cb_ = base::BindRepeating(
+           &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapEgl>);
+       needs_vpp_for_downloading_ = true;
+       break;
+-#endif  // defined(USE_EGL)
++#else
+       // ozone or egl must be used to use the DRM implementation.
+-      NOTREACHED();
++      FALLTHROUGH;
++#endif
+     default:
+       NOTREACHED();
++      break;
+   }
+ }
+ 
+diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
+index 9de0c93b44..e5b9908490 100644
+--- a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
++++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
+@@ -6,7 +6,6 @@
+ 
+ #include "media/gpu/vaapi/va_surface.h"
+ #include "media/gpu/vaapi/vaapi_wrapper.h"
+-#include "ui/base/ui_base_features.h"
+ #include "ui/gfx/x/connection.h"
+ #include "ui/gfx/x/future.h"
+ #include "ui/gfx/x/xproto.h"
+@@ -92,7 +91,6 @@ Status VaapiPictureNativePixmapAngle::Allocate(gfx::BufferFormat format) {
+   if (!make_context_current_cb_ || !make_context_current_cb_.Run())
+     return StatusCode::kVaapiBadContext;
+ 
+-  DCHECK(!features::IsUsingOzonePlatform());
+   auto image =
+       base::MakeRefCounted<gl::GLImageEGLPixmap>(visible_size_, format);
+   if (!image)
+diff --git a/media/gpu/vaapi/vaapi_picture_tfp.cc b/media/gpu/vaapi/vaapi_picture_tfp.cc
+index 3f7e221d8a..11914e3640 100644
+--- a/media/gpu/vaapi/vaapi_picture_tfp.cc
++++ b/media/gpu/vaapi/vaapi_picture_tfp.cc
+@@ -6,7 +6,6 @@
+ 
+ #include "media/gpu/vaapi/va_surface.h"
+ #include "media/gpu/vaapi/vaapi_wrapper.h"
+-#include "ui/base/ui_base_features.h"
+ #include "ui/gfx/x/connection.h"
+ #include "ui/gfx/x/future.h"
+ #include "ui/gl/gl_bindings.h"
+@@ -37,7 +36,6 @@ VaapiTFPPicture::VaapiTFPPicture(
+       connection_(x11::Connection::Get()),
+       x_pixmap_(x11::Pixmap::None) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+-  DCHECK(!features::IsUsingOzonePlatform());
+   DCHECK(texture_id);
+   DCHECK(client_texture_id);
+ }
+diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+index 7514fe4fdd..e4cd7c8d89 100644
+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -184,12 +184,6 @@ bool VaapiVideoDecodeAccelerator::Initialize(const Config& config,
+                                              Client* client) {
+   DCHECK(task_runner_->BelongsToCurrentThread());
+ 
+-#if defined(USE_X11)
+-  // TODO(crbug/1116701): implement decode acceleration when running with Ozone.
+-  if (features::IsUsingOzonePlatform())
+-    return false;
+-#endif
+-
+   vaapi_picture_factory_ = std::make_unique<VaapiPictureFactory>();
+ 
+   if (config.is_encrypted()) {
+@@ -1213,12 +1207,11 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
+ 
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+   // The IMPORT mode is used for Android on Chrome OS, so this doesn't apply
+   // here.
+   DCHECK_NE(output_mode_, VideoDecodeAccelerator::Config::OutputMode::IMPORT);
+   // TODO(crbug/1116701): get video decode acceleration working with ozone.
+-  DCHECK(!features::IsUsingOzonePlatform());
+   // For H.264 on older devices, another +1 is experimentally needed for
+   // high-to-high resolution changes.
+   // TODO(mcasas): Figure out why and why only H264, see crbug.com/912295 and
+diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
+index 5b9a543386..826bb103b1 100644
+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
+@@ -17,7 +17,6 @@
+ #include "media/gpu/vaapi/vaapi_wrapper.h"
+ #include "testing/gmock/include/gmock/gmock.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+-#include "ui/base/ui_base_features.h"
+ 
+ using base::test::RunClosure;
+ using ::testing::_;
+@@ -416,12 +415,10 @@ TEST_P(VaapiVideoDecodeAcceleratorTest, SupportedPlatforms) {
+             mock_vaapi_picture_factory_->GetVaapiImplementation(
+                 gl::kGLImplementationEGLGLES2));
+ 
+-#if defined(USE_X11)
+-  if (!features::IsUsingOzonePlatform()) {
+-    EXPECT_EQ(VaapiPictureFactory::kVaapiImplementationX11,
+-              mock_vaapi_picture_factory_->GetVaapiImplementation(
+-                  gl::kGLImplementationDesktopGL));
+-  }
++#if BUILDFLAG(USE_VAAPI_X11)
++  EXPECT_EQ(VaapiPictureFactory::kVaapiImplementationX11,
++            mock_vaapi_picture_factory_->GetVaapiImplementation(
++                gl::kGLImplementationDesktopGL));
+ #endif
+ }
+ 
+diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
+index 754d258848..e528b0f84d 100644
+--- a/media/gpu/vaapi/vaapi_wrapper.cc
++++ b/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -65,7 +65,7 @@
+ #include "ui/gl/gl_bindings.h"
+ #include "ui/gl/gl_implementation.h"
+ 
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+ typedef XID Drawable;
+ 
+ extern "C" {
+@@ -73,7 +73,7 @@ extern "C" {
+ }
+ 
+ #include "ui/gfx/x/connection.h"  // nogncheck
+-#endif
++#endif                            // BUILDFLAG(USE_VAAPI_X11)
+ 
+ #if defined(USE_OZONE)
+ #include "ui/ozone/public/ozone_platform.h"
+@@ -87,14 +87,14 @@ using media_gpu_vaapi::kModuleVa_prot;
+ 
+ using media_gpu_vaapi::kModuleVa;
+ using media_gpu_vaapi::kModuleVa_drm;
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+ using media_gpu_vaapi::kModuleVa_x11;
+-#endif
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+ using media_gpu_vaapi::InitializeStubs;
+ using media_gpu_vaapi::IsVaInitialized;
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+ using media_gpu_vaapi::IsVa_x11Initialized;
+-#endif
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+ using media_gpu_vaapi::IsVa_drmInitialized;
+ using media_gpu_vaapi::StubPathMap;
+ 
+@@ -559,10 +559,20 @@ VADisplayState::VADisplayState()
+ bool VADisplayState::Initialize() {
+   base::AutoLock auto_lock(va_lock_);
+ 
++#if defined(USE_OZONE) && defined(OS_LINUX)
++  // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on
++  // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi
++  // for more details. This will also require revisiting everything that's
++  // guarded by USE_VAAPI_X11. For example, if USE_VAAPI_X11 is true, but the
++  // user chooses the Wayland backend for Ozone at runtime, then many things (if
++  // not all) that we do for X11 won't apply.
++  if (!ui::OzonePlatform::GetInstance()->GetPlatformProperties().supports_vaapi)
++    return false;
++#endif
++
+   bool libraries_initialized = IsVaInitialized() && IsVa_drmInitialized();
+-#if defined(USE_X11)
+-  if (!features::IsUsingOzonePlatform())
+-    libraries_initialized = libraries_initialized && IsVa_x11Initialized();
++#if BUILDFLAG(USE_VAAPI_X11)
++  libraries_initialized = libraries_initialized && IsVa_x11Initialized();
+ #endif
+   if (!libraries_initialized)
+     return false;
+@@ -577,34 +587,25 @@ bool VADisplayState::Initialize() {
+   return success;
+ }
+ 
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+ 
+ absl::optional<VADisplay> GetVADisplayStateX11(const base::ScopedFD& drm_fd) {
+-  bool use_drm_as_fallback = false;
+   switch (gl::GetGLImplementation()) {
+     case gl::kGLImplementationEGLGLES2:
+       return vaGetDisplayDRM(drm_fd.get());
+ 
+     case gl::kGLImplementationNone:
+-      use_drm_as_fallback = true;
+-      FALLTHROUGH;
+ 
+     case gl::kGLImplementationDesktopGL: {
+-      if (!features::IsUsingOzonePlatform()) {
+-        VADisplay display =
+-            vaGetDisplay(x11::Connection::Get()->GetXlibDisplay());
+-        if (vaDisplayIsValid(display))
+-          return display;
+-        return vaGetDisplayDRM(drm_fd.get());
+-      }
+-      break;
++      VADisplay display =
++          vaGetDisplay(x11::Connection::Get()->GetXlibDisplay());
++      if (vaDisplayIsValid(display))
++        return display;
++      return vaGetDisplayDRM(drm_fd.get());
+     }
+ 
+-    case gl::kGLImplementationEGLANGLE: {
+-      if (!features::IsUsingOzonePlatform())
+-        return vaGetDisplay(x11::Connection::Get()->GetXlibDisplay());
+-      break;
+-    }
++    case gl::kGLImplementationEGLANGLE:
++      return vaGetDisplay(x11::Connection::Get()->GetXlibDisplay());
+ 
+     default:
+       LOG(WARNING) << "VAAPI video acceleration not available for "
+@@ -612,10 +613,6 @@ absl::optional<VADisplay> GetVADisplayStateX11(const base::ScopedFD& drm_fd) {
+                           gl::GetGLImplementationParts());
+       return absl::nullopt;
+   }
+-
+-  if (use_drm_as_fallback)
+-    return vaGetDisplayDRM(drm_fd.get());
+-  return absl::nullopt;
+ }
+ 
+ #else
+@@ -633,11 +630,11 @@ absl::optional<VADisplay> GetVADisplayState(const base::ScopedFD& drm_fd) {
+   }
+ }
+ 
+-#endif  // defined(USE_X11)
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+ 
+ bool VADisplayState::InitializeVaDisplay_Locked() {
+   absl::optional<VADisplay> display =
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+       GetVADisplayStateX11(drm_fd_);
+ #else
+       GetVADisplayState(drm_fd_);
+@@ -702,10 +699,9 @@ bool VADisplayState::InitializeOnce() {
+   if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
+     return false;
+ 
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+   if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE &&
+       implementation_type_ == VAImplementation::kIntelIHD) {
+-    DCHECK(!features::IsUsingOzonePlatform());
+     constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
+     // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
+     // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
+@@ -722,7 +718,7 @@ bool VADisplayState::InitializeOnce() {
+     if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
+       return false;
+   }
+-#endif  // USE_X11
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+ 
+   return true;
+ }
+@@ -2452,11 +2448,10 @@ bool VaapiWrapper::MapAndCopyAndExecute(
+   return Execute_Locked(va_surface_id, va_buffer_ids);
+ }
+ 
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+ bool VaapiWrapper::PutSurfaceIntoPixmap(VASurfaceID va_surface_id,
+                                         x11::Pixmap x_pixmap,
+                                         gfx::Size dest_size) {
+-  DCHECK(!features::IsUsingOzonePlatform());
+   base::AutoLock auto_lock(*va_lock_);
+ 
+   VAStatus va_res = vaSyncSurface(va_display_, va_surface_id);
+@@ -2470,7 +2465,7 @@ bool VaapiWrapper::PutSurfaceIntoPixmap(VASurfaceID va_surface_id,
+   VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVAPutSurface, false);
+   return true;
+ }
+-#endif  // USE_X11
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+ 
+ std::unique_ptr<ScopedVAImage> VaapiWrapper::CreateVaImage(
+     VASurfaceID va_surface_id,
+@@ -2844,9 +2839,8 @@ void VaapiWrapper::PreSandboxInitialization() {
+ 
+   paths[kModuleVa].push_back(std::string("libva.so.") + va_suffix);
+   paths[kModuleVa_drm].push_back(std::string("libva-drm.so.") + va_suffix);
+-#if defined(USE_X11)
+-  if (!features::IsUsingOzonePlatform())
+-    paths[kModuleVa_x11].push_back(std::string("libva-x11.so.") + va_suffix);
++#if BUILDFLAG(USE_VAAPI_X11)
++  paths[kModuleVa_x11].push_back(std::string("libva-x11.so.") + va_suffix);
+ #endif
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+   paths[kModuleVa_prot].push_back(std::string("libva.so.") + va_suffix);
+diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h
+index 0e3da53624..88ffcd0799 100644
+--- a/media/gpu/vaapi/vaapi_wrapper.h
++++ b/media/gpu/vaapi/vaapi_wrapper.h
+@@ -36,9 +36,9 @@
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ #include "ui/gfx/geometry/size.h"
+ 
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+ #include "ui/gfx/x/xproto.h"  // nogncheck
+-#endif  // USE_X11
++#endif                        // BUILDFLAG(USE_VAAPI_X11)
+ 
+ namespace gfx {
+ enum class BufferFormat;
+@@ -426,13 +426,13 @@ class MEDIA_GPU_EXPORT VaapiWrapper
+       const std::vector<std::pair<VABufferID, VABufferDescriptor>>& va_buffers)
+       WARN_UNUSED_RESULT;
+ 
+-#if defined(USE_X11)
++#if BUILDFLAG(USE_VAAPI_X11)
+   // Put data from |va_surface_id| into |x_pixmap| of size
+   // |dest_size|, converting/scaling to it.
+   bool PutSurfaceIntoPixmap(VASurfaceID va_surface_id,
+                             x11::Pixmap x_pixmap,
+                             gfx::Size dest_size) WARN_UNUSED_RESULT;
+-#endif  // USE_X11
++#endif  // BUILDFLAG(USE_VAAPI_X11)
+ 
+   // Creates a ScopedVAImage from a VASurface |va_surface_id| and map it into
+   // memory with the given |format| and |size|. If |format| is not equal to the
+diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
+index 8889828e0f..963dc7a0cd 100644
+--- a/ui/ozone/platform/x11/ozone_platform_x11.cc
++++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
+@@ -208,6 +208,9 @@ class OzonePlatformX11 : public OzonePlatform,
+       properties->supports_global_application_menus = true;
+       properties->app_modal_dialogs_use_event_blocker = true;
+       properties->fetch_buffer_formats_for_gmb_on_gpu = true;
++#if defined(OS_LINUX)
++      properties->supports_vaapi = true;
++#endif
+ 
+       initialised = true;
+     }
+diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
+index df95f07486..2d7f44bbfa 100644
+--- a/ui/ozone/public/ozone_platform.h
++++ b/ui/ozone/public/ozone_platform.h
+@@ -15,6 +15,7 @@
+ #include "base/macros.h"
+ #include "base/message_loop/message_pump_type.h"
+ #include "base/single_thread_task_runner.h"
++#include "build/build_config.h"
+ #include "mojo/public/cpp/bindings/binder_map.h"
+ #include "ui/gfx/buffer_types.h"
+ #include "ui/gfx/native_widget_types.h"
+@@ -154,6 +155,15 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
+     // Determines whether buffer formats should be fetched on GPU and passed
+     // back via gpu extra info.
+     bool fetch_buffer_formats_for_gmb_on_gpu = false;
++
++#if defined(OS_LINUX)
++    // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on
++    // Linux. At the moment, VA-API Linux implementation supports only X11
++    // backend. This implementation must be refactored to support Ozone
++    // properly. As a temporary solution, VA-API on Linux checks if vaapi is
++    // supported (which implicitly means that it is Ozone/X11).
++    bool supports_vaapi = false;
++#endif
+   };
+ 
+   // Groups platform properties that can only be known at run time.
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index c57c29508dfc..dfe427489f8f 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=94.0.4606.81
+version=95.0.4638.54
 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=7071aa2b2caf48094c2ae816395948b4daec940606f4982ad5bbf68e5d2de598
+checksum=3eef88d745e6ddaeaf507358f1510482d6f399cf335061bb1226a5f7120061fd
 nocross=yes
 
 lib32disabled=yes
@@ -51,15 +51,6 @@ post_patch() {
 		done
 	fi
 
-	case "${XBPS_TARGET_MACHINE}" in
-	i686*)
-		for f in "${FILESDIR}"/i686-patches/*.patch; do
-			echo "Applying $f"
-			patch -Np0 -i "$f"
-		done
-		;;
-	esac
-
 	# Use the file at run time instead of effectively compiling it in
 	sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
 		-i services/device/public/cpp/usb/BUILD.gn

From 0023bab55984acc5dc309a57805dcf39deace2e3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 23 Oct 2021 01:56:40 +0200
Subject: [PATCH 1931/4088] thunderbird: properly resync patch

---
 srcpkgs/thunderbird/patches/flac-no-ffvpx.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch b/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch
index 154aad63e33a..ebf48deb9720 100644
--- a/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch
+++ b/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch
@@ -12,15 +12,14 @@ index 53fc3c9937f7..b23771ab80fa 100644
  
  namespace mozilla {
  
-@@ -14,6 +15,11 @@ namespace mozilla {
+@@ -14,6 +15,10 @@ 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);
++         platform->SupportsMimeType("audio/flac"_ns);
  #else
    // Until bug 1295886 is fixed.
    return false;

From 208c91482f9ceb237a1a57d255a8302a72852c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 22 Oct 2021 22:16:10 -0300
Subject: [PATCH 1932/4088] thunderbird: fix i686 build.

They seem to have backported whatever started causing issues in firefox
93, so copy that patch.
---
 .../thunderbird/patches/fix-i386-fdlibm.patch  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/thunderbird/patches/fix-i386-fdlibm.patch

diff --git a/srcpkgs/thunderbird/patches/fix-i386-fdlibm.patch b/srcpkgs/thunderbird/patches/fix-i386-fdlibm.patch
new file mode 100644
index 000000000000..831e5e03678d
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-i386-fdlibm.patch
@@ -0,0 +1,18 @@
+# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double')
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
+
+--- a/modules/fdlibm/src/math_private.h
++++ b/modules/fdlibm/src/math_private.h
+@@ -30,7 +30,12 @@
+  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+  */
+ 
++#if defined(__linux__) && defined(__i386__)
++// rely on glibc's double_t
++typedef long double __double_t;
++#else
+ typedef double      __double_t;
++#endif
+ typedef __double_t  double_t;
+ 
+ /*

From bcf1d2475739a218ad4d697de84d73656a649437 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Oct 2021 14:25:45 +0200
Subject: [PATCH 1933/4088] mesa: disable llvmpipe except on select
 architectures

---
 srcpkgs/mesa/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5a00a188eccf..b8a2fd4a64cb 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -28,6 +28,14 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
 fi
 
+# only use llvmpipe on targets where it's supported and reliable
+# especially on big endian it's all kinds of broken, and e.g. on
+# 32-bit powerpc it does not work at all, so fall back to softpipe
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|aarch64*|ppc64le*|arm*) ;;
+	*) configure_args+=" -Ddraw-use-llvm=false" ;;
+esac
+
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libOSMesa"
 

From eb49458b66666653156a33d2eab5e9b0a0f17cbf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Oct 2021 16:43:42 +0200
Subject: [PATCH 1934/4088] wine: update to 6.20.

---
 srcpkgs/wine/patches/musl-limits.patch       | 12 ++++++++++++
 srcpkgs/wine/patches/musl-ns_name_skip.patch |  4 ++--
 srcpkgs/wine/patches/musl-uid-t.patch        |  4 ++--
 srcpkgs/wine/template                        |  6 +++---
 4 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/wine/patches/musl-limits.patch

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
new file mode 100644
index 000000000000..525b2615de63
--- /dev/null
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -0,0 +1,12 @@
+--- a/wine-6.20/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-6.20/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+@@ -29,7 +29,8 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdint.h>
+-#include <sys/types.h>
++#include <sys/types.h>
++#include <limits.h>
+ #include <dirent.h>
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 5b0a33ef4451..6ab72d412a31 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.19/dlls/dnsapi/libresolv.c
-+++ b/wine-6.19/dlls/dnsapi/libresolv.c
+--- a/wine-6.20/dlls/dnsapi/libresolv.c
++++ b/wine-6.20/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index b032d69fb1ce..8e8eaaf5598b 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-6.19/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-6.19/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-6.20/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-6.20/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 173ed8b30ead..b752200cab61 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.19
+version=6.20
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="4182e2d9627704cc376f46fc3109580ea9077796f44f5ee83e08e3e96bf0ab66
- 47158842c938f68d9097965135321892515bb7f133c88be469c91f845f942ac3"
+checksum="4028237e9c7bfdd56d7604af19783ff812f645f29c27de742a688e4535528471
+ 360fd304a0f4c12e3aa149dde0bc3ac7a2c8787740e1f228bd13158f855166ea"
 
 build_options="mingw staging"
 build_options_default="mingw"

From d522fb06e39b66f523e415a3eabd5dff89011560 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Oct 2021 17:58:38 +0200
Subject: [PATCH 1935/4088] b3sum: update to 1.1.0.

---
 srcpkgs/b3sum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/b3sum/template b/srcpkgs/b3sum/template
index fe4a94e4bdcc..e21418685b36 100644
--- a/srcpkgs/b3sum/template
+++ b/srcpkgs/b3sum/template
@@ -1,6 +1,6 @@
 # Template file for 'b3sum'
 pkgname=b3sum
-version=1.0.0
+version=1.1.0
 revision=1
 wrksrc="BLAKE3-${version}"
 build_wrksrc="b3sum"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CC0-1.0"
 homepage="https://github.com/BLAKE3-team/BLAKE3/"
 distfiles="https://github.com/BLAKE3-team/BLAKE3/archive/${version}.tar.gz"
-checksum=5a4e29b7d687779805bd3e4e345df063ccdde085204bc31d4c516da6a28caa0a
+checksum=0bfba4ba71a9b04afbaa6bfc45c38e0598ce404e2cc5094b1d4ef45e83db2ca1

From 0c1d8187294cf1375328f3170d24ce069827fca5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Oct 2021 18:00:26 +0200
Subject: [PATCH 1936/4088] graphviz: update to 2.49.3.

---
 srcpkgs/graphviz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ed491b555026..f0fb1860101a 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,6 +1,6 @@
 # Template file for 'graphviz'
 pkgname=graphviz
-version=2.49.2
+version=2.49.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-lefty"
@@ -16,7 +16,7 @@ license="EPL-1.0"
 homepage="http://www.graphviz.org"
 changelog="https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md"
 distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz"
-checksum=3d61cfc53e16b28be4df2c0ecfbc8b9dade07180fa83cef91b66270d14fb903b
+checksum=5801664769ab88c2fb8ccb6ab0957cceabe6d4632b193041440e97790f53a9df
 
 # `make check` is broken:
 # https://gitlab.com/graphviz/graphviz/-/issues/2112

From 6f1f4ae2161afb8bb1eb56a8680620046e749b98 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Oct 2021 18:00:28 +0200
Subject: [PATCH 1937/4088] mpop: update to 1.4.16.

---
 srcpkgs/mpop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index 3563b0ca3ac6..ba25741d8db8 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
 # Template file for 'mpop'
 pkgname=mpop
-version=1.4.15
+version=1.4.16
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/mpop/"
 distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=3f52b2b5d4bc58ed93cf0b1146cee4f74de81c2c07a25ee032efa659465a0270
+checksum=870eb571eae6d23fb92ad0c84d79de9c38c5f624e3614937d574bfe49ba687f9

From 19719d6e1185b35472a2ac5a37fc4c5afca36ac6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Oct 2021 18:00:32 +0200
Subject: [PATCH 1938/4088] msmtp: update to 1.8.18.

---
 srcpkgs/msmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index b77ea732f66c..5f6d611259b3 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.17
+version=1.8.18
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=0fddbe74c1a9dcf6461b4a1b0db3e4d34266184500c403d7f107ad42db4ec4d3
+checksum=14fc62af37ebdcc5ed19a245a05eb8376efe7016118f00c9c594bc999d5560a5
 
 build_options="idn sasl gnome msmtpd"
 build_options_default="idn sasl msmtpd"

From e65705188211ba61044b7b3ee096c20364f181b7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Oct 2021 18:01:04 +0200
Subject: [PATCH 1939/4088] parallel: update to 20211022.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index c08c645dd33b..5dc28f607799 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20210922
+version=20211022
 revision=1
 build_style=gnu-configure
 depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=dedca94fc41f2054dbadd9b8361e56015fc8af5d1961c1b982b63e6d86494d66
+checksum=da7190fce22a9cda97b2ce36df112a2c634f1b4a5591af343b928253e996de9b
 
 pre_configure() {
 	# no html and pdf doc

From 37c09d3dbb95343296f32c0d613720153f45127d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Oct 2021 18:01:57 +0200
Subject: [PATCH 1940/4088] xdotool: update to 3.20211022.1.

---
 srcpkgs/xdotool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index a205ebab82b0..43d64a31c290 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210903.1
+version=3.20211022.1
 revision=1
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=9110198702d7549c4eccdab95f276d35a9fa9f540015d2739b62c55618d3b7b6
+checksum=96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada
 
 xdotool-devel_package() {
 	short_desc+=" - development files"

From ef8345c15f28febd59dc2787af2b6352a19f12c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Oct 2021 18:12:12 +0200
Subject: [PATCH 1941/4088] schilytools: add ved.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RIP Jörg Schilling (1955-2021)
---
 srcpkgs/schilytools/template | 12 ++++++++++--
 srcpkgs/ved                  |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/ved

diff --git a/srcpkgs/schilytools/template b/srcpkgs/schilytools/template
index b6d6757d3cb8..e48bbe37ea78 100644
--- a/srcpkgs/schilytools/template
+++ b/srcpkgs/schilytools/template
@@ -1,11 +1,11 @@
 # Template file for 'schilytools'
 pkgname=schilytools
 version=2021.09.18
-revision=1
+revision=2
 wrksrc="schily-${version//./-}"
 build_style=meta
 makedepends="acl-devel attr-devel e2fsprogs-devel m4"
-depends="sccs sdd sfind smake star"
+depends="sccs sdd sfind smake star ved"
 short_desc="Schily's portable tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CDDL-1.0"
@@ -16,6 +16,7 @@ nocross=yes  # configure + re-builds with itself
 
 do_build() {
 	make ${makejobs} CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" INS_BASE=/usr
+	make ${makejobs} -C ved CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" INS_BASE=/usr
 	make -C sccs clean
 	make -C sccs CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" INS_BASE=/usr/libexec/sccs
 }
@@ -71,3 +72,10 @@ star_package() {
 		vlicense CDDL.Schily.txt
 	}
 }
+ved_package() {
+	short_desc+=" - ved"
+	pkg_install() {
+		make install -C ved DESTDIR="$PKGDESTDIR" INS_BASE=/usr
+		vlicense CDDL.Schily.txt
+	}
+}
diff --git a/srcpkgs/ved b/srcpkgs/ved
new file mode 120000
index 000000000000..5064d9720d6a
--- /dev/null
+++ b/srcpkgs/ved
@@ -0,0 +1 @@
+schilytools
\ No newline at end of file

From 234fa3d3959bfb3b4d290c33acd6ef7d1a38e989 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Oct 2021 22:35:00 +0300
Subject: [PATCH 1942/4088] greybird-themes: update to 3.22.15.

---
 srcpkgs/greybird-themes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/greybird-themes/template b/srcpkgs/greybird-themes/template
index f131777419f8..b6dce65c3768 100644
--- a/srcpkgs/greybird-themes/template
+++ b/srcpkgs/greybird-themes/template
@@ -1,7 +1,7 @@
 # Template file for 'greybird-themes'
 pkgname=greybird-themes
-version=3.22.14
-revision=2
+version=3.22.15
+revision=1
 wrksrc="Greybird-${version}"
 build_style=meson
 hostmakedepends="sassc ninja glib-devel gdk-pixbuf-devel librsvg-devel"
@@ -11,4 +11,4 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0"
 homepage="https://github.com/shimmerproject/Greybird"
 distfiles="https://github.com/shimmerproject/Greybird/archive/v${version}.tar.gz"
-checksum=37fc4b8f83ff667e43e9889f6605a9e5da2ce2f5c5801c1ceef90814fb57b294
+checksum=dbf8440d9904bd8d9fb9b612ece5b9cd604c08ff308755a46d41db7e9ea4b617

From f90e633006a47b0d1fdaa4a4e2242cada134f699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 14 Oct 2021 22:11:37 +0200
Subject: [PATCH 1943/4088] ansible-core: explain make_check=no

---
 srcpkgs/ansible-core/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 5a5b546ed033..2ed2c1fe21d7 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -14,6 +14,9 @@ distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
 checksum=93d50283c7c5b476debf83dc089b3f679b939a8b9a7b5d628d28daafbb3d303a
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
+# Tests are currently broken for ansible on python 3.10
+# See https://github.com/ansible/ansible/issues/74658
+# and https://github.com/ansible/ansible/issues/74660
 make_check=no
 
 post_install() {

From d8815a3a3bab5e4f174945983ad002a6caf61d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 14 Oct 2021 22:11:14 +0200
Subject: [PATCH 1944/4088] ansible: explain make_check=no

---
 srcpkgs/ansible/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 42cbc79a1809..47981ea3e8aa 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -11,4 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
 checksum=2955fcbf51367f8bd88c38a86f8be83d4fcd05f778afb4feed31abfe8dcff639
+# Tests are currently broken for ansible on python 3.10
+# See https://github.com/ansible/ansible/issues/74658
+# and https://github.com/ansible/ansible/issues/74660
 make_check=no

From 7f8b90daafdab17ec70475a0f23dc22fceef3dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 16 Jul 2021 12:35:13 +0200
Subject: [PATCH 1945/4088] New package: python3-enrich-1.2.6

---
 srcpkgs/python3-enrich/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-enrich/template

diff --git a/srcpkgs/python3-enrich/template b/srcpkgs/python3-enrich/template
new file mode 100644
index 000000000000..67c7cc53c45f
--- /dev/null
+++ b/srcpkgs/python3-enrich/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-enrich'
+pkgname=python3-enrich
+version=1.2.6
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm python3-wheel python3-rich"
+depends="python3-rich"
+checkdepends="python3-pytest python3-pytest-mock ${depends}"
+short_desc="Extended variant of the rich library for python"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/pycontribs/enrich"
+distfiles="${PYPI_SITE}/e/enrich/enrich-${version}.tar.gz"
+checksum=0e99ff57d87f7b5def0ca79917e88fb9351aa0d52e228ee38bff7cd858315fe4
+
+post_install() {
+	vlicense LICENSE
+}

From c9c6090e33d99306900fb96677015d9f389bb3bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 16 Jul 2021 12:35:21 +0200
Subject: [PATCH 1946/4088] New package: python3-bracex-2.1.1

---
 srcpkgs/python3-bracex/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-bracex/template

diff --git a/srcpkgs/python3-bracex/template b/srcpkgs/python3-bracex/template
new file mode 100644
index 000000000000..7e6ffbc08f21
--- /dev/null
+++ b/srcpkgs/python3-bracex/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-bracex'
+pkgname=python3-bracex
+version=2.1.1
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Bash style brace expansion for Python"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/facelessuser/bracex"
+changelog="https://raw.githubusercontent.com/facelessuser/bracex/master/docs/src/markdown/about/changelog.md"
+distfiles="${PYPI_SITE}/b/bracex/bracex-${version}.tar.gz"
+checksum=01f715cd0ed7a622ec8b32322e715813f7574de531f09b70f6f3b2c10f682425
+
+post_install() {
+	vlicense LICENSE.md
+}

From bf37ab973145dfe086cf5f51a8d4fca9263a49a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 16 Jul 2021 12:36:07 +0200
Subject: [PATCH 1947/4088] New package: python3-wcmatch-8.2

---
 srcpkgs/python3-wcmatch/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-wcmatch/template

diff --git a/srcpkgs/python3-wcmatch/template b/srcpkgs/python3-wcmatch/template
new file mode 100644
index 000000000000..8237206b2b40
--- /dev/null
+++ b/srcpkgs/python3-wcmatch/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-wcmatch'
+pkgname=python3-wcmatch
+version=8.2
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+make_check_args="--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_realpath
+--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_tilde"
+hostmakedepends="python3-setuptools"
+depends="python3-bracex"
+checkdepends="python3-pytest ${depends}"
+short_desc="Wilcard File Name matching library"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/facelessuser/wcmatch"
+changelog="https://raw.githubusercontent.com/facelessuser/wcmatch/main/docs/src/markdown/about/changelog.md"
+distfiles="${PYPI_SITE}/w/wcmatch/wcmatch-${version}.tar.gz"
+checksum=4d54ddb506c90b5a5bba3a96a1cfb0bb07127909e19046a71d689ddfb18c3617
+
+post_install() {
+	vlicense LICENSE.md
+}

From e53b5eba28716f7fbab72c78664167721f2539c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 16 Jul 2021 12:37:00 +0200
Subject: [PATCH 1948/4088] New package: python3-typeguard-2.13.0

---
 srcpkgs/python3-typeguard/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-typeguard/template

diff --git a/srcpkgs/python3-typeguard/template b/srcpkgs/python3-typeguard/template
new file mode 100644
index 000000000000..23083f04f3a4
--- /dev/null
+++ b/srcpkgs/python3-typeguard/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-typeguard'
+pkgname=python3-typeguard
+version=2.13.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Run-time type checker for python"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/agronholm/typeguard"
+distfiles="${PYPI_SITE}/t/typeguard/typeguard-${version}.tar.gz"
+checksum=04e38f92eb59410c9375d3be23df65e0a7643f2e8bcbd421423d808d2f9e99df
+
+post_install() {
+	vlicense LICENSE
+}

From b7826139aeb0c8a4b0aeae0aabb3cb6266b8611f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 16 Jul 2021 12:38:15 +0200
Subject: [PATCH 1949/4088] New package: python3-tenacity-8.0.1

---
 srcpkgs/python3-tenacity/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-tenacity/template

diff --git a/srcpkgs/python3-tenacity/template b/srcpkgs/python3-tenacity/template
new file mode 100644
index 000000000000..1182563e46e2
--- /dev/null
+++ b/srcpkgs/python3-tenacity/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-tenacity'
+pkgname=python3-tenacity
+version=8.0.1
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="python3-Sphinx python3-tornado python3-typeguard"
+checkdepends="python3-pytest ${depends}"
+short_desc="General-purpose retrying library for Python"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="Apache-2.0"
+homepage="https://github.com/jd/tenacity"
+changelog="https://tenacity.readthedocs.io/en/latest/changelog.html"
+distfiles="${PYPI_SITE}/t/tenacity/tenacity-${version}.tar.gz"
+checksum=43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f

From e5357679d68fc1160ab9e8bb6796c5794d1f020f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 12 Oct 2021 19:29:34 +0200
Subject: [PATCH 1950/4088] python3-yamllint: update to 1.26.3.

---
 srcpkgs/python3-yamllint/template | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template
index 201a7b34423a..bc695c0842fb 100644
--- a/srcpkgs/python3-yamllint/template
+++ b/srcpkgs/python3-yamllint/template
@@ -1,20 +1,26 @@
 # Template file for 'python3-yamllint'
 pkgname=python3-yamllint
-version=1.15.0
-revision=5
-wrksrc="yamllint-${version}"
+version=1.26.3
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pathspec python3-setuptools python3-yaml"
-checkdepends="python3-pathspec python3-yaml"
-short_desc="Python3 linter for YAML files"
+checkdepends="python3-pytest python3-pathspec python3-yaml"
+short_desc="Python 3 linter for YAML files"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/yamllint"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=9c27608ec61777f83c2cb29158b247a02079ad2aebb86522dd941397e3e78f6a
+checksum=a12b134d360c8655c831c018162fd058dac308f62462b14c24125171c5822610
 conflicts="python-yamllint>=0"
 
-do_check() {
-	python3 setup.py test
-}
+case "$XBPS_TARGET_MACHINE" in
+	# These test cases require locale support, which musl libc lacks, so these tests are expected to fail
+	# on our musl libc targets. Therefore, we deselect them to ignore their failures.
+	*-musl)
+		make_check_args="--deselect tests/test_cli.py::CommandLineTestCase::test_run_with_locale
+			--deselect tests/rules/test_key_ordering.py::KeyOrderingTestCase::test_locale_accents
+			--deselect tests/rules/test_key_ordering.py::KeyOrderingTestCase::test_locale_case"
+		;;
+esac

From e0ead069eed601a30369921f31e852d4c6c0d037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 16 Jul 2021 12:39:28 +0200
Subject: [PATCH 1951/4088] python3-ansible-lint: update to 5.2.1.

---
 srcpkgs/python3-ansible-lint/template | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 93f631fa6a17..fb8ea33d60ae 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,18 +1,21 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=4.3.5
-revision=3
-wrksrc="ansible-lint-${version}"
+version=5.2.1
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="ansible python3-six python3-yaml python3-ruamel.yaml"
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="ansible-core python3-yamllint python3-six python3-yaml python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch"
 short_desc="Linter for Ansible files"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
-homepage="https://github.com/willthames/ansible-lint"
-changelog="https://raw.githubusercontent.com/willthames/ansible-lint/master/CHANGELOG.md"
-distfiles="${PYPI_SITE}/a/ansible-lint/ansible-lint-${version}.tar.gz"
-checksum=bec230cf5fcc4d976246d4170da3ae289715f99185529ca8bba4b3c173035656
+homepage="https://github.com/ansible-community/ansible-lint"
+distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=d64aca59c8d896541d379b9205b2126b851088aab0a2c2cab19ff74b184cdf1c
+# Tests are currently broken for ansible on python 3.10
+# See https://github.com/ansible/ansible/issues/74658
+# and https://github.com/ansible/ansible/issues/74660
+make_check=no
 
 post_patch() {
 	# scm versioning is broken in this release

From db645372eee0a11b4ce59f9359c659ab03ad057c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 24 Oct 2021 00:44:35 +0200
Subject: [PATCH 1952/4088] minikube: restrict to x86 and aarch64

---
 srcpkgs/minikube/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index ea3f4261aed4..760bede0d8be 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -2,6 +2,7 @@
 pkgname=minikube
 version=1.23.0
 revision=1
+archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
@@ -17,12 +18,6 @@ changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELO
 distfiles="https://github.com/kubernetes/minikube/archive/v$version.tar.gz"
 checksum=c40e43a4944cf434e03d2ce520c330bdca209fb08428601e1d453ea124a9c2b3
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		ppc64le*) vsed -i 's/amd64/ppc64le/g' Makefile;;
-	esac
-}
-
 pre_build() {
 	local storage_provisioner_tag= iso_version=
 

From d310ed43d6fb9df0fbf4d7e9a7d620778b1793e6 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sat, 23 Oct 2021 20:36:09 +0700
Subject: [PATCH 1953/4088] vivaldi: update to 4.3.2439.56

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 183b8d18a591..59fe4a807743 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=4.3.2439.44
+version=4.3.2439.56
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=09c26ecc2868bfbb22333b8791cb29aec65baf31b8d514c0250e0da2bb425daf
+checksum=65a842931cc5c3ff2b12c24c42ddb0bcf29e02403005e01bf1d30eb40a4793d5
 repository=nonfree
 restricted=yes
 nostrip=yes

From b15d2bdb504abe52c306001446010355e1be7df7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Oct 2021 22:31:23 +0300
Subject: [PATCH 1954/4088] papirus-icon-theme: update to 20211001.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index 15dc94490cc9..ce21cacefd59 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210901
+version=20211001
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=b0bdede61177b5a8a666712fc88da4902a28772171202abf2942dd4889e3f94d
+checksum=a81c2b6613df650d02ff6c69846d653a02e4bda7df5e8507934019539c08592c
 
 do_install() {
 	vmkdir usr/share/icons

From f3b9757bc71b52b5a74b7b21cdf7f0b52e75f87f Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Sat, 23 Oct 2021 10:37:58 -0600
Subject: [PATCH 1955/4088] mu4e: update to 1.6.8

---
 srcpkgs/mu4e/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
index c5aa166c3006..ff7dcf2beff3 100644
--- a/srcpkgs/mu4e/template
+++ b/srcpkgs/mu4e/template
@@ -1,6 +1,6 @@
 # Template file for 'mu4e'
 pkgname=mu4e
-version=1.6.7
+version=1.6.8
 revision=1
 wrksrc="mu-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=105df16df5fd6f54d5334cf68d8108f8b0593e37020b2fa8487c2e251ce9d9a2
+checksum=d175272bec399c956393c8e2afa5e16f503b65417edc7e3224b50edd6d1f9750
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"
 

From 293b8982ec005739f37208f6d53e68c9639c2fad Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 23 Oct 2021 10:29:25 -0400
Subject: [PATCH 1956/4088] python3-trimesh: update to 3.9.34.

---
 srcpkgs/python3-trimesh/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index 538fb9767a1c..e716da771676 100644
--- a/srcpkgs/python3-trimesh/template
+++ b/srcpkgs/python3-trimesh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-trimesh'
 pkgname=python3-trimesh
-version=3.9.32
-revision=2
+version=3.9.34
+revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -17,7 +17,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://trimsh.org/"
 distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz"
-checksum=cdecdc43718d9ebaf81da5c2a6f0bbb89d6c383dc6e3e3d6a36ddac24b49d40d
+checksum=713a959be0f93c049d0735f573b814cfa704c5bbfaf0c607facb61ede5a8ab2e
 
 post_install() {
 	vlicense LICENSE.md

From 16d2307cbd411107e21796e6c2032858b8744a3b Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Sat, 23 Oct 2021 22:24:51 +0300
Subject: [PATCH 1957/4088] freerdp: update to 2.4.1.

---
 srcpkgs/freerdp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index dd0ad5e3492e..d5b0a708daf9 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=2
+version=2.4.1
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=20cc4e234613db9bf89f885fc1d0bb820080b1cad66e0650fe3cb6c02ec48a59
 CFLAGS="-Wno-dev"
 
 case "$XBPS_TARGET_MACHINE" in

From 55ad9d74245088b0f4f5466484a9eff70aeed2ab Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Oct 2021 17:38:37 +0300
Subject: [PATCH 1958/4088] notcurses: update to 2.4.8.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index e4e63c33efc2..1a5fdae5d21d 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.4.7
+version=2.4.8
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c79d960acc5233b8c61f45e4abad8037015258d697685ed106483692402b657f
+checksum=d06971005e4cf637cc90a694323c580791d1450a77b1700ae8deb453678d3243
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 5ddc93f18c5cdb3aca762b7c73acf3e455638a87 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Oct 2021 22:51:57 +0300
Subject: [PATCH 1959/4088] arc-theme: update to 20211018.

Also:
- add gtk4-devel to makedepends (gtk4 theme support).
---
 srcpkgs/arc-theme/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template
index 422e0f954ad2..070f1b9a4c7c 100644
--- a/srcpkgs/arc-theme/template
+++ b/srcpkgs/arc-theme/template
@@ -1,14 +1,14 @@
 # Template file for 'arc-theme'
 pkgname=arc-theme
-version=20210412
+version=20211018
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config gnome-shell sassc inkscape cinnamon"
-makedepends="gtk+3-devel"
+makedepends="gtk+3-devel gtk4-devel"
 depends="gnome-themes-extra gtk-engine-murrine"
 short_desc="Flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell"
 maintainer="jtalowell <jtalowell@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jnsh/arc-theme"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=17ec4b5dc520edcec2f7921f7c8360bbb3f7a91779e5c0fe541a75473904e8e2
+checksum=8cdb73dcd3d6651c84c54847596d840f31d6f422b385f5dadfdcf5af5305dc77

From f5b5fd33656115ec0e39e29c91375ec444cdba9f Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Sat, 23 Oct 2021 17:22:49 +1000
Subject: [PATCH 1960/4088] kops: update to 1.22.1

---
 srcpkgs/kops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index f62388049b93..ad2ad9f967b0 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.21.2
+version=1.22.1
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From e60518ff7001602478998481782468c15e6f1da9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 22 Oct 2021 22:27:28 -0400
Subject: [PATCH 1961/4088] toxic: update to 0.11.1

---
 srcpkgs/toxic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template
index bc1daf5e602c..fd6255895ae7 100644
--- a/srcpkgs/toxic/template
+++ b/srcpkgs/toxic/template
@@ -1,6 +1,6 @@
 # Template file for 'toxic'
 pkgname=toxic
-version=0.10.1
+version=0.11.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="avoidr <avoidr@posteo.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/JFreegman/toxic/"
 distfiles="https://github.com/JFreegman/toxic/archive/v${version}.tar.gz"
-checksum=b3cfbea28135fbc48c083276160cef02de755b60f6cfe1bd6efc1b5fdd4b92fe
+checksum=5df8f3cf21c2b228546399f0c2a77c6d8f5356939a85c32222a4f6a26b82688a
 
 do_build() {
 	make CC=$CC USER_CFLAGS="$CFLAGS" USER_LDFLAGS="$LDFLAGS" ${makejobs}

From 13ba26433f5c8840d94218aa12acc80ed9eec171 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 22 Oct 2021 22:32:23 -0400
Subject: [PATCH 1962/4088] bettercap: update to 2.32.0, adopt

---
 srcpkgs/bettercap/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index c42a23ca0761..9d87e9663a75 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,17 +1,20 @@
 # Template file for 'bettercap'
 pkgname=bettercap
-version=2.29
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"
 makedepends="libpcap-devel libnetfilter_queue-devel libusb-devel"
 short_desc="Network attack and monitoring framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/bettercap/bettercap"
-distfiles="https://github.com/bettercap/bettercap/archive/v${version}.tar.gz"
-checksum=c414be98a48d9f279460b325dddaef8479132a1470c6f305790d79e04dac1297
+distfiles="https://github.com/bettercap/bettercap/archive/refs/tags/v${version}.tar.gz"
+checksum=ea28d4d533776a328a54723a74101d1720016ffe7d434bf1d7ab222adb397ac6
+
+# fix: collect2: fatal error: cannot find 'ld'
+LDFLAGS="-fuse-ld=bfd"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	CPPFLAGS="-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t"

From 1758fe85d381c08f99db88c1ac816d36ffb88c8f Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 22 Oct 2021 22:52:22 +0300
Subject: [PATCH 1963/4088] geckodriver: update to 0.30.0.

---
 srcpkgs/geckodriver/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template
index ca028e38b064..6f6d251f3f61 100644
--- a/srcpkgs/geckodriver/template
+++ b/srcpkgs/geckodriver/template
@@ -1,8 +1,8 @@
 # Template file for 'geckodriver'
 pkgname=geckodriver
-version=0.29.0
+version=0.30.0
 revision=1
-_hg_commit="cf6956a5ec8e"
+_hg_commit="d372710b98a6"
 create_wrksrc=yes
 build_wrksrc=${pkgname}
 build_style=cargo
@@ -14,10 +14,10 @@ distfiles="https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/test
  https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/webdriver/>webdriver.zip
  https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/mozbase/rust/>mozbase-rust.zip
  https://hg.mozilla.org/mozilla-central/raw-file/${_hg_commit}/Cargo.lock"
-checksum="5095be872b66c3b0dfc9d3d82bf0a62613b0f9783731d9ea0def6d6019d24b14
- d5297cd054ca19ea23f9e6722b9ada89e0d73941efc374fdbfc613bf18fda544
- 921ed447ece7058652429dfb79a9db4bf0c467163761cbfc3d9daba00b77b662
- 048970448a118b1569b9e70192c0214a86363e0c25094819d4cf6b99ee54eef0"
+checksum="7f8820ec83ca7671236ee74345bdbd20cf328fde4896397353952c0cc4e0eb91
+ 4828ec0256835b893e5642439f83f9de84512a84e4a711262b6f2c37dff15ec8
+ 71043889235bf513b2539490d1c163589484628f6fcf24e4591ba4281e620d6f
+ 5daceea2850bd034ffb1b538b4aa5f8f6915f36631ef6dbeeb9d30fe26180c38"
 skip_extraction="Cargo.lock"
 
 post_extract() {

From 6c5de85b3554d8c3ded4a7c1c1776ca1df9f75e8 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Fri, 22 Oct 2021 14:18:14 +0200
Subject: [PATCH 1964/4088] libxkbcommon: update to 1.3.1.

---
 srcpkgs/libxkbcommon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index ed016aae5ee9..4cc927a6d30f 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,7 +1,7 @@
 # Template file for 'libxkbcommon'
 pkgname=libxkbcommon
-version=1.3.0
-revision=3
+version=1.3.1
+revision=1
 wrksrc="${pkgname}-${pkgname#lib}-${version}"
 build_style=meson
 # b_ndebug=false is needed to pass the test suite, as it relies on side effects
@@ -13,11 +13,11 @@ makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols
  xorgproto libxml2-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
-maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://xkbcommon.org/"
 distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=e1b79838256549d72f42c824f720b4f14603374cfbe5587942e35a0cbb13ff9e
+checksum=8eda6782c6ed4b83296521f2f7e6bea88aba76d49c39fb4fce0f8d355a9181ce
 
 post_install() {
 	vlicense LICENSE

From 1b59ed50cfc8ddf4bbf9848bc879b02322f13dd2 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Fri, 22 Oct 2021 01:57:52 -0500
Subject: [PATCH 1965/4088] dash: update to 5.11.5

---
 srcpkgs/dash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index d966b55956b7..73e020976bd7 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -1,6 +1,6 @@
 # Template file for 'dash'
 pkgname=dash
-version=0.5.11.4
+version=0.5.11.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://gondor.apana.org.au/~herbert/dash/"
 distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
-checksum=4e15b7ba5363bcc2a443549910cdc15b5ad601df8196b5f294c712eff037e08d
+checksum=db778110891f7937985f29bf23410fe1c5d669502760f584e54e0e7b29e123bd
 register_shell="/usr/bin/sh /usr/bin/dash /bin/sh /bin/dash"
 
 alternatives="

From e2778d84c90de17110932c1c3551fa702e3f9f87 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 7 Oct 2021 22:18:20 -0700
Subject: [PATCH 1966/4088] CLion: update to 2021.2.3.

---
 srcpkgs/CLion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 3311c2e9ed58..a7779c295f13 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2.1
+version=2021.2.3
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2db99f8a755ad35b87b276dcbdfbb95be4fe35d0a741e7dfb340b2121403d44e
+checksum=25c3968c72976b2de5e3e8f39b242702c4ec25b32268022cd16590e9fbfc0b27
 repository=nonfree
 restricted=yes
 nopie=yes

From dd67088672c7a64c30f9c11b5e02b9039c056968 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 23 Oct 2021 15:03:43 -0400
Subject: [PATCH 1967/4088] procs: update to 0.11.10

---
 srcpkgs/procs/template | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 9e451fc78c82..8da431f119bb 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,15 +1,28 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.11.8
+version=0.11.10
 revision=1
 build_style=cargo
+build_helper=qemu
 short_desc="Modern replacement for ps written in Rust"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/dalance/procs"
-distfiles="https://github.com/dalance/procs/archive/v${version}.tar.gz"
-checksum=50ef6175c08a5ce7f65c81924e8f295bab9622b453b51178a8b8c37c3ef2beef
+changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
+distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
+checksum=e6a869722181f2122a5a223517a2d1f6505d19b8b9d46ffd59c61fb02f472403
+
+post_build() {
+	PROCS="target/${RUST_TARGET}/release/procs"
+	vtargetrun ${PROCS} --completion bash > procs.bash
+	vtargetrun ${PROCS} --completion fish > procs.fish
+	vtargetrun ${PROCS} --completion zsh > procs.zsh
+}
 
 post_install() {
+	vcompletion procs.bash bash
+	vcompletion procs.fish fish
+	vcompletion procs.zsh zsh
+
 	vlicense LICENSE
 }

From f9bb5f6fd3e6ffd35bcb39a63944bf8aa890102c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Oct 2021 17:41:22 +0300
Subject: [PATCH 1968/4088] python3-pytest-httpserver: update to 1.0.2.

---
 srcpkgs/python3-pytest-httpserver/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index 931083244be0..d3742bf696d1 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-httpserver'
 pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=2
+version=1.0.2
+revision=1
 wrksrc=pytest-httpserver-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://www.github.com/csernazs/pytest-httpserver"
 changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
 distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+checksum=4917bf3a70ae34816ad34b42039e020d9c0da37349e1cc562fb534799dcf202d
 
 post_install() {
 	vlicense LICENSE

From 9e8196089b1e0d683e1d7209b362dcff32d40391 Mon Sep 17 00:00:00 2001
From: Bikutoso <10584311+Bikutoso@users.noreply.github.com>
Date: Wed, 20 Oct 2021 13:32:51 +0200
Subject: [PATCH 1969/4088] clinfo: update to 3.0.21.02.21.

---
 srcpkgs/clinfo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clinfo/template b/srcpkgs/clinfo/template
index 021b5f39fb78..7e8349b54b10 100644
--- a/srcpkgs/clinfo/template
+++ b/srcpkgs/clinfo/template
@@ -1,6 +1,6 @@
 # Template file for 'clinfo'
 pkgname=clinfo
-version=2.2.18.04.06
+version=3.0.21.02.21
 revision=1
 build_style=gnu-makefile
 makedepends="ocl-icd-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="CC0-1.0"
 homepage="https://github.com/Oblomov/clinfo"
 distfiles="https://github.com/Oblomov/clinfo/archive/${version}.tar.gz"
-checksum=f77021a57b3afcdebc73107e2254b95780026a9df9aa4f8db6aff11c03f0ec6c
+checksum=e52f5c374a10364999d57a1be30219b47fb0b4f090e418f2ca19a0c037c1e694
 conflicts="catalyst>0 catalyst-opencl>0" # /usr/bin/clinfo
 
 do_install() {

From a8d171cb6ff4a3fe2885828c731c543fc7a3deb0 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 24 Oct 2021 13:09:02 +1100
Subject: [PATCH 1970/4088] upmpdcli: update to 1.5.13

---
 srcpkgs/upmpdcli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 73fb2e4165ae..0aa931a576e0 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.5.12
+version=1.5.13
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=1d7b6ab360c2549a7e3eff4f261471761dd837e18327a3ca29de1981c090ff3b
+checksum=c7726f0d4062ae253159102e499759bd513d3c68bfe16c44997ee3fba35509f8
 python_version=3
 
 system_accounts="_upmpdcli"

From 47f2edc68870f16d76593d632037f75888cfa5f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 23 Oct 2021 23:52:24 -0400
Subject: [PATCH 1971/4088] chezmoi: update to 2.7.3.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 5edb3dfec0da..252ea71b4f04 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.7.2
+version=2.7.3
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0c02b70735ad7d8703b973644473228ca423eb1d01221dfd03f52cfd39b028ab
+checksum=a9dbaa9bd55f1c1e1c82c7ae5b7b1933f907703d5bd9976b2c14321b8c1e0d90
 
 export CGO_ENABLED=1
 

From 2520d4366971c5d3f577309ebc9edc7a147059e2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 24 Oct 2021 00:07:39 -0500
Subject: [PATCH 1972/4088] xbps-static: Sync with xbps

---
 srcpkgs/xbps-static/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index c6310a497096..7956fdae4d64 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -2,7 +2,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/xbps"
 pkgname=xbps-static
 version=0.59.1
-revision=1
+revision=5
 # only musl
 archs="*-musl"
 wrksrc="xbps-${version}"
@@ -26,6 +26,9 @@ do_install() {
 	make DESTDIR=${wrksrc}/static-install install
 	vmkdir usr/bin
 	mv ${wrksrc}/static-install/usr/bin/*.static ${DESTDIR}/usr/bin
+	for _f in /var/db/xbps/keys/* ; do
+		vinstall "$_f" 0644 var/db/xbps/keys/
+	done
 }
 
 post_install() {

From 9e04f6cf9ab4282fe40863c5186b766626ab085b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 22 Oct 2021 11:23:55 +0200
Subject: [PATCH 1973/4088] New package: python3-rfc3986-1.5.0

---
 srcpkgs/python3-rfc3986/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-rfc3986/template

diff --git a/srcpkgs/python3-rfc3986/template b/srcpkgs/python3-rfc3986/template
new file mode 100644
index 000000000000..6cc9e83b83e8
--- /dev/null
+++ b/srcpkgs/python3-rfc3986/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-rfc3986'
+pkgname=python3-rfc3986
+version=1.5.0
+revision=1
+wrksrc="rfc3986-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-idna"
+checkdepends="python3-pytest $depends"
+short_desc="Python Implementation of RFC3986 including validations"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="Apache-2.0"
+homepage="https://rfc3986.readthedocs.io/"
+distfiles="https://github.com/python-hyper/rfc3986/archive/refs/tags/$version.tar.gz"
+checksum=120c235975198b3e23458ca7ff5b8628f609190c0b067fb6059b448fe1345f1b

From 147f229a31152e3c2b7e72f16d9f8ea54956af65 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 22 Oct 2021 11:23:39 +0200
Subject: [PATCH 1974/4088] New package: python3-httpcore-0.13.7

---
 srcpkgs/python3-httpcore/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-httpcore/template

diff --git a/srcpkgs/python3-httpcore/template b/srcpkgs/python3-httpcore/template
new file mode 100644
index 000000000000..1ad467b26703
--- /dev/null
+++ b/srcpkgs/python3-httpcore/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-httpcore'
+pkgname=python3-httpcore
+version=0.13.7
+revision=1
+wrksrc="httpcore-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-h11 python3-sniffio python3-anyio python3-h2"
+short_desc="Minimal HTTP client"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.encode.io/httpcore/"
+changelog="https://raw.githubusercontent.com/encode/httpcore/master/CHANGELOG.md"
+distfiles="https://github.com/encode/httpcore/archive/refs/tags/$version.tar.gz"
+checksum=c72bf5b60981496361ec39be1f5feff1a4d756acc66847764946d3dac7e443ed
+make_check=no # at least trustme python module is not packaged
+
+post_install() {
+	vlicense LICENSE.md
+}

From 51533dd6dcb17e619462d4ddbc01ce2df0689766 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 22 Oct 2021 11:23:58 +0200
Subject: [PATCH 1975/4088] python3-httpx: add missing dependencies

---
 srcpkgs/python3-httpx/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template
index 9f2ce955f182..78fdb5a3f70a 100644
--- a/srcpkgs/python3-httpx/template
+++ b/srcpkgs/python3-httpx/template
@@ -1,19 +1,23 @@
 # Template file for 'python3-httpx'
 pkgname=python3-httpx
 version=0.20.0
-revision=1
+revision=2
 wrksrc="httpx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-pytest"
+depends="python3-rfc3986 python3-certifi python3-charset-normalizer
+ python3-sniffio python3-httpcore python3-click python3-rich python3-Pygments
+ python3-h2"
 short_desc="Next generation HTTP client for Python"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.python-httpx.org"
+changelog="https://raw.githubusercontent.com/encode/httpx/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/h/httpx/httpx-${version}.tar.gz"
 checksum=09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b
-make_check=no # no tests included
+# the pypi tarball doesn't contain tests
+# the tests need unpackaged dependencies trustme and uvicorn
+make_check=no
 
 post_install() {
 	vlicense LICENSE.md LICENSE

From dc7ca88429678708023ef44dba2c380b2218ac8b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Oct 2021 10:21:21 +0200
Subject: [PATCH 1976/4088] gcdemu: update to 3.2.6.

---
 srcpkgs/gcdemu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcdemu/template b/srcpkgs/gcdemu/template
index 6d66b6ddf346..1f6155c50036 100644
--- a/srcpkgs/gcdemu/template
+++ b/srcpkgs/gcdemu/template
@@ -1,6 +1,6 @@
 # Template file for 'gcdemu'
 pkgname=gcdemu
-version=3.2.5
+version=3.2.6
 revision=1
 wrksrc="gcdemu-${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/gcdemu-${version}.tar.xz"
-checksum=844ef7099bce2ae67cb749f3bed5f52b3d03847bc9db8243e28aa15f095e77db
+checksum=c38bf32a84a8b4be428dfaf80aee1884d4965c9a92fa7fefc92af0bdb851d730

From f281b5d57cce1d7f50adb3132ba8526a6bd6a4f6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Oct 2021 10:23:25 +0200
Subject: [PATCH 1977/4088] vhba-module-dkms: update to 20211023.

---
 srcpkgs/vhba-module-dkms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vhba-module-dkms/template b/srcpkgs/vhba-module-dkms/template
index 0edd3fa266ae..5a5c1fbef6c8 100644
--- a/srcpkgs/vhba-module-dkms/template
+++ b/srcpkgs/vhba-module-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'vhba-module-dkms'
 pkgname=vhba-module-dkms
-version=20210418
+version=20211023
 revision=1
 wrksrc=vhba-module-${version}
 conf_files="/usr/lib/udev/rules.d/40-vhba.rules"
@@ -9,7 +9,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.xz"
-checksum=18bd82ae27721ad1612b3c31accd81898ae326370964385ca52a2a66b67a3f85
+checksum=60087baaa928cefa06d5684706fef3d48712acfef92cb32afc507ab19adebf10
 
 dkms_modules="vhba-module ${version}"
 depends="dkms"

From 78618703020ac3bf9b019a44cc3fe68fc2d43062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 21 Oct 2021 20:46:43 +0200
Subject: [PATCH 1978/4088] qutebrowser: update to 2.4.0.

Closes: #33679 [via git-merge-pr]
---
 srcpkgs/qutebrowser/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 0bf14ec8cc3c..c49a9040c39f 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,7 +1,7 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
-revision=2
+version=2.4.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-yaml
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=f2cd9abb14ebabf9630573b2fb8447be192877787dc4e3964e1b55f72a8592ec
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From a22535fc22618d6d8cc7f563a31ea5123127596e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Oct 2021 16:39:25 +0200
Subject: [PATCH 1979/4088] skaffold: update to 1.33.1.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 4905e07f3e10..d24100513d3a 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.33.0
+version=1.33.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=9e29d015e6c3f7355ac4239014fdfcf8a53e1ee16c1fb49ebac08e0e053d14ca
+checksum=fc9d5d274d60fd106d1ea7f00155e4070be76cdb3cc782a45840e44bf727efd3

From 077f26d6f59b10938a7b265ecf73fbe20a9ca075 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Oct 2021 17:25:11 +0300
Subject: [PATCH 1980/4088] anydesk: fix eula checksum.

---
 srcpkgs/anydesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 0d8597d11f3f..631eb3452181 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -16,7 +16,7 @@ restricted=yes
 distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
 checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
 
-_eula_digest=596226d4f35d871f5dd8bdce1c2a5d00ca9ee76dcb0668a08a9e2ca64e53d11f
+_eula_digest=c2c506dd3fe335365e10814d4b1a2cde227898ce0ddda25c2246a2e18b4ac576
 
 post_extract() {
 	$XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms

From 97411b3c80e93f1e0af84521db7c0b6425b8762f Mon Sep 17 00:00:00 2001
From: Foxlet <foxlet@furcode.co>
Date: Wed, 6 Oct 2021 22:56:31 -0400
Subject: [PATCH 1981/4088] New package: ntfs2btrfs-20210923

---
 ...Use-GNUInstallDirs-to-determine-sbin.patch | 23 +++++++++++++++++++
 srcpkgs/ntfs2btrfs/template                   | 14 +++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch
 create mode 100644 srcpkgs/ntfs2btrfs/template

diff --git a/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch b/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch
new file mode 100644
index 000000000000..4f3412240f52
--- /dev/null
+++ b/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch
@@ -0,0 +1,23 @@
+From f97247434ecda2cd2c451da5c73c3af98dfaea35 Mon Sep 17 00:00:00 2001
+From: Mark Harmstone <mark@harmstone.com>
+Date: Thu, 7 Oct 2021 17:59:35 +0100
+Subject: [PATCH] CMakeLists.txt: use GNUInstallDirs to determine sbin location
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cfaa571..17ded78 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,5 +89,5 @@ else()
+     target_compile_options(ntfs2btrfs PRIVATE -Wall -Wextra -Wno-address-of-packed-member -Wconversion -Wno-unknown-pragmas -Werror=pointer-arith)
+ endif()
+ 
+-install(TARGETS ntfs2btrfs DESTINATION sbin)
++install(TARGETS ntfs2btrfs DESTINATION ${CMAKE_INSTALL_SBINDIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ntfs2btrfs.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+-- 
+2.33.0
+
diff --git a/srcpkgs/ntfs2btrfs/template b/srcpkgs/ntfs2btrfs/template
new file mode 100644
index 000000000000..c87a81de187d
--- /dev/null
+++ b/srcpkgs/ntfs2btrfs/template
@@ -0,0 +1,14 @@
+# Template file for 'ntfs2btrfs'
+pkgname=ntfs2btrfs
+version=20210923
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_SBINDIR=bin"
+hostmakedepends="pkg-config"
+makedepends="fmt-devel zlib-devel lzo-devel libzstd-devel"
+short_desc="Filesystem converter for Microsoft's NTFS"
+maintainer="Foxlet <foxlet@furcode.co>"
+license="GPL-2.0-only"
+homepage="https://github.com/maharmstone/ntfs2btrfs"
+distfiles="https://github.com/maharmstone/ntfs2btrfs/archive/${version}.tar.gz"
+checksum=e07cc1cad634d59e58111bf993683f02a7504913fac1ef8dd33fd06ebf9140c1

From ac0cdd41fdde1df730c703ce336cc321e944c5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 2 Oct 2021 16:53:03 -0300
Subject: [PATCH 1982/4088] librsvg: update to 2.52.2, adopt.

Credit to biopsin for spotting the workaround with .cargo/config.

Upstream issue: https://gitlab.gnome.org/GNOME/librsvg/-/issues/810
---
 srcpkgs/librsvg/template | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index d6c9c2c89ddf..b7c13dbfa9a0 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,6 +1,6 @@
 # Template file for 'librsvg'
 pkgname=librsvg
-version=2.50.7
+version=2.52.2
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -9,18 +9,27 @@ hostmakedepends="cargo pkg-config python glib-devel gdk-pixbuf-devel vala"
 makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel
  libglib-devel libxml2-devel pango-devel rust vala"
 short_desc="SVG library for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/LibRsvg"
 # update changelog when release series changes
 changelog="https://gitlab.gnome.org/GNOME/librsvg/-/raw/librsvg-2.50/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fffb61b08cd5282aaae147a02b305166a7426fad22a8b9427708f0f2fc426ebc
+checksum=03d2887c18ffb906e1a60f97fe46a7169f69aa28d6db5d285748f3618b093427
 
-do_check() {
-	# reference files are for specific pango and harfbuzz versions
-	# the test suite isn't designed to be run by distros
-	:
+# reference files are for specific pango and harfbuzz versions
+# the test suite isn't designed to be run by distros
+make_check=no
+
+pre_configure() {
+	# otherwise the final linking step uses "cc" instead of $CC
+	if [ "$CROSS_BUILD" ]; then
+		cat >> .cargo/config <<- EOF
+
+		[target.${RUST_TARGET}]
+		linker = "${CC}"
+		EOF
+	fi
 }
 
 librsvg-devel_package() {

From 2f2bb7d9547f6127018930f6c1b0385567020b6f Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Sun, 24 Oct 2021 11:42:21 -0600
Subject: [PATCH 1983/4088] mu4e: update to 1.6.9

---
 srcpkgs/mu4e/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
index ff7dcf2beff3..4c9d22d8bc97 100644
--- a/srcpkgs/mu4e/template
+++ b/srcpkgs/mu4e/template
@@ -1,6 +1,6 @@
 # Template file for 'mu4e'
 pkgname=mu4e
-version=1.6.8
+version=1.6.9
 revision=1
 wrksrc="mu-${version}"
 build_style=gnu-configure
@@ -11,8 +11,8 @@ short_desc="Maildir-utils indexer/searcher and associated Emacs client"
 maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=d175272bec399c956393c8e2afa5e16f503b65417edc7e3224b50edd6d1f9750
+distfiles="https://github.com/djcb/mu/releases/download/${version}-signed/mu-${version}.tar.xz"
+checksum=8d99430a4f6942eb3122008bb897c4480cda64b30ff4575c32ded86d7edbaf58
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"
 

From 977e46e3a399a5cb4d4d53af28e84f54e0f6fc4d Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 23 Oct 2021 01:49:47 +0300
Subject: [PATCH 1984/4088] python3-proselint: update to 0.12.0.

---
 srcpkgs/python3-proselint/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-proselint/template b/srcpkgs/python3-proselint/template
index 2ad63eba5c31..57695420e851 100644
--- a/srcpkgs/python3-proselint/template
+++ b/srcpkgs/python3-proselint/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-proselint'
 pkgname=python3-proselint
-version=0.10.2
-revision=5
+version=0.12.0
+revision=1
 wrksrc="proselint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-click python3-future python3-six"
+checkdepends="$depends python3-pytest"
 short_desc="Linter for prose (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/amperser/proselint"
 changelog="https://raw.githubusercontent.com/amperser/proselint/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/proselint/proselint-${version}.tar.gz"
-checksum=3a87eb393056d1bc77d898e4bcf8998f50e9ad84f7b9ff7cf2720509ac8ef904
+checksum=2a98d9c14382d94ed9122a6c0b0657a814cd5c892c77d9477309fc99f86592e6
 conflicts="python-proselint>=0"
 
 post_install() {

From b97e3d6ede7495863e059b030c14696c439d228a Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 24 Oct 2021 03:50:48 +0300
Subject: [PATCH 1985/4088] ldc: update to 1.28.0

---
 common/shlibs        | 10 +++++-----
 srcpkgs/ldc/template |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 775868629d3e..ce4e4b8de097 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2160,11 +2160,11 @@ libFcitx5Config.so.6 libfcitx5-5.0.5_1
 libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1
 libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1
 libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1
-libdruntime-ldc-debug-shared.so.96 ldc-runtime-1.26.0_1
-libdruntime-ldc-shared.so.96 ldc-runtime-1.26.0_1
-libphobos2-ldc-shared.so.96 ldc-runtime-1.26.0_1
-libphobos2-ldc-debug-shared.so.96 ldc-runtime-1.26.0_1
-libldc-jit.so.96 ldc-runtime-1.26.0_1
+libdruntime-ldc-debug-shared.so.98 ldc-runtime-1.28.0_1
+libdruntime-ldc-shared.so.98 ldc-runtime-1.28.0_1
+libphobos2-ldc-shared.so.98 ldc-runtime-1.28.0_1
+libphobos2-ldc-debug-shared.so.98 ldc-runtime-1.28.0_1
+libldc-jit.so.98 ldc-runtime-1.28.0_1
 libmarblewidget-qt5.so.28 marble5-17.12.2_1
 libastro.so.2 marble5-17.12.2_1
 libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template
index 24144b3cc63f..a27280dde3b8 100644
--- a/srcpkgs/ldc/template
+++ b/srcpkgs/ldc/template
@@ -1,6 +1,6 @@
 # Template file for 'ldc'
 pkgname=ldc
-version=1.26.0
+version=1.28.0
 revision=1
 wrksrc="ldc-${version}-src"
 build_style=cmake
@@ -22,7 +22,7 @@ license="BSD-3-Clause, BSL-1.0"
 homepage="https://wiki.dlang.org/LDC"
 changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md"
 distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"
-checksum=c18f4c76869f0196b459dcd6196c7eaea1b097cc422cf3771de394f6c0ef7474
+checksum=17fee8bb535bcb8cda0a45947526555c46c045f302a7349cc8711b254e54cf09
 nopie=yes
 nocross="dmd compilation fails on cross"
 # tests timeout on musl; also require unpackaged python3-lit

From 8ce991017b0bec2c09064207f57b24260718b66e Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 24 Oct 2021 03:51:09 +0300
Subject: [PATCH 1986/4088] gtkd: revbump for ldc-1.28.0

---
 srcpkgs/gtkd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index 7f280b488703..deb4e0bc0e2c 100644
--- a/srcpkgs/gtkd/template
+++ b/srcpkgs/gtkd/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkd'
 pkgname=gtkd
 version=3.9.0
-revision=5
+revision=6
 wrksrc="GtkD-${version}"
 build_style=gnu-makefile
 make_build_args="LDFLAGS='-linker=bfd' DC=ldc2"

From baccc116b02dfad98b5fc9ddf30f5c4ab99237e8 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 24 Oct 2021 03:51:34 +0300
Subject: [PATCH 1987/4088] tilix: revbump for ldc-1.28.0

---
 srcpkgs/tilix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template
index f53d8f86fd87..d8f014bc78c5 100644
--- a/srcpkgs/tilix/template
+++ b/srcpkgs/tilix/template
@@ -1,7 +1,7 @@
 # Template file for 'tilix'
 pkgname=tilix
 version=1.9.4
-revision=2
+revision=3
 build_style=meson
 configure_args="-Db_lto=false"
 hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config

From 6d2a29dc44f255fb5eccb23ec51846c42b3ada26 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 24 Oct 2021 03:51:53 +0300
Subject: [PATCH 1988/4088] onedrive: update to 2.4.13

---
 srcpkgs/onedrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 6ca2242948fc..ef21f47eb6f4 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,6 +1,6 @@
 # Template file for 'onedrive'
 pkgname=onedrive
-version=2.4.12
+version=2.4.13
 revision=1
 build_style=gnu-configure
 configure_args="DC=ldc2"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/abraunegg/onedrive"
 changelog="https://raw.githubusercontent.com/abraunegg/onedrive/master/CHANGELOG.md"
 distfiles="https://github.com/abraunegg/onedrive/archive/v${version}.tar.gz"
-checksum=4f6aa46fc28e859b63c0a2c190f66c3286ec0bde3f54f77af0ddea6b62bba37a
+checksum=6cb903ec14be249caa13c04a4fbba9a431041c224e7d815798a94f7b93861263
 nocross="uses host flags for cross compilations"
 
 post_install() {

From 6406abecc80a02fa124e239d7235a0fa6e23c193 Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Wed, 18 Aug 2021 12:59:00 +0200
Subject: [PATCH 1989/4088] common: fix tooling section in comments

---
 common/chroot-style/uchroot.sh            | 2 +-
 common/chroot-style/uunshare.sh           | 2 +-
 common/hooks/pre-pkg/06-shlib-provides.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/chroot-style/uchroot.sh b/common/chroot-style/uchroot.sh
index 2f9dbb2d45f0..5fe47eb9f8bc 100755
--- a/common/chroot-style/uchroot.sh
+++ b/common/chroot-style/uchroot.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# This chroot script uses xbps-uchroot(8).
+# This chroot script uses xbps-uchroot(1).
 #
 readonly MASTERDIR="$1"
 readonly DISTDIR="$2"
diff --git a/common/chroot-style/uunshare.sh b/common/chroot-style/uunshare.sh
index 7dc476a4627a..4d5146445fd2 100755
--- a/common/chroot-style/uunshare.sh
+++ b/common/chroot-style/uunshare.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# This chroot script uses xbps-uunshare(8) with user_namespaces(7).
+# This chroot script uses xbps-uunshare(1) with user_namespaces(7).
 #
 readonly MASTERDIR="$1"
 readonly DISTDIR="$2"
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index fc39f6bfbe48..a09eb6f5c3b3 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,5 +1,5 @@
 # This hook executes the following tasks:
-#	- generates shlib-provides file for xbps-create(8)
+#	- generates shlib-provides file for xbps-create(1)
 
 collect_sonames() {
 	local _destdir="$1" f _soname _fname _pattern

From 871e9d055558787dba07fec0979eb80876648120 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Oct 2021 14:53:59 +0200
Subject: [PATCH 1990/4088] python3-pycodestyle: update to 2.8.0.

---
 srcpkgs/python3-pycodestyle/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-pycodestyle/template b/srcpkgs/python3-pycodestyle/template
index 0caae52d1f6e..a6afc1d1a79b 100644
--- a/srcpkgs/python3-pycodestyle/template
+++ b/srcpkgs/python3-pycodestyle/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycodestyle'
 pkgname=python3-pycodestyle
-version=2.7.0
-revision=2
+version=2.8.0
+revision=1
 wrksrc="pycodestyle-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/pycodestyle"
 distfiles="${PYPI_SITE}/p/pycodestyle/pycodestyle-${version}.tar.gz"
-checksum=c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef
+checksum=eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f
 
 do_check() {
 	# from tox.ini and alpine
@@ -19,11 +19,6 @@ do_check() {
 	python3 -m pycodestyle --max-doc-length=72 --testsuite testsuite
 	python3 -m pycodestyle --max-doc-length=72 --doctest
 	python3 -m unittest discover testsuite -vv
-
-	python -m pycodestyle --statistics pycodestyle.py
-	python -m pycodestyle --max-doc-length=72 --testsuite testsuite
-	python -m pycodestyle --max-doc-length=72 --doctest
-	python -m unittest discover testsuite -vv
 }
 
 post_install() {

From 0d417c3bed2e6c67fcdff22e1b0978b27d96faa9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Oct 2021 14:54:02 +0200
Subject: [PATCH 1991/4088] python3-pyflakes: update to 2.4.0.

---
 srcpkgs/python3-pyflakes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyflakes/template b/srcpkgs/python3-pyflakes/template
index be45e862dfae..9a24828f4394 100644
--- a/srcpkgs/python3-pyflakes/template
+++ b/srcpkgs/python3-pyflakes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyflakes'
 pkgname=python3-pyflakes
-version=2.3.1
-revision=2
+version=2.4.0
+revision=1
 wrksrc="pyflakes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/pyflakes"
 distfiles="${PYPI_SITE}/p/pyflakes/pyflakes-${version}.tar.gz"
-checksum=f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db
+checksum=05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c
 conflicts="python-pyflakes>=0"
 
 post_install() {

From e84fc4b8e70f06e6b3355f0fd5fb2b1f17f826d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Oct 2021 14:53:45 +0200
Subject: [PATCH 1992/4088] flake8: update to 4.0.1.

---
 srcpkgs/flake8/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index d5e68dde1b92..0433af3aa460 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,7 +1,7 @@
 # Template file for 'flake8'
 pkgname=flake8
-version=3.9.2
-revision=2
+version=4.0.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pycodestyle python3-pyflakes python3-mccabe"
@@ -12,15 +12,14 @@ license="MIT"
 homepage="https://gitlab.com/pycqa/flake8"
 changelog="https://raw.githubusercontent.com/PyCQA/flake8/master/docs/source/release-notes/$version.rst"
 distfiles="${PYPI_SITE}/f/flake8/flake8-${version}.tar.gz"
-checksum=07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b
+checksum=806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d
 
 do_check() {
 	# from alpine
 	PYTHONPATH=build/lib python3 -m pytest \
 			--deselect=tests/integration/test_api_legacy.py::test_legacy_api \
 			--deselect=tests/integration/test_main.py \
-			--deselect=tests/integration/test_plugins.py \
-			--deselect=tests/unit/test_setuptools_command.py::test_package_files_removes_submodules
+			--deselect=tests/integration/test_plugins.py
 }
 
 post_install() {

From bcca10f3c082d853463c08627443b5ebeb837178 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 21 Oct 2021 16:46:12 +0200
Subject: [PATCH 1993/4088] ghidra: update to 10.0.4.

---
 .../patches/honor_source_date_epoch.patch     | 29 ++++++++++++
 srcpkgs/ghidra/patches/protoc.patch           | 45 ++++++++++++-------
 srcpkgs/ghidra/template                       | 18 +++++---
 srcpkgs/ghidra/update                         |  2 +
 4 files changed, 71 insertions(+), 23 deletions(-)
 create mode 100644 srcpkgs/ghidra/patches/honor_source_date_epoch.patch
 create mode 100644 srcpkgs/ghidra/update

diff --git a/srcpkgs/ghidra/patches/honor_source_date_epoch.patch b/srcpkgs/ghidra/patches/honor_source_date_epoch.patch
new file mode 100644
index 000000000000..ecf92eb3c0b8
--- /dev/null
+++ b/srcpkgs/ghidra/patches/honor_source_date_epoch.patch
@@ -0,0 +1,29 @@
+--- a/ghidra_build/build.gradle	2021-09-28 20:47:24.000000000 +0200
++++ -	2021-10-21 16:31:33.820391721 +0200
+@@ -246,7 +246,7 @@
+  *********************************************************************************/
+ def getCurrentDate() {
+ 
+-	def date = new Date()
++	def date = System.getenv("SOURCE_DATE_EPOCH") == null ? new Date() : new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))
+ 	def formattedDate = date.format('yyyyMMdd')
+ 	return formattedDate
+ }
+@@ -256,7 +256,7 @@
+  *********************************************************************************/
+ def getCurrentDateTime() {
+ 
+-	def date = new Date()
++	def date = System.getenv("SOURCE_DATE_EPOCH") == null ? new Date() : new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))
+ 	def formattedDate = date.format('yyyyMMdd-HHmm')
+ 	return formattedDate
+ }
+@@ -266,7 +266,7 @@
+  *********************************************************************************/
+ def getCurrentDateTimeLong() {
+ 
+-	def date = new Date()
++	def date = System.getenv("SOURCE_DATE_EPOCH") == null ? new Date() : new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))
+ 	def formattedDate = date.format('yyyy-MMM-dd HHmm z')
+ 	return formattedDate
+ }
diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch
index a3ab960346e3..30c45164caf9 100644
--- a/srcpkgs/ghidra/patches/protoc.patch
+++ b/srcpkgs/ghidra/patches/protoc.patch
@@ -1,16 +1,15 @@
---- ghidra-10.0.1/ghidra-Ghidra_10.0.1_build/Ghidra/Debug/Debugger-gadp/build.gradle	2021-07-08 12:16:19.000000000 -0500
-+++ -	2021-07-19 04:53:54.446268239 -0500
-@@ -27,7 +27,6 @@
- 
- configurations {
- 	allProtocArtifacts
--	protocArtifact
- }
- 
+--- a/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle	2021-09-28 20:47:24.000000000 +0200
++++ -	2021-10-21 16:35:42.275129993 +0200
+@@ -33,21 +33,11 @@
  def os = org.gradle.internal.os.OperatingSystem.current()
-@@ -37,16 +36,6 @@
-     allProtocArtifacts 'com.google.protobuf:protoc:3.11.1:linux-x86_64@exe'
-     allProtocArtifacts 'com.google.protobuf:protoc:3.11.1:osx-x86_64@exe'
+ 
+ dependencies {
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.11.1:windows-x86_64@exe'
+-    allProtocArtifacts 'com.google.protobuf:protoc:3.11.1:linux-x86_64@exe'
+-    allProtocArtifacts 'com.google.protobuf:protoc:3.11.1:osx-x86_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:windows-x86_64@exe'
++    allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
++    allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
  
 -	if (os.isWindows()) {
 -    	protocArtifact 'com.google.protobuf:protoc:3.11.1:windows-x86_64@exe'
@@ -22,12 +21,21 @@
 -    	protocArtifact 'com.google.protobuf:protoc:3.11.1:osx-x86_64@exe'
 -    }
 -
- 	api 'com.google.protobuf:protobuf-java:3.11.1'
+-	api 'com.google.protobuf:protobuf-java:3.11.1'
++	api 'com.google.protobuf:protobuf-java:3.18.1'
  	api project(':Framework-AsyncComm')
  	api project(':Framework-Debugging')
-@@ -70,14 +59,9 @@
- 	ext.outdir = file("build/generated/source/proto/main/java")
- 	outputs.dir(outdir)
+ 	api project(':ProposedUtils')
+@@ -58,7 +48,7 @@
+ 
+ /*protobuf {
+ 	protoc {
+-		artifact = 'com.google.protobuf:protoc:3.11.1'
++		artifact = 'com.google.protobuf:protoc:3.18.1'
+ 	}
+ }*/
+ 
+@@ -72,12 +62,7 @@
  	inputs.files(src)
 -	dependsOn(configurations.protocArtifact)
  	doLast {
@@ -41,3 +49,8 @@
  			args src
  		}
  	}
+--- a/ghidra_build/Ghidra/Debug/Debugger-gadp/Module.manifest	2021-09-28 20:47:24.000000000 +0200
++++ -	2021-10-21 16:40:18.629990242 +0200
+@@ -1 +1 @@
+-MODULE FILE LICENSE: lib/protobuf-java-3.11.1.jar BSD
++MODULE FILE LICENSE: lib/protobuf-java-3.18.1.jar BSD
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 7f4182f3730a..30eb7b2e9716 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,10 +1,11 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.0.1
+version=10.0.4
 revision=1
 archs="x86_64*"
 create_wrksrc=yes
-hostmakedepends="gradle openjdk11 flex unzip protobuf"
+build_wrksrc="ghidra_build"
+hostmakedepends="gradle openjdk11 flex unzip protobuf which"
 depends="openjdk11"
 short_desc="Software reverse engineering (SRE) framework"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
@@ -15,7 +16,7 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
  https://sourceforge.net/projects/catacombae/files/HFSExplorer/0.21/hfsexplorer-0_21-bin.zip
  https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-12.12/yajsw-stable-12.12.zip
  https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar"
-checksum="37c5d0cb8d016860eb6dd3ec3aa1b81d22b7d2d42dd7d40cf4f2fcab2b0e0b43
+checksum="76f1bd9604d49a2e59c47b347aedb90484bcfe51217c792e8cc771fc6481147c
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
  90c9b54798abca5b12f4a678db7d0a4c970f4702cb153c11919536d0014dedbf
  1398fcb1e93abb19992c4fa06d7fe5758aabb4c45781d7ef306c6f57ca7a7321
@@ -41,10 +42,14 @@ skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
  /usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/sharedReturn
  /usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/switch
  /usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/write"
-python_version=2 #unverified
+python_version=2 # Jython 2.7.2 stuff
+
+post_extract() {
+	# makes patching easier
+	mv ${wrksrc}/ghidra-Ghidra_${version}_build ${wrksrc}/ghidra_build
+}
 
 do_configure() {
-	cd ghidra-Ghidra_${version}_build
 	mkdir -p dependencies/flatRepo
 	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
 	for lib in csframework.jar hfsx_dmglib.jar hfsx.jar iharder-base64.jar; do
@@ -57,12 +62,11 @@ do_configure() {
 }
 
 do_build() {
-	cd ghidra-Ghidra_${version}_build
 	gradle buildGhidra
 }
 
 do_install() {
-	cd ghidra-Ghidra_${version}_build
+	cd ${wrksrc}/${build_wrksrc}
 	vmkdir usr/libexec/ghidra
 	bsdtar --strip-components 1 -C ${DESTDIR}/usr/libexec/ghidra -xf build/dist/ghidra_${version}_DEV_$(date -u +%Y%m%d)_linux64.zip
 	vmkdir usr/bin
diff --git a/srcpkgs/ghidra/update b/srcpkgs/ghidra/update
new file mode 100644
index 000000000000..e6f8cb86edc0
--- /dev/null
+++ b/srcpkgs/ghidra/update
@@ -0,0 +1,2 @@
+site=https://github.com/NationalSecurityAgency/ghidra/tags
+pattern='/archive/refs/tags/Ghidra_?\K[\d.]+(?=_build\.tar\.gz")'

From c4abe7fe897af28a8a1f6c55500a93b8357c274f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 19 Oct 2021 22:05:59 -0400
Subject: [PATCH 1994/4088] gnucobol: update to 3.1.2

---
 srcpkgs/gnucobol/template | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnucobol/template b/srcpkgs/gnucobol/template
index 979ca3538543..4519ea786724 100644
--- a/srcpkgs/gnucobol/template
+++ b/srcpkgs/gnucobol/template
@@ -1,22 +1,24 @@
 # Template file for 'gnucobol'
 pkgname=gnucobol
-version=2.2
-revision=2
+version=3.1.2
+revision=1
 build_style=gnu-configure
+make_check_target="test"
 makedepends="gmp-devel db-devel"
+depends="gnucobol-libs>=${version}_${revision}"
+checkdepends="curl perl wget which"
 short_desc="GnuCOBOL (formerly OpenCOBOL) is a free COBOL compiler"
 maintainer="Cthulhux <git@tuxproject.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://sourceforge.net/projects/open-cobol/"
-distfiles="${SOURCEFORGE_SITE}/open-cobol/gnu-cobol/2.2/gnucobol-2.2.tar.xz"
-checksum=dc18fc45c269debfe86a4bbe20a7250983cba6238ea1917e135df5926cd024a0
-depends="gnucobol-libs>=${version}_${revision}"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=f38c60b38a9e404bcba709b61b46f2bafa146b5f3dd90a94b2a70f5cea2f6297
 nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/7152/steps/shell_3/logs/stdio"
 
 gnucobol-libs_package() {
-        short_desc+=" - runtime libraries"
-        pkg_install() {
-                vmove usr/lib/*.so.*
-                vmove usr/lib/gnucobol
-        }
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+		vmove usr/lib/gnucobol
+	}
 }

From a2fddd60ec82d8630ca2d664417b8f2af733b49f Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Mon, 25 Oct 2021 00:51:55 +0300
Subject: [PATCH 1995/4088] youtube-viewer: update to 3.9.6.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index f23decf3ef58..1753562f6547 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.5
+version=3.9.6
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=49b7591a87bd3322af63548698d227924779ccacfc5b5d7e3bbd80c44c65e116
+checksum=d8cc6a8611688507117d3d2fe492d70c436e81f2599485f943a5f01a5ef515db
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 349d731941981f4389541edb6a9ed61b920b6903 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 24 Oct 2021 04:05:47 +0300
Subject: [PATCH 1996/4088] dub: update to 1.27.0

---
 srcpkgs/dub/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dub/template b/srcpkgs/dub/template
index c717ee5d0005..f80d21bb90a2 100644
--- a/srcpkgs/dub/template
+++ b/srcpkgs/dub/template
@@ -1,6 +1,6 @@
 # Template file for 'dub'
 pkgname=dub
-version=1.23.0
+version=1.27.0
 revision=1
 hostmakedepends="dmd dtools"
 makedepends="libcurl-devel"
@@ -10,7 +10,7 @@ maintainer="Follpvosten <wolfi@karpador.xyz>"
 license="MIT"
 homepage="https://github.com/dlang/dub"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=9c7196fd76efce50e8606b3f0ab103bb8b3984842dcc7c0970eb07aba63dbaa5
+checksum=fb800f3355f167ac7f997f77e31e331db9d33477779fdaaf2851b3abcecc801a
 nocross="requires dmd"
 
 do_build() {

From d056f43fdda98da55d241272823e9eaa58335769 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:05:42 -0400
Subject: [PATCH 1997/4088] gajim: update to 1.3.3

---
 srcpkgs/gajim/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 49eda2f31542..ff3278df8e66 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,19 +1,20 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.3.2
-revision=2
+version=1.3.3
+revision=1
+wrksrc="gajim-gajim-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
-depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
- python3-precis-i18n python3-keyring python3-cssutils python3-packaging
- python3-css-parser python3-idna farstream python3-dbus libsoup"
+depends="python3-gobject python3-nbxmpp python3-setuptools python3-Pillow
+ python3-cairo python3-precis-i18n python3-keyring python3-packaging
+ python3-css-parser farstream python3-dbus python3-openssl"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=70ea462b3f3c3b3c0b8d3129fae912d24062e77a8cce80781f69e8f43eda5fee
+checksum=ddbcbe6aaf36c238e0ca7503034ed0870a5b059a96e9a4f973409ecdeec4678c
 # Does not find gdk, introspection typelib
 # even wtih gdk-pixbuf in checkdepends
 make_check=no

From de7122f3d6f884a90949755e8028d776b9ffa6e1 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:06:04 -0400
Subject: [PATCH 1998/4088] python3-nbxmpp: update to 2.0.4

---
 srcpkgs/python3-nbxmpp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index 332b88092708..e1ea0667bb57 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=2.0.2
-revision=2
+version=2.0.4
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-gobject python3-openssl python3-precis-i18n python3-idna"
+depends="python3-gobject python3-openssl python3-precis-i18n python3-idna libsoup"
 checkdepends="${depends} python3-wheel python3-pylint python3-coverage libsoup"
 short_desc="Non blocking Jabber/XMPP module"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 #changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=a3863671ab88992d3ea5d475b25c88ffe18aa1030c9ce980e1014470d4760291
+checksum=2cc967808fe73d01adee59c084d17bf5f1d27e33e98ed4f2467a1e7c638457e8
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

From 780c061a7466c4af9eb1c1c800966a03e30d099c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 25 Oct 2021 12:22:46 +0200
Subject: [PATCH 1999/4088] python3-charset-normalizer: update to 2.0.7.

---
 srcpkgs/python3-charset-normalizer/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index a319e2daa13c..c2146ab534b1 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,16 +1,21 @@
 # Template file for 'python3-charset-normalizer'
 pkgname=python3-charset-normalizer
-version=2.0.4
-revision=2
+version=2.0.7
+revision=1
 wrksrc="charset_normalizer-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest"
 short_desc="Encoding and language detection"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://charset-normalizer.readthedocs.io/"
 distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
-checksum=3fcde2e1c62bb86ed8e20ce03127ffa5ac09a3e2f2c69cc273834ed6d3e94205
+checksum=6473e80f73f5918254953073798a367f120cc5717e70c917359e155901c0e2d0
+
+pre_check() {
+	vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg
+}
 
 post_install() {
 	vlicense LICENSE

From 33c133d8880ee06b226b4b30d0330bc246546f17 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Oct 2021 14:10:54 +0200
Subject: [PATCH 2000/4088] python3-astroid: update to 2.8.3.

---
 srcpkgs/python3-astroid/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 43aeed136fd8..b6310c002b1d 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,12 +1,11 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.8.0
-revision=2
+version=2.8.3
+revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt python3-setuptools
- python3-typing_extensions"
+depends="python3-lazy-object-proxy python3-wrapt python3-setuptools"
 checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -14,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
 distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=20d69b874d2fd6ffd3f71c51ce67ba253f288342b803bda247da2595f0d0ed8f
+checksum=4cccf37b45f72a2107c2541829f36b00348679967868ba54a03a52a1bd4ae7ff

From 98058c1300d9974d509b050842b2fb5a435d36b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 25 Oct 2021 12:27:57 +0200
Subject: [PATCH 2001/4088] lagrange: update to 1.7.3.

---
 srcpkgs/lagrange/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0b834d0db3be..7baf49c65294 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,18 +1,18 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.7.1
+version=1.7.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="pcre-devel SDL2-devel openssl-devel zlib-devel libunistring-devel
- mpg123-devel libcurl-devel fribidi-devel harfbuzz-devel"
+ mpg123-devel libcurl-devel fribidi-devel harfbuzz-devel libwebp-devel"
 short_desc="Beautiful Gemini Client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=f43800fbfa99c15233a5dc5333f6d981b9a6139ff354c664213a04b3d6250703
+checksum=46d9ad305aca2cbe0ef52060a28634c9ed20098e1784e7e9f787ae5d0394ef9d
 
 post_install() {
 	vlicense LICENSE.md

From 63010c9dee70d2e993ac94b63e2b54fc0e73c755 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 25 Oct 2021 12:55:52 +0200
Subject: [PATCH 2002/4088] gi-docgen: update to 2021.8.

---
 srcpkgs/gi-docgen/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
index 046960af9469..7c440eff1f7d 100644
--- a/srcpkgs/gi-docgen/template
+++ b/srcpkgs/gi-docgen/template
@@ -1,7 +1,7 @@
 # Template file for 'gi-docgen'
 pkgname=gi-docgen
-version=2021.7
-revision=2
+version=2021.8
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml
@@ -9,7 +9,8 @@ depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml
 short_desc="Documentation generator for GObject-based libraries"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=aa338333bc36f8cf75181f8e950cd9109e7fd47a8a36ea0545c2c76a9666d0aa
+homepage="https://gitlab.gnome.org/GNOME/gi-docgen/"
+changelog="https://gitlab.gnome.org/GNOME/gi-docgen/-/releases"
+distfiles="https://download.gnome.org/sources/gi-docgen/${version%.*}/gi-docgen-$version.tar.xz"
+checksum=5bcda2cec5986f2c8efb2fab4555ca8a5c35f0002ba34442e7d602bee09dd457
 make_check=no # no tests, but check fails

From e2d8704ad85417f828d7d295654117ad2f6d47fe Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 25 Oct 2021 11:17:31 +0300
Subject: [PATCH 2003/4088] himalaya: update to 0.5.1.

---
 srcpkgs/himalaya/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index b74215c98c69..5ad5316f8c08 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,6 +1,6 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.5.0
+version=0.5.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/soywod/himalaya"
 changelog="https://raw.githubusercontent.com/soywod/himalaya/master/CHANGELOG.md"
 distfiles="https://github.com/soywod/himalaya/archive/v${version}.tar.gz"
-checksum=9ac8828f476f7b91ead4598237aa0e46a782327ef8f3d1ab6d7db75eb928173a
+checksum=13567726903243f04a4aa64e96b88e0d0fd5c3ccbe4953357f3a8ef1c569dad9
 
 post_install() {
 	vlicense LICENSE

From 354cef5e175c91adfae0706696434face3f00d52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Oct 2021 08:36:49 -0400
Subject: [PATCH 2004/4088] python3-hypothesis: update to 6.24.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index a47c101a28d1..a35747335158 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.23.0
+version=6.24.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=cc332ce3953e7d0e4a9d1d0da64ea5b53d3ce712c05aaaccacbafa7f865b4269
+checksum=da6ec0437786b16662c7d68dcdccfaf75cebf980aa0f03429f96424962f851cb
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From bbf431c2aab2373c77992767acfcf9105e9a1dc1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Oct 2021 08:37:02 -0400
Subject: [PATCH 2005/4088] python3-pip: update to 21.3.1.

---
 srcpkgs/python3-pip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 88379e9930b3..eb4d131ffc19 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.3
+version=21.3.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=741a61baab1dbce2d8ca415effa48a2b6a964564f81a9f4f1fce4c433346c034
+checksum=fd11ba3d0fdb4c07fbc5ecbba0b1b719809420f25038f8ee3cd913d3faa3033a
 # Tests have unpackaged dependencies
 make_check=no
 

From fa847bf462e6a1b674cd21ae42f896be9821af30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Oct 2021 08:37:42 -0400
Subject: [PATCH 2006/4088] python3-prompt_toolkit: update to 3.0.21.

---
 srcpkgs/python3-prompt_toolkit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 0cf01a50c762..405142b86949 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.20
-revision=2
+version=3.0.21
+revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c
+checksum=27f13ff4e4850fe8f860b77414c7880f67c6158076a7b099062cc8570f1562e5
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From fa6379d2133853fa1e42d2c403f0e4b48766352a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Oct 2021 08:37:56 -0400
Subject: [PATCH 2007/4088] python3-tomli: update to 1.2.2.

---
 srcpkgs/python3-tomli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-tomli/template b/srcpkgs/python3-tomli/template
index 1f9fb2165cf7..c016a861beaf 100644
--- a/srcpkgs/python3-tomli/template
+++ b/srcpkgs/python3-tomli/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tomli'
 pkgname=python3-tomli
-version=1.2.1
-revision=3
+version=1.2.2
+revision=1
 create_wrksrc=yes
 build_wrksrc="tomli-${version}"
 build_style=python3-pep517
@@ -20,7 +20,7 @@ homepage="https://github.com/hukkin/tomli"
 _flit_version=3.4.0
 distfiles="${PYPI_SITE}/t/tomli/tomli-${version}.tar.gz
  ${PYPI_SITE}/f/flit_core/flit_core-${_flit_version}.tar.gz"
-checksum="a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442
+checksum="c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee
  29468fa2330969167d1f5c23eb9c0661cb6dacfcd46f361a274609a7f4197530"
 # Archive includes no tests
 make_check=no

From 620f5f600e8746c36701650bc21ed085b5953e96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Oct 2021 08:38:20 -0400
Subject: [PATCH 2008/4088] vkQuake: update to 1.11.1.

---
 srcpkgs/vkQuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 9fa599a21960..bc9aacd697d1 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
 # Template file for 'vkQuake'
 pkgname=vkQuake
-version=1.11.0
+version=1.11.1
 revision=1
 build_wrksrc="Quake"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Novum/vkQuake"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=502e9218ac4c243c32a1bcaf32330ed8f0ff3b520605620b271da52120be622c
+checksum=c0dafb1b0b9392a1fdda60531e60d2e719cad772e56ee913ac5c72e0146cbee7
 
 do_install() {
 	vbin vkquake

From c03cfa3ba5d57eff81489908cf1fc8940abbdb5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Oct 2021 19:07:45 +0200
Subject: [PATCH 2009/4088] New package: libkdumpfile-0.4.0

---
 common/shlibs                 |  1 +
 srcpkgs/libkdumpfile-devel    |  1 +
 srcpkgs/libkdumpfile/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/libkdumpfile-devel
 create mode 100644 srcpkgs/libkdumpfile/template

diff --git a/common/shlibs b/common/shlibs
index ce4e4b8de097..23ad6e9c0600 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4031,3 +4031,4 @@ libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libavif.so.13 libavif-0.9.3_1
+libkdumpfile.so.8 libkdumpfile-0.4.0_1
diff --git a/srcpkgs/libkdumpfile-devel b/srcpkgs/libkdumpfile-devel
new file mode 120000
index 000000000000..609d3b4fa353
--- /dev/null
+++ b/srcpkgs/libkdumpfile-devel
@@ -0,0 +1 @@
+libkdumpfile
\ No newline at end of file
diff --git a/srcpkgs/libkdumpfile/template b/srcpkgs/libkdumpfile/template
new file mode 100644
index 000000000000..3299ae3414f0
--- /dev/null
+++ b/srcpkgs/libkdumpfile/template
@@ -0,0 +1,29 @@
+# Template file for 'libkdumpfile'
+pkgname=libkdumpfile
+version=0.4.0
+revision=1
+build_style=gnu-configure
+configure_args="PYTHON=python3"
+hostmakedepends="automake pkg-config libtool"
+makedepends="python3-devel zlib-devel lzo-devel snappy-devel"
+short_desc="Kernel coredump file access library"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/ptesarik/libkdumpfile"
+distfiles="https://github.com/ptesarik/libkdumpfile/archive/refs/tags/v${version}.tar.gz"
+checksum=0bee18de9dfe2dc4c164307df3a5a51f8f8a7cc2452398deb3931182fe1b0a21
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libkdumpfile-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+	}
+}

From bd40a8e2bdc00f0a9522ac0b8ad2250c076c34ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Oct 2021 19:06:29 +0200
Subject: [PATCH 2010/4088] New package: python3-drgn-0.0.14

---
 srcpkgs/python3-drgn/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-drgn/template

diff --git a/srcpkgs/python3-drgn/template b/srcpkgs/python3-drgn/template
new file mode 100644
index 000000000000..f5bd4b72a2e9
--- /dev/null
+++ b/srcpkgs/python3-drgn/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-drgn'
+pkgname=python3-drgn
+version=0.0.14
+revision=1
+wrksrc="drgn-${version}"
+build_style=python3-module
+hostmakedepends="automake libtool pkg-config python3-setuptools"
+makedepends="elfutils-devel libgomp-devel python3-devel libkdumpfile-devel"
+depends="python3"
+short_desc="Scriptable debugger library"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/osandov/drgn/"
+distfiles="https://github.com/osandov/drgn/archive/refs/tags/v${version}.tar.gz"
+checksum=97088c7f32fcfbad0795159807e3290794cacc011228bd27e86510eb62e73bc3
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		export CONFIGURE_FLAGS="--host=$XBPS_CROSS_TRIPLET --with-libtool-sysroot=$XBPS_CROSS_BASE"
+	fi
+}

From 843d0d2bde45ae3dfdd70001cf7134a61f341996 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Oct 2021 19:06:02 +0200
Subject: [PATCH 2011/4088] perl-Path-Tiny: update to 0.120.

---
 srcpkgs/perl-Path-Tiny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Path-Tiny/template b/srcpkgs/perl-Path-Tiny/template
index 19dcf6e01de6..96328e0a6825 100644
--- a/srcpkgs/perl-Path-Tiny/template
+++ b/srcpkgs/perl-Path-Tiny/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Path-Tiny'
 pkgname=perl-Path-Tiny
-version=0.118
+version=0.120
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Path-Tiny"
 distfiles="${CPAN_SITE}/Object/DAGOLDEN/Path-Tiny-${version}.tar.gz"
-checksum=32138d8d0f4c9c1a84d2a8f91bc5e913d37d8a7edefbb15a10961bfed560b0fd
+checksum=66a1164981d449da46cc88383fe37f9e352e87e9570bfb960e43fe8ff016ee1b

From 5f70d2bde6dfe330714ffdf0ecb3752284d32288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 15 Oct 2021 19:47:27 +0200
Subject: [PATCH 2012/4088] Manual.md: require justification for make_check

---
 Manual.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Manual.md b/Manual.md
index db605c52135f..0f268fa79ea0 100644
--- a/Manual.md
+++ b/Manual.md
@@ -605,8 +605,7 @@ patches to the package sources during `do_patch()`. Patches are stored in
 and `XBPS_MAKEJOBS` has no effect.
 
 - `make_check` Sets the cases in which the `check` phase is run.
-This option should usually be accompanied by a comment explaining why it was set, especially when
-set to `no`.
+This option has to be accompanied by a comment explaining why the tests fail.
 Allowed values:
   - `yes` (the default) to run if `XBPS_CHECK_PKGS` is set.
   - `extended` to run if `XBPS_CHECK_PKGS` is `full`.

From e984729b89ec10a583637fd6b1342e3f4d7fdb80 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 25 Oct 2021 21:02:13 +0200
Subject: [PATCH 2013/4088] bluez: ship gatt tools

---
 srcpkgs/bluez/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 7e886382522c..f19ac4aa6d79 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,7 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
 version=5.61
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
@@ -36,6 +36,9 @@ pre_configure() {
 
 post_install() {
 	vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth
+	vbin attrib/gatttool
+	vbin tools/btgatt-client
+	vbin tools/btgatt-server
 	vsv bluetoothd
 	if [ "$build_option_mesh" ]; then
 		vsv bluetooth-meshd
@@ -77,6 +80,7 @@ bluez-deprecated_package() {
 		vmove usr/bin/hcitool
 		vmove usr/bin/rfcomm
 		vmove usr/bin/sdptool
+		vmove usr/bin/gatttool
 		vmove usr/share/man/man1/ciptool.1
 		vmove usr/share/man/man1/hciattach.1
 		vmove usr/share/man/man1/hciconfig.1

From ab2505f9eb133e689a1202eb3164b99e75459e8b Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Sat, 23 Oct 2021 09:36:49 +0200
Subject: [PATCH 2014/4088] New package: lynis-3.0.6

Closes: #33710 [via git-merge-pr]
---
 srcpkgs/lynis/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/lynis/template

diff --git a/srcpkgs/lynis/template b/srcpkgs/lynis/template
new file mode 100644
index 000000000000..17940cdf5138
--- /dev/null
+++ b/srcpkgs/lynis/template
@@ -0,0 +1,27 @@
+# Template file for 'lynis'
+pkgname=lynis
+version=3.0.6
+revision=1
+short_desc="System and security auditing tool"
+maintainer="Johannes Heimansberg <git@jhe.dedyn.io>"
+license="GPL-3.0-only"
+homepage="https://cisofy.com/lynis/"
+distfiles="https://github.com/CISOfy/lynis/archive/refs/tags/${version}.tar.gz"
+checksum=584ed6f6fa9dedeea1b473d888a4fe92fa9716400284fe41c92aed09cf10ec3e
+
+do_install() {
+	vmkdir etc/lynis
+	vinstall default.prf 0644 etc/lynis
+	vmkdir usr/share/lynis
+	vcopy include usr/share/lynis/
+	vcopy plugins usr/share/lynis/
+	vcopy db usr/share/lynis/
+	vbin lynis
+	vman lynis.8
+	vmkdir usr/share/doc/lynis
+	vinstall CHANGELOG.md 0644 usr/share/doc/lynis
+	vinstall FAQ 0644 usr/share/doc/lynis
+	vinstall INSTALL 0644 usr/share/doc/lynis
+	vinstall README 0644 usr/share/doc/lynis
+	vcompletion extras/bash_completion.d/lynis bash
+}

From 969334e4f47aa54479966f26516274cb838a7d19 Mon Sep 17 00:00:00 2001
From: Shahab Vahedi <shahab.vahedi@gmail.com>
Date: Mon, 25 Oct 2021 16:50:37 +0200
Subject: [PATCH 2015/4088] profanity: update to 0.11.1

---
 srcpkgs/profanity/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index ebda58656130..959da4cedb93 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,7 +1,7 @@
 # Template file for 'profanity'
 pkgname=profanity
-version=0.11.0
-revision=2
+version=0.11.1
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
  $(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins)
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://profanity-im.github.io/"
 changelog="https://raw.githubusercontent.com/profanity-im/profanity/master/CHANGELOG"
 distfiles="https://github.com/boothj5/profanity/releases/download/${version}/profanity-${version}.tar.gz"
-checksum=3fc9809816f69186dbb860b27183f6cd2aef0a52a7d14e20e4ef6c3a7f0f3606
+checksum=6f1b4df6c2971f51d03d48d2bfd4f69b4404410d800b43f029ea1cf08a02bd45
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)

From d67e2758357fab875c3c13918851850cfaa3e1d8 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 25 Oct 2021 22:44:37 +0300
Subject: [PATCH 2016/4088] lazygit: update to 0.30.

---
 srcpkgs/lazygit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 1af14b8ad150..5a0328ad326b 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.29
+version=0.30
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=f25de2ddab99d2ea06aae87e0be6365033b2ceb8efe94807c8b074884d5e8e38
+checksum=e0d1f442acb45fbb1eac1a77d60ad6e4db35470e62a2b9efe91832fce8cffbc6
 
 post_install() {
 	vlicense LICENSE

From e777c258900d11c7821f2d7d1c55d55b50984512 Mon Sep 17 00:00:00 2001
From: istepic <imiste@protonmail.com>
Date: Thu, 5 Aug 2021 13:23:48 +0200
Subject: [PATCH 2017/4088] qtcreator-full: examples and documentation are not
 available in QTCreator without qt5-doc package

---
 srcpkgs/qtcreator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index afbc1e8af7df..44144a6b107a 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -51,7 +51,7 @@ qtcreator-full_package() {
  qt5-speech-devel qt5-styleplugins-devel qt5-svg-devel
  qt5-tools-devel qt5-virtualkeyboard-devel qt5-wayland-devel qt5-webchannel-devel
  qt5-webglplugin-devel qt5-webkit-devel qt5-websockets-devel qt5-webview-devel
- qt5-x11extras-devel qt5-xmlpatterns-devel qt5-host-tools
+ qt5-x11extras-devel qt5-xmlpatterns-devel qt5-host-tools qt5-doc
  qt5-examples qt5-imageformats qt5-graphicaleffects qt5-translations
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
 	# Not for big endian targets and not if word sizes of host and target differ

From 4895b7fdc010f48155229b61fa150c9d8e22fa3f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 23 Oct 2021 15:37:14 -0400
Subject: [PATCH 2018/4088] qtcreator: update to 5.0.2.

---
 srcpkgs/qtcreator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 44144a6b107a..668c38d027e8 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=4.15.2
+version=5.0.2
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
@@ -16,7 +16,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=9edb911d910665891a8e1488d72d080fb9a6002b24eb9034aa031a67a5496f7f
+checksum=1bf07150226da46237f26f5eaa9f090ce81ed79b9bc75e0dfa6328043e360103
 replaces="qtcreator-data>=0"
 python_version=3
 

From 686c864a7d55220ce5fbbe9653459beeffd485cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 25 Oct 2021 18:48:59 +0200
Subject: [PATCH 2019/4088] qtcreator: search updates at git tags

---
 srcpkgs/qtcreator/update | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qtcreator/update b/srcpkgs/qtcreator/update
index a205704990e2..50a6754eaec7 100644
--- a/srcpkgs/qtcreator/update
+++ b/srcpkgs/qtcreator/update
@@ -1 +1,2 @@
-pattern='\K([\d+.])+\d+(?=.tar.xz)'
+site="https://code.qt.io/cgit/qt-creator/qt-creator.git/refs/"
+pattern="/tag/[?]h=v\K[.0-9]+(?=')"

From 70aae1bb353e8a3fae0e94a01a660d6bab209c9b Mon Sep 17 00:00:00 2001
From: bertronika <nejc@bertoncelj.eu.org>
Date: Sat, 2 Oct 2021 15:30:10 +0200
Subject: [PATCH 2020/4088] uthash: update to 2.3.0.

Upstream changelog has been added and short description now passes
xlint.

Closes: #33265 [via git-merge-pr]
---
 srcpkgs/uthash/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/uthash/template b/srcpkgs/uthash/template
index dd689bd7ebc0..6aa2f663db7a 100644
--- a/srcpkgs/uthash/template
+++ b/srcpkgs/uthash/template
@@ -1,13 +1,14 @@
 # Template file for 'uthash'
 pkgname=uthash
-version=2.1.0
+version=2.3.0
 revision=1
-short_desc="A hash table for C structures"
+short_desc="Hash table for C structures"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="BSD-2-Clause"
 homepage="http://troydhanson.github.com/uthash/"
+changelog="https://raw.githubusercontent.com/troydhanson/uthash/master/doc/ChangeLog.txt"
 distfiles="https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"
-checksum=152ccd8e64d0f495377232e3964d06c7ec8bb8c3fbd3217f8a5702614f9a669e
+checksum=e10382ab75518bad8319eb922ad04f907cb20cccb451a3aa980c9d005e661acc
 
 do_install() {
 	vmkdir usr/include

From 196ac8ca36b282c591cd5f3ddaf16bc66f5c6b12 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 17 Sep 2021 22:33:49 +0300
Subject: [PATCH 2021/4088] runelite-launcher: update to 2.1.7.

---
 srcpkgs/runelite-launcher/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template
index 9b083e779e71..390c4b3e62d2 100644
--- a/srcpkgs/runelite-launcher/template
+++ b/srcpkgs/runelite-launcher/template
@@ -1,7 +1,7 @@
 # Template file for 'runelite-launcher'
 pkgname=runelite-launcher
-version=2.1.3
-revision=2
+version=2.1.7
+revision=1
 wrksrc="launcher-${version}"
 hostmakedepends="apache-maven"
 depends="virtual?java-runtime"
@@ -10,7 +10,7 @@ maintainer="Matteo Signer <matteo.signer@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://runelite.net"
 distfiles="https://github.com/runelite/launcher/archive/${version}.tar.gz"
-checksum=164125d77eb67c936dff43da7d395fbb3a8d948312097cd4f0075ccca4beaf37
+checksum=9b14d5f2b10c6dad39554ba9faf24b58b74e35d8557e1d46dd814031f4844b8b
 
 do_build() {
 	mvn package

From 0bfbb87b4d2165ddb031a3e5888324d94244cb78 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 25 Oct 2021 23:04:58 -0500
Subject: [PATCH 2022/4088] fuzzypkg: update to 1.0.7.

---
 srcpkgs/fuzzypkg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzypkg/template b/srcpkgs/fuzzypkg/template
index 4152ca448235..3e804bcb78cd 100644
--- a/srcpkgs/fuzzypkg/template
+++ b/srcpkgs/fuzzypkg/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzypkg'
 pkgname=fuzzypkg
-version=1.0.6
+version=1.0.7
 revision=1
 depends="bash xtools"
 short_desc="XBPS fuzzy package manager"
@@ -8,7 +8,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"
 homepage="https://github.com/zdykstra/fuzzypkg"
 distfiles="https://github.com/zdykstra/fuzzypkg/archive/v${version}.tar.gz"
-checksum=a3078ad6602ab9e5a158814f41a7ad4c82a4c161713c1cfe0d6e0afb1b6a82a8
+checksum=14b9fde85a0b58e7ca34797c8e21c4257f10e323d0cf40dd3053c57c75e59ac0
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)

From f947267420e331724b67fdb96ec98650abadae42 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 26 Oct 2021 21:43:30 +1100
Subject: [PATCH 2023/4088] retroarch: update to 1.9.12

---
 srcpkgs/retroarch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index e086463e8d14..4b253b236b5a 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.9.10
+version=1.9.12
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=33c0f5570fab3a6217b20e4dedb9f389083e84b7a80dab3578a0cdb0b30b7581
+checksum=69b2139fd1393682be4aec3168187a05f010e3acf4ab23d1cf759e894f10ad8f
 
 build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"

From d872b7685ee45133aafec761182d6810fa7d1362 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Oct 2021 18:32:22 +0200
Subject: [PATCH 2024/4088] amdvlk: update to 2021.Q3.7.

---
 srcpkgs/amdvlk/template | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..ba1d8fe8265a 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,14 +1,14 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.7
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
-_spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
+_llpc_commit=b8ba5f3626f07dbf76026a05394bc2b5c99fe713
+_xgl_commit=9244bd33f361bbfd23df14789e82457a63d70d5d
+_pal_commit=8e5baae7cfdd885974013337e556e9dc955b6737
+_llvm_project_commit=2108ca319b3f5d5e84603e6644365cd14a58c0de
+_spvgen_commit=ac9911afeff0e33ee240c01a593b156f0bc6f6af
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
-_CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
+_CWPack_commit=39f8940199e60c44d4211cf8165dfd12876316fa
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
@@ -32,14 +32,14 @@ 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="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
- 1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
+checksum="1b17e6c2cfe1e94e4f114a2f9e6e88ace48760e06068d3967bad6c7f62efac5e
+ beaa044cb6035d332cabd5f46dbd10a6da7fa36d27bcbfa14ec3903bddd0801a
+ 2137647bee53a36e1da61c74781b95d9b0355d8ae18169324c848fdcfebf3fc3
+ 13ea4c6cd6fd71543369968fd54d943a10458fbc965a8b3261e7592abfb5340c
+ 78bad8a9fe5eb9a2de91241e41b8050aa21ab1f19be3fdfdfabf6d5170aac939
+ a382c15bb12489a5e47eac7161d27f25c6d4d13050d710d20d6e71ad9e45ee01
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
- 186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
+ 0f5f9e050bdd944b335b3dd5baafce8327b75d65ec5a2812cf0441d1172b03ea"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 

From e4127674d8cd0f4bfd73d163204e280031c13737 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 24 Oct 2021 13:38:35 +0200
Subject: [PATCH 2025/4088] telegram-desktop: update to 3.1.9.

---
 srcpkgs/telegram-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 9981d317ea81..24e4b45bee20 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=3.1.1
+version=3.1.9
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=04c891128639f0c96fbb63248692d1674a5c03db0f9d294adb4281ec4b895afe
+checksum=569555194f8c8396ee21de44971709dc0d331fe9b3d99cce49977d6dd19fcecf
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From bcca78fe797564ba250f8837227e2e42ddd09c86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:33:02 +0200
Subject: [PATCH 2026/4088] dbeaver: enable aarch64 package creation

---
 srcpkgs/dbeaver/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 596d64f3f2c3..0668672afa3f 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -3,7 +3,7 @@ pkgname=dbeaver
 version=21.2.3
 revision=1
 # the build downloads binaries linked to glibc
-archs="x86_64"
+archs="x86_64 aarch64"
 hostmakedepends="apache-maven"
 depends="openjdk11" # openjdk11 or later version, when available
 short_desc="Free Universal Database Tool"
@@ -15,12 +15,12 @@ checksum=ea3bbbad9d09962fb2711309b56e74c75e973028cea395e3e27e454e831bb676
 nopie=true
 
 do_build() {
-	mvn package
+	mvn package -P all-platforms
 }
 
 do_install() {
 	vmkdir /usr/lib
-	vcopy "product/community/target/products/org.jkiss.dbeaver.core.product/linux/gtk/x86_64/dbeaver" /usr/lib/
+	vcopy "product/community/target/products/org.jkiss.dbeaver.core.product/linux/gtk/${XBPS_TARGET_MACHINE}/dbeaver" /usr/lib/
 
 	vmkdir /usr/bin
 	ln -s /usr/lib/dbeaver/dbeaver ${DESTDIR}/usr/bin/dbeaver

From 4c25a192d78a6c91392db164266667e8725e4197 Mon Sep 17 00:00:00 2001
From: Kiarash Korki <kiarash.96@gmail.com>
Date: Tue, 26 Oct 2021 14:58:07 +0330
Subject: [PATCH 2027/4088] font-vazir: update to 30.1.0.

---
 srcpkgs/font-vazir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template
index 7167174f8663..d54cbcb20163 100644
--- a/srcpkgs/font-vazir/template
+++ b/srcpkgs/font-vazir/template
@@ -1,6 +1,6 @@
 # Template file for 'font-vazir'
 pkgname=font-vazir
-version=29.1.0
+version=30.1.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="linarcx <linarcx@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/rastikerdar/vazir-font"
 distfiles="https://github.com/rastikerdar/vazir-font/releases/download/v${version}/vazir-font-v${version}.zip"
-checksum=00163e1383c2515501d03209683f5312b27624e99bcf2439ae89bbb7509eac61
+checksum=0b10a9624f45b00c68a22b5727697ebc0ed94d5bf067e81cdad02d5e7e91f02d
 
 font_dirs="/usr/share/fonts/TTF"
 

From 7af4db5b17366543c05d9cdd5b9ab4ef5d544d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 26 Oct 2021 14:48:47 -0300
Subject: [PATCH 2028/4088] bluez: update to 5.62.

---
 srcpkgs/bluez/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index f19ac4aa6d79..25adca4ace8f 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,7 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.61
-revision=2
+version=5.62
+revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
@@ -15,7 +15,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=83afd6c52179554bfeabbcb538fec2eb6be90a8ac3c40871b49d7ad8b49c423b
+checksum=38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 

From cf56475de1b14551292ef17ab0862176f1409c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 26 Oct 2021 14:48:48 -0300
Subject: [PATCH 2029/4088] gzdoom: update to 4.7.1.

---
 srcpkgs/gzdoom/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index ece13eb73454..24dc9599bee1 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,9 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.7.0
+version=4.7.1
 revision=1
-_tagdate=2021-07-25
-_widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
+_tagdate=2021-10-20
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
@@ -15,11 +14,9 @@ license="GPL-3.0-or-later"
 homepage="https://www.zdoom.org"
 # WARNING: watch out for new submodules
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
- https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
- https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="60549ea3597496cadec97e4f6958422c22b4cf5d6693552cf4f8deeaca53efeb
- 48f9cd513ee62fcbf54bc941e09ddb9b00aaf8d41953d63a820c7a34397d083e
- f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
+ https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
+checksum="454257582be0576501eef1efc99fe7ea70f1c4d7993549db3cbc709ce75fc102
+ af1501c05815a7945a335704f6f05ac263c5877549fa3f476478077b56ea14f2"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
@@ -34,9 +31,6 @@ esac
 post_extract() {
 	bsdtar xOf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
-
-	rmdir wadsrc_widescreen/static
-	mv ../WidePix-${_widepix_commit} wadsrc_widescreen/static
 }
 
 post_patch() {

From 07ae98699257d0dee5fdbd0e017ee45018f08121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 26 Oct 2021 14:48:48 -0300
Subject: [PATCH 2030/4088] mdBook: update to 0.4.13.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..b9df0433334f 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.13
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=12a88a08e5c5b26810cc33b4e0ebed7cc72394f9041e8b15253e3cfac1223a7b
 
 post_install() {
 	vlicense LICENSE

From d70dd31117015d82cff3946fc357c48e1a76498f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 26 Oct 2021 14:48:49 -0300
Subject: [PATCH 2031/4088] waypipe: update to 0.8.1.

---
 srcpkgs/waypipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template
index c9da48718a2d..18a035c87719 100644
--- a/srcpkgs/waypipe/template
+++ b/srcpkgs/waypipe/template
@@ -1,6 +1,6 @@
 # Template file for 'waypipe'
 pkgname=waypipe
-version=0.8.0
+version=0.8.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -16,7 +16,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/mstoeckl/waypipe"
 distfiles="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=e61fa816a770d0bc22aa2545547c61edc24cf52ca5bb3da32351f2ac9ff94d02
+checksum=a6f71fa325ca37d998705fa864e39af8d32fb5dca252fc1d3e41542bb40e758b
 
 post_install() {
 	vlicense COPYING LICENSE

From c738de84865a8445897f7ee9c91d61f91fa0f91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 26 Oct 2021 14:48:50 -0300
Subject: [PATCH 2032/4088] wireplumber: update to 0.4.4.

---
 srcpkgs/wireplumber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index adf4189c7495..b5ed09736967 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,6 +1,6 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.4.2
+version=0.4.4
 revision=1
 build_style=meson
 build_helper=gir
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=79be595ed5c12edeeb7dd07092c7dacb756a28ac4f453af4108793a002395d4a
+checksum=a09ef574990a39db134506079cc9abe76ab5931ea2bdbee8ac01023a9e6f3185
 
 post_install() {
 	vlicense LICENSE

From b3fa39853c09254285e537e63fded3b696d29fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:45 +0200
Subject: [PATCH 2033/4088] filelight: update to 21.08.2.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index c2f60dafd442..cf7d94105d77 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.1
+version=21.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=b147ce4454c6b7e1c19581f3b471dd687e0db99917b43e34811bdcf40edcbb6a
+checksum=4d9e026318994488806fee19d3fa363e14cb50f7aab951440ad1b06eb3d7115e

From 7cdd5b8969117ec9ec7460a11307ff50cca3e78b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:45 +0200
Subject: [PATCH 2034/4088] kaccounts-integration: update to 21.08.2.

---
 srcpkgs/kaccounts-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 2c3fb18a98b0..393a26b4e050 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.1
+version=21.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=1787509bf66f1640f18611c9af834c4280df89ba24bde3c9f8ed4ed6bcb4c0a0
+checksum=005e9967267762e523774ef91d1a9ff02372daad99874412a273a0c5a7a87cb2
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 42278fd58dd2fcc6ec594b408960f79202d0e11d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:45 +0200
Subject: [PATCH 2035/4088] kaccounts-providers: update to 21.08.2.

---
 srcpkgs/kaccounts-providers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 905527a14e5e..6ce301a7225d 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.1
+version=21.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=e0365b037483273ccfeef19b4840db2ab9e1d4b9910fc588a3e14ed5913fb3f0
+checksum=8fd28e9073ae08db80f80ba5164e5905df08adf7908b65acd49b75dee18a0197
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From b79c7ee8b477265ab0d4e8361fb7191834ff96b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:45 +0200
Subject: [PATCH 2036/4088] kcachegrind: update to 21.08.2.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 0d749db9a2c2..26d052163476 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.1
+version=21.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=fb8bbbba0178f33c8a4bdace2fdfe747036822b5fa9013b5905a1de5198def27
+checksum=898492e020308e05ea3edc8738f83ee0d79480d86b07713469e2f3150c50d888
 python_version=2

From 4980550cad0dcd6b06385e589ee12adbd708335d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:45 +0200
Subject: [PATCH 2037/4088] kcron: update to 21.08.2.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 80a692fab5df..052c0df92932 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.1
+version=21.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=567547daca9467aa08beeb2ce8aac1e3be757fa08194bb42984d095a691e2d31
+checksum=08aec3d7ffa18761e3567efd6b3d3895d8d13391a8e44543d8e73a461050cee7

From fdff225037c86875f64680d7439c75f765333ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2038/4088] kdialog: update to 21.08.2.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index e1c2cc19dbc0..c0e411dfd12e 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=24a90bdef85a9e189f080bdc6724d604f4a4d6610d33ba26862dc0525991b5d7
+checksum=dd833fa0691a491372b7f4ec8695c12e854354d45c9f2d8fabe3f2cedc557422

From 5d11cf47b3b9e7fe89ca947ab07c53a61c394ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2039/4088] keditbookmarks: update to 21.08.2.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index d4e61a554516..db4c3033235f 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig 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/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=9cf82962dfe24cc8986e5732fdc3cefc620c15d77a2fa2554e262d4a072d3549
+checksum=715f0750e38e521048c8acc92c77cf1ced772b8d60066a75585bfe3f3266da1f

From 5e0f704947bf75e415a372a7d91068a23e9c4a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2040/4088] kfind: update to 21.08.2.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 560c34c4ae6f..c47a577b409e 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.1
+version=21.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=ae8c19d207dd1e154f92676ae52ff1b4ddac78cb72157552d094db9f178d7534
+checksum=8decee5367fd8a94a2692080330a196c7618bd23b43d82a79ddb8d88ea3916e7

From c76fd992031f272c243c3926babef6108223d671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2041/4088] kio-gdrive: update to 21.08.2.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 5b5157fc7060..00e98c426e2e 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,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=7c8795e0052adbbef06500d073a1a26c4d9c74f4a3874fa5f3e1c114d04215ef
+checksum=62b678eb3f90293752c4cbe65ffae5edd485f04cbab53831b4cec7c1192b7055

From 042325f0b8c43eddf88966d6efc7e59975b04d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2042/4088] kmag: update to 21.08.2.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 209db5fc6ba8..4b0dc79665d1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.1
+version=21.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=ccd088dc143ed5366585cc81c1efdfce38e40fd6e1c2d4c06fca6c199467b2c1
+checksum=8059075ce395f1fd72975a05190232ce809d2509220abbb7d40e4a57d2dbc878

From dee5b83232a09cab0669b511a15e71b601d32597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2043/4088] kmix: update to 21.08.2.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index c272d6fc8447..25ae9d02c779 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.1
+version=21.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=6ec70d841101bb3233742c541812265af32c9bdb2cd4f3c157e73d3164588049
+checksum=b8b9cae11dc23d62fc0c4990c0cf7560e5337cf831cbb46b3e880b9ca90a3beb

From 000b986cd6bd4b39d022c1907bcc6618d41e65b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2044/4088] kolourpaint: update to 21.08.2.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0e000f74b7b0..695c1e6db907 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.1
+version=21.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=4aa091e986fc4ae369fbcd078bb47f4aa41b1bbad3ea778209bd2176a2d55a6e
+checksum=cdc83bd1c5013c78f95cf211ee1b8ec58363dc6bceb49771f1cca33acc6dc45c
 
 post_install() {
 	vlicense COPYING

From c915901d745c2091956e188b009b1da7347126bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2045/4088] kompare: update to 21.08.2.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 42c68e4f2c0f..d2cdd1c94819 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.1
+version=21.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=76c8e4fa59397117da95aed852e47a04f28539a32874cabcc9c7b99098802f6a
+checksum=2d2cec54c21b4b543fa6ae10efab4dff2fb24d5748fcfa4d15ef18f95bc76b91

From 416376540fdfee5ecaede2d7f71ee2eb921aecc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2046/4088] konversation: update to 21.08.2.

---
 srcpkgs/konversation/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 34439fff9404..1af3070cc54f 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,6 +1,6 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=de6dfb5b983cc70d6e59d801ab9a3d728c7253d3e9e5993ada4a8ec0a4df766c
+checksum=ea22da9832e3e049369098fd80d752d83b3704ded4932d78766120706fef8aae
 python_version=3

From 99cea0415ed1d74991d1000b1e79716cfc3bf3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2047/4088] kpat: update to 21.08.2.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 8587a0d1f85d..9975c8d68651 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ 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=d66fd231dd579028af2b32e30cce56fcd537b0b2cb7d7ede9aa2a95a5485b1b7
+checksum=8274922b2bd15278ed881b329f0685adfd398489a32a2e020e59adc8081f9299

From 7eceeeabc58e93c7577fa39fc26bc34e26bd58a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:46 +0200
Subject: [PATCH 2048/4088] kruler: update to 21.08.2.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 92dfb654509c..a84f19d0b5da 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.1
+version=21.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=644b37d91b594c927606b9408058db8a6c31a0545b3e92805a5d72f9cf84e850
+checksum=19ac77e9c104de4ee4be9101337ec6b178731f1281769aa5209c87cb36095f20

From 2a8dee218a4283d7de47fad630c0dc95cbc537c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2049/4088] ksystemlog: update to 21.08.2.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 415f031a87e1..6031c22b901f 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.1
+version=21.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://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=bbb08a286fa4c20405b7cc3ddf65eb30746c06a3c5235c4146785d3bd6e260ef
+checksum=92c6eeaf6b1291ea684a90ec930f7d1e9a6e70fec5df7a37db8fbe72e282d6e2

From 7e2612fc0ba1abedd218a8952a386e86fef48408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2050/4088] kteatime: update to 21.08.2.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 8df5df1172f3..223fdaa4b1dc 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.1
+version=21.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=e2acd7c44131988f61ef4c4bf8a210a7f6939fb49011636922602c9b37db563e
+checksum=5707d239675f1dc3fac3ceca7a3e471014a9237a4822fa414f6a31e5db80730b

From 866f823f99d8924957db7c40b008e6cc06933bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2051/4088] kturtle: update to 21.08.2.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index a2e7b9fe1db6..ceb48a7635a2 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.1
+version=21.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=b76d95d8c113b0148e7c1cdc6b4c767e9c7985bc4954e6773b432ad7cd34cf96
+checksum=8f5e5311251fe74c7a09e502b7a241bc7e69e492583565ad14185132dde071b8

From cc6ea558244b237bb61a6ae5626702f182c8e835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2052/4088] kwalletmanager: update to 21.08.2.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index b93757e6d2f1..122a48e6bf19 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.1
+version=21.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=bf060a706578347a01524e66b794adca69b304961c73694ca9341380a58a8aa8
+checksum=2bfae765d18f8b60cedab313b42acefc3d354c30e7a0d7f96772c2451648868c

From bedda74fec743a0c1e28fae61789faca8a96e9fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2053/4088] libkdegames: update to 21.08.2.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 06ccb21a8955..fa40197866e5 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=51de56a9f714085ceed2d3200852c1e33b7847768336d02524b07ce3f51cdd6d
+checksum=077203df97c7b41b1f87d790a8107066d59b1fa65ae176320230b1120a246b49
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d6eb5e4771117f769ca88915139b8a6abab4f24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2054/4088] libkomparediff2: update to 21.08.2.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index e38b6fab7850..812a0d784f68 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.1
+version=21.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=fdb23c226c11dcaada8eb36d985772de9a791da4c035cc133312cd31aaeadd58
+checksum=1d84be7b279c170783a6a49525e9b9d67be3d20e376d41b057ba4440e3b8c923
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 2ae1ce51d27347b8f33b83b3fc703c4caa2a0ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2055/4088] marble5: update to 21.08.2.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index cec600a8852b..8267f4b13889 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.1
+version=21.08.2
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=fcc7d3bbeed31a43a36db4f2ec94f742ef40edea73ddd0df9dd4fdf4391f0e06
+checksum=aa57a65e0c20e9c63b9cf4c1ce0c0da9fc4517c95a6a71151b19613f81e40dd1
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From d6aa909246b806f0561459c17f24aed2f79ba6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2056/4088] signon-kwallet-extension: update to 21.08.2.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index f867fa874083..b253701780a0 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=15194148a06a67a2505e16a8d5994e034a114c2f89b00ea53ed8a68aeb0e38f4
+checksum=9af3a61f9b73174b37828501912aeeec02bfc8f9323dff5adb9e42dc133457a6

From 33fdd32973c414345441471345081c5a0f0c5300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2057/4088] svgpart: update to 21.08.2.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index c3ddd0995bd3..9b9911501f3a 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=db249c2c86548b18a89e75144e640dee199f1bd91172048719ab270aa6b934ea
+checksum=dce1239167a9eecf56e10bdb092972a9a301553961f847a404fc6d7677e3af93

From fcbebfc162ceabcbe68a2d271e5fdf455b87120e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2058/4088] umbrello: update to 21.08.2.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 3a099a6ba7d2..4f4817de0d8c 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=ec59d5a01e7bb216fab97dadba02018a7de8b88c144553da87f9fae6231c8e74
+checksum=d917cc43706e9064651e9e4a1870047535b6b27dcdd2f37a365abf7b0d003ff6
 python_version=2
 
 pre_configure() {

From c0225f92087535c8017fa59be8a53736366afff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:08:47 +0200
Subject: [PATCH 2059/4088] yakuake: update to 21.08.2.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 474c6d836120..00ea85858f4e 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.1
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=8993f4e9e18fecb071bd330ac0b13cfce36f76665484c670e9c839ba679681f4
+checksum=0f12ff2124d05e4da17a2337f31c982f95bd799b7505e850bda4de2941800db5

From b9e4c0617e50efd3ba9944265fa450b247426a7d Mon Sep 17 00:00:00 2001
From: DirectorX <DirectorX@users.noreply.github.com>
Date: Tue, 26 Oct 2021 21:26:10 +0300
Subject: [PATCH 2060/4088] sublime-text4: update to 4121.

---
 srcpkgs/sublime-text4/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sublime-text4/template b/srcpkgs/sublime-text4/template
index 1cda3af1dd75..5f3918a9b03f 100644
--- a/srcpkgs/sublime-text4/template
+++ b/srcpkgs/sublime-text4/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-text4'
 pkgname=sublime-text4
-version=4113
+version=4121
 revision=1
 archs="x86_64 aarch64"
 wrksrc="sublime_text"
@@ -19,11 +19,11 @@ _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45e
 case "$XBPS_TARGET_MACHINE" in
 		x86_64)
 		distfiles="https://download.sublimetext.com/sublime_text_build_${version}_x64.tar.xz"
-		checksum=900ef90fc6453efc4c2b36132a5f16a4db67a226fa9732e4d3c1bf586d4dc78c
+		checksum=084fcf79457c320d59da1f0e58c85a7a63956bde41d64db01ec86df2554fc5e6
 		;;
 		aarch64)
 		distfiles="https://download.sublimetext.com/sublime_text_build_${version}_arm64.tar.xz"
-		checksum=63d536e4c1ff8ca13bbf19fdfacbdeedd6af783f759824500faa4216d978e641
+		checksum=7af7845b402aea98a6d259d0e817c849168182881ea1f80b98e5729525688f08
 		;;
 esac
 

From 989a32798513e0a6e7b122b4eda28f2d2519c377 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Sun, 8 Aug 2021 00:24:20 -0700
Subject: [PATCH 2061/4088] jetbrains-jdk-bin: update to 11.0.12.b1504.40.

---
 srcpkgs/jetbrains-jdk-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 60272b6918c6..7114636c6562 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'jetbrains-jdk-bin'
 pkgname=jetbrains-jdk-bin
-version=11.0.11b1504.16
+version=11.0.12b1504.40
 revision=1
 archs="x86_64"
 wrksrc="jbr"
@@ -11,7 +11,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
 _jdk_ver=${version%b*}
 _jdk_build=${version#*b}
 distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=f289130e302357d000c84e56d31e24fb0d1fcf74cac84787acc1b08d6f51490f
+checksum=56646f634eafbe85d177e40267f52d83a4bbfcb2bd359b97282bca54812e0784
 # This JDK appears to link to libs that do not exist, but functions well even in their absence.
 # Best guess is that they are optional. ¯\_(ツ)_/¯
 noverifyrdeps=yes

From 1e1efa1a6e02adc8a2736a2b6af2ce3c629ddb9d Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Tue, 26 Oct 2021 12:19:54 +0200
Subject: [PATCH 2062/4088] viking: update to 1.9.

---
 ...14f554825b1350a0ad349ffc0b7920a528c6.patch | 25 -------------------
 ...97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch | 24 ------------------
 srcpkgs/viking/template                       | 15 +++++------
 3 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch
 delete mode 100644 srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch

diff --git a/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch b/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch
deleted file mode 100644
index b7159a98b76d..000000000000
--- a/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-upstream: yes
-
-From 7ff014f554825b1350a0ad349ffc0b7920a528c6 Mon Sep 17 00:00:00 2001
-From: Nikolay Korotkiy <sikmir@gmail.com>
-Date: Tue, 4 Feb 2020 21:12:47 +0000
-Subject: [PATCH] Fix build without mapnik
-
-Signed-off-by: Rob Norris <rw_norris@hotmail.com>
----
- src/viklayer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/viklayer.c b/src/viklayer.c
-index dc0ab1ff..3070157f 100644
---- a/src/viklayer.c
-+++ b/src/viklayer.c
-@@ -36,7 +36,7 @@ extern VikLayerInterface vik_dem_layer_interface;
- #ifdef HAVE_LIBMAPNIK
- extern VikLayerInterface vik_mapnik_layer_interface;
- #endif
--#ifdef HAVE_LIBMAPNIK
-+#ifdef HAVE_LIBGEOCLUE_2
- extern VikLayerInterface vik_geoclue_layer_interface;
- #endif
- 
diff --git a/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch b/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch
deleted file mode 100644
index 2ef4c0589bb7..000000000000
--- a/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-upstream: yes
-
-From da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f Mon Sep 17 00:00:00 2001
-From: Rob Norris <rw_norris@hotmail.com>
-Date: Sun, 9 Feb 2020 11:28:30 +0000
-Subject: [PATCH] Github #80: Fix build with '--with-libexif'
-
----
- src/geotag_exif.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/geotag_exif.c b/src/geotag_exif.c
-index 0e879a39..6e9514a7 100644
---- a/src/geotag_exif.c
-+++ b/src/geotag_exif.c
-@@ -362,7 +362,7 @@ VikWaypoint* a_geotag_create_waypoint_from_file ( const gchar *filename, VikCoor
- 	// Not worried if none of the other fields exist, as can default the values to something
- 	//
- 
--	gdouble alt = VIK_DEFAULT_ALTITUDE;
-+	gdouble alt = NAN;
- 	ee = exif_content_get_entry (ed->ifd[EXIF_IFD_GPS], EXIF_TAG_GPS_ALTITUDE);
- 	if ( ee && ee->components == 1 && ee->format == EXIF_FORMAT_RATIONAL ) {
- 		alt = Rational2Double ( ee->data,
diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index b02ad7498482..9cd2eff9e11c 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,22 +1,23 @@
 # Template file for 'viking'
 pkgname=viking
-version=1.8
-revision=2
+version=1.9
+revision=1
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
  --disable-expedia --disable-mapnik --enable-magic --enable-bzip2
  --enable-mbtiles --with-libexif"
-hostmakedepends="gdk-pixbuf-devel intltool pkg-config"
-makedepends="file-devel gnome-doc-utils gtk+-devel libcurl-devel libexif-devel
- libgexiv2-devel sqlite-devel bzip2-devel geoclue2-devel liboauth-devel
- nettle-devel"
+hostmakedepends="docbook-xsl gdk-pixbuf-devel glib-devel itstool intltool libxslt pkg-config"
+makedepends="file-devel glib-devel gnome-doc-utils gtk+-devel
+ libcurl-devel libexif-devel libgexiv2-devel sqlite-devel bzip2-devel
+ geoclue2-devel liboauth-devel nettle-devel"
+checkdepends="python3-lxml yelp-tools"
 short_desc="Open/source GPS data editor and analyzer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/viking"
 distfiles="${SOURCEFORGE_SITE}/viking/viking-${version}.tar.bz2"
-checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
+checksum=fe4acf3d24121d6f3097d17ea704b42c0336a8f693151886b8b26e308dbfcb3b
 
 CFLAGS="-fcommon"
 

From fa8f4ce3b5689e90885b697a19ae1b53517c0a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:16:34 +0200
Subject: [PATCH 2063/4088] ImageMagick: update to 7.1.0.10 (with soname bump)

- Remove unnecessary configure options
- Add support for graphviz, jbig, lqr and raqm
---
 common/shlibs                |  4 ++--
 srcpkgs/ImageMagick/template | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 23ad6e9c0600..8e5cf6f4a2f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -333,8 +333,8 @@ liblcms.so.1 lcms-1.18_1
 libgd.so.3 gd-2.1.0_1
 libcroco-0.6.so.3 libcroco-0.6.2_1
 libgsf-1.so.114 libgsf-1.14.11_1
-libMagickCore-7.Q16HDRI.so.9 libmagick-7.0.11.1_1
-libMagickWand-7.Q16HDRI.so.9 libmagick-7.0.11.1_1
+libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
+libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4648abfb476c 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,28 +1,26 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.0.11.12
-revision=3
+version=7.1.0.10
+revision=1
 _majorver=${version%.*}
 _patchver=${version##*.}
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
 build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static
- --with-openjp2"
+configure_args="--disable-static --enable-opencl --with-modules --with-gslib
+ --with-rsvg --with-wmf --with-dejavu-font-dir=/usr/share/fonts/TTF
+ --with-gs-font-dir=/usr/share/fonts/Type1"
 hostmakedepends="automake libtool pkg-config autoconf"
 makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
- ocl-icd-devel pango-devel libopenjpeg2-devel"
-short_desc="Package for display and interactive manipulation of images"
+ ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
+ libraqm-devel"
+short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
-homepage="https://www.imagemagick.org/"
+homepage="https://www.imagemagick.org"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=b4054e9f6b6692791f37fe6f2ab5819152210e6628e69a8dbd66a41320c3c9d3
+checksum=a2139da9a7c2e97f28861dfb18986f1d03435cf72e8ee4cc720a4997b5fa8d66
 
 subpackages="libmagick libmagick-devel"
 
@@ -68,7 +66,7 @@ libmagick_package() {
 libmagick-devel_package() {
 	depends="
 		fftw-devel fontconfig-devel lcms2-devel libXt-devel
-		libgomp-devel libltdl-devel
+		libgomp-devel libltdl-devel liblqr-devel libraqm-devel
 		libmagick>=${version}_${revision}"
 	short_desc="ImageMagick low-level image manipulation development files"
 	pkg_install() {

From e226cdaa5bfad5663cc917d1c46f401fbe99915f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:32:20 +0200
Subject: [PATCH 2064/4088] Converseen: rebuild against libmagick-7.1.0.10

---
 srcpkgs/Converseen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
index 7117f14e87a9..8daaa56ac67d 100644
--- a/srcpkgs/Converseen/template
+++ b/srcpkgs/Converseen/template
@@ -1,7 +1,7 @@
 # Template file for 'Converseen'
 pkgname=Converseen
 version=0.9.9.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-tools-devel libmagick-devel ImageMagick"

From 012f0ca7f1ef1c88f5cddc06723bdf7ff831a703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:43:53 +0200
Subject: [PATCH 2065/4088] chafa: rebuild against libmagick-7.1.0.10

---
 srcpkgs/chafa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index 18b3a329b36b..ba80b16495f3 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,7 +1,7 @@
 # Template file for 'chafa'
 pkgname=chafa
 version=1.8.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libglib-devel libmagick-devel libXext-devel libxml2-devel"

From 6af860b0cdcec79f76713a812d7f0457a561a962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 15 Jul 2021 18:43:53 +0200
Subject: [PATCH 2066/4088] dmtx-utils: rebuild against libmagick-7.1.0.10

---
 srcpkgs/dmtx-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dmtx-utils/template b/srcpkgs/dmtx-utils/template
index b251f0a2061b..c00404c8b4c3 100644
--- a/srcpkgs/dmtx-utils/template
+++ b/srcpkgs/dmtx-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'dmtx-utils'
 pkgname=dmtx-utils
 version=0.7.6
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libdmtx-devel libmagick-devel libXext-devel libxml2-devel"

From 6894c4f5ba34a984d7a68ba71d974654c1eb3b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 8 Sep 2021 19:35:42 +0200
Subject: [PATCH 2067/4088] sk1: update to 2.0rc5

---
 srcpkgs/sk1/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 18804e74fc39..06f02c449210 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -1,7 +1,7 @@
 # Template file for 'sk1'
 pkgname=sk1
-version=2.0rc4
-revision=4
+version=2.0rc5
+revision=1
 build_style=python2-module
 pycompile_dirs="/usr/lib/sk1-wx-${version}"
 hostmakedepends="pkg-config python"
@@ -12,15 +12,10 @@ short_desc="Open source multiplatform vector graphics editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://sk1project.net"
-distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
-checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
+distfiles="https://downloads.sk1project.net/sk1/sk1-${version}.tar.gz"
+checksum=1f70dd490a62aad97118454bd18f13c3459dcbd910823835404d6b639f7ef637
 python_version=2
 
-pre_configure() {
-	# python2: can't open file 'setup.py': [Errno 2] No such file or directory
-	ln -s setup-sk1.py setup.py
-}
-
 do_install() {
 	# must supply either prefix/exec-prefix/home or install-base/install-platbase -- not both
 	python2 setup.py install --root=${DESTDIR}

From 6a57b87ec74b126cc9f27304b59eed9104cabad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 8 Sep 2021 20:26:58 +0200
Subject: [PATCH 2068/4088] ripright: rebuild against libmagick-7.1.0.10

---
 srcpkgs/ripright/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..ae532205dbd2 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,7 +1,7 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake"
 makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"

From a82277ae0cd84375cf08a7d052f720040df22cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Sun, 24 Oct 2021 23:30:48 +0200
Subject: [PATCH 2069/4088] libopenshot: rebuild against libmagick-7.1.0.10

---
 srcpkgs/libopenshot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index b9996036b6ed..b59472105b35 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
 # Template file for 'libopenshot'
 pkgname=libopenshot
 version=0.2.5
-revision=5
+revision=6
 archs="i686 x86_64 ppc64le"
 build_style=cmake
 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1

From 11a65d00d851462b4abe56eecc40cc11fe95a6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Mon, 25 Oct 2021 01:25:53 +0200
Subject: [PATCH 2070/4088] zbar: rebuild against libmagick-7.1.0.10

---
 srcpkgs/zbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 139f17f4ec52..e8c8bdc28aab 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -1,7 +1,7 @@
 # Template file for 'zbar'
 pkgname=zbar
 version=0.23.1
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper=gir
 configure_args="$(vopt_with qt) --with-gir --with-python=python3"

From 34d523564ed5eb63da83c36552328ed3c21ca3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Mon, 25 Oct 2021 01:36:06 +0200
Subject: [PATCH 2071/4088] php-imagick: rebuild against libmagick-7.1.0.10

---
 srcpkgs/php-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php-imagick/template b/srcpkgs/php-imagick/template
index 271bbe6959a9..6dc33ff938bd 100644
--- a/srcpkgs/php-imagick/template
+++ b/srcpkgs/php-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php-imagick'
 pkgname=php-imagick
 version=3.4.4
-revision=4
+revision=5
 wrksrc="imagick-$version"
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr"

From 51178a80a490345db9a51f506e9a948771c88cc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Mon, 25 Oct 2021 01:36:06 +0200
Subject: [PATCH 2072/4088] vapoursynth: rebuild against libmagick-7.1.0.10

---
 srcpkgs/vapoursynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index 3d0692e631d6..c4de1d5712a0 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,7 +1,7 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
 version=R52
-revision=3
+revision=4
 build_style=gnu-configure
 # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
 # until this is fixed upstream, manually define am_cv_python_version to circumvent

From 6355bd25dbcdcd2ed25866a9f7064ecec77f1ff7 Mon Sep 17 00:00:00 2001
From: Lorenzo Beretta <vc.net.loreb@gmail.com>
Date: Tue, 26 Oct 2021 21:37:16 +0200
Subject: [PATCH 2073/4088] util-linux: backport upstream fix for musl until
 next release

Fixes https://github.com/void-linux/void-packages/issues/33699
---
 ...t-before-reading-stdin-and-fix-unini.patch | 37 +++++++++++++++++++
 ...ush-stdout-before-reading-from-stdin.patch | 27 ++++++++++++++
 ...w-flush-stdout-before-getting-answer.patch | 35 ++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 4 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
 create mode 100644 srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
 create mode 100644 srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch

diff --git a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch b/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
new file mode 100644
index 000000000000..0a99aa7fae56
--- /dev/null
+++ b/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
@@ -0,0 +1,37 @@
+From 05907d0d9e7c85f33e168feab1eb36b464425054 Mon Sep 17 00:00:00 2001
+From: Lorenzo Beretta <vc.net.loreb@gmail.com>
+Date: Mon, 25 Oct 2021 14:06:00 +0200
+Subject: [PATCH] chfn: flush stdout before reading stdin and fix uninitialized
+ variable
+
+Same problem as described in https://github.com/karelzak/util-linux/pull/1481
+
+Signed-off-by: Lorenzo Beretta <vc.net.loreb@gmail.com>
+---
+ login-utils/chfn.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/login-utils/chfn.c b/login-utils/chfn.c
+index 2508e14c9..ece5cdce0 100644
+--- a/login-utils/chfn.c
++++ b/login-utils/chfn.c
+@@ -227,7 +227,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
+ 			   char *def_val)
+ {
+ 	int len;
+-	char *buf;
++	char *buf = NULL; /* leave initialized to NULL or getline segfaults */
+ #ifndef HAVE_LIBREADLINE
+ 	size_t dummy = 0;
+ #endif
+@@ -242,6 +242,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
+ 		if ((buf = readline(" ")) == NULL)
+ #else
+ 		putchar(' ');
++		fflush(stdout);
+ 		if (getline(&buf, &dummy, stdin) < 0)
+ #endif
+ 			errx(EXIT_FAILURE, _("Aborted."));
+-- 
+2.33.0
+
diff --git a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch b/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
new file mode 100644
index 000000000000..280c7fd0a62a
--- /dev/null
+++ b/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
@@ -0,0 +1,27 @@
+From 0a08200bd5664d1849e477f7f776ab4d13bb8422 Mon Sep 17 00:00:00 2001
+From: Lorenzo Beretta <vc.net.loreb@gmail.com>
+Date: Mon, 25 Oct 2021 15:28:02 +0200
+Subject: [PATCH] chsh: fflush stdout before reading from stdin
+
+Same problem as described in https://github.com/karelzak/util-linux/pull/1481
+
+Signed-off-by: Lorenzo Beretta <vc.net.loreb@gmail.com>
+---
+ login-utils/chsh.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/chsh.c b/login-utils/chsh.c
+index 349712072..3b446beeb 100644
+--- a/login-utils/chsh.c
++++ b/login-utils/chsh.c
+@@ -210,6 +210,7 @@ static char *ask_new_shell(char *question, char *oldshell)
+ 	if ((ans = readline(" ")) == NULL)
+ #else
+ 	putchar(' ');
++	fflush(stdout);
+ 	if (getline(&ans, &dummy, stdin) < 0)
+ #endif
+ 		return NULL;
+-- 
+2.33.0
+
diff --git a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch b/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch
new file mode 100644
index 000000000000..e17c31291bcf
--- /dev/null
+++ b/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch
@@ -0,0 +1,35 @@
+From 34a9b65587a7d704db0344e859511af4a6756c89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Fri, 22 Oct 2021 14:28:50 -0300
+Subject: [PATCH] vipw: flush stdout before getting answer.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise the question is displayed only after the user presses Return,
+and the program looks like it's hanging.
+
+This happens at least on musl libc.
+
+Reported by @loreb.
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ login-utils/vipw.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/vipw.c b/login-utils/vipw.c
+index 8e63efde2..f59948a44 100644
+--- a/login-utils/vipw.c
++++ b/login-utils/vipw.c
+@@ -353,6 +353,7 @@ int main(int argc, char *argv[])
+ 		 * which means they can be translated. */
+ 		printf(_("Would you like to edit %s now [y/n]? "), orig_file);
+ 
++		fflush(stdout);
+ 		if (fgets(response, sizeof(response), stdin) &&
+ 		    rpmatch(response) == RPMATCH_YES)
+ 			edit_file(1);
+-- 
+2.33.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 8e622ca3cdc0..ae39761e102d 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From 3f83b4f831d14bc8fce94a727a135e32963c51a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 Oct 2021 08:31:05 +0700
Subject: [PATCH 2074/4088] changed_templates: use $GIT_CMD instead of git
 everywhere

---
 common/travis/changed_templates.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh
index 8c5d8a880a68..686436ce4327 100755
--- a/common/travis/changed_templates.sh
+++ b/common/travis/changed_templates.sh
@@ -8,13 +8,13 @@ elif command -v git >/dev/null 2>&1; then
 	GIT_CMD=$(command -v git)
 fi
 
-tip="$(git rev-list -1 --parents HEAD)"
+tip="$($GIT_CMD rev-list -1 --parents HEAD)"
 case "$tip" in
 	*" "*" "*) tip="${tip##* }" ;;
 	*)         tip="${tip%% *}" ;;
 esac
 
-base="$(git merge-base FETCH_HEAD "$tip")" || {
+base="$($GIT_CMD merge-base FETCH_HEAD "$tip")" || {
 	echo "Your branches is based on too old copy."
 	echo "Please rebase to newest copy."
 	exit 1

From 28c57f5ed13d62412789c89630f3e8352f2e4e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 Oct 2021 08:39:00 +0700
Subject: [PATCH 2075/4088] github/workflow: don't install git

---
 .github/workflows/build.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 08445b742177..8ecd4d0e658a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -57,8 +57,6 @@ jobs:
           xbps-install -Syu || xbps-install -yu xbps
           # Upgrade again (in case there was a xbps update)
           xbps-install -yu
-          # Install git
-          xbps-install -y git
 
       - uses: actions/checkout@v1
         with:
@@ -71,8 +69,6 @@ jobs:
          common/travis/fetch_upstream.sh &&
          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
-      - name: Remove git after checkout to not interfere with build
-        run: xbps-remove -yR git
 
       - name: Build and check packages
         run: |

From 75de7759b17c66f626e4d5e04e924ebd4bf8ae6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 Oct 2021 08:40:06 +0700
Subject: [PATCH 2076/4088] python3-pypandoc: update to 1.6.4.

---
 srcpkgs/python3-pypandoc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index 1b172c843f91..1a4f16673cfa 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=2
+version=1.6.4
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
 checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=6ea03c8e92d561b0b47ff91ee9a777c50a8d3a325f3272ea4fefef4bb6562b91
 
 post_install() {
 	vlicense LICENSE

From 588115d3f37ba13650acc5b92fce9527b8d3fcad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Oct 2021 13:17:27 +0200
Subject: [PATCH 2077/4088] linux5.10: update to 5.10.76.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 61e8572fd164..da77cc4c13af 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.75
+version=5.10.76
 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=0a2b2f5fefb90773190aaef4726ac363e03992aedc424b0a57eca092d084304b
+checksum=480a09ba1962862ff18df9453fa0df6ba11cbe19eefedeab81bf2c84f49e1890
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 8c41eac1434b99ee72609c3d3a8257dc80ebd994 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 24 Oct 2021 13:35:03 -0400
Subject: [PATCH 2078/4088] python3-frozendict: update to 2.0.7.

---
 srcpkgs/python3-frozendict/patches/build-py.patch | 13 -------------
 srcpkgs/python3-frozendict/template               | 14 ++++----------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-frozendict/patches/build-py.patch

diff --git a/srcpkgs/python3-frozendict/patches/build-py.patch b/srcpkgs/python3-frozendict/patches/build-py.patch
deleted file mode 100644
index 4ec531e6aa66..000000000000
--- a/srcpkgs/python3-frozendict/patches/build-py.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 462ee99..c287130 100755
---- a/setup.py
-+++ b/setup.py
-@@ -157,7 +157,7 @@ common_setup_args = dict(
-     keywords = keywords,
- )
- 
--custom_arg = None
-+custom_arg = "py"
- 
- if len(argv) > 1 and (argv[1] == "py" or argv[1] == "c_debug"):
-     custom_arg = argv[1]
diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 479b6b47a656..6a478b3e1b5d 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.0.6
+version=2.0.7
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -12,14 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=3f00de72805cf4c9e81b334f3f04809278b967d2fed84552313a0fcce511beb1
+checksum=a68f609d1af67da80b45519fdcfca2d60249c0a8c96e68279c1b6ddd92128204
 
-pre_patch() {
-	# remove c implementation tests
-	cd test
-	rm c_only.py
-	rm test_frozendict_c.py
-	rm test_frozendict_c_subclass.py
-	rm test_coold.py
-	rm test_coold_subclass.py
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" pytest3 -k 'not test_empty_sub'
 }

From 5e777d700b3f769b5d353e5990f615690d0e98ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Oct 2021 09:31:39 -0400
Subject: [PATCH 2079/4088] tagparser: update to 10.3.1.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 89ba6fde0086..c3f35266314d 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.3.0
+version=10.3.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=7ec68d39b7a3a7e3d4ca2e991e2eea5158c91d2afb6c5607b49a27a5c81930d1
+checksum=2ad0ad322acf2574743c71fa7935b961eb82ce42818e3e888800c176c77e6564
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From 098732fc5c17e368f5a6d4ec08aefe88e27151c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Oct 2021 09:48:46 -0400
Subject: [PATCH 2080/4088] python3-imageio: update to 2.10.1.

---
 srcpkgs/python3-imageio/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 0fcca3af4a5a..a367df980791 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,17 +1,21 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.9.0
-revision=3
+version=2.10.1
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
+# Ignored tests have unpackaged dependencies or require missing data files
+make_check_args="--ignore=tests/test_pillow.py
+ --ignore=tests/test_ffmpeg.py --ignore=tests/test_ffmpeg_info.py"
 hostmakedepends="python3-setuptools"
 depends="python3-numpy python3-Pillow"
+checkdepends="python3-pytest python3-psutil git libglvnd freeimage $depends"
 short_desc="Python library for reading and writing image data"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6a4bb17127d1af103bf146f8b0bd68ccb647a926002e8a6800c6d7859048661a
+checksum=43eefc54146c42d95c8212150216f952c4e6e8270d58b6e01118348aa2c0e252
 
 post_install() {
 	vlicense LICENSE

From bdbf9e130eba21440472c92b0edd90dc0ba1e055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Oct 2021 07:46:58 +0700
Subject: [PATCH 2081/4088] sip: update to 6.3.1.

---
 srcpkgs/sip/patches/python310.patch | 8 --------
 srcpkgs/sip/template                | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 srcpkgs/sip/patches/python310.patch

diff --git a/srcpkgs/sip/patches/python310.patch b/srcpkgs/sip/patches/python310.patch
deleted file mode 100644
index 066b665a7eb1..000000000000
--- a/srcpkgs/sip/patches/python310.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./sipbuild/py_versions.py.orig	2021-09-25 21:37:44.381213255 -0400
-+++ ./sipbuild/py_versions.py	2021-09-25 21:38:00.904208911 -0400
-@@ -23,4 +23,4 @@
- 
- # The first and last supported minor versions of Python v3.
- FIRST_SUPPORTED_MINOR = 6
--LAST_SUPPORTED_MINOR = 9
-+LAST_SUPPORTED_MINOR = 10
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index ea60d37cab72..bb1ddc10f7d2 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,7 +1,7 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
-revision=2
+version=6.3.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
 makedepends="python3-devel"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=2f9cd6ce0e19226d53d62ad6ba81a62f624626f14924724eab2a23390d4dc684
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From f7c20315872c3d34d46637188266af002cb84d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Oct 2021 07:46:56 +0700
Subject: [PATCH 2082/4088] python3-PyQt-builder: update to 1.12.1.

---
 srcpkgs/python3-PyQt-builder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 5e9833dbc98d..09f6cfabdda4 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
-version=1.10.0
-revision=2
+version=1.12.1
+revision=1
 wrksrc=PyQt-builder-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools sip"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://www.riverbankcomputing.com/software/pyqt/"
 distfiles="$PYPI_SITE/P/PyQt-builder/PyQt-builder-$version.tar.gz"
-checksum=86bd19fde83d92beaefacdeac1e26c6e1918c300ff78d7ec2a19973bf2cf21b5
+checksum=9a71e9cac134702467bd93ed9c7a5a47dc4386d93501bdcafb14cd08b3041d40
 
 post_install() {
 	rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle

From e3c3ba28dbac3ed6b6849f9627b86445bb8561b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Oct 2021 07:47:03 +0700
Subject: [PATCH 2083/4088] python3-PyQt5: update to 5.15.5.

---
 srcpkgs/python3-PyQt5/template | 40 +++++-----------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 37cc00fdcecc..ff7b3ca221b6 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,10 +1,12 @@
 # Template file for 'python3-PyQt5'
 pkgname=python3-PyQt5
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
 _sipver=12.8.0
 wrksrc="PyQt5-${version}"
-build_helper="qemu qmake"
+build_style=sip-build
+build_helper=qemu
+configure_args="--confirm-license"
 hostmakedepends="pkg-config python3-PyQt-builder qt5-qmake qt5-host-tools
  python3-dbus"
 makedepends="qscintilla-qt5-devel python3-sip-PyQt5
@@ -19,10 +21,8 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://riverbankcomputing.com/software/pyqt/intro"
 distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
-checksum=2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be
+checksum=b411b7a8fa03901c9feb1dcbac7ea1fc3ce20b9ae682762b777cd5398749ca2b
 lib32disabled=yes
-CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
-CXXFLAGS="$CFLAGS"
 
 export INCPATH=$XBPS_CROSS_BASE/usr/include/python$py3_ver
 
@@ -30,38 +30,10 @@ post_extract() {
 	rm -rf pyuic/uic/port_v2
 }
 
-do_configure() {
-	mkdir -p build
-	sip-build --confirm-license --no-make \
-		--api-dir /usr/share/qt5/qsci/api/python \
-		--build-dir build
-
-	if [ "$CROSS_BUILD" ]; then
-		# -I/usr/include/python$py3_ver is set by sip-build :(
-		find build -name Makefile |
-		xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
-	fi
-}
-
-do_build() {
-	make -C build ${makejobs}
-}
-
-do_install() {
-	make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-	for f in pylupdate5 pyrcc5 pyuic5; do
-		mv ${DESTDIR}/usr/bin/{,python3-}${f}
-	done
-}
-
 python3-PyQt5-devel-tools_package() {
 	lib32disabled=yes
 	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc+=" - development tools"
-	alternatives="
-	 pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
-	 pyqt5:pyrcc5:/usr/bin/python3-pyrcc5
-	 pyqt5:pyuic5:/usr/bin/python3-pyuic5"
 	pkg_install() {
 		vmove usr/bin
 		vmove "${py3_sitelib}/PyQt5/pylupdate*"

From 285fe0fb28ef0d5cde7e9bf2dc7382f8b1db4b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Oct 2021 07:47:06 +0700
Subject: [PATCH 2084/4088] python3-PyQt5-networkauth: update to 5.15.5.

---
 srcpkgs/python3-PyQt5-networkauth/template | 29 +++-------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template
index 66930f6868d1..c01ee3b1ebb6 100644
--- a/srcpkgs/python3-PyQt5-networkauth/template
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-PyQt5-networkauth'
 pkgname=python3-PyQt5-networkauth
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
 wrksrc=PyQtNetworkAuth-$version
-build_helper="qmake"
+build_style=sip-build
 hostmakedepends="qt5-qmake python3-PyQt5-devel pkg-config sip
  python3-PyQt-builder"
 makedepends="python3-devel python3-PyQt5-devel qt5-networkauth-devel"
@@ -13,32 +13,11 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
 distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
-checksum=893b9f8afb26a64757e9fa3436261b8bfcb4e696efc2a364a9dc8ac44db67fa7
+checksum=2230b6f56f4c9ad2e88bf5ac648e2f3bee9cd757550de0fb98fe0bcb31217b16
 lib32disabled=yes
 CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
 CXXFLAGS="$CFLAGS"
 
-do_configure() {
-	mkdir -p build
-	sip-build --no-make \
-		--api-dir /usr/share/qt5/qsci/api/python \
-		--build-dir build
-
-	if [ "$CROSS_BUILD" ]; then
-		# -I/usr/include/python$py3_ver is set by sip-build :(
-		find build -name Makefile |
-		xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
-	fi
-}
-
-do_build() {
-	make -C build ${makejobs}
-}
-
-do_install() {
-	make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-}
-
 python3-PyQt5-networkauth-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 260cfc79a356fe9b42c2d8f2f44f8bf6c99f1054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Oct 2021 07:47:11 +0700
Subject: [PATCH 2085/4088] python3-PyQt5-webengine: update to 5.15.5.

---
 srcpkgs/python3-PyQt5-webengine/template | 30 ++++--------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 84f8d667cc64..b51c73564923 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,8 +1,9 @@
 # Template file for 'python3-PyQt5-webengine'
 pkgname=python3-PyQt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
 wrksrc="PyQtWebEngine-${version}"
+build_style=sip-build
 build_helper="qmake"
 hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel
  sip python3-PyQt-builder"
@@ -14,10 +15,8 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
 distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
-checksum=cedc28f54165f4b8067652145aec7f732a17eadf6736835852868cf76119cc19
+checksum=ab47608dccf2b5e4b950d5a3cc704b17711af035024d07a9b71ad29fc103b941
 lib32disabled=yes
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
-CXXFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
 
 if [ "$XBPS_TARGET_ENDIAN" != le ]; then
 	broken="no webengine for big endian"
@@ -31,27 +30,6 @@ post_extract() {
 	rm -rf pyuic/uic/port_v2
 }
 
-do_configure() {
-	mkdir -p build
-	sip-build --no-make \
-		--api-dir /usr/share/qt5/qsci/api/python \
-		--build-dir build
-
-	if [ "$CROSS_BUILD" ]; then
-		# -I/usr/include/python$py3_ver is set by sip-build :(
-		find build -name Makefile |
-		xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
-	fi
-}
-
-do_build() {
-	make -C build ${makejobs}
-}
-
-do_install() {
-	make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-}
-
 python3-PyQt5-webengine-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From ba21dca54f8ea576c845f1e81b296f2ef43dc2fa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 13 Oct 2021 15:53:23 +0300
Subject: [PATCH 2086/4088] xfce4-cpugraph-plugin: update to 1.2.5, adopt.

---
 srcpkgs/xfce4-cpugraph-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index b113bc5995f8..65a862297f82 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.2.4
+version=1.2.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=c7d21de539f6263ecbee5971497bb22a1e84628f0e1483b6302a7976745d7705
+checksum=c2f6dbd7f83c79b63b83c98232c79d050e18640e82464b9ec8d3643a92c3a1b0
 
 post_install() {
 	vlicense COPYING

From 48ed908b85d7f3447bbbe264801b99429543edbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Oct 2021 22:39:17 +0700
Subject: [PATCH 2087/4088] python3-PyQt-builder: fix sip minimum version

---
 srcpkgs/python3-PyQt-builder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 09f6cfabdda4..24141e24b2da 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
 version=1.12.1
-revision=1
+revision=2
 wrksrc=PyQt-builder-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools sip"
-depends="python3 sip>=6.0.0"
+depends="python3 sip>=6.3"
 short_desc="PEP 517 compliant PyQt build system"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"

From 889ad91f503cf6eaa8d73f758fd96b243ede3c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:18:14 +0200
Subject: [PATCH 2088/4088] README.md: recommend native build for i686

---
 README.md | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 66cdb30c9ce9..40c85db25128 100644
--- a/README.md
+++ b/README.md
@@ -469,14 +469,10 @@ Sometimes the bootstrap packages must be updated to the latest available version
 
 Two ways are available to build 32bit packages on x86\_64:
 
- - cross compilation mode
- - native mode with a 32bit masterdir
+ - native mode with a 32bit masterdir (recommended, used in official repository)
+ - cross compilation mode to i686 [target](#cross-compiling)
 
-The first mode (cross compilation) is as easy as:
-
-    $ ./xbps-src -a i686 pkg ...
-
-The second mode (native) needs a new x86 `masterdir`:
+The canonical mode (native) needs a new x86 `masterdir`:
 
     $ ./xbps-src -m masterdir-x86 binary-bootstrap i686
     $ ./xbps-src -m masterdir-x86 ...

From 9b3757962d4127e9731d6e5fd3dd2f23f5c5f32d Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Tue, 26 Oct 2021 08:24:45 +0200
Subject: [PATCH 2089/4088] mpg123: update to 1.29.2.

---
 srcpkgs/mpg123/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index b96129d60721..8e376648070e 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,6 +1,6 @@
 # Template file for 'mpg123'
 pkgname=mpg123
-version=1.29.0
+version=1.29.2
 revision=1
 build_style=gnu-configure
 # --with-cpu not necessary, upstream detects features correctly
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.mpg123.org/"
 distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=135e0172dfb6c7937a81f1188c27f9a47b0a337f7637680039ff3ee5fea3ce7d
+checksum=9071214ebdfc1b6ed0c0a85d530010bbb8ebc044cfe5ae5930e83f7e6b7937e6
 
 case "$XBPS_TARGET_MACHINE" in
 	# No LFS required with musl

From 4261d61cc1bea3c8e2cef4aa2a8a38d2c6b0885f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 27 Oct 2021 19:22:02 +0200
Subject: [PATCH 2090/4088] warzone2100: update to 4.2.0.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..c4b120a6a91d 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.2.0
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=d4cefbcee02aba77c08cad89beed3c67b8a708c741617f76026c8c0fd79ab9ef
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From a691159da14bf660c6a856d47754ddb9938bc02e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 27 Oct 2021 19:33:30 +0200
Subject: [PATCH 2091/4088] u-boot-tools: update to 2021.10.

---
 srcpkgs/u-boot-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index 65d4c5a24352..2cd89ec0b012 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
-version=2021.07
+version=2021.10
 revision=1
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.denx.de/wiki/U-Boot/"
 distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e
+checksum=cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 2ff6b072790281b7375fb4b48a179044409330cd Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 27 Oct 2021 08:42:49 +0200
Subject: [PATCH 2092/4088] kotlin-bin: update to 1.5.31.

---
 srcpkgs/kotlin-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index a4fbb519756e..5e66c3abf3af 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'kotlin-bin'
 pkgname=kotlin-bin
-version=1.5.30
+version=1.5.31
 revision=1
 archs="x86_64"
 wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="Apache-2.0"
 homepage="https://kotlinlang.org/"
 distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=25eebdb9bb2e165e4ba8efbf8ff943c45d4fc39dbffc2c1caa059e8dd813675f
+checksum=661111286f3e5ac06aaf3a9403d869d9a96a176b62b141814be626a47249fe9e
 nostrip=yes
 replaces="kotlin>=0"
 

From 6adf2ecca66bb376f0e212be3b489aeca278d84f Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 25 Oct 2021 08:42:26 +0200
Subject: [PATCH 2093/4088] img2pdf: update to 0.4.3.

---
 .../patches/0_fix_color_profile_path.patch    | 15 ++++++++
 .../patches/fix_color_profile_path.patch      | 35 -------------------
 srcpkgs/img2pdf/template                      |  8 ++---
 3 files changed, 19 insertions(+), 39 deletions(-)
 create mode 100644 srcpkgs/img2pdf/patches/0_fix_color_profile_path.patch
 delete mode 100644 srcpkgs/img2pdf/patches/fix_color_profile_path.patch

diff --git a/srcpkgs/img2pdf/patches/0_fix_color_profile_path.patch b/srcpkgs/img2pdf/patches/0_fix_color_profile_path.patch
new file mode 100644
index 000000000000..009eee3c2981
--- /dev/null
+++ b/srcpkgs/img2pdf/patches/0_fix_color_profile_path.patch
@@ -0,0 +1,15 @@
+--- a/src/img2pdf.py
++++ b/src/img2pdf.py
+@@ -3439,10 +3439,10 @@ RGB.""",
+     outargs.add_argument(
+         "--pdfa",
+         nargs="?",
+-        const="/usr/share/color/icc/sRGB.icc",
++        const="/usr/share/color/icc/colord/sRGB.icc",
+         default=None,
+         help="Output a PDF/A-1b compliant document. By default, this will "
+-        "embed /usr/share/color/icc/sRGB.icc as the color profile.",
++        "embed /usr/share/color/icc/colord/sRGB.icc as the color profile.",
+     )
+ 
+     sizeargs = parser.add_argument_group(
diff --git a/srcpkgs/img2pdf/patches/fix_color_profile_path.patch b/srcpkgs/img2pdf/patches/fix_color_profile_path.patch
deleted file mode 100644
index cfbbb6f54b09..000000000000
--- a/srcpkgs/img2pdf/patches/fix_color_profile_path.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/img2pdf.py
-+++ b/src/img2pdf.py
-@@ -3439,10 +3439,10 @@ RGB.""",
-     outargs.add_argument(
-         "--pdfa",
-         nargs="?",
--        const="/usr/share/color/icc/sRGB.icc",
-+        const="/usr/share/color/icc/colord/sRGB.icc",
-         default=None,
-         help="Output a PDF/A-1b compliant document. By default, this will "
--        "embed /usr/share/color/icc/sRGB.icc as the color profile.",
-+        "embed /usr/share/color/icc/colord/sRGB.icc as the color profile.",
-     )
- 
-     sizeargs = parser.add_argument_group(
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -304,7 +304,7 @@ def compare(im1, im2, exact, icc, cmyk):
-     else:
-         iccargs = []
-         if icc:
--            iccargs = ["-profile", "/usr/share/color/icc/sRGB.icc"]
-+            iccargs = ["-profile", "/usr/share/color/icc/colord/sRGB.icc"]
-         psnr = subprocess.run(
-             ["compare"]
-             + iccargs
-@@ -424,7 +424,7 @@ def compare_pdfimages_png(tmpdir, img, pdf, exact=True, icc=False):
-                     "PSNR",
-                     "(",
-                     "-profile",
--                    "/usr/share/color/icc/ghostscript/srgb.icc",
-+                    "/usr/share/color/icc/colord/sRGB.icc",
-                     "-depth",
-                     "8",
-                     str(img),
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 4d285b15e821..a24ea1f1b610 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -1,7 +1,7 @@
 # Template file for 'img2pdf'
 pkgname=img2pdf
-version=0.4.1
-revision=2
+version=0.4.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
@@ -10,5 +10,5 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
-checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
+checksum=8e51c5043efa95d751481b516071a006f87c2a4059961a9ac43ec238915de09f
+make_check=no # need to patch out some bitdepth checks

From 4a09b7e24e4c150f2539abaaaa25cecf3d36477c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 26 Oct 2021 23:02:49 -0300
Subject: [PATCH 2094/4088] pari: update to 2.13.3.

---
 srcpkgs/pari/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..0fbfb340d4c9 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,6 +1,6 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.3
 revision=1
 build_style=configure
 build_helper=qemu
@@ -16,7 +16,7 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=ccba7f1606c6854f1443637bb57ad0958d41c7f4753f8ae8459f1d64c267a1ca
 
 build_options="x11 pthreads"
 build_options_default="x11 pthreads"

From ae5da6ff492d908deeb2eeb21f1ed68d05de12b5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 26 Oct 2021 20:47:33 -0400
Subject: [PATCH 2095/4088] watchexec: update to 1.17.1

---
 srcpkgs/watchexec/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index a9be5777c606..e49e51c555c8 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,17 +1,19 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.15.0
+version=1.17.1
 revision=1
+wrksrc="${pkgname}-cli-v${version}"
+build_wrksrc="cli"
 build_style=cargo
 short_desc="Executes commands in response to file modifications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
-distfiles="https://github.com/watchexec/watchexec/archive/${version}.tar.gz"
-checksum=536366e294047480ebfd440edc473690c226f23d07ea166023d1a7e8953c4f34
+distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
+checksum=3bc82174729628010d29c85f2d2c61cc45cef5cc729f13153b1422c8f647d33f
 
 post_install() {
-	vdoc README.md
-	vman doc/watchexec.1
-	vcompletion completions/zsh zsh
+	vdoc ../README.md
+	vman ../doc/watchexec.1
+	vcompletion ../completions/zsh zsh
 }

From fdfd5d1e8df2684953bf7723c2b32cded5c00d59 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 26 Oct 2021 19:36:45 -0400
Subject: [PATCH 2096/4088] hex: update to 0.4.2

---
 srcpkgs/hex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hex/template b/srcpkgs/hex/template
index 0fcd9618cb81..6295e03ddffe 100644
--- a/srcpkgs/hex/template
+++ b/srcpkgs/hex/template
@@ -1,6 +1,6 @@
 # Template file for 'hex'
 pkgname=hex
-version=0.4.1
+version=0.4.2
 revision=1
 build_style=cargo
 short_desc="Futuristic take on hexdump"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/sitkevij/hex"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=993c7ab59c98a1b97f348d6609e2ef7cb199f46e85bb06e093a9e01d06d85c97
+checksum=a7cc1ece337fc19e77fbbbca145001bc5d447bde4118eb6de2c99407eb1a3b74
 
 post_install() {
 	vlicense LICENSE

From 0cfde051f6d617f89062d7cfc859a78a487edb71 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 26 Oct 2021 18:34:15 -0400
Subject: [PATCH 2097/4088] upower: update to 0.99.13

---
 srcpkgs/upower/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index 906c3103db71..b87ec0d5f9e0 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,7 +1,7 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.11
-revision=2
+version=0.99.13
+revision=1
 _distver="${version//./_}"
 wrksrc="upower-UPOWER_${_distver}"
 build_style=gnu-configure
@@ -12,13 +12,13 @@ hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
  intltool libtool libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
-checkdepends="python3-dbus"
+checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=d50961ff6d2c5bc5e9b8ef6611a12dc8933f722ebf7de245b97fbe72999ebd9b
+checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"

From 09a934ce816d2822ca07b5735030b8a9f258506c Mon Sep 17 00:00:00 2001
From: lberrymage <lberrymage@tutanota.com>
Date: Tue, 26 Oct 2021 14:23:40 -0800
Subject: [PATCH 2098/4088] uwsgi: update to 2.0.20

Fixes uwsgi-python3 not loading properly due to the removal of some
deprecated APIs in Python 3.10.
---
 srcpkgs/uwsgi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 8a29c001b5e4..a735ff2cbb6b 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,7 +1,7 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
-version=2.0.19.1
-revision=3
+version=2.0.20
+revision=1
 hostmakedepends="python3"
 makedepends="python3-devel"
 short_desc="Fast, self-healing application container server"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only WITH GCC-exception-2.0"
 homepage="http://projects.unbit.it/uwsgi"
 distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
-checksum=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
+checksum=88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9
 
 _libdir=usr/lib/uwsgi
 

From 47cb2f1dc453740ad65bba1ff2a54be539d7b70e Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 8 Jul 2021 18:42:06 +1000
Subject: [PATCH 2099/4088] sane: add libcurl for escl backend, add runit
 service

Avahi support is now optional. The escl backend is only available
if Avahi is enabled.

When SANE is built with Avahi support, saned will spawn a child process
that is related to Avahi functionality. This process can't be stopped
by sv and will remain after the main saned process is terminated.
Reported upstream: https://gitlab.com/sane-project/backends/-/issues/499
---
 srcpkgs/sane/files/saned/run |  3 +++
 srcpkgs/sane/template        | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/sane/files/saned/run

diff --git a/srcpkgs/sane/files/saned/run b/srcpkgs/sane/files/saned/run
new file mode 100644
index 000000000000..18016ad066c4
--- /dev/null
+++ b/srcpkgs/sane/files/saned/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+exec saned -l -u _saned ${OPTS}
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 4e8cdab17d61..c21c9ea8aed1 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -9,20 +9,26 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  --with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes
  $(vopt_with snmp)"
 hostmakedepends="pkg-config python3"
-makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel openssl-devel libxml2-devel
- $(vopt_if snmp net-snmp-devel)"
+makedepends="libjpeg-turbo-devel tiff-devel libgphoto2-devel v4l-utils-devel
+ libusb-devel openssl-devel libxml2-devel $(vopt_if snmp net-snmp-devel)
+ $(vopt_if avahi 'avahi-libs-devel libcurl-devel')"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"
 short_desc="Scanner Access Now Easy"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:GPL-2.0-or-later-with-SANE-exception"
 homepage="http://www.sane-project.org/"
+changelog="https://gitlab.com/sane-project/backends/-/raw/master/NEWS"
 distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
 checksum=3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114
 noshlibprovides="avoid false detection of device drivers"
 
-build_options="snmp"
+# additional group 'lp' is required by saned to access some all-in-one devices
+system_accounts="_saned"
+_saned_groups="lp,scanner"
+
+build_options="avahi snmp"
+build_options_default="avahi"
 
 # tests broken on 32bit.  https://gitlab.com/sane-project/backends/-/issues/157
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -47,6 +53,8 @@ post_install() {
 	sed -n \
 		-e "/\/* sane - Scanner Access Now Easy./,/dynamic linking to load backends on demand./p" \
 		"${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION"
+
+	vsv saned
 }
 
 libsane_package() {

From dd07b42fd3722847c9260ac4d40dbd4b5aa03c39 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:21:35 +0400
Subject: [PATCH 2100/4088] atril: update to 1.26.0.

---
 srcpkgs/atril/patches/disable-synctex.patch | 242 --------------------
 srcpkgs/atril/template                      |  18 +-
 2 files changed, 7 insertions(+), 253 deletions(-)
 delete mode 100644 srcpkgs/atril/patches/disable-synctex.patch

diff --git a/srcpkgs/atril/patches/disable-synctex.patch b/srcpkgs/atril/patches/disable-synctex.patch
deleted file mode 100644
index 2f6d4b7ea476..000000000000
--- a/srcpkgs/atril/patches/disable-synctex.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From c246af6b85bfb326d10eb56e0d2563138495dfa2 Mon Sep 17 00:00:00 2001
-From: Oz Tiram <oz.tiram@noris.de>
-Date: Fri, 7 Feb 2020 21:57:10 +0100
-Subject: [PATCH] Make synctex optional
-
-Not everyone who reads PDF's is necessarily a LaTeX user.
-These changes allow users to install atril without the huge bagage
-of tex-live on systems where synctex isn't provided as a stand alone
-library.
----
- configure.ac              | 25 +++++++++++++++++--------
- libdocument/ev-document.c | 16 ++++++++++++----
- libview/ev-view.c         |  9 ++++++++-
- shell/ev-window.c         |  5 +++++
- 4 files changed, 42 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 529ef2a0..543808f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -361,15 +361,25 @@ AC_SUBST([GIRTYPELIBDIR])
- AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
- 
- dnl ================== libsynctex ===========================================
-+AC_ARG_ENABLE([synctex],
-+  [AS_HELP_STRING([--disable-synctex], [Disable support for synctex])],
-+  [],
-+  [enable_synctex=yes])
- 
--PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no)
- 
--dnl not found? use internal code copy.
--if test "x$has_synctex" = "xno"; then
--        AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found")
-+if test "$enable_synctex" = "yes"; then
-+  AC_DEFINE([ENABLE_SYNCTEX],[1],[Define if synctex support is enabled])
-+  PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no)
-+  dnl not found? use internal code copy.
-+  if test "x$has_synctex" = "xno"; then
-+          AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found")
-+  fi
-+  AC_SUBST(SYNCTEX_LIBS)
-+  AC_SUBST(SYNCTEX_CFLAGS)
- fi
--AC_SUBST(SYNCTEX_LIBS)
--AC_SUBST(SYNCTEX_CFLAGS)
-+
-+AM_CONDITIONAL([ENABLE_SYNCTEX], [test "$enable_synctex" = "yes"])
-+
- 
- dnl ================== portability checks ===========================================
- 
-@@ -770,6 +780,7 @@ Configure summary:
-     Tests...............:    $enable_tests
- 
-     PDF Backend.........:    $enable_pdf
-+    Synctex enabled.....:    $enable_synctex
-     PostScript Backend..:    $enable_ps
-     TIFF Backend........:    $enable_tiff
-     DJVU Backend........:    $enable_djvu
-@@ -778,6 +789,4 @@ Configure summary:
-     Comics Backend......:    $enable_comics
-     XPS Backend.........:    $enable_xps
-     ePub Backend........:    $have_webkit
--
--    SyncTeX.............:    $has_synctex
- "
-diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
-index b713a671..be082aeb 100644
---- a/libdocument/ev-document.c
-+++ b/libdocument/ev-document.c
-@@ -25,7 +25,9 @@
- #include <string.h>
- 
- #include "ev-document.h"
-+#ifdef ENABLE_SYNCTEX
- #include "synctex_parser.h"
-+#endif
- #include "ev-file-helpers.h"
- 
- typedef struct _EvPageSize
-@@ -53,8 +55,9 @@ struct _EvDocumentPrivate
- 	gchar         **page_labels;
- 	EvPageSize     *page_sizes;
- 	EvDocumentInfo *info;
--
-+#ifdef ENABLE_SYNCTEX
- 	synctex_scanner_p synctex_scanner;
-+#endif
- };
- 
- static gint            _ev_document_get_n_pages     (EvDocument *document);
-@@ -124,12 +127,12 @@ ev_document_finalize (GObject *object)
- 		ev_document_info_free (document->priv->info);
- 		document->priv->info = NULL;
- 	}
--
-+#ifdef ENABLE_SYNCTEX
- 	if (document->priv->synctex_scanner) {
- 		synctex_scanner_free (document->priv->synctex_scanner);
- 		document->priv->synctex_scanner = NULL;
- 	}
--
-+#endif
- 	G_OBJECT_CLASS (ev_document_parent_class)->finalize (object);
- }
- 
-@@ -137,8 +140,9 @@ static void
- ev_document_init (EvDocument *document)
- {
- 	document->priv = ev_document_get_instance_private (document);
-+#ifdef ENABLE_SYNCTEX
- 	document->synctex_version = SYNCTEX_VERSION_STRING;
--
-+#endif
- 	/* Assume all pages are the same size until proven otherwise */
- 	document->priv->uniform = TRUE;
- 	/* Assume that the document is not a web document*/
-@@ -336,6 +340,7 @@ ev_document_load (EvDocument  *document,
- 		}
- 
- 		priv->info = _ev_document_get_info (document);
-+#ifdef ENABLE_SYNCTEX
- 		if (_ev_document_support_synctex (document)) {
- 			gchar *filename;
- 
-@@ -346,6 +351,7 @@ ev_document_load (EvDocument  *document,
- 				g_free (filename);
- 			}
- 		}
-+#endif
- 	}
- 
- 	return retval;
-@@ -388,6 +394,7 @@ _ev_document_support_synctex (EvDocument *document)
- 	return klass->support_synctex ? klass->support_synctex (document) : FALSE;
- }
- 
-+#ifdef ENABLE_SYNCTEX
- gboolean
- ev_document_has_synctex (EvDocument *document)
- {
-@@ -492,6 +499,7 @@ ev_document_synctex_forward_search (EvDocument   *document,
- 
-         return result;
- }
-+#endif /* ENABLE_SYNCTEX */
- 
- static gint
- _ev_document_get_n_pages (EvDocument  *document)
-diff --git a/libview/ev-view.c b/libview/ev-view.c
-index a195ba21..e98582d3 100644
---- a/libview/ev-view.c
-+++ b/libview/ev-view.c
-@@ -3210,6 +3210,7 @@ ev_view_remove_annotation (EvView       *view,
-         g_object_unref (annot);
- }
- 
-+#ifdef ENABLE_SYNCTEX
- static gboolean
- ev_view_synctex_backward_search (EvView *view,
- 				 gdouble x,
-@@ -3235,6 +3236,7 @@ ev_view_synctex_backward_search (EvView *view,
- 
- 	return FALSE;
- }
-+#endif
- 
- /* Caret navigation */
- #define CURSOR_ON_MULTIPLIER 2
-@@ -4078,8 +4080,10 @@ ev_view_draw (GtkWidget      *widget,
- 			show_annotation_windows (view, i);
- 		if (page_ready && view->focused_element)
- 			draw_focus (view, cr, i, &clip_rect);
-+#ifdef ENABLE_SYNCTEX
- 		if (page_ready && view->synctex_result)
- 			highlight_forward_search_results (view, cr, i);
-+#endif
- 	}
- 
- 	if (GTK_WIDGET_CLASS (ev_view_parent_class)->draw)
-@@ -4472,9 +4476,10 @@ ev_view_button_press_event (GtkWidget      *widget,
- 			EvFormField *field;
- 			EvMapping *link;
- 			gint page;
--
-+#ifdef ENABLE_SYNCTEX
- 			if (event->state & GDK_CONTROL_MASK)
- 				return ev_view_synctex_backward_search (view, event->x , event->y);
-+#endif
- 
- 			if (EV_IS_SELECTION (view->document) && view->selection_info.selections) {
- 				if (event->type == GDK_3BUTTON_PRESS) {
-@@ -7522,6 +7527,7 @@ ev_view_find_cancel (EvView *view)
- 	view->find_pages = NULL;
- }
- 
-+#ifdef ENABLE_SYNCTEX
- /*** Synctex ***/
- void
- ev_view_highlight_forward_search (EvView       *view,
-@@ -7549,6 +7555,7 @@ ev_view_highlight_forward_search (EvView       *view,
- 	ensure_rectangle_is_visible (view, &view_rect);
- 	gtk_widget_queue_draw (GTK_WIDGET (view));
- }
-+#endif /* ENABLE_SYNCTEX */
- 
- /*** Selections ***/
- static gboolean
-diff --git a/shell/ev-window.c b/shell/ev-window.c
-index e4cbce93..a2da929d 100644
---- a/shell/ev-window.c
-+++ b/shell/ev-window.c
-@@ -7751,6 +7751,8 @@ ev_window_emit_doc_loaded (EvWindow *window)
-         ev_atril_window_emit_document_loaded (window->priv->skeleton, window->priv->uri);
- }
- 
-+
-+#ifdef ENABLE_SYNCTEX
- static gboolean
- handle_sync_view_cb (EvAtrilWindow        *object,
-                      GDBusMethodInvocation *invocation,
-@@ -7771,6 +7773,7 @@ handle_sync_view_cb (EvAtrilWindow        *object,
- 
- 	return TRUE;
- }
-+#endif
- #endif /* ENABLE_DBUS */
- 
- static gboolean
-@@ -7831,9 +7834,11 @@ ev_window_init (EvWindow *ev_window)
-                                                       ev_window->priv->dbus_object_path,
-                                                       &error)) {
-                         ev_window->priv->skeleton = skeleton;
-+#ifdef ENABLE_SYNCTEX
-                         g_signal_connect (skeleton, "handle-sync-view",
-                                           G_CALLBACK (handle_sync_view_cb),
-                                           ev_window);
-+#endif
-                 } else {
-                         g_printerr ("Failed to register bus object %s: %s\n",
- 			            ev_window->priv->dbus_object_path, error->message);
diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index 97602c4b1b0b..e3beb69b9e04 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,33 +1,29 @@
 # Template file for 'atril'
 pkgname=atril
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --enable-djvu --disable-synctex
+configure_args="--disable-schemas-compile --enable-djvu --enable-synctex=no
  --enable-dvi --enable-t1lib --enable-pixbuf --enable-comics --enable-xps
  --disable-static $(vopt_enable gir introspection)"
-hostmakedepends="glib-devel intltool itstool pkg-config automake libtool
- gettext-devel perl-XML-Parser yelp-tools mate-common autoconf-archive
- $(vopt_if gir 'gobject-introspection')"
+hostmakedepends="glib-devel intltool itstool pkg-config
+ perl-XML-Parser yelp-tools mate-common $(vopt_if gir 'gobject-introspection')"
 makedepends="djvulibre-devel libSM-devel libcaja-devel libgxps-devel
  libnotify-devel libsecret-devel libspectre-devel libunique-devel
  mate-desktop-devel mate-icon-theme poppler-glib-devel webkit2gtk-devel"
 depends="dbus mate-desktop mate-icon-theme"
 short_desc="Simply a document viewer for MATE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/atril/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b48372a89813f31d2635de02d9e92ba38e794daddf625f06d80c3793248bde1a
+checksum=715e766eaede3fa5d8ca300fa3319fb2b63055dfdc6e971d8750c2aec624e45f
 
 build_options="gir"
 build_options_default="gir"
 
-pre_configure() {
-	autoreconf -fi
-}
-
 do_check() {
 	: dogtail does NOT support Void Linux
 }

From 1fd7b224f68f51c7e9df68d0db383e693d791be8 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:23:40 +0400
Subject: [PATCH 2101/4088] caja-dropbox: update to 1.26.0.

---
 srcpkgs/caja-dropbox/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/caja-dropbox/template b/srcpkgs/caja-dropbox/template
index 952cccbd43a5..0beb6967905f 100644
--- a/srcpkgs/caja-dropbox/template
+++ b/srcpkgs/caja-dropbox/template
@@ -1,18 +1,24 @@
 # Template file for 'caja-dropbox'
 pkgname=caja-dropbox
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-gksu --disable-static"
-hostmakedepends="pkg-config python3-docutils python3-gobject gdk-pixbuf-devel"
+configure_args="--disable-static"
+hostmakedepends="autoconf-archive gettext-devel libtool pkg-config
+ python3-docutils python3-gobject gdk-pixbuf-devel which mate-common"
 makedepends="libcaja-devel glib-devel gtk+3-devel python3-gobject-devel"
 depends="caja"
 short_desc="Dropbox extension for Caja file manager"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CC-BY-ND-3.0, GPL-3.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/caja-dropbox/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=224a6ad0b9cc994384192469fbcd745f077e85577f57d58b85695754b04096e5
+checksum=9693d0c3426822d5b549e2241cd2b8a0ed552d4eebf2c87fa522e82b3fc8849b
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vlicense COPYING

From 874b960fbdcaf2eab25fb77b2a2f57e8056fb291 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:24:06 +0400
Subject: [PATCH 2102/4088] caja-extensions: update to 1.26.0.

---
 srcpkgs/caja-extensions/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/caja-extensions/template b/srcpkgs/caja-extensions/template
index 171720780a86..a258f63ada12 100644
--- a/srcpkgs/caja-extensions/template
+++ b/srcpkgs/caja-extensions/template
@@ -1,9 +1,9 @@
 # Template file for 'caja-extensions'
 pkgname=caja-extensions
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-gksu"
+configure_args="--disable-gksu --disable-static"
 hostmakedepends="pkg-config intltool glib-devel libxml2"
 makedepends="libcaja-devel mate-desktop-devel dbus-glib-devel gupnp-devel"
 depends="caja"
@@ -11,8 +11,9 @@ short_desc="Extensions for the MATE Caja file manager"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/caja-extensions/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8533c3e0d3b0984eac284168744ecd12f8d0bdd914b908b4b71a496c95f5538e
+checksum=f01539530840f8bd32ad119fab346cac214149dec74a69ae65a39442fdd8fc0f
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/include
@@ -25,8 +26,6 @@ caja-image-converter_package() {
 	depends="caja-extensions ImageMagick"
 	pkg_install() {
 		vmove usr/lib/caja/extensions-2.0/libcaja-image-converter.so
-		vmove usr/share/caja-extensions/caja-image-resize.ui
-		vmove usr/share/caja-extensions/caja-image-rotate.ui
 	}
 }
 

From bb80fc01e26ca055f26a3d0143081657e4b7ae87 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:24:27 +0400
Subject: [PATCH 2103/4088] caja: update to 1.26.0.

---
 srcpkgs/caja/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index ef7f481d9502..95167200cdb6 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -1,6 +1,6 @@
 # Template file for 'caja'
 pkgname=caja
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -8,8 +8,7 @@ build_helper="gir"
 configure_args="--disable-static --disable-packagekit --disable-schemas-compile
  --disable-update-mimedb --disable-self-check $(vopt_enable gir introspection)
  ac_cv_lib_selinux_is_selinux_enabled=no ac_cv_strftime_extensions=yes"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection
- intltool itstool libtool pkg-config"
+hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
 makedepends="exempi-devel gvfs-devel libXt-devel libexif-devel libnotify-devel
  mate-desktop-devel"
 depends="dbus gvfs mate-desktop mate-icon-theme"
@@ -17,16 +16,13 @@ short_desc="MATE shell and file manager"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/caja/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e50b0147ce4c43107d4dadddafd2fa3928f7522515663b6bc58fef3016598f7a
+checksum=a200a6fad3a5fbc70d10f8626788e2f4f31bde363649bc50a6bb8a85b2880ad4
 
 build_options="gir"
 build_options_default="gir"
 
-pre_configure() {
-	autoreconf -fi
-}
-
 libcaja_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 7060ae57bad319b8feebf47e52e6a2e662bcb1f6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:24:53 +0400
Subject: [PATCH 2104/4088] engrampa: update to 1.26.0.

---
 srcpkgs/engrampa/patches/zstd-mime-type.patch | 31 +++++++++++--------
 srcpkgs/engrampa/template                     |  8 +++--
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/engrampa/patches/zstd-mime-type.patch b/srcpkgs/engrampa/patches/zstd-mime-type.patch
index cf56c55509a6..75e2f5a1629d 100644
--- a/srcpkgs/engrampa/patches/zstd-mime-type.patch
+++ b/srcpkgs/engrampa/patches/zstd-mime-type.patch
@@ -1,7 +1,8 @@
-diff --git caja/caja-engrampa.c caja/caja-engrampa.c
+diff --git a/caja/caja-engrampa.c b/caja/caja-engrampa.c
+index ad89608..d4019ec 100644
 --- a/caja/caja-engrampa.c
 +++ b/caja/caja-engrampa.c
-@@ -191,7 +191,8 @@ static struct {
+@@ -195,7 +195,8 @@ static struct {
  		{ "application/x-zip", TRUE },
  		{ "application/x-zip-compressed", TRUE },
  		{ "application/x-zoo", TRUE },
@@ -11,10 +12,11 @@ diff --git caja/caja-engrampa.c caja/caja-engrampa.c
  		{ "application/x-zstd-compressed-tar", TRUE },
  		{ "application/zip", TRUE },
  		{ "multipart/x-zip", TRUE },
-diff --git configure.ac configure.ac
+diff --git a/configure.ac b/configure.ac
+index 5d03e6b..6305854 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -141,7 +141,6 @@ AC_ARG_ENABLE([magic],
+@@ -148,7 +148,6 @@ AC_ARG_ENABLE([magic],
                AS_HELP_STRING([--enable-magic], [use libmagic to detect file type]),,
                [enable_magic=no])
  
@@ -22,7 +24,7 @@ diff --git configure.ac configure.ac
  if test x"$enable_magic" = x"yes" ; then
  	save_LIBS="$LIBS"
  	LIBS="$LIBS -lmagic"
-@@ -154,47 +153,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); }
+@@ -161,47 +160,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); }
  		       [AC_MSG_RESULT([no])
  		        AC_MSG_ERROR([libmagic is needed for magic])])
  
@@ -70,7 +72,7 @@ diff --git configure.ac configure.ac
  	LIBS="$save_LIBS"
  
  	MAGIC_CFLAGS=
-@@ -207,9 +165,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); }
+@@ -214,9 +172,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); }
  fi
  
  AM_CONDITIONAL(ENABLE_MAGIC, test x"$enable_magic" != x"no")
@@ -80,19 +82,21 @@ diff --git configure.ac configure.ac
  
  AC_ARG_VAR([CPIO], [Path to the `cpio` command])
  AC_PATH_PROGS(CPIO, gcpio cpio, cpio)
-diff --git data/engrampa.desktop.in.in data/engrampa.desktop.in.in
+diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in
+index c23c8ab..6d8c511 100644
 --- a/data/engrampa.desktop.in.in
 +++ b/data/engrampa.desktop.in.in
 @@ -11,7 +11,7 @@ Type=Application
  Icon=engrampa
  # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
  Categories=GTK;Utility;Archiving;Compression;
--MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;@ZSTD_MIME_TYPE@;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
-+MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zstd;application/x-zstd;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
+-MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;@ZSTD_MIME_TYPE@;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
++MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zstd;application/x-zstd;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
  # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
  Keywords=MATE;archive;manager;compression;
  X-MATE-DocPath=engrampa/engrampa.xml
-diff --git src/fr-command-cfile.c src/fr-command-cfile.c
+diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c
+index a914abe..93f641f 100644
 --- a/src/fr-command-cfile.c
 +++ b/src/fr-command-cfile.c
 @@ -301,7 +301,8 @@ fr_command_cfile_add (FrCommand     *comm,
@@ -155,10 +159,11 @@ diff --git src/fr-command-cfile.c src/fr-command-cfile.c
  		return PACKAGES ("zstd");
  
  	return NULL;
-diff --git src/fr-init.c src/fr-init.c
+diff --git a/src/fr-init.c b/src/fr-init.c
+index 7d7b313..57dfc40 100644
 --- a/src/fr-init.c
 +++ b/src/fr-init.c
-@@ -108,7 +108,8 @@ FrMimeTypeDescription mime_type_desc[] = {
+@@ -110,7 +110,8 @@ FrMimeTypeDescription mime_type_desc[] = {
  	{ "application/x-xz",                                         ".xz",       N_("Xz compressed file"), 0 },
  	{ "application/x-xz-compressed-tar",                          ".tar.xz",   N_("Tar compressed with xz"), 0 },
  	{ "application/x-zoo",                                        ".zoo",      N_("Zoo"), 0 },
@@ -168,7 +173,7 @@ diff --git src/fr-init.c src/fr-init.c
  	{ "application/x-zstd-compressed-tar",                        ".tar.zst",  N_("Tar compressed with zstd"), 0 },
  	{ "application/zip",                                          ".zip",      N_("Zip"), 0 },
  	{ NULL, NULL, NULL, 0 }
-@@ -181,7 +182,7 @@ FrExtensionType file_ext_type[] = {
+@@ -185,7 +186,7 @@ FrExtensionType file_ext_type[] = {
  	{ ".Z", "application/x-compress" },
  	{ ".zip", "application/zip" },
  	{ ".zoo", "application/x-zoo" },
diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template
index ac402d6fb4a9..14d98489c715 100644
--- a/srcpkgs/engrampa/template
+++ b/srcpkgs/engrampa/template
@@ -1,9 +1,10 @@
 # Template file for 'engrampa'
 pkgname=engrampa
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
-configure_args="--enable-magic --disable-schemas-compile --disable-packagekit"
+configure_args="--enable-magic --disable-schemas-compile --disable-packagekit
+ --disable-static"
 hostmakedepends="glib-devel intltool itstool pkg-config cpio automake
  gettext-devel tar libtool mate-common autoconf-archive"
 makedepends="file-devel gtk+3-devel json-glib-devel libSM-devel libarchive-devel
@@ -13,8 +14,9 @@ short_desc="Archive manipulator for MATE"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/engrampa/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee280d288c974732ec7bc2d1c3e18fa563b33a30f3e4cb3e976ebc71be6c4674
+checksum=97cdb2c22c32315a38803d4147dfad9de7309e30ce8f37ac9f600709ad075ee3
 
 pre_configure() {
 	autoreconf -fi

From 6a93b6f2aa78fc475410b84f108532719ba39aba Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:25:16 +0400
Subject: [PATCH 2105/4088] eom: update to 1.26.0.

---
 srcpkgs/eom/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/eom/template b/srcpkgs/eom/template
index 6ed175f3a443..37241c0b9b4e 100644
--- a/srcpkgs/eom/template
+++ b/srcpkgs/eom/template
@@ -1,6 +1,6 @@
 # Template file for 'eom'
 pkgname=eom
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -10,11 +10,12 @@ makedepends="dbus-glib-devel exempi-devel libexif-devel libpeas-devel
  librsvg-devel mate-desktop-devel mate-icon-theme"
 depends="dbus mate-icon-theme"
 short_desc="MATE image viewer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/eom/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2eb9d106f658565399f83d3d13315a144715a7e9b069cfd0a040ef0698a62a37
+checksum=27f169aa396ddbc75740bf802bef1c0251771ca0747b5a727ff985c03dc067db
 
 eom-devel_package() {
 	short_desc+=" - development files"

From 224df08823e2072b61fc350b593b6d3c4d91b0d9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:25:47 +0400
Subject: [PATCH 2106/4088] libmatekbd: update to 1.26.0.

---
 srcpkgs/libmatekbd/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libmatekbd/template b/srcpkgs/libmatekbd/template
index 577e6b919899..dd4ca77315a0 100644
--- a/srcpkgs/libmatekbd/template
+++ b/srcpkgs/libmatekbd/template
@@ -1,28 +1,24 @@
 # Template file for 'libmatekbd'
 pkgname=libmatekbd
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
-hostmakedepends="mate-common autoconf-archive pkg-config intltool itstool
- glib-devel gobject-introspection"
+hostmakedepends="pkg-config intltool itstool glib-devel gobject-introspection"
 makedepends="libICE-devel gtk+3-devel libxklavier-devel iso-codes"
 depends="dconf iso-codes"
 short_desc="MATE keyboard library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/libmatekbd/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a87f6369e3f35428bc8fccafca1103004b2e2f5cb3d8d122019704baa7ebac9e
+checksum=220ee8cab0cbc5f42ca6b621bcd009b0b736507945a2aedbffe2235fa1d811ad
 
 build_options="gir"
 build_options_default="gir"
 
-pre_configure() {
-	autoreconf -fi
-}
-
 libmatekbd-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+3-devel libxklavier-devel ${sourcepkg}>=${version}_${revision}"

From 4f79f5d6e28e0beb6964a18a158b78b901dc28fa Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:26:03 +0400
Subject: [PATCH 2107/4088] libmatemixer: update to 1.26.0.

---
 srcpkgs/libmatemixer/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libmatemixer/template b/srcpkgs/libmatemixer/template
index 2028de955a83..36ec5c3322fe 100644
--- a/srcpkgs/libmatemixer/template
+++ b/srcpkgs/libmatemixer/template
@@ -1,21 +1,18 @@
 # Template file for 'libmatemixer'
 pkgname=libmatemixer
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="mate-common pkg-config intltool itstool autoconf-archive"
+hostmakedepends="mate-common pkg-config intltool itstool"
 makedepends="libglib-devel alsa-lib-devel pulseaudio-devel"
 short_desc="MATE mixer library"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/libmatemixer/master/NEWS"
 distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1d2f2f0c3b6b31f96b689e28a73d4c3c080061ec22c1b3b4696e7f63e6c1d9d8
-
-pre_configure() {
-	autoreconf -fi
-}
+checksum=9a9bcc605b27e9c5c91a28eb7cb79831e6d6fbf6339f5e5c18d524f3ee259ff1
 
 libmatemixer-devel_package() {
 	short_desc+=" - development files"

From 3652459e899d2e15035a49f7c1e558b73b7c2a47 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:26:22 +0400
Subject: [PATCH 2108/4088] libmateweather: update to 1.26.0.

---
 srcpkgs/libmateweather/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libmateweather/template b/srcpkgs/libmateweather/template
index b7180e39aff1..6ac1a9208910 100644
--- a/srcpkgs/libmateweather/template
+++ b/srcpkgs/libmateweather/template
@@ -1,10 +1,10 @@
 # Template file for 'libmateweather'
 pkgname=libmateweather
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --disable-python
- --enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo"
+configure_args="--disable-static --enable-locations-compression
+ --with-zoneinfo-dir=/usr/share/zoneinfo"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel libsoup-devel"
 depends="dconf"
@@ -12,8 +12,9 @@ short_desc="Provides access to weather information from the Internet for MATE"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/libmateweather/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9b4cfdefcd368137b9300e19fd6ed31b26a56336b78ef3fa772156755361a709
+checksum=a7fd9713099c88826fb67249771cd0cdb92ee9d4784068b1a165840b84607b15
 
 libmateweather-devel_package() {
 	short_desc+=" - development files"

From eb2556af526c0ef9dd634829041f59dfb5765dcf Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:26:47 +0400
Subject: [PATCH 2109/4088] marco: update to 1.26.0.

---
 srcpkgs/marco/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template
index 5abb62b91fec..047eb7fd3f3a 100644
--- a/srcpkgs/marco/template
+++ b/srcpkgs/marco/template
@@ -1,10 +1,10 @@
 # Template file for 'marco'
 pkgname=marco
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-startup-notification --disable-schemas-compile"
-hostmakedepends="gdk-pixbuf-devel mate-common which zenity autoconf-archive"
+hostmakedepends="gdk-pixbuf-devel zenity pkg-config itstool intltool"
 makedepends="libXt-devel libcanberra-devel libgtop-devel
  libnotify-devel mate-desktop-devel libXpresent-devel"
 depends="zenity"
@@ -12,12 +12,13 @@ short_desc="Window manager for MATE"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/marco/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=498350cb12fc4d9c7c4a0355102c17b50043fbab258d11ad41b7d698b4f042a7
+checksum=f63c08cd8b07450ab3e33a04605c4f9e69522358884273b3cbcf30275eee5b05
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+# pre_configure() {
+# 	NOCONFIGURE=1 ./autogen.sh
+# }
 
 libmarco_package() {
 	short_desc+=" - runtime library"

From 573d641e9ad74483c1769b0e498281c83b41bda2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:27:03 +0400
Subject: [PATCH 2110/4088] mate-applets: update to 1.26.0.

---
 srcpkgs/mate-applets/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mate-applets/template b/srcpkgs/mate-applets/template
index 8a530aafa043..9a124f551487 100644
--- a/srcpkgs/mate-applets/template
+++ b/srcpkgs/mate-applets/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-applets'
 pkgname=mate-applets
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-ipv6"
@@ -8,14 +8,15 @@ hostmakedepends="glib-devel intltool itstool libxslt pkg-config polkit"
 makedepends="NetworkManager-devel gtksourceview-devel libSM-devel libgtop-devel
  libmate-panel-devel libmateweather-devel libnotify-devel libwnck-devel
  mate-desktop-devel mate-icon-theme mate-settings-daemon-devel polkit-devel
- upower-devel wireless_tools-devel"
+ upower-devel wireless_tools-devel libnl3-devel"
 depends="mate-icon-theme"
 short_desc="Applets for MATE panel"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-applets/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d76f6be9aa19451b52b4f354d9f846a572810c40c27eb2df3d01cc353a89e040
+checksum=b7e0439b4e0c754233c2988644faa3f6ab6270970061b7a0c635d68d236fc977
 replaces="mate-applets-data>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From b0b63fcdc9f5bf68aded95f7eea7c09723fceef0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:27:22 +0400
Subject: [PATCH 2111/4088] mate-backgrounds: update to 1.26.0.

---
 srcpkgs/mate-backgrounds/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-backgrounds/template b/srcpkgs/mate-backgrounds/template
index d2bb23c7a30d..c33b9cb4db5c 100644
--- a/srcpkgs/mate-backgrounds/template
+++ b/srcpkgs/mate-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-backgrounds'
 pkgname=mate-backgrounds
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool"
@@ -8,5 +8,6 @@ short_desc="Background images and data for MATE"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-backgrounds/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5bea10c346bf527508fe4c94e4b34785434dc5cf93d72571425b751e916abc7
+checksum=0dc9127224ae1573301cfa0aaa6c6262827072d2bf6e5c67c9e1aae19f85e90c

From 6dd701f7d492ea0fa409410460f675aad7302017 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:28:00 +0400
Subject: [PATCH 2112/4088] mate-calc: update to 1.26.0.

---
 srcpkgs/mate-calc/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-calc/template b/srcpkgs/mate-calc/template
index 9088f46c01d5..e45ee7e9c338 100644
--- a/srcpkgs/mate-calc/template
+++ b/srcpkgs/mate-calc/template
@@ -1,13 +1,14 @@
 # Template file for 'mate-calc'
 pkgname=mate-calc
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="glib-devel intltool itstool pkg-config"
-makedepends="gtk+3-devel"
+makedepends="gtk+3-devel mpfr-devel libmpc-devel"
 short_desc="MATE Calculator"
 maintainer="Álvaro Castillo <midgoon@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org/"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-calc/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5c2d1b0101c087c3fdae143058994a76093590693a33392bc2329756708dad46
+checksum=7eb826801dda5d7b070e41d9e831df2ad24459be6c96fe9c0506c21e1374ad55

From a5f2960a99d115701dc6e180394bba3873df71a4 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:28:16 +0400
Subject: [PATCH 2113/4088] mate-common: update to 1.26.0.

---
 srcpkgs/mate-common/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-common/template b/srcpkgs/mate-common/template
index 7afe80ba44a2..1f85f1f47f7b 100644
--- a/srcpkgs/mate-common/template
+++ b/srcpkgs/mate-common/template
@@ -1,13 +1,14 @@
 # Template file for 'mate-common'
 pkgname=mate-common
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool"
 depends="automake libtool intltool pkg-config gtk-doc gettext-devel glib-devel yelp-tools"
 short_desc="Common development macros for MATE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="http://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-common/master/NEWS"
 distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=71d2013f5743c71e10e04f3c2205d3bb8db1ddb26954a4197801cb5b3c152b6b
+checksum=4ec9e308ef7ea87435769976b5bd7e41d612be2357a91bd0fed3557cb1bb9c04

From 981c92cdadbbdc52e5823c2a4458d051aaa644ab Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:28:30 +0400
Subject: [PATCH 2114/4088] mate-control-center: update to 1.26.0.

---
 srcpkgs/mate-control-center/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template
index 513812986a2b..4f83fd8e1a84 100644
--- a/srcpkgs/mate-control-center/template
+++ b/srcpkgs/mate-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-control-center'
 pkgname=mate-control-center
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb"
@@ -14,8 +14,9 @@ short_desc="Control Center for MATE"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-control-center/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=69d8c633a73a4f503501a6bd03f81f230c26835110bb02942a735842d9c47aa3
+checksum=286714ea778f6540fe74ef00aaf504c47141518d26ab224994f4a1af36b0134a
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache

From 76cf72ef664b6119f792d073da0d03ab41c62e88 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:28:42 +0400
Subject: [PATCH 2115/4088] mate-desktop: update to 1.26.0.

---
 srcpkgs/mate-desktop/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mate-desktop/template b/srcpkgs/mate-desktop/template
index 42224e430206..730707b276c0 100644
--- a/srcpkgs/mate-desktop/template
+++ b/srcpkgs/mate-desktop/template
@@ -1,11 +1,10 @@
 # Template file for 'mate-desktop'
 pkgname=mate-desktop
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-mpaste
- --disable-schemas-compile $(vopt_enable gir introspection)"
+configure_args="--disable-static --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool itstool glib-devel librsvg-utils"
 makedepends="gtk+3-devel dconf-devel libXrandr-devel startup-notification-devel"
 depends="dconf hicolor-icon-theme dejavu-fonts-ttf"
@@ -13,8 +12,9 @@ short_desc="Library with common API for various MATE modules"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-desktop/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d1e8cfae3828d8f083d624b1bfaa332a68ff37c145286432e9e6875a916da1d9
+checksum=5f7c6b9b88886cb3393b3ffd57f9e9ec29f03a3c23ce8d4b45292de0aa4652a3
 
 # Package build options
 build_options="gir"

From 34283d8395cd05ebd7e6e204f49e3106be30ad37 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:28:58 +0400
Subject: [PATCH 2116/4088] mate-icon-theme: update to 1.26.0.

---
 srcpkgs/mate-icon-theme/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mate-icon-theme/template b/srcpkgs/mate-icon-theme/template
index 9d1892344e4a..42973b71275c 100644
--- a/srcpkgs/mate-icon-theme/template
+++ b/srcpkgs/mate-icon-theme/template
@@ -1,17 +1,18 @@
 # Template file for 'mate-icon-theme'
 pkgname=mate-icon-theme
-version=1.24.0
-revision=2
+version=1.26.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool icon-naming-utils"
 makedepends="icon-naming-utils"
 depends="gtk-update-icon-cache hicolor-icon-theme"
 short_desc="MATE icon theme"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CC-BY-SA-3.0"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-icon-theme/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca9e5387439fcf7eed53eb33f10a6d3ae51b4d96af525eed6f8cf31d83f95428
+checksum=41f50436d57f425e54fd9557541be77fb291e03aacd55f7991c042e84a290a5a
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/icons/mate/icon-theme.cache

From 6d8bf9b190d1523e7810f8384d0deeda08fd06d3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:29:14 +0400
Subject: [PATCH 2117/4088] mate-indicator-applet: update to 1.26.0.

---
 srcpkgs/mate-indicator-applet/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-indicator-applet/template b/srcpkgs/mate-indicator-applet/template
index 676c2ee2440f..cd2f426086fe 100644
--- a/srcpkgs/mate-indicator-applet/template
+++ b/srcpkgs/mate-indicator-applet/template
@@ -1,13 +1,15 @@
 # Template file for 'mate-indicator-applet'
 pkgname=mate-indicator-applet
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=gnu-configure
+configure_args="--disable-static"
 hostmakedepends="pkg-config gettext intltool"
 makedepends="gtk+3-devel libX11-devel libmate-panel-devel libindicator-devel"
 short_desc="MATE applet to display information from various applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-indicator-applet/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8eab3f66a027c971d8c7a92b69e595fe0edec0e568610e0071c54358f4daf754
+checksum=e4fbfbede0e58ff7503ead66a3e044ca0f3411a4fd9b552d66e2293a5c828e90

From 9cd85b4411abd87c275b094b09acfa8c6439f462 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:29:27 +0400
Subject: [PATCH 2118/4088] mate-media: update to 1.26.0.

---
 srcpkgs/mate-media/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-media/template b/srcpkgs/mate-media/template
index 53e1641a8556..289bddd0dc4f 100644
--- a/srcpkgs/mate-media/template
+++ b/srcpkgs/mate-media/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-media'
 pkgname=mate-media
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -8,8 +8,9 @@ hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libcanberra-devel mate-desktop-devel libmatemixer-devel libmate-panel-devel"
 depends="sound-theme-freedesktop"
 short_desc="MATE Media Tools"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-media/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=222d75d6105a2665f7f0f5e44480917223eca6fc120eebd673703c1105271185
+checksum=8b731b203fd8219ccc2f2ced40e4301823a17f7940acf3cec72b4494a3fe3c3a

From 6670becd98bb79d72cc6585c38c65e2cc3d7e5e7 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:29:39 +0400
Subject: [PATCH 2119/4088] mate-menus: update to 1.26.0.

---
 srcpkgs/mate-menus/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-menus/template b/srcpkgs/mate-menus/template
index f68aa451db93..dd84f983c95c 100644
--- a/srcpkgs/mate-menus/template
+++ b/srcpkgs/mate-menus/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-menus'
 pkgname=mate-menus
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -8,11 +8,12 @@ configure_args="--disable-static"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel"
 short_desc="MATE menu specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-menus/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a295f5403136f9cfbe0fcf567e48e624c8e01a73ca20f8685d34b12ac4bec9f
+checksum=0309964abd813053368ac4fc446898d27cdb019e894e78cea75751a68871ffe4
 
 build_options="gir"
 build_options_default="gir"

From 87d1f53df535a78a174e6036b929309a76b48b01 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:30:03 +0400
Subject: [PATCH 2120/4088] mate-netbook: update to 1.26.0.

---
 srcpkgs/mate-netbook/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-netbook/template b/srcpkgs/mate-netbook/template
index 75366db27060..dc18118ed9d5 100644
--- a/srcpkgs/mate-netbook/template
+++ b/srcpkgs/mate-netbook/template
@@ -1,13 +1,14 @@
 # Template file for 'mate-netbook'
 pkgname=mate-netbook
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libmate-panel-devel libXtst-devel libwnck-devel libfakekey-devel"
 short_desc="MATE netbook extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-netbook/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=48a1d4b88be09da420d10905dd07934a23781d86211e75afdb13b357f04bb3ae
+checksum=e3bf1b6d9fb266600db408fd9ce97d4a4d3b29586853d4ea46547b6793f1ed89

From be7773e1bdf99b3bdfccbd4f58a0993272c0260f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:30:19 +0400
Subject: [PATCH 2121/4088] mate-notification-daemon: update to 1.26.0.

---
 srcpkgs/mate-notification-daemon/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mate-notification-daemon/template b/srcpkgs/mate-notification-daemon/template
index da41832c1153..983a03ccf396 100644
--- a/srcpkgs/mate-notification-daemon/template
+++ b/srcpkgs/mate-notification-daemon/template
@@ -1,15 +1,17 @@
 # Template file for 'mate-notification-daemon'
 pkgname=mate-notification-daemon
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --disable-schemas-compile --enable-wayland"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel libxml2"
-makedepends="libnotify-devel dbus-glib-devel libwnck-devel libcanberra-devel"
+makedepends="libnotify-devel dbus-glib-devel libwnck-devel libcanberra-devel
+ mate-desktop-devel libmate-panel-devel gtk-layer-shell-devel"
 depends="dconf hicolor-icon-theme desktop-file-utils"
 short_desc="Notification daemon for MATE"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-notification-daemon/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58a4193ef8b36024ec0035c3e48e2a08d87c569260317ffef6f12f665048ae0a
+checksum=b23c6581f8f5916d6a16584edd91c2e4b6d0db7dd8e1eec5dd360acf2834b9ba

From 4b31dc3ee6bb069b18ce69ef3d238aa5e0803c6f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:30:29 +0400
Subject: [PATCH 2122/4088] mate-panel: update to 1.26.0.

---
 srcpkgs/mate-panel/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template
index 8241e191d40c..c11e37f27ad5 100644
--- a/srcpkgs/mate-panel/template
+++ b/srcpkgs/mate-panel/template
@@ -1,23 +1,24 @@
 # Template file for 'mate-panel'
 pkgname=mate-panel
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --disable-schemas-compile
+configure_args="--disable-static --disable-schemas-compile --enable-wayland
  $(vopt_enable gir introspection)"
 hostmakedepends="glib-devel intltool itstool pkg-config
  $(vopt_if gir 'gobject-introspection')"
 makedepends="dbus-glib-devel libSM-devel libcaja-devel libcanberra-devel
  libmarco-devel libmateweather-devel librsvg-devel libwnck-devel
- mate-desktop-devel mate-menus-devel"
+ mate-desktop-devel mate-menus-devel wayland-devel gtk-layer-shell-devel"
 depends="caja marco mate-session-manager"
 short_desc="MATE Panel"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-panel/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=30c5ba0392ec76b110220ee6d10bbdba76af36586592a6b3d604db70602848ea
+checksum=092e1ed2177b3a13cfb7df19667b06083009210e48294c18c8a68b9b3c47ea64
 
 build_options="gir"
 build_options_default="gir"

From 2bcc130fd5b8bbade27222c5dc3c2677d790c432 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:30:43 +0400
Subject: [PATCH 2123/4088] mate-polkit: update to 1.26.0.

---
 srcpkgs/mate-polkit/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-polkit/template b/srcpkgs/mate-polkit/template
index fef702b7d618..1c132efd9a42 100644
--- a/srcpkgs/mate-polkit/template
+++ b/srcpkgs/mate-polkit/template
@@ -1,14 +1,15 @@
 # Template file for 'mate-polkit'
 pkgname=mate-polkit
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel polkit-devel"
 short_desc="PolicyKit integration for the MATE desktop"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-polkit/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=76bf1133a22d0772bff02c34d6178ef73826a400415294541f9e6f4b3f5ea090
+checksum=ada57812add0dff4b03ed03adb467c3a9e59e179c1cf52451988065a04d8724e

From c0af2ee3c084c246095095b69bc52f780540bf6c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:31:01 +0400
Subject: [PATCH 2124/4088] mate-power-manager: update to 1.26.0.

---
 srcpkgs/mate-power-manager/patches/musl.patch | 84 -------------------
 srcpkgs/mate-power-manager/template           | 12 +--
 2 files changed, 6 insertions(+), 90 deletions(-)
 delete mode 100644 srcpkgs/mate-power-manager/patches/musl.patch

diff --git a/srcpkgs/mate-power-manager/patches/musl.patch b/srcpkgs/mate-power-manager/patches/musl.patch
deleted file mode 100644
index 827698b4c9fb..000000000000
--- a/srcpkgs/mate-power-manager/patches/musl.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/src/egg-debug.c	2015-11-07 07:50:36.623167156 +0100
-+++ b/src/egg-debug.c	2015-11-07 07:51:46.719072134 +0100
-@@ -39,7 +39,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <time.h>
-+#ifdef __GLIBC__
- #include <execinfo.h>
-+#endif
- 
- #include "egg-debug.h"
- 
-@@ -78,6 +80,7 @@ pk_set_console_mode (guint console_code)
- void
- egg_debug_backtrace (void)
- {
-+#ifdef __GLIBC__
- 	void *call_stack[512];
- 	int  call_stack_size;
- 	char **symbols;
-@@ -95,6 +98,7 @@ egg_debug_backtrace (void)
- 		pk_set_console_mode (CONSOLE_RESET);
- 		free (symbols);
- 	}
-+#endif
- }
- 
- /**
---- a/applets/brightness/egg-debug.c	2015-11-07 07:52:33.320008962 +0100
-+++ b/applets/brightness/egg-debug.c	2015-11-07 07:53:09.302960183 +0100
-@@ -39,7 +39,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <time.h>
-+#ifdef __GLIBC__
- #include <execinfo.h>
-+#endif
- 
- #include "egg-debug.h"
- 
-@@ -78,6 +80,7 @@ pk_set_console_mode (guint console_code)
- void
- egg_debug_backtrace (void)
- {
-+#ifdef __GLIBC__
- 	void *call_stack[512];
- 	int  call_stack_size;
- 	char **symbols;
-@@ -95,6 +98,7 @@ egg_debug_backtrace (void)
- 		pk_set_console_mode (CONSOLE_RESET);
- 		free (symbols);
- 	}
-+#endif
- }
- 
- /**
---- a/applets/inhibit/egg-debug.c	2015-11-07 07:53:32.815928309 +0100
-+++ b/applets/inhibit/egg-debug.c	2015-11-07 07:53:55.503897553 +0100
-@@ -39,7 +39,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <time.h>
-+#ifdef __GLIBC__
- #include <execinfo.h>
-+#endif
- 
- #include "egg-debug.h"
- 
-@@ -78,6 +80,7 @@ pk_set_console_mode (guint console_code)
- void
- egg_debug_backtrace (void)
- {
-+#ifdef __GLIBC__
- 	void *call_stack[512];
- 	int  call_stack_size;
- 	char **symbols;
-@@ -95,6 +98,7 @@ egg_debug_backtrace (void)
- 		pk_set_console_mode (CONSOLE_RESET);
- 		free (symbols);
- 	}
-+#endif
- }
- 
- /**
diff --git a/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template
index 4f2f7d77c8f1..50448859e863 100644
--- a/srcpkgs/mate-power-manager/template
+++ b/srcpkgs/mate-power-manager/template
@@ -1,17 +1,17 @@
 # Template file for 'mate-power-manager'
 pkgname=mate-power-manager
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel
- polkit"
+hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel polkit"
 makedepends="libcanberra-devel libgnome-keyring-devel libmate-panel-devel
- libnotify-devel upower-devel"
+ libnotify-devel upower-devel libsecret-devel"
 depends="dconf upower"
 short_desc="Power management tool for the MATE desktop"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-power-manager/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d24b9fce23b086817d5494f7e65e58f18367af6eb5d0d4ade45de5396e20d13a
+checksum=26b603ccf077366414a41e91ca6aa4c4c227a8e9fb6925a8ec5ca147c4e67b79

From 8c55649c6affe09ac8a9fb1b65e2c5536e0708e4 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:31:25 +0400
Subject: [PATCH 2125/4088] mate-screensaver: update to 1.26.0.

---
 srcpkgs/mate-screensaver/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mate-screensaver/template b/srcpkgs/mate-screensaver/template
index 46d34246fa35..252934fdf1d1 100644
--- a/srcpkgs/mate-screensaver/template
+++ b/srcpkgs/mate-screensaver/template
@@ -1,20 +1,21 @@
 # Template file for 'mate-screensaver'
 pkgname=mate-screensaver
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
-configure_args="--without-console-kit"
+configure_args="--without-console-kit --without-systemd --with-elogind"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="dbus-glib-devel libnotify-devel libXScrnSaver-devel
  libmatekbd-devel mate-menus-devel mate-desktop-devel pam-devel
 elogind-devel"
 depends="mate-desktop mate-session-manager"
 short_desc="Screensaver for MATE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-screensaver/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bc0925002fccb2de3b36cc37b16ad2becf994c61260dfc5b4930fcedc50fab46
+checksum=41514032206da2a62105ead90fdce95639d5ea234d1e67d533fd4c5b56feaf76
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}

From f21a448477fba3755641bcdb228325eaa4b0206a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:31:40 +0400
Subject: [PATCH 2126/4088] mate-sensors-applet: update to 1.26.0.

---
 srcpkgs/mate-sensors-applet/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-sensors-applet/template b/srcpkgs/mate-sensors-applet/template
index ba0971aeffd4..3ddf97ba9b23 100644
--- a/srcpkgs/mate-sensors-applet/template
+++ b/srcpkgs/mate-sensors-applet/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-sensors-applet'
 pkgname=mate-sensors-applet
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -9,8 +9,9 @@ makedepends="dbus-glib-devel libatasmart-devel libmate-panel-devel
  libnotify-devel libsensors-devel"
 depends="dconf"
 short_desc="Sensors applet for MATE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-sensors-applet/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=262c494b207e615656d8d8723946d11beb705fbf9f0166eb3dbb7a56877764d9
+checksum=4c437c3ff04488543e2cf0c4627fe265c48b4ad8f4946fd9de9845edc0c82968

From 377dc8be9cbf30d4e953879104dde05f08e3053d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:31:56 +0400
Subject: [PATCH 2127/4088] mate-session-manager: update to 1.26.0.

---
 srcpkgs/mate-session-manager/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-session-manager/template b/srcpkgs/mate-session-manager/template
index 7be98f824528..ad76047358f1 100644
--- a/srcpkgs/mate-session-manager/template
+++ b/srcpkgs/mate-session-manager/template
@@ -1,14 +1,15 @@
 # Template file for 'mate-session-manager'
 pkgname=mate-session-manager
-version=1.24.3
+version=1.26.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --with-elogind"
+configure_args="--disable-static --with-elogind --without-systemd"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel elogind-devel"
 makedepends="gtk+3-devel dbus-glib-devel libSM-devel libXtst-devel"
 short_desc="MATE Session Manager"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-session-manager/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90a0aec5b59b6287b4d2c4d452b0b6410f9d12490ca1f890e81ba2801bdab0a2
+checksum=5915a2f6583c0e5e58afb3abae3f4adbbe6a003c174a5b6e3d204b4e398a1816

From 0ae9c92d986c43bd03ef45d5d599bb44d0b5855b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:32:14 +0400
Subject: [PATCH 2128/4088] mate-settings-daemon: update to 1.26.0.

---
 srcpkgs/mate-settings-daemon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template
index 010361166854..b5db461e136b 100644
--- a/srcpkgs/mate-settings-daemon/template
+++ b/srcpkgs/mate-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-settings-daemon'
 pkgname=mate-settings-daemon
-version=1.24.2
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse"
@@ -13,8 +13,9 @@ short_desc="MATE Settings daemon (pulseaudio)"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-settings-daemon/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c25b4f8aba69b9a0597e8759f9ef23f12ac0d3153f3f5b5a6d4afd0733f3914
+checksum=b77aa017ff811a6fcae40bd45f18d8606eec87be21e3e6fa6d35c0fe14e66d41
 
 mate-settings-daemon-devel_package() {
 	depends="${sourcepkg}-${version}_${revision} dbus-glib-devel"

From 0cef08f29a861c80dde61a30edf3df7c34d36aa3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:32:29 +0400
Subject: [PATCH 2129/4088] mate-system-monitor: update to 1.26.0.

---
 srcpkgs/mate-system-monitor/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mate-system-monitor/template b/srcpkgs/mate-system-monitor/template
index ceada7658151..54c77a5e3914 100644
--- a/srcpkgs/mate-system-monitor/template
+++ b/srcpkgs/mate-system-monitor/template
@@ -1,15 +1,16 @@
 # Template file for 'mate-system-monitor'
 pkgname=mate-system-monitor
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
+configure_args="--disable-static --disable-schemas-compile"
 hostmakedepends="glib-devel intltool itstool pkg-config polkit"
-makedepends="dbus-glib-devel gtkmm-devel libgtop-devel librsvg-devel
- libwnck-devel"
+makedepends="dbus-glib-devel gtkmm-devel libgtop-devel librsvg-devel libwnck-devel"
 depends="dbus mate-icon-theme"
 short_desc="MATE system monitor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-system-monitor/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1fa384fae8be0384dbfa7bb32acdbda977745185e59570bd3869ea6e382559c4
+checksum=83472c3add79e52b2fb3c1bc55f33f968c71a2b90e2b62027ad688c1cecc338f

From 40f858f699f021550405f969ec3aee0ade168c6e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:32:44 +0400
Subject: [PATCH 2130/4088] mate-terminal: update to 1.26.0.

---
 srcpkgs/mate-terminal/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-terminal/template b/srcpkgs/mate-terminal/template
index c8bf685d82aa..5809ac48d0b9 100644
--- a/srcpkgs/mate-terminal/template
+++ b/srcpkgs/mate-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-terminal'
 pkgname=mate-terminal
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="glib-devel intltool itstool pkg-config"
@@ -10,5 +10,6 @@ short_desc="MATE Terminal Emulator"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-terminal/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=550d38f223d21ab12d39b00af6cd75f083d3790c38d53051537df2ac6a87be62
+checksum=7727e714c191c3c55e535e30931974e229ca5128e052b62ce74dcc18f7eaaf22

From bb31fc3546742fec9f02bada56c17109a315d5a9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:33:20 +0400
Subject: [PATCH 2131/4088] mate-themes: update to 3.22.22.

---
 srcpkgs/mate-themes/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mate-themes/template b/srcpkgs/mate-themes/template
index fc9edc93ff0b..145b272be28e 100644
--- a/srcpkgs/mate-themes/template
+++ b/srcpkgs/mate-themes/template
@@ -1,15 +1,15 @@
 # Template file for 'mate-themes'
 pkgname=mate-themes
-version=3.22.21
-revision=2
+version=3.22.22
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool icon-naming-utils"
 makedepends="gtk+-devel gtk+3-devel"
 depends="gtk2-engines gtk-engine-murrine librsvg mate-icon-theme"
 short_desc="Default themes for the MATE desktop"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
 changelog="https://raw.githubusercontent.com/mate-desktop/mate-themes/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/themes/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d668c578fd10d6e2a46932df1cb8852f77923193f0b88fb327e89d80f0162f14
+checksum=bd00affe5aec217656c0af21496a4c66fd5f6f3e9e93b42fc96b54771d6f99a1

From 8cd44e7810aaed2ace1b3e1933dc069fcd24495e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:33:39 +0400
Subject: [PATCH 2132/4088] mate-user-guide: update to 1.26.0.

---
 srcpkgs/mate-user-guide/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mate-user-guide/template b/srcpkgs/mate-user-guide/template
index a4b5664333b6..a0b4994c783f 100644
--- a/srcpkgs/mate-user-guide/template
+++ b/srcpkgs/mate-user-guide/template
@@ -1,12 +1,13 @@
 # Template file for 'mate-user-guide'
 pkgname=mate-user-guide
-version=1.24.0
-revision=2
+version=1.26.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool"
 short_desc="MATE User Guide"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GFDL-1.1-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-user-guide/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee344d5e8170cd4c366c3a8f98f941f066f12b079ae2d50af2bbf94890f2bd35
+checksum=0581d45053e9a1c16925c3154341b5b21140905a22b1bd3caa84619f9f05c2c0

From 4770ccd5cb8fddcff99565a68372e6998af4bddb Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:33:52 +0400
Subject: [PATCH 2133/4088] mate-utils: update to 1.26.0.

---
 .../mate-utils/patches/cross-strftime.patch   | 47 -------------------
 srcpkgs/mate-utils/template                   | 15 ++----
 2 files changed, 5 insertions(+), 57 deletions(-)
 delete mode 100644 srcpkgs/mate-utils/patches/cross-strftime.patch

diff --git a/srcpkgs/mate-utils/patches/cross-strftime.patch b/srcpkgs/mate-utils/patches/cross-strftime.patch
deleted file mode 100644
index 971af91c61ef..000000000000
--- a/srcpkgs/mate-utils/patches/cross-strftime.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.ac	2015-09-01 15:56:57.000000000 +0200
-+++ b/configure.ac	2015-10-23 15:09:25.486599085 +0200
-@@ -277,24 +277,32 @@ AS_IF([test "x$have_ipv6" = "xyes"],
-       ]
- )
- 
--
--dnl strftime extension checks
--AC_TRY_RUN([
-+dnl ***************************************
-+dnl *** Check for strftime() extensions ***
-+dnl ***************************************
-+AC_CACHE_CHECK([Define if strftime supports %E and %O modifiers], ac_cv_strftime_extensions,
-+  [AC_TRY_RUN([
-+    #include <string.h>
-   #include <time.h>
--  int main (void) {
--    char buf[100];
--    struct tm tm = {0};
--    tm.tm_year = 99;
--    if (strftime(buf, 100, "%EY", &tm) == 4 && strcmp (buf, "1999")==0)
-+    int
-+    main (int argc, char **argv)
-+    {
-+      struct tm tm;
-+      char      buffer[16];
-+      tm.tm_year = 81;
-+      if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
-       return 0;
-     return 1;
-   }
-   ],
--  [
--    AC_DEFINE([HAVE_STRFTIME_EXTENSION], [1],
--              [Define if strftime supports %E and %O modifiers.])
--  ]
-+  ac_cv_strftime_extensions=yes,
-+  ac_cv_strftime_extensions=no,
-+  [AC_MSG_ERROR([cross-compiling, preset ac_cv_strftime_extensions=yes/no])]
-+  )]
- )
-+if test x"$ac_cv_strftime_extensions" = x"yes"; then
-+  AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
-+fi
- 
- dnl mate-search-tool checks
- withval=""
diff --git a/srcpkgs/mate-utils/template b/srcpkgs/mate-utils/template
index 855db8054d4d..dcddebe79e33 100644
--- a/srcpkgs/mate-utils/template
+++ b/srcpkgs/mate-utils/template
@@ -1,25 +1,20 @@
 # Template file for 'mate-utils'
 pkgname=mate-utils
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile"
-hostmakedepends="automake libtool gettext-devel pkg-config which
- intltool itstool glib-devel mate-common librsvg-utils inkscape
- autoconf-archive"
+hostmakedepends="pkg-config intltool itstool glib-devel librsvg-utils inkscape"
 makedepends="gtk+3-devel libSM-devel zlib-devel libcanberra-devel
  libgtop-devel libmate-panel-devel udisks2-devel"
 depends="desktop-file-utils"
 short_desc="Common utilities for the MATE desktop"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mate-utils/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=219673047fe2a14eb9c8bc23a5fb7c99d45e7acad4c05b4bf59a3d244cb026ac
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=7ca56ab242e8efaa64f93ffb84f6e4bf8d4d0df01e20b3b6ef8956ce3192782e
 
 post_install() {
 	rm -r ${DESTDIR}/usr/include

From 1b69f3626e0d495c54f57efcce8165502d226aea Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:34:01 +0400
Subject: [PATCH 2134/4088] mozo: update to 1.26.0.

---
 srcpkgs/mozo/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template
index 9a2daf9294cb..1c578504c085 100644
--- a/srcpkgs/mozo/template
+++ b/srcpkgs/mozo/template
@@ -1,14 +1,15 @@
 # Template file for 'mozo'
 pkgname=mozo
-version=1.24.0
-revision=3
+version=1.26.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 makedepends="glib-devel mate-menus-devel python3-gobject-devel"
 depends="desktop-file-utils gtk+3 mate-menus python3-gobject"
 short_desc="MATE menu editing tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/mozo/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mozo-${version}.tar.xz"
-checksum=23ff04f98338f8aa35512666dab898daebb21faeceee55fc02b313a00e899e06
+checksum=4642cbf985fa0d72e205ad7f6abfb7d008e3117e2c5e331340f2bc6466c3ddc2

From 8165708e7d0a56040d2edf6e123da2c175e38931 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 13:34:18 +0400
Subject: [PATCH 2135/4088] pluma: update to 1.26.0.

---
 srcpkgs/pluma/template | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index 4a689f727b18..78c3a67494b6 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -1,29 +1,26 @@
 # Template file for 'pluma'
 pkgname=pluma
-version=1.24.1
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
 pycompile_dirs="usr/lib/pluma/plugins"
-hostmakedepends="autoconf-archive gobject-introspection mate-common
- automake libtool"
-makedepends="enchant2-devel gtksourceview-devel iso-codes libSM-devel
+hostmakedepends="gobject-introspection mate-common automake libtool"
+makedepends="enchant2-devel gtksourceview4-devel iso-codes libSM-devel
  libpeas-devel mate-desktop-devel"
 depends="desktop-file-utils iso-codes zenity mate-desktop"
 short_desc="Powerful text editor for MATE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
+changelog="https://raw.githubusercontent.com/mate-desktop/pluma/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2e251113afa1af63fb98f28f2b49aea874c5f654a33da3ad12994580882bece9
-python_version=2 #unverified
-
-pre_configure() {
-	autoreconf -fi
-}
+checksum=310644dae7393cf5d47928fd4fab5d120da4e683ecf4fc248fcf778145f08a53
+python_version=3
+make_check=no # needs gsettings-schemas and gvfs-mount
 
 pluma-devel_package() {
-	depends="${sourcepkg}-${version}_${revision} gtksourceview-devel libpeas-devel"
+	depends="${sourcepkg}-${version}_${revision} gtksourceview4-devel libpeas-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 16f50b58472b21d32c6b503707a95e5f801f7951 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 15:46:33 +0400
Subject: [PATCH 2136/4088] mate: update to 1.26.0.

---
 srcpkgs/mate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate/template b/srcpkgs/mate/template
index 791511d8e351..0b661ce6f8d7 100644
--- a/srcpkgs/mate/template
+++ b/srcpkgs/mate/template
@@ -1,6 +1,6 @@
 # Template file for 'mate'
 pkgname=mate
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=meta
 depends="
@@ -22,6 +22,6 @@ depends="
 	elogind
 	zenity"
 short_desc="MATE meta-package for Void Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.mate-desktop.org"

From ab164361f8e9a7861b8306acb0e57012dc805768 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 27 Aug 2021 15:46:49 +0400
Subject: [PATCH 2137/4088] mate-extra: update to 1.26.0.

---
 srcpkgs/mate-extra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-extra/template b/srcpkgs/mate-extra/template
index 1fa661577181..e4466d38f57d 100644
--- a/srcpkgs/mate-extra/template
+++ b/srcpkgs/mate-extra/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-extra'
 pkgname=mate-extra
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=meta
 depends="
@@ -22,6 +22,6 @@ depends="
 	caja-extensions>=${version}
 	yelp"
 short_desc="MATE extras meta-package for Void Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.mate-desktop.org"

From e18350941e07e0a09b00a65a7aada01456989e66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Oct 2021 13:26:05 +0200
Subject: [PATCH 2138/4088] gucci: update to 1.5.1.

---
 srcpkgs/gucci/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..5af3aba5ad09 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=c8dbd097a4451aae08b1d16824b7175f4d8def6f4e064d05c9a48ab9f466d1b2
 
 post_install() {
 	vlicense LICENSE

From b0d59aefa8fb1d0c804ea5ac62f6050d41aefb0a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Oct 2021 13:28:07 +0200
Subject: [PATCH 2139/4088] kubefwd: update to 1.22.0.

---
 srcpkgs/kubefwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 98545253c85e..734b9c732c88 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,6 +1,6 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
-version=1.21.0
+version=1.22.0
 revision=1
 build_style=go
 go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/txn2/kubefwd"
 distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
-checksum=cc7d8724d758c599946eb459379b1cffc2e72411489dc951788d687269a84778
+checksum=38a36dfe7182b4a9a4515d49c6dbeeceb101397cc5c11fbf720d2570cb0b86ef
 
 post_install() {
 	vlicense NOTICE

From 29052ce4fc2f5f55e9ab52d68009ad11fec17ee5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Oct 2021 13:29:56 +0200
Subject: [PATCH 2140/4088] perl-LWP: update to 6.58.

---
 srcpkgs/perl-LWP/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index 41c666055e4a..f1c5ad930cff 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.57
+version=6.58
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -11,10 +11,10 @@ hostmakedepends="
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 checkdepends="perl-Test-RequiresInternet perl-Test-Fatal perl-Test-Needs
- perl-Test-LeakTrace"
+ perl-Test-LeakTrace perl-HTML-Parser"
 short_desc="LWP - The World-Wide Web library for Perl (libwww-perl)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=30c242359cb808f3fe2b115fb90712410557f0786ad74844f9801fd719bc42f8
+checksum=f881f52775073a685cefd6aed4f8c53d0c17a808d4dc6e2231530426b997edbd

From 02d30108a892d0547df078459acaffc2d02cefbd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Oct 2021 13:32:20 +0200
Subject: [PATCH 2141/4088] perl-WWW-Mechanize: update to 2.06.

---
 srcpkgs/perl-WWW-Mechanize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 7124634e2fa4..6df7be5b4baf 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.05
+version=2.06
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=0c77284103e93d098fa8b277802b589cfd1df8c11a8968e5ecd377f863c21dd9
+checksum=d97cd31e35fd1ff7078d3f568b62e3fe3911843a64d3c2d078eebd3ff9b8b38d

From 620a917dcb6261352c04a1253021df74e718c9f9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Oct 2021 13:32:24 +0200
Subject: [PATCH 2142/4088] thinkfan: update to 1.3.0.

---
 srcpkgs/thinkfan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thinkfan/template b/srcpkgs/thinkfan/template
index 8e302e465bd5..768ba1fc8b79 100644
--- a/srcpkgs/thinkfan/template
+++ b/srcpkgs/thinkfan/template
@@ -1,6 +1,6 @@
 # Template file for 'thinkfan'
 pkgname=thinkfan
-version=1.2.2
+version=1.3.0
 revision=1
 build_style=cmake
 configure_args="-DUSE_ATASMART:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/vmatare/thinkfan"
 distfiles="https://github.com/vmatare/thinkfan/archive/${version}.tar.gz"
-checksum=e3988baffdbe75f8a3bfdec4ed3d731a35b04ec5dafe13a4acfead5e22eab197
+checksum=ffadd3e488726c852f389f49e504c43e893b2260bf570db9a98956c4f2926c7c
 
 do_install() {
 	vbin build/thinkfan

From 5f005278318bf3c3e2ec8db99e90164607efc190 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Oct 2021 13:33:35 +0200
Subject: [PATCH 2143/4088] libfido2: update to 1.9.0.

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 4a14c7a8d2fb..79bfde463235 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,6 +1,6 @@
 # Template file for 'libfido2'
 pkgname=libfido2
-version=1.8.0
+version=1.9.0
 revision=1
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/Yubico/libfido2"
 distfiles="https://github.com/Yubico/libfido2/archive/${version}.tar.gz"
-checksum=554291188f24ab595cb947f9d2b6ec40ce5afe39d9257c1e2cd0bdef8bf7fd1d
+checksum=ba39e3af3736d2dfc8ad3d1cb6e3be7eccc09588610a3b07c865d0ed3e58c2d2
 # udev rules used to be shipped by libu2f-host
 conf_files="/usr/lib/udev/rules.d/70-u2f.rules"
 conflicts="libu2f-host<=1.1.10_3"

From d6a722b8a1917a3d60c52fe7793a534188a81630 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Thu, 28 Oct 2021 21:24:17 +0200
Subject: [PATCH 2144/4088] stockfish: update to 14.1

---
 srcpkgs/stockfish/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 320b54527b0f..ab86e2e00d8d 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
 # Template file for 'stockfish'
 pkgname=stockfish
-version=14
+version=14.1
 revision=1
-_net_file=nn-3475407dc199.nnue
+_net_file=nn-13406b1dcbe0.nnue
 wrksrc="Stockfish-sf_${version}"
 build_wrksrc=src
 build_style=gnu-makefile
@@ -15,8 +15,8 @@ license="GPL-3.0-or-later"
 homepage="http://stockfishchess.org/"
 distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz
  https://tests.stockfishchess.org/api/nn/${_net_file}"
-checksum="6f35e3e684da87d27d3f29ec7281ac81468a5a86b4d99ac5c599addc984a766c
- 3475407dc19973ea44467678634cce023d620e419770c111cc8937fe6689ec87"
+checksum="11d71018af47ba047175f846be72d8d9878df698e9b5d708ab158cf530633600
+ 13406b1dcbe0a36dfc5e07da51d8db38b7a45d7da43078ec25a7624c2b83236f"
 skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"

From b17d16321e69024c49eb4cf9b87dbfc00680a788 Mon Sep 17 00:00:00 2001
From: Colin Reeder <colin@vpzom.click>
Date: Wed, 20 Oct 2021 21:57:17 -0600
Subject: [PATCH 2145/4088] python3-jellyfish: Update to 0.8.8

---
 srcpkgs/python3-jellyfish/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index c1b55e36e8ef..61a15e15e861 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.2
-revision=4
+version=0.8.8
+revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
-pycompile_module="jellyfish"
+make_check_target=build/lib.*/jellyfish/test.py
 hostmakedepends=" python3-setuptools"
 makedepends="python3-devel"
+checkdepends="python3-pytest"
 short_desc="Python3 library for approximate and phonetic matching of strings"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
+checksum=0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c
 
 post_install() {
 	vlicense LICENSE

From 1de91e827376e5ee9be949903ccd7bed30000f38 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 28 Oct 2021 00:56:25 -0400
Subject: [PATCH 2146/4088] mdbook-toc: update to 0.7.0

---
 srcpkgs/mdbook-toc/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-toc/template b/srcpkgs/mdbook-toc/template
index 6d3ba93f4e6a..152c6db0938b 100644
--- a/srcpkgs/mdbook-toc/template
+++ b/srcpkgs/mdbook-toc/template
@@ -1,14 +1,15 @@
 # Template file for 'mdbook-toc'
 pkgname=mdbook-toc
-version=0.5.1
+version=0.7.0
 revision=1
 build_style=cargo
 short_desc="Preprocessor for mdbook to add inline TOC support"
 maintainer="q66 <daniel@octaforge.org>"
 license="MPL-2.0"
 homepage="https://github.com/badboy/mdbook-toc"
+changelog="https://raw.githubusercontent.com/badboy/mdbook-toc/main/CHANGELOG.md"
 distfiles="https://github.com/badboy/${pkgname}/archive/${version}.tar.gz"
-checksum=f688eaf876a235bfc3644e5fc5c4a2601ac513c5861ca3fd5d42e4a9a93bbfc0
+checksum=2407220d701db86767465acf96b4356bc357fc5d0f6e3ad4f2e6758e98714f40
 
 post_install() {
 	vlicense LICENSE

From 8e52ce7513b3939152b899972829d8de85de2720 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 28 Oct 2021 19:49:52 -0500
Subject: [PATCH 2147/4088] Amass: update to 3.14.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 98d0b02afe0a..46783d6888b4 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.14.1
+version=3.14.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=03ab09258f82a81f49c7ba99988f23151b56ab481236a46a95c12c8eef0952fa
+checksum=18600a607b10fd672ad21b48e9c5f87b5b8a49a4a7e2cde520c246b499521278
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From 1defbba8f276bb7300ad0937a0fa308cceab1ad4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 28 Oct 2021 19:53:53 -0500
Subject: [PATCH 2148/4088] impacket: update to 0.9.24.

---
 srcpkgs/impacket/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/impacket/template b/srcpkgs/impacket/template
index 9e968e0a7975..008b4c5d4f25 100644
--- a/srcpkgs/impacket/template
+++ b/srcpkgs/impacket/template
@@ -1,7 +1,7 @@
 # Template file for 'impacket'
 pkgname=impacket
-version=0.9.23
-revision=2
+version=0.9.24
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-six python3-chardet python3-pyasn1
@@ -13,13 +13,12 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-1.1, MIT"
 homepage="https://www.secureauth.com/labs/open-source-tools/impacket/"
 distfiles="https://github.com/SecureAuthCorp/impacket/releases/download/impacket_${version//./_}/impacket-${version}.tar.gz"
-checksum=1c1be8a50cdbe3cffc566ba64f552b1b28bcc79b7a406b833956b49c56d77184
+checksum=18d557d387f4914fafa739813b9172bc3f8bd9c036e93bf589a8e0ebb7304bba
 make_check=extended
 
 post_install() {
 	vlicense LICENSE
 
-	rm ${DESTDIR}/usr/bin/A.py      \
-	   ${DESTDIR}/usr/bin/PoC.py    \
+	rm ${DESTDIR}/usr/bin/PoC.py    \
 	   ${DESTDIR}/usr/bin/PoC2.py
 }

From d80913dfa329b6ddd0eb04ac47ae03458c865ec1 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 28 Oct 2021 08:12:27 +0400
Subject: [PATCH 2149/4088] calibre: update to 5.30.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 8d55162c2ccb..1e9aed0bab5c 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.29.0
+version=5.30.0
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=f729871294c70d43373401a8792113cca44b2a024b458e1e1258ba37995b66e8
+checksum=8ef87f24ba4ca56d842252951690c96402f4ef6096b6187424f40e063bc60d15
 lib32disabled=yes
 nocross=yes
 

From 6a0c202a180dbc3affa3fd8bccca6137a47d2aec Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Thu, 28 Oct 2021 03:46:00 -0500
Subject: [PATCH 2150/4088] opera: update to 80.0.4170.72

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 7885c301f441..e71fb90b9313 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=79.0.4143.50
+version=80.0.4170.72
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=d7429be47cd28d8ff6ebf392f19bc20a6349a20b998cd14fbc91affa81ce98c8
+checksum=f6b9e132c9cd2f7343ffb5fae1edb80a08087bac90ddb53d5fb2e475f834177a
 repository="nonfree"
 nostrip=yes
 

From 33b099226b9bf28b1c298f4e6094a6983e2eb548 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 23 Oct 2021 01:49:58 -0400
Subject: [PATCH 2151/4088] gdown: update to 4.2.0

---
 srcpkgs/gdown/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gdown/template b/srcpkgs/gdown/template
index bc9cc3b8b69f..019647ef6a0f 100644
--- a/srcpkgs/gdown/template
+++ b/srcpkgs/gdown/template
@@ -1,18 +1,18 @@
 # Template file for 'gdown'
 pkgname=gdown
-version=3.13.0
-revision=2
+version=4.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="python3-filelock python3-requests python3-six python3-tqdm
- python3-pysocks"
+ python3-pysocks python3-BeautifulSoup4"
 checkdepends="${depends} python3-pytest"
 short_desc="Download a large file from Google Drive"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/wkentaro/gdown"
 distfiles="https://github.com/wkentaro/gdown/archive/v${version}.tar.gz"
-checksum=830d88d3ab4640ff2f0a34d51bda4badda64ed6df4eefd5b1a4823c96e574a19
+checksum=24d159c7f9448bc864fef2dcc3d77c6b7b805654c5b2cf61bb05722fdef50049
 make_check=no # doesn't create egg-info during build
 
 post_install() {

From b79835ecd7efa107cb41179cfda755bc38494fda Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 28 Oct 2021 09:49:39 +0200
Subject: [PATCH 2152/4088] kakoune: update to 2021.10.28.

---
 srcpkgs/kakoune/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index c402141c08a7..2e5955d2b293 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -1,7 +1,7 @@
 # Template file for 'kakoune'
 pkgname=kakoune
 reverts=20180409_1
-version=2021.08.28
+version=2021.10.28
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ maintainer="Jakub Skrzypnik <j.skrzypnik@openmailbox.org>"
 license="Unlicense"
 homepage="https://kakoune.org"
 distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
-checksum=6f6ed7dfd8c5723210dbd848708acf03af4b847016fd3ede96b2a89ad32276cb
+checksum=2f4c93871dc31f6281712281a7119928b1d6d6f300dded84b2d3ce0ab27f2126
 
 post_patch() {
 	vsed -i -e 's/-O3//' Makefile

From 8de870f402f492c04dab18d46f728be0183a9490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 26 Oct 2021 23:27:14 -0300
Subject: [PATCH 2153/4088] arb: update to 2.21.1.

---
 ...35a84a40acc1871cd84f1caf2ea47c11a18c.patch | 73 -------------------
 srcpkgs/arb/template                          |  5 +-
 2 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 srcpkgs/arb/patches/450435a84a40acc1871cd84f1caf2ea47c11a18c.patch

diff --git a/srcpkgs/arb/patches/450435a84a40acc1871cd84f1caf2ea47c11a18c.patch b/srcpkgs/arb/patches/450435a84a40acc1871cd84f1caf2ea47c11a18c.patch
deleted file mode 100644
index 179ba8887f32..000000000000
--- a/srcpkgs/arb/patches/450435a84a40acc1871cd84f1caf2ea47c11a18c.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 450435a84a40acc1871cd84f1caf2ea47c11a18c Mon Sep 17 00:00:00 2001
-From: fredrik <fredrik.johansson@gmail.com>
-Date: Tue, 28 Sep 2021 12:07:45 +0200
-Subject: [PATCH] fix (hopefully) spurious test failures for gamma_fmpq
-
----
- arb_hypgeom/gamma_fmpq.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/arb_hypgeom/gamma_fmpq.c b/arb_hypgeom/gamma_fmpq.c
-index 996a87e5..ee750d0d 100644
---- a/arb_hypgeom/gamma_fmpq.c
-+++ b/arb_hypgeom/gamma_fmpq.c
-@@ -529,22 +529,22 @@ arb_hypgeom_gamma_fmpq_outward(arb_t y, const fmpq_t x, slong prec)
- 
-     if (q == 1 || q == 2 || q == 3 || q == 4 || q == 6)
-     {
--        arb_hypgeom_gamma_small_frac(t, p, q, prec);
-+        arb_hypgeom_gamma_small_frac(t, p, q, prec + 4 * (m != 0));
-     }
-     else
-     {
--        arb_hypgeom_gamma_fmpq_hyp(t, a, prec);
-+        arb_hypgeom_gamma_fmpq_hyp(t, a, prec + 4 * (m != 0));
-     }
- 
-     /* argument reduction */
-     if (m >= 0)
-     {
--        arb_rising_fmpq_ui(u, a, m, prec);
-+        arb_rising_fmpq_ui(u, a, m, prec + 4);
-         arb_mul(y, t, u, prec);
-     }
-     else
-     {
--        arb_rising_fmpq_ui(u, x, -m, prec);
-+        arb_rising_fmpq_ui(u, x, -m, prec + 4);
-         arb_div(y, t, u, prec);
-     }
- 
-@@ -602,7 +602,7 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
-     }
- 
-     arb_set_fmpq(t, a, prec + 4);
--    success = arb_hypgeom_gamma_taylor(t, t, 0, prec);
-+    success = arb_hypgeom_gamma_taylor(t, t, 0, prec + 4);
- 
-     if (success)
-     {
-@@ -611,12 +611,12 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
- 
-         if (m >= 0)
-         {
--            arb_rising_fmpq_ui(u, a, m, prec);
-+            arb_rising_fmpq_ui(u, a, m, prec + 4);
-             arb_mul(y, t, u, prec);
-         }
-         else
-         {
--            arb_rising_fmpq_ui(u, x, -m, prec);
-+            arb_rising_fmpq_ui(u, x, -m, prec + 4);
-             arb_div(y, t, u, prec);
-         }
- 
-@@ -684,7 +684,7 @@ arb_hypgeom_gamma_fmpq(arb_t y, const fmpq_t x, slong prec)
-         wp = (slong) fmpz_bits(fmpq_numref(x)) - (slong) fmpz_bits(fmpq_denref(x));
-         wp = FLINT_MAX(wp, 0);
-         wp = FLINT_MIN(wp, 4 * prec);
--        wp += prec;
-+        wp += prec + 4;
- 
-         arb_set_fmpq(y, x, wp);
- 
diff --git a/srcpkgs/arb/template b/srcpkgs/arb/template
index 2c6981319352..fc99c3cebff6 100644
--- a/srcpkgs/arb/template
+++ b/srcpkgs/arb/template
@@ -1,6 +1,6 @@
 # Template file for 'arb'
 pkgname=arb
-version=2.21.0
+version=2.21.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-flint=/usr"
@@ -9,8 +9,9 @@ short_desc="C library for arbitrary-precision interval arithmetic"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://arblib.org"
+changelog="https://raw.githubusercontent.com/fredrik-johansson/arb/master/doc/source/history.rst"
 distfiles="https://github.com/fredrik-johansson/arb/archive/${version}.tar.gz"
-checksum=6493ebcfb1772458db4ca66da4c5536968484a3815cf75d2bb33c600b4471910
+checksum=aecc9f55eb35a00a2490e9a7536a0babf8ac86bb13d32a4a95e1216f9f5cbfa8
 
 CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
 

From 145a8101c8a87e0db14f20dfaa143e538aa6ea57 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 26 Oct 2021 17:19:33 +0200
Subject: [PATCH 2154/4088] aqbanking: update to 3.6.2.

---
 srcpkgs/aqbanking/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aqbanking/template b/srcpkgs/aqbanking/template
index ea55a80935d7..3722d7485a6b 100644
--- a/srcpkgs/aqbanking/template
+++ b/srcpkgs/aqbanking/template
@@ -1,6 +1,6 @@
 # Template file for 'aqbanking'
 pkgname=aqbanking
-version=6.3.0
+version=6.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config gwenhywfar tar"
@@ -9,8 +9,8 @@ short_desc="Library for online banking and financial applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only"
 homepage="http://www.aquamaniac.de/aqbanking"
-distfiles="https://www.aquamaniac.de/rdm/attachments/download/372/${pkgname}-${version}.tar.gz"
-checksum=a0e85da2072c927bc32cfd808caaccfdabe34725e75618b08d8049306d8355cc
+distfiles="https://www.aquamaniac.de/rdm/attachments/download/386/${pkgname}-${version}.tar.gz"
+checksum=a97ab42f7298cbb2617b2bda53ca51a2b0fe5f780bde098a39a5f4a3243e3418
 disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then

From 127f318d61587e668ba95f8abbbd7b6c022ffc29 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Tue, 26 Oct 2021 07:09:30 +0200
Subject: [PATCH 2155/4088] borgmatic: update to 1.5.20.

---
 srcpkgs/borgmatic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 10127a653e8a..523fbf23951c 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,7 +1,7 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
-version=1.5.18
-revision=2
+version=1.5.20
+revision=1
 build_style=python3-module
 # runs not yet installed self
 make_check_args="--deselect=tests/integration/commands/test_borgmatic.py"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://torsion.org/borgmatic/"
 changelog="https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/NEWS"
 distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz"
-checksum=757d54d73cdaf333210e24cb13e0e0b4de912d17222e4b383433ae929287fe9a
+checksum=0aa6705cd72c6bd8fec94ba9e5e13ba9e90e6671799af2f2f5cb91186b90b7e5
 
 post_install() {
 	# remove tests directory polluting site-packages

From 0aa4725420f6b369ab3fea0d4716597c2a43c45d Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 26 Oct 2021 06:46:36 +1100
Subject: [PATCH 2156/4088] MoarVM: update to 2021.10.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index cc0219528eb7..37caf79e2288 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2021.07
+version=2021.10
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -15,6 +15,6 @@ license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
 distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum=8437ceefa5c132d0cf8328b22604e26f0a2a54c0377538aa9ae4bdfcf66d63fe
+checksum=7f3487a70e8b77be0e4e2f12b14c49f6a01d0378e0940c86958c9016c495ad75
 nocross=yes
 shlib_provides="libmoar.so"

From e4642dc7b04aa3196531ccc6ddc17191a2e606da Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 26 Oct 2021 06:48:06 +1100
Subject: [PATCH 2157/4088] nqp: update to 2021.10.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 897293725b5c..cf27ec5c0ecd 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2021.07
+version=2021.10
 revision=1
 build_style=configure
 make_check_target=test
@@ -15,5 +15,5 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://github.com/Raku/nqp"
 distfiles="https://rakudo.org/dl/nqp/${pkgname}-${version}.tar.gz"
-checksum=dcaaf2a43ab3b752be6f4147a88abdc5b897e5ba85e536a0282bde8e4d363ea4
+checksum=48135bc1b3ce22c1c57ccef46531e7688eec83d6b905b502ffcefd6c23294b49
 nocross=yes

From 931912585f2d4e9088e1acc725f29232ab18676d Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 26 Oct 2021 06:49:58 +1100
Subject: [PATCH 2158/4088] rakudo: update to 2021.10.

---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 8896db418459..57066beaaa8b 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2021.07
+version=2021.10
 revision=1
 build_style=configure
 make_check_target=test
@@ -32,7 +32,7 @@ license="Artistic-2.0"
 homepage="https://rakudo.org"
 changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog"
 distfiles="https://rakudo.org/dl/rakudo/${pkgname}-${version}.tar.gz"
-checksum=178afe4dc8b2f32e155eb2f8482e1125409edfd8451c39d33a472047047fab52
+checksum=b174c7537328efb5e3f74245e79fa7159b70131b84c597916cf5a65c2aca24a1
 nocross=yes
 provides="raku-${version}_${revision}"
 

From 7456bd9c944d06824a7742d3dddc0a28787ecf57 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 24 Oct 2021 23:13:29 -0400
Subject: [PATCH 2159/4088] ncmpcpp: fix support for non-inode sockets

---
 srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ++++++++++++++++
 srcpkgs/ncmpcpp/template                   |  6 +++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch

diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
new file mode 100644
index 000000000000..6bf92146ea09
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/socket-inode.patch
@@ -0,0 +1,16 @@
+# Support sockets without a socket inode
+# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
+diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
+index ccdee31d..9a92e5df 100644
+--- a/src/mpdpp.cpp
++++ b/src/mpdpp.cpp
+@@ -147,7 +147,7 @@ unsigned Connection::Version() const
+ void Connection::SetHostname(const std::string &host)
+ {
+ 	size_t at = host.find("@");
+-	if (at != std::string::npos)
++	if (at != 0 && at != std::string::npos)
+ 	{
+ 		m_password = host.substr(0, at);
+ 		m_host = host.substr(at+1);
+
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..482d2154c0f7 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
  readline-devel taglib-devel"
 short_desc="Ncurses mpd client inspired by ncmpc"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://rybczak.net/ncmpcpp"
 distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
@@ -19,7 +19,7 @@ checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
 CXXFLAGS="-D_XOPEN_SOURCE=600"
 
 pre_configure() {
-	vsed -i '/^docdir/d' {,doc/}Makefile.in
+	vsed -e '/^docdir/d' -i {,doc/}Makefile.in
 }
 
 post_install() {

From d7c29c4f016b46facefd810c19fa9b803f4f3c54 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Tue, 26 Oct 2021 07:14:42 +0200
Subject: [PATCH 2160/4088] cgrps: update to 0.8.2.

---
 srcpkgs/cgrps/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index d0f9a17dc7e6..d16f28bfa7b4 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,6 +1,6 @@
 # Template file for 'cgrps'
 pkgname=cgrps
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
@@ -8,8 +8,9 @@ short_desc="Set of commands for checking cgroups"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k1LoW/cgrps"
+changelog="https://raw.githubusercontent.com/k1LoW/cgrps/master/CHANGELOG.md"
 distfiles="https://github.com/k1LoW/cgrps/archive/v${version}.tar.gz"
-checksum=381ab96fbfe98700112e0bddfaffde471ce08b838b0a91e489bd932c99c8ffdc
+checksum=e44901cbd1b2aa58fff84dffadf4196fc48e62e2b4cf180ee97f651ee0835618
 
 post_install() {
 	vlicense LICENSE

From b887a5763ffb76860c9ccd159c2d0fee5f3ab2fa Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 28 Oct 2021 08:21:15 +0400
Subject: [PATCH 2161/4088] python3-regex: update to 2021.10.23.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 802eb45c4ff2..c7b70acbaa73 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.10.8
+version=2021.10.23
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=26895d7c9bbda5c52b3635ce5991caa90fbb1ddfac9c9ff1c7ce505e2282fb2a
+checksum=f3f9a91d3cc5e5b0ddf1043c0ae5fa4852f18a1c0050318baf5fc7930ecc1f9c
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 692fba7b3928ae4cf893ad58808a750bb1b9910c Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Thu, 28 Oct 2021 08:37:46 +0200
Subject: [PATCH 2162/4088] bmake: update to 20211020.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 56e931e68705..27f400fbd816 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20211001
+version=20211020
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=cad7ef0fb41138050f8932af3a7ade16f7265b3f37ff6356703e0b1ad6542739
+checksum=9c1f979a16a407bc099f28240d0e52b44845b3ac64b9950bb5b0847cc32e3032
 python_version=3
 
 do_configure() {

From c111054d817137b25d9e0604afa50ef769449835 Mon Sep 17 00:00:00 2001
From: Vilhelm Bergsoe <vilhelmbergsoe@gmail.com>
Date: Mon, 11 Oct 2021 18:05:44 +0200
Subject: [PATCH 2163/4088] go: update to 1.17.2

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9d6294c91fd2..9aa551c74c53 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.17.1
+version=1.17.2
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=49dc08339770acd5613312db8c141eaf61779995577b89d93b541ef83067e5b1
+checksum=2255eb3e4e824dd7d5fcdc2e7f84534371c186312e546fb1086a34c17752f431
 nostrip=yes
 noverifyrdeps=yes
 

From af0d4412e8a5521f72c7f0236666b696ba20295b Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 8 Oct 2021 18:14:47 -0500
Subject: [PATCH 2164/4088] gns3-server: update to 2.2.26.

---
 srcpkgs/gns3-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 040a420f23f1..679b9ae3fb91 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.25
-revision=2
+version=2.2.26
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl
@@ -13,7 +13,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=43faa7d57126e813dae3bf702c11e520148d9c3c234e4f1a7c23872e931c6251
+checksum=6d89d91f74d2891de3c7ebec93880af662f835580d2f18a797794eb8e2350bc0
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From cdd49bc4ead5f74ba1c2b3aeea5ed846a8fd2a8c Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 8 Oct 2021 18:14:51 -0500
Subject: [PATCH 2165/4088] gns3-gui: update to 2.2.26.

---
 srcpkgs/gns3-gui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 269b0c64beac..e122e2c7ecd3 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.25
-revision=2
+version=2.2.26
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
@@ -13,7 +13,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=a49bfe7756403e8fddfe19382780c95ae28e1eab7e63b48140655212f91612ba
+checksum=b97084e1024dfc23255fa0bdd1023a9b145ba610322a8363cd15d9153837333d
 
 post_install() {
 	vinstall gns3-gui.desktop 644 usr/share/applications

From 8a70aee24d61572e52246ade71d7cb37009d382d Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 4 Oct 2021 19:12:02 +0300
Subject: [PATCH 2166/4088] sof-firmware: update to 1.9.

split sof-tools as a separate package, since the package was previously
using pre-built binaries for x86_64. It can't be built for archs other
than x86_64 glibc yet, but that's not a problem, since the package was
only usable there.
---
 srcpkgs/sof-firmware/template | 12 ++----------
 srcpkgs/sof-tools             |  1 -
 srcpkgs/sof-tools/template    | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/sof-tools
 create mode 100644 srcpkgs/sof-tools/template

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 65a4f4f0317f..5e866cb448f7 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=1.8
+version=1.9
 revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
@@ -11,7 +11,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
 distfiles="https://github.com/thesofproject/sof-bin/archive/refs/tags/v${version}.tar.gz"
-checksum=1d4ac18db8d2ec3046fdb56b4155f1c14d69644743b7c0324ba9b02f4308ab22
+checksum=633bff2cc1490146de66796e52e06c7a608591a328c0bfc6f3fc30114640803a
 
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof
@@ -21,11 +21,3 @@ do_install() {
 
 	vlicense LICENCE.NXP
 }
-
-sof-tools_package() {
-	pkg_install() {
-		vbin "v${version}.x/tools-v${version}/sof-ctl"
-		vbin "v${version}.x/tools-v${version}/sof-logger"
-		vbin "v${version}.x/tools-v${version}/sof-probes"
-	}
-}
diff --git a/srcpkgs/sof-tools b/srcpkgs/sof-tools
deleted file mode 120000
index 438798503c9c..000000000000
--- a/srcpkgs/sof-tools
+++ /dev/null
@@ -1 +0,0 @@
-sof-firmware
\ No newline at end of file
diff --git a/srcpkgs/sof-tools/template b/srcpkgs/sof-tools/template
new file mode 100644
index 000000000000..e10c8afe210f
--- /dev/null
+++ b/srcpkgs/sof-tools/template
@@ -0,0 +1,21 @@
+# Template file for 'sof-tools'
+pkgname=sof-tools
+version=1.9
+revision=1
+# https://github.com/thesofproject/sof/issues/4902
+archs="x86_64"
+wrksrc="sof-${version}"
+build_wrksrc="tools"
+build_style=cmake
+hostmakedepends="alsa-utils m4"
+makedepends="alsa-lib-devel"
+short_desc="Sound Open Firmware and topology binaries - development tools"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://thesofproject.github.io/latest/index.html"
+distfiles="https://github.com/thesofproject/sof/archive/refs/tags/v${version}.tar.gz"
+checksum=29b83a63720ace3a9173073f12c4dfae5ece841773483cb025623506cd02eccb
+
+post_install() {
+	vlicense ../LICENCE
+}

From ce90a13aec5307db634dc0ff60710c8bc5c9fa63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:32:03 -0300
Subject: [PATCH 2167/4088] kicad: update to 5.1.11.

Update homepage, see
https://www.kicad.org/blog/2021/10/Avoid-links-to-former-kicad-domain/
---
 srcpkgs/kicad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 41c5ce3c48d6..ba9934bf70c2 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad'
 pkgname=kicad
-version=5.1.10
+version=5.1.11
 revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
@@ -18,9 +18,9 @@ depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
-homepage="http://kicad-pcb.org"
+homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
-checksum=296341f30ada2c7f4a1c54720eab425835a93349527d4bf08f73f280d19695ed
+checksum=32751a375bb117d51c07dde29cf3eea01cd9ff77336740e2728cb5f36bb48374
 python_version=3
 
 build_options="spice occt"

From 50340deae7a52d3705fbc249be2e6175f9321159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:32:01 -0300
Subject: [PATCH 2168/4088] kicad-packages3D: update to 5.1.11.

---
 srcpkgs/kicad-packages3D/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-packages3D/template b/srcpkgs/kicad-packages3D/template
index 32ca47b5ac0d..3bd516bb4859 100644
--- a/srcpkgs/kicad-packages3D/template
+++ b/srcpkgs/kicad-packages3D/template
@@ -1,12 +1,12 @@
 # Template file for 'kicad-packages3D'
 pkgname=kicad-packages3D
-version=5.1.10
+version=5.1.11
 revision=1
 build_style=cmake
 depends="kicad"
 short_desc="Kicad 3D model libraries"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
-homepage="http://kicad-pcb.org"
+homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=b79f8de319a463d12972253a125ece118a8000533061d443d5730e1498822bff
+checksum=5ef77e1762fa8e8042f061dd2baa2bcb8934fe80c154f8b7e3c7a8cf474927d9

From 3c40e3c6140d249b3ba41cd09368d499a4456425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:32:01 -0300
Subject: [PATCH 2169/4088] kicad-footprints: update to 5.1.11.

---
 srcpkgs/kicad-footprints/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template
index 38655e0d5ff7..53ee1dad0c2e 100644
--- a/srcpkgs/kicad-footprints/template
+++ b/srcpkgs/kicad-footprints/template
@@ -1,15 +1,15 @@
 # Template file for 'kicad-footprints'
 pkgname=kicad-footprints
-version=5.1.10
+version=5.1.11
 revision=1
 build_style=cmake
 depends="kicad"
 short_desc="Kicad footprint libraries"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
-homepage="http://kicad-pcb.org"
+homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=65de50a9669e5eb0f2e4eed433802432eee2bd98df1e898905a7dc117cdb3050
+checksum=320cae2d830cfb4ff50f187f36c9e7c3c1565fbd6ea5b064e98ec44891ea8b9e
 
 post_install() {
 	# otherwise KiCad will complain about a missing library when launched

From ac42dd51e6fe017eb78ce9db221828343971651b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:32:02 -0300
Subject: [PATCH 2170/4088] kicad-templates: update to 5.1.11.

---
 srcpkgs/kicad-templates/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-templates/template b/srcpkgs/kicad-templates/template
index 8c680089bd98..7cfe95f73be5 100644
--- a/srcpkgs/kicad-templates/template
+++ b/srcpkgs/kicad-templates/template
@@ -1,12 +1,12 @@
 # Template file for 'kicad-templates'
 pkgname=kicad-templates
-version=5.1.10
+version=5.1.11
 revision=1
 build_style=cmake
 depends="kicad"
 short_desc="Kicad templates"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
-homepage="http://kicad-pcb.org"
+homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=f2c44d6dc69fc3c7db05f57c5caf290721e0bba3fe686e4e3bc2765e3f314668
+checksum=66272a39f624f5efa494b6bde2c10f3553167dbae5f52ca14a786bfc002b7961

From 9dd64a200e437ef6d245f4776057d3a63ff86a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:32:03 -0300
Subject: [PATCH 2171/4088] kicad-library: update to 5.1.11.

---
 srcpkgs/kicad-library/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-library/template b/srcpkgs/kicad-library/template
index 847613c34704..b8bb109976e7 100644
--- a/srcpkgs/kicad-library/template
+++ b/srcpkgs/kicad-library/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-library'
 pkgname=kicad-library
-version=5.1.10
+version=5.1.11
 revision=1
 build_style=meta
 depends="kicad-footprints>=${version} kicad-packages3D>=${version}
@@ -8,4 +8,4 @@ depends="kicad-footprints>=${version} kicad-packages3D>=${version}
 short_desc="Kicad libraries"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
-homepage="http://kicad-pcb.org"
+homepage="http://kicad.org"

From 579728892382b666dbc12ee5fcbacb2de3cc43f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:32:04 -0300
Subject: [PATCH 2172/4088] kicad-symbols: update to 5.1.11.

---
 srcpkgs/kicad-symbols/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-symbols/template b/srcpkgs/kicad-symbols/template
index afb67fcb7805..a5c8b3ebcb59 100644
--- a/srcpkgs/kicad-symbols/template
+++ b/srcpkgs/kicad-symbols/template
@@ -1,12 +1,12 @@
 # Template file for 'kicad-symbols'
 pkgname=kicad-symbols
-version=5.1.10
+version=5.1.11
 revision=1
 build_style=cmake
 depends="kicad"
 short_desc="Kicad symbol libraries"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
-homepage="http://kicad-pcb.org"
+homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=5e80c8420a563c76c884b2771792ce7ee69efbe67d11d9b025eeb16b75aee45e
+checksum=f0877ff30e3f17be1ba17f33895a45998b4c08d62a48c51a25626ce7e269b098

From ce27efc4e9dad926dbbc3a4a9a85d90fb9642613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:32:05 -0300
Subject: [PATCH 2173/4088] kicad-doc: update to 5.1.11.

---
 srcpkgs/kicad-doc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-doc/template b/srcpkgs/kicad-doc/template
index 0c1ac8eaf8e7..398cb7c5c0f2 100644
--- a/srcpkgs/kicad-doc/template
+++ b/srcpkgs/kicad-doc/template
@@ -1,13 +1,13 @@
 # Template file for 'kicad-doc'
 pkgname=kicad-doc
-version=5.1.10
+version=5.1.11
 revision=1
 short_desc="KiCad documentation"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-3.0"
-homepage="http://kicad-pcb.org"
+homepage="http://kicad.org"
 distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz"
-checksum=73d986b7a9d5d777e4bf9bc7594e43568e067cd33466940957b5a513d9affd03
+checksum=3ce13d43c29e9eab502575b765a9be077e4d478b6e9d829c01739a7575a83512
 
 do_install() {
 	vmkdir usr/

From 355b2416ff3bd7656c1ddfecd3d2c1bbe58e044b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:32:05 -0300
Subject: [PATCH 2174/4088] kicad-i18n: update to 5.1.11.

---
 srcpkgs/kicad-i18n/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template
index 828c31afd4ab..67d31370545f 100644
--- a/srcpkgs/kicad-i18n/template
+++ b/srcpkgs/kicad-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-i18n'
 pkgname=kicad-i18n
-version=5.1.10
+version=5.1.11
 revision=1
 _commit=0ad3d7e469e31c8868ad83f90e22a9c18f16aa1f
 wrksrc="${pkgname}-${version}-${_commit}"
@@ -10,6 +10,6 @@ depends="kicad"
 short_desc="KiCad localization files"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
-homepage="http://kicad-pcb.org"
+homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=07053ec2fbef9307583a423afe8c7c47ed5ee0f8189ee37fc1b47e2f1e566671
+checksum=2cbde9705f945be3b9796d981aea0dbc70a3f24796c9156e337b8014868be4e9

From 9540aae3f284e467e7b419cc6270a60ffb271ab3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 15 Oct 2021 08:10:43 +0400
Subject: [PATCH 2175/4088] fribidi: update to 1.0.11.

---
 srcpkgs/fribidi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index 1bd1bb01a0db..48f1bbfd36b4 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -1,6 +1,6 @@
 # Template file for 'fribidi'
 pkgname=fribidi
-version=1.0.10
+version=1.0.11
 revision=1
 build_style=gnu-configure
 configure_args="--disable-docs"
@@ -9,8 +9,9 @@ short_desc="Free Implementation of the Unicode Bidirectional Algorithm"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fribidi/fribidi/"
+changelog="https://raw.githubusercontent.com/fribidi/fribidi/master/NEWS"
 distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz"
-checksum=3ebb19c4184ed6dc324d2e291d7465bc6108a20be019f053f33228e07e879c4f
+checksum=0e6d631c184e1012fb3ae86e80adabf26e46b4ffee2332e679eb308edd337398
 disable_parallel_build=yes
 
 pre_configure() {

From c24d7b2570fc275aac3672d4d7ff7fd6444155e2 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Tue, 19 Oct 2021 00:15:59 -0500
Subject: [PATCH 2176/4088] file: update to 5.41

Closes: #33631 [via git-merge-pr]
---
 srcpkgs/file/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index a3213b20ecc4..a7e080f143ba 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,7 +1,7 @@
 # Template file for 'file'
 pkgname=file
-version=5.40
-revision=3
+version=5.41
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--enable-static $(vopt_enable libseccomp)"
@@ -9,9 +9,9 @@ makedepends="zlib-devel $(vopt_if libseccomp libseccomp-devel)"
 short_desc="File type identification utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://www.darwinsys.com/file/"
+homepage="https://www.darwinsys.com/file/"
 distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
-checksum=167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
+checksum=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
 
 build_options="libseccomp"
 

From 915df7dd231951d6c9a4354d5243ca79ea9b3152 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Thu, 28 Oct 2021 22:59:53 -0400
Subject: [PATCH 2177/4088] lighttpd: update to 1.4.61

---
 srcpkgs/lighttpd/patches/020-decls.patch | 34 ------------------------
 srcpkgs/lighttpd/template                |  4 +--
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/lighttpd/patches/020-decls.patch

diff --git a/srcpkgs/lighttpd/patches/020-decls.patch b/srcpkgs/lighttpd/patches/020-decls.patch
deleted file mode 100644
index c1d15cfb8737..000000000000
--- a/srcpkgs/lighttpd/patches/020-decls.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cf4dfbe15ef8ead3a7eda974af7d804d447f00db Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Mon, 4 Oct 2021 09:51:22 -0400
-Subject: [PATCH] [core] define __BEGIN_DECLS, __END_DECLS if needed
-
----
- src/first.h | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/src/first.h
-+++ b/src/first.h
-@@ -39,6 +39,22 @@
- #include <sys/types.h>
- #include <stddef.h>
- 
-+#ifndef __BEGIN_DECLS
-+#ifdef __cplusplus
-+#define __BEGIN_DECLS extern "C" {
-+#else
-+#define __BEGIN_DECLS
-+#endif
-+#endif
-+
-+#ifndef __END_DECLS
-+#ifdef __cplusplus
-+#define __END_DECLS }
-+#else
-+#define __END_DECLS
-+#endif
-+#endif
-+
- #if defined HAVE_STDINT_H
- # include <stdint.h>
- #elif defined HAVE_INTTYPES_H
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 18e5fced85a3..d0ebf6677418 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.60
+version=1.4.61
 revision=1
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=4bb1dd859e541a3131e5be101557d2e1195b4129d3a849a3a6fbd21fe1c946f0
+checksum=43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

From bc5e41fb5a6a4bc1f347ce52dc45a0638ff9470e Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Thu, 14 Oct 2021 14:08:20 +1000
Subject: [PATCH 2178/4088] terraform: update to 1.0.8

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 9db2110ab99e..b23f18007919 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76c343637517df13abe5e25ad55057b3c2a85604591d37cf5b29685083a0de43
+checksum=b12daf73d366e11fdceec78479613703e123712bb06abd8a2006931a667d5459

From 9db479b5a3151a13e791270a56567e227aa2f79e Mon Sep 17 00:00:00 2001
From: Vilhelm Bergsoe <vilhelmbergsoe@gmail.com>
Date: Tue, 12 Oct 2021 19:05:30 +0200
Subject: [PATCH 2179/4088] vault: update to 1.8.4

---
 srcpkgs/vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 9d946c7c396e..4796d0d95c01 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,6 +1,6 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.2
+version=1.8.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=ead7e85a64d31a8e69ca9932f1c53cdc46ed813d9532a8a7a7f0d187ea4f01f3
+checksum=ff7fd9a1b33d19e3cb4743acd0139004e360bbffc04fa8e9598129530fc7118f
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"

From 31dab9e2863a96c808d9d228b2cfecdd3e234678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 29 Oct 2021 06:55:45 +0200
Subject: [PATCH 2180/4088] exiftool: update to 12.34.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index c36916024f4d..00700e58fc8d 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.33
+version=12.34
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=8af7f07064b6c494c01ffa131c34a3ed312f409a6e1a9fedc83eda5ff99009ff
+checksum=85679f6293ae3032c7141fce164ea4bf68b2dd65b0e148219b290557981596cd

From 5b5ba34e7b1e24ad60fbd4df9a4cadaa80f4fa47 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 29 Oct 2021 08:40:19 +0400
Subject: [PATCH 2181/4088] mate-themes: update to 3.22.23.

---
 srcpkgs/mate-themes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-themes/template b/srcpkgs/mate-themes/template
index 145b272be28e..748337dbd7c0 100644
--- a/srcpkgs/mate-themes/template
+++ b/srcpkgs/mate-themes/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-themes'
 pkgname=mate-themes
-version=3.22.22
+version=3.22.23
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool icon-naming-utils"
@@ -12,4 +12,4 @@ license="LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
 changelog="https://raw.githubusercontent.com/mate-desktop/mate-themes/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/themes/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd00affe5aec217656c0af21496a4c66fd5f6f3e9e93b42fc96b54771d6f99a1
+checksum=61e5ad626c9841f5763c908f1769139b2a812687b98f6b330afee4da18fb6fab

From 74f437c5916583adab3a34406e30e28d83066222 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 29 Oct 2021 08:21:53 +0400
Subject: [PATCH 2182/4088] mate-panel: update to 1.26.1.

---
 srcpkgs/mate-panel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template
index c11e37f27ad5..73a61658514c 100644
--- a/srcpkgs/mate-panel/template
+++ b/srcpkgs/mate-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-panel'
 pkgname=mate-panel
-version=1.26.0
+version=1.26.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 changelog="https://raw.githubusercontent.com/mate-desktop/mate-panel/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=092e1ed2177b3a13cfb7df19667b06083009210e48294c18c8a68b9b3c47ea64
+checksum=683038c483456e5068f5bb20c3d565936700c9898005c7149ee7aa44e5cc110d
 
 build_options="gir"
 build_options_default="gir"

From b82f16152c900579a23297cc16331790a3d463fb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 29 Oct 2021 09:50:25 +0200
Subject: [PATCH 2183/4088] terragrunt: update to 0.35.5.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 43309afcd0eb..3188caf25b6e 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.32.4
+version=0.35.5
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=aff8bbdf1636e22b7e4ab04c4409d399208b8640b224f6e49d16344f37150eb2
+checksum=b6c221311a2092b61f281e448d6e0ce7e953c3e2cb0deab646bf4f68884f30d7
 
 post_install() {
 	vlicense LICENSE.txt

From 2644084cebdfd4a57e7d1698a1a3b4cd96a41b5a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 29 Oct 2021 09:52:08 +0200
Subject: [PATCH 2184/4088] packer: update to 1.7.8.

---
 srcpkgs/packer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index f3e4da0cf3d5..058a396d66f5 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.7.6
+version=1.7.8
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=2e414c4c7ae930f3d2851de39f31f159eb1b073401956a6856bd89d592664b50
+checksum=7f4f3eab48f7e5b153772c079379589d208fd911a155431cf0d7d0f309418af2
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From b581b1f84f0bbc0251bac24542b3c722d68f789e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 29 Oct 2021 09:55:21 +0200
Subject: [PATCH 2185/4088] python-b2sdk: update to 1.13.0.

---
 srcpkgs/python-b2sdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 1274f7051157..8bdbfd86f04d 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,8 +1,8 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.12.0
-revision=2
+version=1.13.0
+revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-pip"
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=3ec2264ae2b421563d130a4b2a53f96454ba03b8f68893ad520fc651c413251d
+checksum=43d07ce5cf9685acc3797b0c4764b4688777db12d8f0102e6118f8403db5c759
 
 post_install() {
 	vlicense LICENSE

From e5b7bc4b56d7a09d3843800aeaa18e7bafb9cac9 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 29 Oct 2021 09:55:58 +0200
Subject: [PATCH 2186/4088] motion: update to 4.4.0.

---
 srcpkgs/motion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template
index a9423d2b0f60..14ebb0b32118 100644
--- a/srcpkgs/motion/template
+++ b/srcpkgs/motion/template
@@ -1,6 +1,6 @@
 # Template file for 'motion'
 pkgname=motion
-version=4.3.2
+version=4.4.0
 revision=1
 wrksrc="motion-release-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://motion-project.github.io/"
 distfiles="https://github.com/Motion-Project/motion/archive/release-${version}.tar.gz"
-checksum=dafa4264b2d8e4778f8be5871f09b6c0ec710d5a836182c583469c18db944d70
+checksum=3fb0d14fff8a8a143716223b5d2d55c0f52b11badf13a2e485b98bae3cf1b572
 
 pre_configure() {
 	autoreconf -fi

From f58bd82f990ca1d3ec1a4c8cc1db70a3f7547a53 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 29 Oct 2021 09:56:56 +0200
Subject: [PATCH 2187/4088] git-cola: update to 3.11.0.

---
 srcpkgs/git-cola/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index 29a7e26276e6..777788276c95 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.10.1
-revision=2
+version=3.11.0
+revision=1
 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=1d7a9be54e66fcaa49585cda3ec89b6b2448f6e38c6f41047e55ecaff2d809d3
+checksum=5f14ab41508ee9c8756097d6fa81f471fce58089b178317cc25d948d42620994

From e87f66a860d40c573fb3ce150b21d0128b714be2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 29 Oct 2021 09:57:10 +0200
Subject: [PATCH 2188/4088] yoshimi: update to 2.1.1.1.

---
 srcpkgs/yoshimi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 582c55440b30..1af9222d41ae 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=2.1.0
+version=2.1.1.1
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=0ba966c2e608712c21e2bdcb395227e93d35bea07a80b3f9ed01a37b9154f4df
+checksum=62336821d8817fe98f11f16807cf22a0bedf1d2bee550ffe30c1c818c93096c6
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;

From 1dca98f85fe325bd3c16f63f8be084baaa78721f Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 10 Oct 2021 12:53:49 -0300
Subject: [PATCH 2189/4088] inetutils: update to 2.2.

---
 srcpkgs/inetutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index ced4ac1166cd..e19293fa7ab0 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -1,6 +1,6 @@
 # Template file for 'inetutils'
 pkgname=inetutils
-version=2.0
+version=2.2
 revision=1
 build_style=gnu-configure
 configure_args="--without-wrap --with-pam"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/inetutils"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=e573d566e55393940099862e7f8994164a0ed12f5a86c3345380842bdc124722
+checksum=d547f69172df73afef691a0f7886280fd781acea28def4ff4b4b212086a89d80
 
 subpackages="inetutils-dnsdomainname inetutils-ftp inetutils-hostname
  inetutils-ifconfig inetutils-inetd inetutils-ping inetutils-rexec

From 784e78d6547ae5e4fbc601994180594c5bf3fa2d Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 25 Sep 2021 09:54:48 +0000
Subject: [PATCH 2190/4088] ethtool: update to 5.14.

---
 srcpkgs/ethtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index e9d8c365320f..66add241d5e2 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=5.12
+version=5.14
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org/pub/software/network/ethtool/"
 distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07
+checksum=bb13db91915cacd7a492b65b65df07a67e4b974ddbeaf76205b1945a23d27686

From 6b8904d61b54a7a00e05371478a83953e6d23356 Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Tue, 26 Oct 2021 16:15:22 +0200
Subject: [PATCH 2191/4088] rdfind: update to 1.5.0.

---
 srcpkgs/rdfind/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rdfind/template b/srcpkgs/rdfind/template
index 53a34e68dedd..4cee9ae73f3a 100644
--- a/srcpkgs/rdfind/template
+++ b/srcpkgs/rdfind/template
@@ -1,7 +1,7 @@
 # Template file for 'rdfind'
 pkgname=rdfind
-version=1.4.1
-revision=3
+version=1.5.0
+revision=1
 build_style=gnu-configure
 makedepends="nettle-devel"
 checkdepends="tar which"
@@ -9,8 +9,9 @@ short_desc="Program that finds duplicate files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://rdfind.pauldreik.se"
+changelog="https://raw.githubusercontent.com/pauldreik/rdfind/main/ChangeLog"
 distfiles="https://rdfind.pauldreik.se/rdfind-${version}.tar.gz"
-checksum=30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c
+checksum=4150ed1256f7b12b928c65113c485761552b9496c433778aac3f9afc3e767080
 
 pre_configure() {
 	# skip tests that don't work as expected in the chroot

From f1b8a7e8459ac4c70726132ef5a0cc9fb3ab785e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Oct 2021 18:40:35 +0200
Subject: [PATCH 2192/4088] mathcomp: update to 1.13.0.

---
 srcpkgs/mathcomp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 68ce0bb70b22..987999e61563 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
-version=1.12.0
-revision=6
+version=1.13.0
+revision=1
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CECILL-B"
 homepage="https://github.com/math-comp/math-comp"
 distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz"
-checksum=a57b79a280e7e8527bf0d8710c1f65cde00032746b52b87be1ab12e6213c9783
+checksum=4334e915736f96032e1d4d502e70537047220af1a1c7a6740f770e45601bdab0
 
 do_install() {
 	make install DESTDIR="${DESTDIR}" 'COQLIB:=$(shell coqtop -where)/'

From 3b48b02b075922ebcbb3f7fe76a1af8e14d9b873 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 31 Aug 2021 19:53:58 +0200
Subject: [PATCH 2193/4088] racket: update to 8.2.

Closes #25748.
Closes #25349.
---
 srcpkgs/racket/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 1fee0a65e39d..f5dea34e4dcd 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,19 +1,19 @@
 # Template file for 'racket'
 pkgname=racket
-version=7.9
+version=8.2
 revision=1
 build_wrksrc=src
 build_style=gnu-configure
 configure_args="--enable-useprefix --disable-docs"
 hostmakedepends="gsfonts"
-makedepends="sqlite-devel gtk+-devel"
-depends="gtk+"
+makedepends="sqlite-devel gtk+3-devel"
+depends="gtk+3 libssl1.1"
 short_desc="Multi-paradigm programming language in the Lisp-Scheme family"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3.0-only, MIT"
 homepage="http://racket-lang.org/"
 distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=5578942066a9405fdbcad9522d08685356693f4ddd5dbe92b5273557a112b73e
+checksum=a0f3cf72938e7ae0f4f3eab70360812a2ec4e40efe327f1b449feb447b4f7482
 nostrip=yes
 nocross=yes
 

From 99edfe05c975639738fad45cb239bd3d3d63428a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Oct 2021 09:44:32 -0400
Subject: [PATCH 2194/4088] common/environment/setup: properly handle symlinks
 in vsv

---
 common/environment/setup/install.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..5f0571de14ae 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -20,6 +20,7 @@ done
 _vsv() {
 	local service="$1"
 	local LN_OPTS="-s"
+	local svdir="${PKGDESTDIR}/etc/sv/${service}"
 
 	if [ $# -lt 1 ]; then
 		msg_red "$pkgver: vsv: 1 argument expected: <service>\n"
@@ -32,14 +33,18 @@ _vsv() {
 
 	vmkdir etc/sv
 	vcopy "${FILESDIR}/$service" etc/sv
-	chmod 755 ${PKGDESTDIR}/etc/sv/${service}/run
-	if [ -r ${PKGDESTDIR}/etc/sv/${service}/finish ]; then
-		chmod 755 ${PKGDESTDIR}/etc/sv/${service}/finish
+	if [ ! -L $svdir/run ]; then
+		chmod 755 $svdir/run
 	fi
-	ln ${LN_OPTS} /run/runit/supervise.${service} ${PKGDESTDIR}/etc/sv/${service}/supervise
-	if [ -r ${PKGDESTDIR}/etc/sv/${service}/log/run ]; then
-		chmod 755 ${PKGDESTDIR}/etc/sv/${service}/log/run
-		ln ${LN_OPTS} /run/runit/supervise.${service}-log ${PKGDESTDIR}/etc/sv/${service}/log/supervise
+	if [ -e $svdir/finish ] && [ ! -L $svdir/finish ]; then
+		chmod 755 $svdir/finish
+	fi
+	ln ${LN_OPTS} /run/runit/supervise.${service} $svdir/supervise
+	if [ -d $svdir/log ]; then
+		ln ${LN_OPTS} /run/runit/supervise.${service}-log $svdir/log/supervise
+		if [ -e $svdir/log/run ] && [ ! -L $svdir/log/run ]; then
+			chmod 755 ${PKGDESTDIR}/etc/sv/${service}/log/run
+		fi
 	fi
 }
 

From a8bd58428bbd0dceae54818a584937314ad43586 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:09 +0200
Subject: [PATCH 2195/4088] bluez: rebuild to fix vsv symlinks.

---
 srcpkgs/bluez/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 25adca4ace8f..f6788a81ec46 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,7 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
 version=5.62
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated

From 93786119aaf495e4f3292848164d1a09654cbedb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:09 +0200
Subject: [PATCH 2196/4088] caddy: rebuild to fix vsv symlinks.

---
 srcpkgs/caddy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 3ace9a1870b3..fc679e26edf1 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.4.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"

From 7aeb53a5210be89809c6ddf5b9bfae43ac6c6e58 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:09 +0200
Subject: [PATCH 2197/4088] dhcp: rebuild to fix vsv symlinks.

---
 srcpkgs/dhcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template
index 2db18dcc60b0..c95d2391664c 100644
--- a/srcpkgs/dhcp/template
+++ b/srcpkgs/dhcp/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcp'
 pkgname=dhcp
 version=4.4.2P1
-revision=2
+revision=3
 wrksrc="dhcp-${version/P/-P}"
 build_style=gnu-configure
 hostmakedepends="perl tar automake libtool"

From 4030a3e33f92b2eb5d0d6ff482dffddaeaf7531f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:09 +0200
Subject: [PATCH 2198/4088] go-ipfs: rebuild to fix vsv symlinks.

---
 srcpkgs/go-ipfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index e67b59649a48..a38fb43b84b7 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"

From 620a09b8bab2e46a7446c90a517f7326f3582ed9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:10 +0200
Subject: [PATCH 2199/4088] lldpd: rebuild to fix vsv symlinks.

---
 srcpkgs/lldpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index aa63aae2c8c4..bb103044a0c2 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lldpd'
 pkgname=lldpd
 version=1.0.11
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-privsep-chroot=/var/empty"
 hostmakedepends="pkg-config"

From 7ef185f9463454d6d1bf1cf5bb2a98a8113c0adc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:10 +0200
Subject: [PATCH 2200/4088] minidlna: rebuild to fix vsv symlinks.

---
 srcpkgs/minidlna/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template
index b112fb56efcc..da681f604300 100644
--- a/srcpkgs/minidlna/template
+++ b/srcpkgs/minidlna/template
@@ -1,7 +1,7 @@
 # Template file for 'minidlna'
 pkgname=minidlna
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 81046ba40c75b5e6a5161b890784e6be19bb328a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:10 +0200
Subject: [PATCH 2201/4088] synapse: rebuild to fix vsv symlinks.

---
 srcpkgs/synapse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index ca626b475adc..4dd2de2caf7f 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
 # Template file for 'synapse'
 pkgname=synapse
 version=1.45.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson

From fedda9bee61873b30a30df7213a9460c3f71242a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:10 +0200
Subject: [PATCH 2202/4088] vnstat: rebuild to fix vsv symlinks.

---
 srcpkgs/vnstat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vnstat/template b/srcpkgs/vnstat/template
index 73c5ae382168..d005ceedff76 100644
--- a/srcpkgs/vnstat/template
+++ b/srcpkgs/vnstat/template
@@ -1,7 +1,7 @@
 # Template file for 'vnstat'
 pkgname=vnstat
 version=2.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="gd-devel sqlite-devel"

From 473798d1bf2469c50daba91b0f8e03f7e12bba69 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:10 +0200
Subject: [PATCH 2203/4088] yggdrasil: rebuild to fix vsv symlinks.

---
 srcpkgs/yggdrasil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 6e756e9d5239..4a6b2936bc5f 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.0
-revision=1
+revision=2
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go

From b55960c32431457d66d995c01322fa6bbd130936 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:10 +0200
Subject: [PATCH 2204/4088] znc: rebuild to fix vsv symlinks.

---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index dcb788e647dc..1e60d3683eb6 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="
  --enable-python

From c685dc299c3b7bcc3c998db5331ce119919d6814 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:44:10 +0200
Subject: [PATCH 2205/4088] moby: rebuild to fix vsv symlinks.

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 9f23fabe2ab4..bf9a8f2ff51a 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -1,7 +1,7 @@
 # Template file for 'moby'
 pkgname=moby
 version=20.10.9
-revision=1
+revision=2
 _libnetwork_commit=64b7a4574d1426139437d20e81c0b6d391130ec8
 create_wrksrc=yes
 build_style=go

From 0f6c57fcb55a5e6006f6fbd4bb80e7b2740d071f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 29 Oct 2021 00:43:58 -0400
Subject: [PATCH 2206/4088] watchexec: add update file

---
 srcpkgs/watchexec/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/watchexec/update

diff --git a/srcpkgs/watchexec/update b/srcpkgs/watchexec/update
new file mode 100644
index 000000000000..cb9bfa5ea5da
--- /dev/null
+++ b/srcpkgs/watchexec/update
@@ -0,0 +1 @@
+pattern="cli-v\K[0-9.]+(?=.tar.gz)"

From 4ffa0f766602243448d9dca01ddcf0640965bd14 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Tue, 19 Oct 2021 21:37:01 +0300
Subject: [PATCH 2207/4088] tree: change distfiles to more universal variant.

Previous source is unreachable from some locations, see
https://check-host.net/check-report/50cff9fk55d
---
 srcpkgs/tree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template
index 91df6c7bde9d..d7642490f19e 100644
--- a/srcpkgs/tree/template
+++ b/srcpkgs/tree/template
@@ -7,7 +7,7 @@ short_desc="Resursive directory listing program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://mama.indstate.edu/users/ice/tree"
-distfiles="http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz"
+distfiles="http://deb.debian.org/debian/pool/main/t/tree/tree_${version}.orig.tar.gz"
 checksum=715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2
 
 do_install() {

From 1ce3f4c98a0c91adb1d72083390f4ab8e5e3bffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Wed, 13 Oct 2021 10:08:33 +0200
Subject: [PATCH 2208/4088] run-mailcap: update to 3.68

---
 srcpkgs/run-mailcap/patches/tempfile.patch | 16 ----------------
 srcpkgs/run-mailcap/template               | 12 ++++++------
 srcpkgs/run-mailcap/update                 |  2 +-
 3 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/run-mailcap/patches/tempfile.patch

diff --git a/srcpkgs/run-mailcap/patches/tempfile.patch b/srcpkgs/run-mailcap/patches/tempfile.patch
deleted file mode 100644
index 435074a43dd2..000000000000
--- a/srcpkgs/run-mailcap/patches/tempfile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Replace unknown "tempfile" tool with "mktemp" from coreutils
-
---- a/run-mailcap	2017-02-21 20:26:27.367144678 +0100
-+++ b/run-mailcap	2017-02-21 20:25:51.576143081 +0100
-@@ -141,9 +141,9 @@
- #   $tmpfile = POSIX::tmpnam($name);
- #   unlink($tmpfile);
- 
--    $cmd  = "tempfile --mode=600";
--    $cmd .= " --prefix $head" if $head;
-+    $cmd  = "mktemp";
-     $cmd .= " --suffix $tail" if $tail;
-+    $cmd .= " $head" if $head;
- 
-     $tmpfile = `$cmd`;
-     chomp($tmpfile);
diff --git a/srcpkgs/run-mailcap/template b/srcpkgs/run-mailcap/template
index 8eb80e3b58ed..aef16fa059a5 100644
--- a/srcpkgs/run-mailcap/template
+++ b/srcpkgs/run-mailcap/template
@@ -1,15 +1,15 @@
 # Template file for 'run-mailcap'
 pkgname=run-mailcap
-version=3.64
-revision=2
-wrksrc="mime-support-${version}ubuntu1"
+version=3.68
+revision=1
+wrksrc="mailcap-${version}ubuntu1"
 depends="perl"
 short_desc="Execute programs via entries in the mailcap file"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:ad-hoc, custom:Bellcore"
-homepage="http://packages.ubuntu.com/disco/mime-support"
-distfiles="${UBUNTU_SITE}/main/m/mime-support/mime-support_${version}ubuntu1.tar.xz"
-checksum=5007d2ebc25935bfca6d4bdac0efdfc089a38c1be49d19f0422559f666e4f2c4
+homepage="https://packages.ubuntu.com/hirsute/mailcap"
+distfiles="${UBUNTU_SITE}/main/m/mailcap/mailcap_${version}ubuntu1.tar.xz"
+checksum=d5567fef2d81ecdc6b98f7a5a052375cbff000b2255567abe261c0b8371444f0
 
 do_install() {
 	local _aliases="see edit compose print"
diff --git a/srcpkgs/run-mailcap/update b/srcpkgs/run-mailcap/update
index 2e0c92d172bf..9533db4bca88 100644
--- a/srcpkgs/run-mailcap/update
+++ b/srcpkgs/run-mailcap/update
@@ -1,2 +1,2 @@
 version="${version}ubuntu1"
-pkgname="mime-support"
+pkgname="mailcap"

From 1fcedcca8206f40b5cc2993a42dfb8fdfb5bc0d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 7 Oct 2021 10:17:35 -0300
Subject: [PATCH 2209/4088] isl: remove bootstrap=yes

---
 srcpkgs/isl/template | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index 6d4e18b18874..c842587f7b7d 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -2,7 +2,6 @@
 pkgname=isl
 version=0.24
 revision=2
-bootstrap=yes
 build_style=gnu-configure
 makedepends="gmp-devel"
 short_desc="Integer Set Library"
@@ -12,11 +11,6 @@ homepage="https://libisl.sourceforge.io/"
 distfiles="${SOURCEFORGE_SITE}/libisl/isl-${version}.tar.bz2"
 checksum=fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0
 
-if [ -z "$CHROOT_READY" ]; then
-	CFLAGS="-I${XBPS_MASTERDIR}/usr/include"
-	LDFLAGS="-L${XBPS_MASTERDIR}/usr/lib"
-fi
-
 post_install() {
 	vlicense LICENSE
 	# Remove gdb python files.

From f9d3c3f49c3562b9a876643d296532d5361b290a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 7 Oct 2021 10:18:09 -0300
Subject: [PATCH 2210/4088] isl15: remove bootstrap=yes

---
 srcpkgs/isl15/template | 1 -
 srcpkgs/isl15/update   | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/isl15/update

diff --git a/srcpkgs/isl15/template b/srcpkgs/isl15/template
index e8225eb6d491..0ef1192a2195 100644
--- a/srcpkgs/isl15/template
+++ b/srcpkgs/isl15/template
@@ -3,7 +3,6 @@ pkgname=isl15
 version=0.19
 revision=3
 wrksrc="isl-${version}"
-bootstrap=yes
 build_style=gnu-configure
 makedepends="gmp-devel"
 short_desc="Integer Set Library"
diff --git a/srcpkgs/isl15/update b/srcpkgs/isl15/update
new file mode 100644
index 000000000000..ef4dc3a4607f
--- /dev/null
+++ b/srcpkgs/isl15/update
@@ -0,0 +1,3 @@
+pkgname=isl
+# ad-hoc updates so ignore everything
+ignore=*

From fbaa5911709369ea33f8307dca10de7acea74056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 8 Oct 2021 09:08:10 -0300
Subject: [PATCH 2211/4088] cloog: remove bootstrap=yes.

---
 srcpkgs/cloog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
index 18a84032fdd4..c7b19891f15b 100644
--- a/srcpkgs/cloog/template
+++ b/srcpkgs/cloog/template
@@ -2,7 +2,6 @@
 pkgname=cloog
 version=0.20.0
 revision=1
-bootstrap=yes
 build_style=gnu-configure
 configure_args="--with-isl=system --with-gmp=system --with-gmp-exec-prefix=${XBPS_CROSS_BASE}"
 makedepends="isl-devel"

From 60f20a16d6317a4ff94f3669334e578a86027561 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Thu, 28 Oct 2021 04:51:43 +0300
Subject: [PATCH 2212/4088] vim: update to 8.2.3565

---
 srcpkgs/vim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 3802307b156c..39edc3d83b6d 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.2.3459
-revision=2
+version=8.2.3565
+revision=1
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)
@@ -13,7 +13,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=ec05d2d438c3487c4c8aaa626195f9e3ca0903659b91824f44ee299a3af850fe
+checksum=ac2264c45684218232ec49a6ae8b88b9a68312b664b93b811868d24c39d8dc11
 python_version=3
 
 build_options="x11 gtk3 huge"

From 5fefcd81ec059e5e7f934edad43e2f400cf50142 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 29 Oct 2021 15:40:20 +0200
Subject: [PATCH 2213/4088] cppcheck: update to 2.6.1.

---
 srcpkgs/cppcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 1a9d83b52e68..0f0501f09db6 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.5
+version=2.6.1
 revision=1
 build_style=gnu-makefile
 make_build_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 changelog="https://sourceforge.net/p/cppcheck/news/"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=dc27154d799935c96903dcc46653c526c6f4148a6912b77d3a50cb35dabd82e1
+checksum=41700db44b349428d5602356b32183b7776380e7a5b0b82a2f2764fadadb015e
 
 post_install() {
 	vman cppcheck.1

From 32c2464c5fc783d941c28f53430ca73d5205d088 Mon Sep 17 00:00:00 2001
From: malice <derpmalicious@protonmail.com>
Date: Fri, 29 Oct 2021 16:22:45 +0300
Subject: [PATCH 2214/4088] overpass-otf: update to 3.0.5

---
 srcpkgs/overpass-otf/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/overpass-otf/template b/srcpkgs/overpass-otf/template
index 2bdb74580d8a..eac25d841595 100644
--- a/srcpkgs/overpass-otf/template
+++ b/srcpkgs/overpass-otf/template
@@ -1,15 +1,15 @@
 # Template file for 'overpass-otf'
 pkgname=overpass-otf
-version=3.0.4
-revision=2
+version=3.0.5
+revision=1
 wrksrc="Overpass-${version}"
 depends="font-util xbps-triggers"
 short_desc="Open source font family inspired by Highway Gothic"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1, LGPL-2.1-only"
 homepage="http://overpassfont.org"
-distfiles="https://github.com/RedHatBrand/Overpass/archive/${version}.tar.gz"
-checksum=07600d6745f5199ad210c7f39e934dcd9716b54615e44ccf1f830001a0da3597
+distfiles="https://github.com/RedHatOfficial/Overpass/archive/refs/tags/v${version}.tar.gz"
+checksum=beb7528f1e9adf3decf841f02510a3752820561a06842f9097d9f2565fe41f34
 font_dirs="/usr/share/fonts/OTF"
 
 do_install() {

From 92a851f0ff496030f1a8b39d021c506b418e5d83 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Wed, 27 Oct 2021 01:38:15 -0300
Subject: [PATCH 2215/4088] oil: update to 0.9.3

Update template
---
 srcpkgs/oil/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 09b496a6d3b1..e2e129d55b7a 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,17 +1,17 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.9.0
+version=0.9.3
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
 hostmakedepends="$(vopt_if readline readline-devel)"
 makedepends="$hostmakedepends"
 short_desc="Oil, a new unix shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=c64e22a3665756ea54ea60aa983f7893501a13c2a4d1c7f73c8c76f17ea03636
+checksum=62f36072f69f3378e03b79d8d5255c1d136094ec11410db4f16ee82f1660efda
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From b9f9fa9a269774402b9273c1d3612fa98bef1dfd Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 29 Oct 2021 08:54:31 +0400
Subject: [PATCH 2216/4088] nghttp2: update to 1.46.0.

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index da8b226cfa01..9b2afe9d7ea6 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,6 +1,6 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
-version=1.45.1
+version=1.46.0
 revision=1
 build_style=gnu-configure
 # build system errors out if python isn't available
@@ -14,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://nghttp2.org"
 distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
-checksum=abdc4addccadbc7d89abe27c4d6427d78e57d139f69c1f45749227393c68bf79
+checksum=1a68cc4a5732afb735baf50aaac3cb3a6771e49f744bd5db6c49ab5042f12a43
 python_version=3
 
 post_install() {

From 69412515d976492a16b1e27e391bf7f27246b097 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 27 Oct 2021 16:10:10 -0400
Subject: [PATCH 2217/4088] New package: hunspell-en_CA-2020.12.07

- Taken from the same source as the en_US one
---
 srcpkgs/hunspell-en_CA/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/hunspell-en_CA/template

diff --git a/srcpkgs/hunspell-en_CA/template b/srcpkgs/hunspell-en_CA/template
new file mode 100644
index 000000000000..65d7926b2603
--- /dev/null
+++ b/srcpkgs/hunspell-en_CA/template
@@ -0,0 +1,18 @@
+# Template file for 'hunspell-en_CA'
+pkgname=hunspell-en_CA
+version=2020.12.07
+revision=1
+create_wrksrc=yes
+hostmakedepends="unzip"
+short_desc="Canadian English en_CA dictionary for hunspell"
+maintainer="0x5c <dev@0x5c.io>"
+license="custom:SCOWL"
+homepage="http://wordlist.aspell.net/dicts"
+distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip"
+checksum=ff6b91e4ed768348c61ae7c326e848059810fa43a5d601df6b3f45ad9c0ef5bf
+
+do_install() {
+	vinstall en_CA.aff 644 /usr/share/hunspell
+	vinstall en_CA.dic 644 /usr/share/hunspell
+	vlicense README_en_CA.txt SCOWL
+}

From f751640c10de95853d305ddaf88ad19d016636a1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 29 Oct 2021 20:18:29 +0200
Subject: [PATCH 2218/4088] linux5.4: update to 5.4.156.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 06efdae03094..349a62af67dc 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.155
+version=5.4.156
 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=cc0c0f902748d251cb22d0e69e3b8d260c447eb0072ef853da15da6cce775038
+checksum=06fe73e4623fcf1b3c0d0e1983d8286a2ff5b8fffbcb2163f4c01696a1c377fe
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 3ba4d089e2b9d3a0fc8cc131b83dbcb9ed4a9ac3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 29 Oct 2021 20:22:07 +0200
Subject: [PATCH 2219/4088] linux4.19: update to 4.19.214.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index de0d1afffda7..c79dac80d3d3 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.213
+version=4.19.214
 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=38f28c1cd6db0b54ee37a14fd17db651fe68704d08f95e141b14d32b872f4e98
+checksum=ffe1df2f3e63a7d5f727b28ea2d6ba4a8085db45624873213b7ac6fec8b50844
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 53eea83fef809bd7af01ad17bd863d6f42103bbe Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Fri, 29 Oct 2021 16:23:47 +0200
Subject: [PATCH 2220/4088] ART: update to 1.10.1.

---
 srcpkgs/ART/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
index d84f8c8aa9af..31370020a225 100644
--- a/srcpkgs/ART/template
+++ b/srcpkgs/ART/template
@@ -1,6 +1,6 @@
 # Template file for 'ART'
 pkgname=ART
-version=1.9.3
+version=1.10.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agriggio/art/wiki/Home"
 distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
+checksum=e20b73de6be55bbb5924d1bc194ecd7f0bf26d581bd9b8b7d8a1af70ea85483e

From 161f59e7408c97f6229c135bb5a6581d6806ffe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 26 Oct 2021 20:32:34 +0200
Subject: [PATCH 2221/4088] common/lint-commits: catch non-conventional subject

---
 common/scripts/lint-commits | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index 785bf0ef1d0d..65f584f5f84e 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -38,6 +38,7 @@ do
 	(NF > 2) && (length > 80) { print C ": long line: " $0; exit 1 }
 	!subject {
 		if (length > 50) { print C ": subject is a bit long" }
+		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print C ": subject does not follow CONTRIBUTING.md guildelines" }
 		# Below check is too noisy?
 		# if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) {
 		# 	print C ": not new package/update/removal?"

From 5d8fe4f86e4ecab1c05031dfb7c30cdd6cd0310a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 15:40:46 -0400
Subject: [PATCH 2222/4088] starfighter: update to 2.4.

---
 srcpkgs/starfighter/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/starfighter/template b/srcpkgs/starfighter/template
index 0b13c8578649..265314882ae8 100644
--- a/srcpkgs/starfighter/template
+++ b/srcpkgs/starfighter/template
@@ -1,21 +1,20 @@
 # Template file for 'starfighter'
 pkgname=starfighter
-version=2.0.0.2
-revision=2
-_version="${version%.*.*}"
+version=2.4
+revision=1
 build_style=gnu-configure
 configure_args="exec_prefix=/usr"
-hostmakedepends="pkg-config automake"
-makedepends="SDL2_image-devel SDL2_mixer-devel"
+hostmakedepends="pkg-config automake gettext python3"
+makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel pango-devel"
 depends="desktop-file-utils"
 short_desc="Side-scrolling shoot 'em up space game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://pr-starfighter.github.io"
 distfiles="https://github.com/pr-starfighter/starfighter/archive/v${version}.tar.gz"
-checksum=100562f2e12530ff4e360898ec5aace7f2c99806a9cba68d02466e82f8c1ae83
+checksum=d0757da7657253316053acf37dabf8e54607420d66a4d7cc2a9fc0d4b4d54074
 replaces="starfighter-data>=0"
 
 pre_configure() {
-	autoreconf -fi
+	./autogen.sh
 }

From f503cfde20d8274d70c017329f09e6ef18080076 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Sun, 17 Oct 2021 20:03:24 +0200
Subject: [PATCH 2223/4088] luarocks: update to 3.7.0.

---
 srcpkgs/luarocks-lua53/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/luarocks-lua53/template b/srcpkgs/luarocks-lua53/template
index 05f94d1acb54..9ab25a87f5ec 100644
--- a/srcpkgs/luarocks-lua53/template
+++ b/srcpkgs/luarocks-lua53/template
@@ -1,6 +1,6 @@
 # Template file for 'luarocks-lua53'
 pkgname=luarocks-lua53
-version=3.5.0
+version=3.7.0
 revision=1
 wrksrc=luarocks-${version}
 build_style=configure
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://luarocks.org/"
 distfiles="https://luarocks.org/releases/luarocks-${version}.tar.gz"
-checksum=701d0cc0c7e97cc2cf2c2f4068fce45e52a8854f5dc6c9e49e2014202eec9a4f
+checksum=9255d97fee95cec5b54fc6ac718b11bf5029e45bed7873e053314919cd448551
 alternatives="
  luarocks:luarocks:/usr/bin/luarocks-5.3
  luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.3"

From 0d72d7df95ad1cb75be9a1962c337033d417a524 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 Oct 2021 22:28:04 +0200
Subject: [PATCH 2224/4088] Rocket.Chat-Desktop: update to 3.5.7.

---
 srcpkgs/Rocket.Chat-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index 0297835d4446..4af2672dc7a8 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.5.6
+version=3.5.7
 revision=1
 _electron_ver=13
 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=e123c3d3bf70972f58c050a381471f3acec0b0b224a8b35900db073233024ccc
+checksum=0b7fc8b711bcabee8b4c6871ee56245e8e16e0f327fd3503720ae67c2ef044fe
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 3f32c19093c5f4a499361dd2f5caa345e63c9287 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 Oct 2021 22:27:54 +0200
Subject: [PATCH 2225/4088] android-tools: update to 31.0.3.

---
 srcpkgs/android-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 214c3002145f..d2bc1b59fdbe 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=31.0.2
-revision=2
+version=31.0.3
+revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf pkg-config"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="http://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=61b3bf6c240cb0b4d0ccfef696c55986e06657843627df950fdcf6881af0f8d4
+checksum=d7d2d945b6e1a7ba0c7d0b68a6d21ada6914155bf3ca02ff06c9db628ae6b029
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From b5ece188557c41afbc2bd07bb5ca8b7b3f5781fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:33:54 +0200
Subject: [PATCH 2226/4088] bluedevil: update to 5.23.2.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 57947bd524ec..138106077b14 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2a3f42ee03d342673ac5ab4f91fd858f5d0003b798257d6cb7304c79c40eb4bb
+checksum=cb161132ea7290d37f2267fc00ca2a11e259eaf6ced1f63761dfd45d52430f72
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From e45a6e97ed5a5e8d75d6ff150a3aed8fd9a79a40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:33:56 +0200
Subject: [PATCH 2227/4088] breeze-gtk: update to 5.23.2.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index ce4918174377..713c3491215e 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50667357732aced49eec270e875546bf56a4e3a945d575c2d95a946aa055d287
+checksum=91156d7e5fa1afaa088f4c462eb9b8c7e04dabaf4cbaa226e93ef8facc17daab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 66c2078270c9e04c707d12b580dd57b568687fe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:07 +0200
Subject: [PATCH 2228/4088] breeze: update to 5.23.2.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 590391710055..8e382b55d480 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ac11dc5f9347d870cbe33f2452bbc738e92e9d3dfc2dc8c2f5c0896476181481
+checksum=4b0f10cd78d7136a33c9209f00cdbabbb7cd4ca614d5cacc99265dc7190756ac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 0849f045b7acdb643aee2b37b45f7dec515475fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:09 +0200
Subject: [PATCH 2229/4088] kactivitymanagerd: update to 5.23.2.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 1d021ff9618c..635e3dbbfb14 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eabc518b1476f17257c6f42c986611604903aa9efc42d35fd9d3fd15839fea09
+checksum=b0897976f800398d1d30a741c05aae5b126b59b201528d674e33fda938af8bf8

From 545b308c7e965baeffcbb18b53d7b15e9cd67d40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:11 +0200
Subject: [PATCH 2230/4088] kde-cli-tools: update to 5.23.2.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 36d980ff6e80..c7aa43f8bbd8 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da1a08c54b3e085916c5157e1339ccb397e41dbfd68ce3334591e0ddbed0a7e2
+checksum=87f290593bd7e8b003ea5812ba5f73bc2153e4a42b3400a041ffd6f14ebaf0fe
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From f903177c5936526943d2fd06de8281b61b675b72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:12 +0200
Subject: [PATCH 2231/4088] kde-gtk-config5: update to 5.23.2.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index bb1b0f47bd99..e8ffd4b8bfa2 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.23.1
+version=5.23.2
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=7dd978c591892052e79c19190fde98cca8a6e57da5a4bf72253262c36c36573c
+checksum=a609b498cd1715243d909826c41229c9b09783af1412d3754b5cd8f62da69c2f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 60c4a823b497ccf15114fd7a995a3fbbd1ee6ed0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:14 +0200
Subject: [PATCH 2232/4088] kdecoration: update to 5.23.2.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 4e77671eb171..382d69495443 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1587aeab3743cb426318d4639e53b81c6227d114fc96b082b897cde6a2b0c327
+checksum=d328bb66614b953cd6b7db66d40352b18a932f0a79cf8cf10c875a276d7e665c
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 1177a8e2f67546c3ae1f85f99e18a43bdc3b0dd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:15 +0200
Subject: [PATCH 2233/4088] kdeplasma-addons5: update to 5.23.2.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 20d038f8c366..cf6ee3b9e91b 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.23.1
+version=5.23.2
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=84ee5a39458f767cb0f1304bcffa556e99119b7d6ae7556b0c310c2284ccd988
+checksum=e6c4e223cea82b42eff96a17cbcabaac764c8d3c80c31d7c35587081eb840b4b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From b18e6f2b2cb59956d8db517080a82ec905707f67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:17 +0200
Subject: [PATCH 2234/4088] kgamma5: update to 5.23.2.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 2a7917237030..a3f1336319be 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cf756d0ad3ae1803830372a2b1ce7c9e23533bd7aa4aa0ddc1a1d8fe60c3a585
+checksum=66898131de21dd498141996ef6b765a302f5b7c4cac1a7efccbcae6eb3611799
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From 6cddf88d8cbddfaa006d07b293c75efa9c52974c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:19 +0200
Subject: [PATCH 2235/4088] khotkeys: update to 5.23.2.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 75764b01232c..2699a209a078 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dae80968b6d2310b6eaad2e0786adb7a9047d4e9fe8fa5bf71586796f9bbe84f
+checksum=2b26a5fb9161a00854fe98688209b507e81b10c78c493274f8a524c60cb9a2dd
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 4f5f2307a31db0bccf12cf4b1025bf0f2f282dfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:20 +0200
Subject: [PATCH 2236/4088] kinfocenter: update to 5.23.2.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 0e806b6f1327..a8d63b79e34a 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e12f892612a4be07945b85df90463f7e0c36d24159393d4f60279aa97605c904
+checksum=d5db1219657322130d11b7499bb3bab20eb75d7ad6e386d52ccb2163417bed2d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 8d0ef5ac394428dde2656ac65b96db155624d478 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:22 +0200
Subject: [PATCH 2237/4088] kmenuedit: update to 5.23.2.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 3f303705fe04..07498539b7cd 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f34227aba3af95ac1d24b00cb587590490c4b9b9ca83d0c66d302ea74eaf9188
+checksum=3d40f12f191e3c80fad1f778760b62e3ec5284eb8299851187b2597adb2f22cb

From f755564e861c9e2ace4c385feeae55cb4c5d0148 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:24 +0200
Subject: [PATCH 2238/4088] kscreen: update to 5.23.2.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index be1bd4870afd..a0473fd929a8 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af143f2d3b25478437ff894b0afe094a69df8dab055bba3c6311d0735f431fc9
+checksum=9b100ba19b51a51f4c4084f7c17f175f3f21beec6c662c6f1d75ed127df380f1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From b340feec6411879468a4f1badc00b24bfe402c94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:25 +0200
Subject: [PATCH 2239/4088] kscreenlocker: update to 5.23.2.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 1c9408bcbc9a..37f7b04c8355 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a0c41353285b41372eecce77d643e3332a34a391c52fb44064498f4321abb563
+checksum=e609dcdbf8191fea98facd9659b3681061f46b7d0bfc3b0a545eed7f5e91d8f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From ff35844cba11c1a37c0a806d1b8775bdbbd86717 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:26 +0200
Subject: [PATCH 2240/4088] ksshaskpass: update to 5.23.2.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index fe1bf64603d7..a32675410b69 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c1ab89e8c5f592a3bf54d6ee3ff733e8406a865ff126b9c5440638a14b0aeb2b
+checksum=3454fce2b83ecba09052348949f0a48493206a7fb7dc3c9380307b0bcf2f8bc5
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 52489322658f48b7e51655f60e6a920c7b0a1a03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:28 +0200
Subject: [PATCH 2241/4088] ksystemstats: update to 5.23.2.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 14b5c023b9c3..84a8f3746ec5 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e603659096d6f1da02dd8aa68f7ed211c0ce84f49450c8d769e567480f786a7e
+checksum=24dae0ae39f9c52672c2754233de4ea721b7798930a05c215909ac92f1963154

From c79a241486b59278e1e504a6ffa098ef06c7ea9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:29 +0200
Subject: [PATCH 2242/4088] kwallet-pam: update to 5.23.2.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index f423dc38c98a..08d8c9fb8d16 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=63661188dae40e708e516de2611cf05e1d899a0f060995b27067107aa0645e0a
+checksum=dfece4e4e6313bec1cc6a00e34d46f0765b05e24549706ed9a78ea6f16bbad80

From ca4ef5f8c9dede1d9022b37fb77a3b682d000a65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:31 +0200
Subject: [PATCH 2243/4088] kwayland-integration: update to 5.23.2.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index c70e37cf48a1..8a4aaa32dc12 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f73510f65bff5dac0b9eb1715af58f7a95f312a9dbe816d853e78a9539c10d6a
+checksum=748584ddb87b62e7e39edab041474af789f8e57814e29f859c3b592f57a19039

From 59ff5b8b0db2051255069967fa3eb21b5ea9a49c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:32 +0200
Subject: [PATCH 2244/4088] kwayland-server: update to 5.23.2.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 5e02e4650920..65f21e75e9e7 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ebad1a6dc1bf246cab9ca8ba0a13edd578646cb333ce09303d79d78727a59d57
+checksum=32383464649e8e95cbe377551d0ab5fa593b74c7739bb9e601d9bf942a048c0d
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8bb5766ea1147d53773835416029bcf60684a28a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:35 +0200
Subject: [PATCH 2245/4088] kwin: update to 5.23.2.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index fad81d40eb75..c18abb99134f 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5838d7ab84babc5bd3cb3df9f7e38fc01c98ba1bf584b6d43e4528dd03598b31
+checksum=ffba7dac42cbcab86392a9482f6b39f4bdc61ce153a236d9af1c4c3a521ef8ba
 
 build_options="pipewire"
 build_options_default="pipewire"

From 5e75c2bae62c5288e0d0e06d54e5b4e495b3257f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:36 +0200
Subject: [PATCH 2246/4088] kwrited: update to 5.23.2.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 67cfc3b7a1f8..5429462b16e2 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f31247382fb8b1d9246a16552a3d9b577e24428af39bdb042bfd42ee5c254f9b
+checksum=a4bd2d821583a5dce053c45daf2f85d38a5048593d1b614609bb2cffdfc0eab3

From 9ac9d2faff3a14b7941f133460e0eb8cdd57bd3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:38 +0200
Subject: [PATCH 2247/4088] layer-shell-qt: update to 5.23.2.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 5a448c062bd7..1154dd976871 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c79c2306ee9f6a672612b37f28074609748f5570b7785d4096e5573f12fb9e0a
+checksum=8fc29b2cd8c7f4ff2ce2fb9de495673e0778af2125e63aa1c1d295775e98895f
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From cf1e7a3203b8ad59bf830c31fbbdc339d837ae79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:39 +0200
Subject: [PATCH 2248/4088] libkscreen: update to 5.23.2.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index d31ef9ecfd74..bf6f15138aed 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3930d578f55e5d5be95da1f3fe298b15623afcea0a9c73005cb983589204d043
+checksum=4e9bcbebaf6fa8b7a7f9b860c08184120b53ab28c7c45320743406a078e214ea
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 31154df1d2fd244bc0e042d82b2e1a0f8ef727db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:41 +0200
Subject: [PATCH 2249/4088] libksysguard: update to 5.23.2.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 05747bcecf8c..38db6e17590a 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=083ddf436a9678e6e3d9c900d2c974586a313e58f60a32b7cb6600338ec78189
+checksum=f8fabf6af590e92146d1449e96a66ea7e5b7c249699ec0fe0e612f91c78ccbce
 
 build_options="webengine"
 

From 78b6ec4b90e58ac60055173691f3f261ee2fc44c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:43 +0200
Subject: [PATCH 2250/4088] milou: update to 5.23.2.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 7eb77a9751fd..4de610d396a8 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8f91c04785af3ed86ddf1fce18fe67f5b70cabf0827750cdec119e496723ff10
+checksum=bfc501695a9a8583e0c66f3922fecf10b6ac6bf10007a8b4d0d9cbb59661505b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From c7d5d09c0935da2e0210caa4516a81f7c8502051 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:45 +0200
Subject: [PATCH 2251/4088] oxygen: update to 5.23.2.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 36d8627aeeef..340a0a0b15c2 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2ea0ca8d889cc10f0d3c60217655b35b8417347243af9239a6b6998bb20bb237
+checksum=970559c7a07fb840be571491d14515d3c9b2c2106164df0f6a8affc6df8a4bcc

From c00330b205176f18ce174c805ea163ef5d2817f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:46 +0200
Subject: [PATCH 2252/4088] plasma-browser-integration: update to 5.23.2.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index d6f7811a453a..5e7b322a0112 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dd6477ffd0eddb70086fbf3e9c8f63845f6d552a06c22fb32846be068cf74af9
+checksum=efd5956d826740f68e3f49d4bdfb464891bb59c3e3f0fbcf736814cc2446ee23
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 594a1bb8d47fb3975d02edd15db25a05c7d4c4eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:50 +0200
Subject: [PATCH 2253/4088] plasma-desktop: update to 5.23.2.

---
 srcpkgs/plasma-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e016cb09e6bc..f344ca7ea0cd 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.23.1
+version=5.23.2.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -17,7 +17,7 @@ short_desc="KDE Plasma Desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ee6c6af0926ea3c6edd808f2962ef6579953c82e0d08ac053fbc8f012b9c4e80
+distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=8f69e465cf98413008514ead445a90ac2a49fcfecd6cda9842071020fb325934
 replaces="user-manager>=0"
 python_version=3

From 8ac1fcc948533aefcfd23f2f345a397f6c7b5843 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:51 +0200
Subject: [PATCH 2254/4088] plasma-disks: update to 5.23.2.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index bed7970624f8..b9d9d6e44711 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b83b021f43f3b7736fc0908dae7efd5526474879f03e340eb13441f2dbd39a85
+checksum=7c8e8fde93f0ba4d860f7c4b814ac6daccceeae6ec38b1ec095b49b2cb081b5e

From de564200623929026163c5c80ead2284b2ad5d39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:53 +0200
Subject: [PATCH 2255/4088] plasma-firewall: update to 5.23.2.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 54f62e43ed2d..a8a7ca2ba705 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1cccf92f94a7c7fa17f9893128b69006707e21c2a168fa60e5ce31dfa719cb18
+checksum=df4a4431d4318a27cbc73ab471954d62f001ed78d76062fa5d1a5a75fa971fc0

From 1ab407c2a454ccdc8f60084df6c3740da09403b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:54 +0200
Subject: [PATCH 2256/4088] plasma-integration: update to 5.23.2.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 1f6146b4ea50..91d034b06b43 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ca2b3487de16646bc5d2120adfd9d58cee69570a0eb64630ea075a93cdddcb71
+checksum=c8ef1d5c5580c39f0b5b09358e5b85d58daaa80e5d62afaad60113c8ddb4d084

From 72f750138a813afa924892b55b81a3b6970c4479 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:56 +0200
Subject: [PATCH 2257/4088] plasma-nm: update to 5.23.2.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f14493c8dfcc..b9c7f41b68e9 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d1d578c0386c2506f2cf361cd81f7060e6edcc7546d1716fb7299e34332f5063
+checksum=a08be797fbf00585651d541f25c2b31966a659a603ddbf65218032566afbf05e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d7e495fa1e2e67ed3918fc75cb6842500e0b7723 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:58 +0200
Subject: [PATCH 2258/4088] plasma-pa: update to 5.23.2.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 07470b2d2db0..77a4c07b4b12 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a79f1971a5acdeccb9e7363560b1828f35cac4faeb3c8036d8cdd1243565a57e
+checksum=564ff9f88fa223cd2fbcfb87effd6e93d4fd9be715c1c09149f4a071b783c315
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 21e790d1dc0eeb02ce5b4f6a0d5f61b3242346e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:34:59 +0200
Subject: [PATCH 2259/4088] plasma-sdk: update to 5.23.2.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 75d0651b6e02..509a3830e247 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=00d7389635c3a97e7f3badc3a25a6b3b1e200ad9e18f709cf31e3ed352e61eeb
+checksum=3ac08707454804e6a400897d5cd68e8570d88a07246fcc00aaf7f369fabe7810
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From dcbfbe53ef6369b5a60eb5f22ac2e985cb8a9185 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:01 +0200
Subject: [PATCH 2260/4088] plasma-systemmonitor: update to 5.23.2.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3496b630a45b..5dcd343c6dd4 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8212484044840119f939ff2fcacea6a3d02c25a171a75c68145cf88be9c19cf
+checksum=07bf1ad2231550ee431f1fd2eee96b35f1f87095e2e3b13d3c7d1a0209525b5b

From 59bf4667ee272fb81cc51ad5920b035d984a24d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:02 +0200
Subject: [PATCH 2261/4088] plasma-thunderbolt: update to 5.23.2.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e9ff3bb397e4..6947e65928b8 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0a5c5f1ac69d63b533acc1171e726043542f17ccad019b530c03e31a9ece118d
+checksum=8c3399bc14c5a73eafc76edb8c2aa6907910bc6eaf2ea19476ca0ebc4054058e
 
 do_check() {
 	: # Requires running dbus and bolt services

From 5c9354e1412fc0743e1cee28381ecbc254496849 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:04 +0200
Subject: [PATCH 2262/4088] plasma-vault: update to 5.23.2.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 416b4d2f85ab..a9ddaa62b3c8 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c5abe2e90c29e2a76c4fd276ad2efd0a296da7ed641ca8f401e95d446a5b8c4f
+checksum=4e4300bdf38d340a1f7f79056143f9fe7c69bd0a65b593a969babbe1a7f53135
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d94bdd23e00958d52ba8a2762f3826bd81ab8eb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:13 +0200
Subject: [PATCH 2263/4088] plasma-workspace-wallpapers: update to 5.23.2.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index d94bdc0b70f4..84c6f2e96cfd 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb26b880b60e893f08f51e17a845d6e252ce744441947e6e6119913689edf4aa
+checksum=e9052ec5323bfa3f2aea7634cfeece3f4ac61f9865cbb401ffb47e3441a84a01

From 3e48b281d28b275fa9e4409be0756de51bd01250 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:16 +0200
Subject: [PATCH 2264/4088] plasma-workspace: update to 5.23.2.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 747f7cc5d1ab..c2c764ca9a33 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fbf979f857b3cdcc8fe6dc45c3a1d9dfe297e1120aa551a02faa339abb81efad
+checksum=dbd261cecaafeb0b230ead6eaceedd4601f90c8f5844b811d6941a5d28933b72
 
 build_options="pipewire"
 build_options_default="pipewire"

From 13741dc4f6be084f91a4c96c4a11a18563c0f8ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:18 +0200
Subject: [PATCH 2265/4088] polkit-kde-agent: update to 5.23.2.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 925e5fc8dceb..9b29570666ff 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.23.1
+version=5.23.2
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=416617237e045567daf830e23c0d3f32f3b4d9891e9a61888f735f494ccbf529
+checksum=4001b9ebfe4ef83847d1a1f187042fc12ae92a4851e7f153f512f2cba8f38dba

From e5e7377939e12c532a673c03ca8326f93226fa11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:19 +0200
Subject: [PATCH 2266/4088] powerdevil: update to 5.23.2.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 10c2722b5eb2..6af89df62a87 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=721a5938d6cb0439943fa912b9f360b9b563a91ceff138869636f2ef45edc096
+checksum=b1d7816c8214e3632effa602ee667c90b8a3e54ed71a0722a1b1eb871485d638

From eecde3a288036f75fd8e31a073b60c9390c1345d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:21 +0200
Subject: [PATCH 2267/4088] sddm-kcm: update to 5.23.2.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index d9d54c3d93c3..fe1116cbbeee 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b72629f744d9859f93d097d7272d63543b97e0ff4c5774dadcd935838cf48044
+checksum=d0836035594ca006bc60d4410fbf1ca1224a15b8707b5281e2196e53bcc70977

From 7102c5a4eb0dbd346c720ee14cb8e57ade64e58e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:22 +0200
Subject: [PATCH 2268/4088] systemsettings: update to 5.23.2.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 33335ef56cd5..1b9e3aff4804 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cd451319125c7b56c6f13c65462136179c39f607cc4d4e66b90079a72df6e54
+checksum=1169814a7a0d8a8c9d6117fd889787160141fc21b6ad1a3b2ee5720be412226f

From 09269ef8d5664b7c627e82e5963ce7eb159c2b64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 23:35:24 +0200
Subject: [PATCH 2269/4088] xdg-desktop-portal-kde: update to 5.23.2.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 88ee52c0e8cf..ba7f87b00518 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.23.1
+version=5.23.2
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f7664cc4c0ea7fcd93a15d35fc5f5b5f5c8910c07204fad35783f9d3acc1f2ae
+checksum=ceb28535915d34e6a367d2b821a1482824f5c2aca5cbbca28b4cb6cdf412204a

From 9bf98a0253aaf751a8a1eb751306a56b5bf6dcca Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Oct 2021 02:56:46 +0200
Subject: [PATCH 2270/4088] gzdoom: need libatomic

---
 srcpkgs/gzdoom/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 24dc9599bee1..ac587d95bd19 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -28,6 +28,11 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*) configure_args+=" -DSSE_MATTERS=true" ;;
 esac
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
 post_extract() {
 	bsdtar xOf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}

From 947b1111bc3d1a36d6631f8158a7b95fadca60d3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 29 Oct 2021 00:18:25 -0400
Subject: [PATCH 2271/4088] gping: update to 1.2.6

---
 srcpkgs/gping/template | 10 ++++++----
 srcpkgs/gping/update   |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gping/update

diff --git a/srcpkgs/gping/template b/srcpkgs/gping/template
index 18a07e70728e..c3fb77d05345 100644
--- a/srcpkgs/gping/template
+++ b/srcpkgs/gping/template
@@ -1,15 +1,17 @@
 # Template file for 'gping'
 pkgname=gping
-version=1.2.0
+version=1.2.6
 revision=1
+wrksrc="${pkgname}-${pkgname}-v${version}"
+build_wrksrc="gping"
 build_style=cargo
 short_desc="Ping, but with a graph"
 maintainer="Paper <paper@tilde.institute>"
 license="MIT"
 homepage="https://github.com/orf/gping/"
-distfiles="https://github.com/orf/gping/archive/v${version}.tar.gz"
-checksum=2379d2d5c3e301140d9c65c4dcc2b99602acf511b2798f45009af4c1101a0716
+distfiles="https://github.com/orf/gping/archive/refs/tags/gping-v${version}.tar.gz"
+checksum=e36d5bc02157708c803d1855be4b2a9daa27d077fffe86c58b12c746fdc04c8f
 
 post_install() {
-	vlicense LICENSE
+	vlicense ../LICENSE
 }
diff --git a/srcpkgs/gping/update b/srcpkgs/gping/update
new file mode 100644
index 000000000000..08d9ce62349b
--- /dev/null
+++ b/srcpkgs/gping/update
@@ -0,0 +1 @@
+pattern="gping-v\K[0-9.]+(?=.tar.gz)"

From 15f40a622d6f1f6543658d044f4c010e9d5129e8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 30 Oct 2021 14:40:48 +0200
Subject: [PATCH 2272/4088] gtk3-nocsd: update to 3.0.8.

---
 srcpkgs/gtk3-nocsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk3-nocsd/template b/srcpkgs/gtk3-nocsd/template
index 4071ec9a572b..bd9b7ac030fc 100644
--- a/srcpkgs/gtk3-nocsd/template
+++ b/srcpkgs/gtk3-nocsd/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk3-nocsd'
 pkgname=gtk3-nocsd
-version=3.0.7
+version=3.0.8
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/ZaWertun/gtk3-nocsd"
 distfiles="https://github.com/ZaWertun/gtk3-nocsd/archive/v${version}.tar.gz"
-checksum=62bf1fa228d6f1882069d90b0ffb59871aa74c78a16f207607bbad69755703c6
+checksum=ee680980294d899c4bdeea5398fc361a66f97d6df7cd59546b11ac7bfb40a09a
 
 do_install() {
 	vbin gtk3-nocsd

From 4269ee2186dd91f7e0759260554757927a654383 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 30 Oct 2021 14:53:19 +0200
Subject: [PATCH 2273/4088] smplayer: update to 21.10.0.

---
 srcpkgs/smplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..48481113d136 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
+version=21.10.0
 revision=1
 build_style=gnu-makefile
 build_helper=qmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=2c0bf10add4bea2582104281553cda9792b74d41273a98bceaa147c70065db8a
 
 export QT_SELECT=5
 

From 8fe45583cd0436939c1e6bdb5d52900e12c28fc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 29 Oct 2021 23:29:43 +0200
Subject: [PATCH 2274/4088] qt5-webengine: update to 5.15.7.

---
 .../qt5-webengine/patches/0114-time64.patch   |  89 -----------
 .../patches/0121-glibc-2.33.patch             | 144 ------------------
 srcpkgs/qt5-webengine/template                |   9 +-
 3 files changed, 4 insertions(+), 238 deletions(-)
 delete mode 100644 srcpkgs/qt5-webengine/patches/0114-time64.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0121-glibc-2.33.patch

diff --git a/srcpkgs/qt5-webengine/patches/0114-time64.patch b/srcpkgs/qt5-webengine/patches/0114-time64.patch
deleted file mode 100644
index 6a98dd4e480e..000000000000
--- a/srcpkgs/qt5-webengine/patches/0114-time64.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Description: fix seccomp-bpf failures in syscalls 0403, 0407
- glibc ≥ 2.31 uses these syscalls on 32-bit platforms:
- .
- - https://sourceware.org/git/?p=glibc.git;a=commit;h=2e44b10b42d68d98
- - https://sourceware.org/git/?p=glibc.git;a=commit;h=ec138c67cbda8b58
-Author: Andreas Müller <schnitzeltony@gmail.com>
-Forwarded: no
-Last-Update: 2020-09-02
-
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -148,7 +148,14 @@ ResultExpr EvaluateSyscallImpl(int fs_de
-     return Allow();
- #endif
- 
--  if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
-+  if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep
-+#if defined(__NR_clock_gettime64)
-+                                  || sysno == __NR_clock_gettime64
-+#endif
-+#if defined(__NR_clock_nanosleep_time64)
-+                                  || sysno == __NR_clock_nanosleep_time64
-+#endif
-+  ) {
-     return RestrictClockID();
-   }
- 
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-@@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf
-       case __NR_clock_gettime:
-       case __NR_clock_getres:
-       case __NR_clock_nanosleep:
-+#if defined(__NR_clock_nanosleep_time64)
-+      case __NR_clock_nanosleep_time64:
-+#endif
-+#if defined(__NR_clock_gettime64)
-+      case __NR_clock_gettime64:
-+#endif
-         return RestrictClockID();
-       default:
-         return Allow();
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -39,6 +39,12 @@ bool SyscallSets::IsAllowedGettime(int s
-                                 // filtered by RestrictClokID().
-     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
-     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
-+#if defined(__NR_clock_gettime64)
-+    case __NR_clock_gettime64:  // Parameters filtered by RestrictClockID().
-+#endif
-+#if defined(__NR_clock_nanosleep_time64)
-+    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
-+#endif
-     case __NR_clock_settime:    // Privileged.
- #if defined(__i386__) || \
-     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
---- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,14 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_clock_gettime64)
-+#define __NR_clock_gettime64 (__NR_SYSCALL_BASE+403)
-+#endif
-+
-+#if !defined(__NR_clock_nanosleep_time64)
-+#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE+407)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
---- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
-+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1433,4 +1433,12 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
- 
-+#if !defined(__NR_clock_gettime64)
-+#define __NR_clock_gettime64 (__NR_Linux + 403)
-+#endif
-+
-+#if !defined(__NR_clock_nanosleep_time64)
-+#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
diff --git a/srcpkgs/qt5-webengine/patches/0121-glibc-2.33.patch b/srcpkgs/qt5-webengine/patches/0121-glibc-2.33.patch
deleted file mode 100644
index 3a0ba3b2d854..000000000000
--- a/srcpkgs/qt5-webengine/patches/0121-glibc-2.33.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-# Patch made by Kevin Kofler <Kevin@tigcc.ticalc.org>
-# https://bugzilla.redhat.com/show_bug.cgi?id=1904652
-
-diff -ur qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
---- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc	2020-11-07 02:22:36.000000000 +0100
-+++ qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc	2021-01-20 02:14:53.066223906 +0100
-@@ -257,6 +257,18 @@
-     return RestrictKillTarget(current_pid, sysno);
-   }
- 
-+#if defined(__NR_newfstatat)
-+  if (sysno == __NR_newfstatat) {
-+    return RewriteFstatatSIGSYS();
-+  }
-+#endif
-+
-+#if defined(__NR_fstatat64)
-+  if (sysno == __NR_fstatat64) {
-+    return RewriteFstatatSIGSYS();
-+  }
-+#endif
-+
-   if (SyscallSets::IsFileSystem(sysno) ||
-       SyscallSets::IsCurrentDirectory(sysno)) {
-     return Error(fs_denied_errno);
-diff -ur qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
---- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc	2020-11-07 02:22:36.000000000 +0100
-+++ qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc	2021-01-22 19:02:55.651668257 +0100
-@@ -6,6 +6,8 @@
- 
- #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
- 
-+#include <errno.h>
-+#include <fcntl.h>
- #include <stddef.h>
- #include <stdint.h>
- #include <string.h>
-@@ -355,6 +357,35 @@
-   return -ENOSYS;
- }
- 
-+intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
-+                            void* aux) {
-+  switch (args.nr) {
-+#if defined(__NR_newfstatat)
-+    case __NR_newfstatat:
-+#endif
-+#if defined(__NR_fstatat64)
-+    case __NR_fstatat64:
-+#endif
-+#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
-+      if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
-+          && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
-+        return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
-+                                    reinterpret_cast<struct stat64 *>(args.args[2]));
-+      } else {
-+        errno = EACCES;
-+        return -1;
-+      }
-+      break;
-+#endif
-+  }
-+
-+  CrashSIGSYS_Handler(args, aux);
-+
-+  // Should never be reached.
-+  RAW_CHECK(false);
-+  return -ENOSYS;
-+}
-+
- bpf_dsl::ResultExpr CrashSIGSYS() {
-   return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
- }
-@@ -387,6 +418,10 @@
-   return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
- }
- 
-+bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
-+  return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
-+}
-+
- void AllocateCrashKeys() {
- #if !defined(OS_NACL_NONSFI)
-   if (seccomp_crash_key)
-diff -ur qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
---- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h	2020-11-07 02:22:36.000000000 +0100
-+++ qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h	2021-01-20 02:11:04.583714199 +0100
-@@ -62,6 +62,10 @@
- // sched_setparam(), sched_setscheduler()
- SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
-                                            void* aux);
-+// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
-+// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
-+SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, 
-+                                             void* aux);
- 
- // Variants of the above functions for use with bpf_dsl.
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
-@@ -72,6 +76,7 @@
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
- SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
-+SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
- 
- // Allocates a crash key so that Seccomp information can be recorded.
- void AllocateCrashKeys();
-diff -ur qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
---- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc	2020-11-07 02:22:36.000000000 +0100
-+++ qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc	2021-01-20 02:41:12.033133269 +0100
-@@ -261,4 +261,13 @@
- 
- #endif  // defined(MEMORY_SANITIZER)
- 
-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
-+{
-+#if defined(__NR_fstat64)
-+    return syscall(__NR_fstat64, fd, buf);
-+#else
-+    return syscall(__NR_fstat, fd, buf);
-+#endif
-+}
-+
- }  // namespace sandbox
-diff -ur qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
---- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h	2020-11-07 02:22:36.000000000 +0100
-+++ qtwebengine-everywhere-src-5.15.2-#1904652/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h	2021-01-20 02:40:26.499827829 +0100
-@@ -17,6 +17,7 @@
- struct rlimit64;
- struct cap_hdr;
- struct cap_data;
-+struct stat64;
- 
- namespace sandbox {
- 
-@@ -84,6 +85,9 @@
-                                  const struct sigaction* act,
-                                  struct sigaction* oldact);
- 
-+// Recent glibc rewrites fstat to fstatat.
-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
-+
- }  // namespace sandbox
- 
- #endif  // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 7d3b98cf2464..b65131b26d27 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,10 +1,9 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.6
+version=5.15.7
 revision=1
 _version="${version}-lts"
-_commit=2acbba86362ac3a1c2d8c20390dc263875f8f09c
-_chromium_commit=9f71911e38c041cedc5291c5e772b7d03ce8b8c8
+_chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
 wrksrc="qtwebengine-${_version}"
 build_style=qmake
@@ -33,8 +32,8 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="2f2fe706ad0b365dd9a261588d0097388540147acb167ca062877b91592c0212
- 68d70367b503e3be54bc54349e0af319fcdffaf94796906ef00b495e0c732603"
+checksum="ef71f5bd741c917787a9431a2c359842de15a14126ef5f34ac28c8b0c07304ae
+ 75c79b886cf9c10778c5880754e1cf021e9a5e4fc372e8e6ab252d4ada263062"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"

From 4f1d03a1409434e4dfd1b54b4363edc9821eb6bb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Oct 2021 16:51:15 +0300
Subject: [PATCH 2275/4088] topgrade: update to 8.0.3.

---
 srcpkgs/topgrade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index d1e67d3aa470..727040079f98 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=7.1.0
+version=8.0.3
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,4 +8,4 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-darwish/topgrade"
 distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz"
-checksum=db8a2777f0a1c3e59012936d3edb5a54d378a2be036604590557d6e3affde8d8
+checksum=c60dd5ae7d1d3bcfe941ead9f088c4b0413b9a4561fb9154429faf86a43e0983

From 5399cec1ca1951196d79a28c6fe17b412b77cfec Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Oct 2021 16:09:06 +0300
Subject: [PATCH 2276/4088] execline-man-pages: update to 2.8.1.0.3.

---
 srcpkgs/execline-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index 027b47ef7412..d8466767816e 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 'execline-man-pages'
 pkgname=execline-man-pages
-version=2.8.1.0.2
+version=2.8.1.0.3
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/execline-man-pages"
 distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=7280b70e0eacd551bfa215550d78a8ed12876a1bd7012c084addaa50c809c2fa
+checksum=6887fb4102aff257182f6889de16068c57281e4fe1e3c9758fa894f024fee2c3
 
 do_install() {
 	vmkdir usr/share/man/man1

From f81047953d7018bbc4d9df2b001c8c5159bd7474 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Oct 2021 22:24:05 +0300
Subject: [PATCH 2277/4088] stremio-shell: fix dependencies.

qt5-webengine needs to be in depends.
---
 srcpkgs/stremio-shell/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..3d29d1da3303 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.142
-revision=1
+revision=2
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
 build_style=qmake
@@ -9,7 +9,8 @@ hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel
  qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
  qt5-quickcontrols2-devel qt5-quickcontrols chromaprint-devel"
-depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime"
+depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime
+ qt5-webengine"
 short_desc="Hub for video content aggregation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3ab2d7bb6714b1ebb27f7da22a1a311e924cbeae Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Fri, 29 Oct 2021 13:45:04 -0700
Subject: [PATCH 2278/4088] widelands: correct install paths

Specify WL_INSTALL_BASEDIR.
Remove redundant desktop file.
---
 srcpkgs/widelands/files/widelands.desktop | 22 ----------------------
 srcpkgs/widelands/template                |  9 +++------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/widelands/files/widelands.desktop

diff --git a/srcpkgs/widelands/files/widelands.desktop b/srcpkgs/widelands/files/widelands.desktop
deleted file mode 100644
index 5eb5337e52c0..000000000000
--- a/srcpkgs/widelands/files/widelands.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Widelands
-GenericName=Strategy Game
-GenericName[af]=Strategie-spel
-GenericName[ca]=Joc d'estrategia
-GenericName[de]=Strategiespiel
-GenericName[dk]=Strategi-spil
-GenericName[eu]=Estrategiako jokoa
-GenericName[fr]=Jeu de stratégie
-GenericName[he]=משחק אסטרטגיה
-GenericName[hu]=Stratégia
-GenericName[ru]=Стратегическая игра
-GenericName[sk]=Strategická hra
-Comment=A a real-time build-up strategy game
-Comment[de]=Echtzeitbasiertes Aufbau-Strategiespiel
-Icon=/usr/share/widelands/pics/wl-ico-128.png
-TryExec=/usr/bin/widelands
-Exec=/usr/bin/widelands --datadir=/usr/share/widelands
-Categories=Application;Game;StrategyGame;
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97cb44097295..8d208f682992 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -4,10 +4,11 @@ pkgname=widelands
 reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
  19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
 version=1.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
- -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_DATADIR=/usr/share/widelands"
+ -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_BASEDIR=/usr/share/widelands
+ -DWL_INSTALL_DATADIR=/usr/share/widelands"
 hostmakedepends="python3 pkg-config gettext"
 makedepends="boost-devel icu-devel minizip-devel gettext-devel
  glu-devel glew-devel libcurl-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
@@ -29,7 +30,3 @@ fi
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DOPTION_BUILD_TESTS=OFF"
 fi
-
-post_install() {
-	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
-}

From db19cc0a8b18972d69e095e67a3215166aa2e10c Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sat, 30 Oct 2021 22:08:11 +0700
Subject: [PATCH 2279/4088] vivaldi: update to 4.3.2439.63

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 59fe4a807743..69688904c974 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=4.3.2439.56
+version=4.3.2439.63
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=65a842931cc5c3ff2b12c24c42ddb0bcf29e02403005e01bf1d30eb40a4793d5
+checksum=e1e3212331dfcc9e338110c02534237bc6b181e8d7f9ca916a888390e26a095f
 repository=nonfree
 restricted=yes
 nostrip=yes

From d7207346b39bc48bd1eec222b27c08e6a9c59e1c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Oct 2021 16:05:00 +0300
Subject: [PATCH 2280/4088] sublime-merge-bin: update to 2063.

---
 srcpkgs/sublime-merge-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..e67a7d6d6a27 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2063
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=97abf170e210de442a3732e47f73dbb94dc3a437cb874b570a5fcb9c9b02b769
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree

From 8e8e038b0778658502be4ce66accc6c031600793 Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Sat, 30 Oct 2021 09:38:14 +0200
Subject: [PATCH 2281/4088] partclone: update to 0.3.18.

---
 srcpkgs/partclone/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 05a6cb1280d9..f7187bbff910 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,7 +1,7 @@
 # Template file for 'partclone'
 pkgname=partclone
-version=0.3.17
-revision=3
+version=0.3.18
+revision=1
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
@@ -12,9 +12,9 @@ makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.partclone.org/"
+homepage="https://partclone.org/"
 distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
-checksum=ef1391db3801e4b3ef82fc9417f1d7f0542b7229b3394120072b2dfeae0bbbb0
+checksum=50070e29c2e00e991a3784f13339347acb46d2a293f43531d1f4f4f0dcb42311
 CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
 
 pre_configure() {

From 3605cad927a9f87ba5281fc0a4d85d6d117aeaec Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Sat, 30 Oct 2021 09:29:55 +0200
Subject: [PATCH 2282/4088] bmake: update to 20211024.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 27f400fbd816..d01ec195ba89 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20211020
+version=20211024
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=9c1f979a16a407bc099f28240d0e52b44845b3ac64b9950bb5b0847cc32e3032
+checksum=b5a3305bdb328b1383982125e90785baa30bc2ff024a1b0fda3d5d5beca82ac9
 python_version=3
 
 do_configure() {

From 1ad9e01ec8b4f7e7d52c17c55a79abd7a7a7a1f7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 30 Oct 2021 00:50:23 -0400
Subject: [PATCH 2283/4088] gifski: update to 1.5.1

---
 srcpkgs/gifski/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index 9a1057cb13af..9c4837e11ca2 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,6 +1,6 @@
 # Template file for 'gifski'
 pkgname=gifski
-version=1.4.3
+version=1.5.1
 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=74b98ede664e3da420ead70e3da1dfeb1a6e33545a618124e6b49da8f399902f
+checksum=88beeb896b6a1138046f665c3495f85670a74a527e34743080d8976d3f1b73b7
 
 post_install() {
 	vlicense LICENSE

From b133b82e2e7ac38382f5ebbb6bac3e41cb4fabc9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 29 Oct 2021 23:17:21 -0400
Subject: [PATCH 2284/4088] broot: update to 1.6.6

---
 srcpkgs/broot/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 28e1bfb81bf4..315d5c31630f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,14 +1,15 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.4
+version=1.6.6
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
+changelog="https://raw.githubusercontent.com/Canop/broot/master/CHANGELOG.md"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=609bd9e6c7fea85b68586435280b37cb90c2af3cb0a3f63a5a37dfdcc822fdc7
+checksum=95927b3f2c55f69cd87bb80672e697c83ad63dd9237fe3ebdd970b655d53a725
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From a9058a8c38334d8bb4dc797ec645d3b6cae49cbe Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 30 Oct 2021 00:40:42 -0400
Subject: [PATCH 2285/4088] dutree: update to 0.2.18

---
 srcpkgs/dutree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dutree/template b/srcpkgs/dutree/template
index 70155936776a..0c102e0a8631 100644
--- a/srcpkgs/dutree/template
+++ b/srcpkgs/dutree/template
@@ -1,6 +1,6 @@
 # Template file for 'dutree'
 pkgname=dutree
-version=0.2.17
+version=0.2.18
 revision=1
 build_style=cargo
 short_desc="Tool to analyze file system usage written in Rust"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nachoparker/dutree"
 distfiles="https://github.com/nachoparker/dutree/archive/v${version}.tar.gz"
-checksum=c88f2328c4e6cf96a0222efbe2a5c6d2de8cd0de0ebf01deb1f5fe81b5f8518e
+checksum=55c30e57cc339dd16141510af33245cc3b82f588f22419fc034f02b36ebecba0
 
 pre_build() {
 	# default version too old for ppc musl systems

From cbf56435a8624f1ad9f1a28dcfbba287f34a6979 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Fri, 29 Oct 2021 20:19:54 -0600
Subject: [PATCH 2286/4088] sbcl: update to 2.1.10

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 9ce39b2dde80..5225f4ae682c 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.9
+version=2.1.10
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=9e746ff12c4f78d2deabd95e48169b552f9472808cf8b8fc801d84df3e962fa1
+checksum=eb183f0f59a5cb2cbed762ec062bc34b9b6214b65402660784ef54838884b138
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 55cf7dbac0653c8058c591e2bcdb6d77e075338bba1b7c83f96b589d8c5ffabf"
+	checksum+=" 5b23e9527d5a451bff8a78d08650122a7c4bf7d34b73fa7c8e712670fadc28ff"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 920a163ea7edc16a84668b326c53d174b212f038 Mon Sep 17 00:00:00 2001
From: heitor <heitorleite.dev@gmail.com>
Date: Fri, 29 Oct 2021 21:04:45 -0300
Subject: [PATCH 2287/4088] fsarchiver: update to 0.8.6.

---
 srcpkgs/fsarchiver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fsarchiver/template b/srcpkgs/fsarchiver/template
index 72d75c579ba5..058c1c9bc796 100644
--- a/srcpkgs/fsarchiver/template
+++ b/srcpkgs/fsarchiver/template
@@ -1,6 +1,6 @@
 # Template file for 'fsarchiver'
 pkgname=fsarchiver
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.fsarchiver.org/"
 distfiles="https://github.com/fdupoux/fsarchiver/releases/download/${version}/fsarchiver-${version}.tar.gz"
-checksum=c694f52e42703d7e8c4d56f2db97a8ff5616df1d723429126de97c22217c88fe
+checksum=be1d44222c4ef428360120c7326c8910930da5f318f7291f8b8d61cb2b730ebd

From 4ae0f857b0a2f1263e5b3c2fa8f149494ca80bb0 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 29 Oct 2021 18:40:44 -0500
Subject: [PATCH 2288/4088] mesa: update to 21.2.5.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index b8a2fd4a64cb..d6f47316bdc1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.2.4
+version=21.2.5
 revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44
+checksum=8e49585fb760d973723dab6435d0c86f7849b8305b1e6d99f475138d896bacbb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From c8fa64091adcbd30072c03da63f9cc6582f4e9eb Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 29 Oct 2021 13:28:35 +0200
Subject: [PATCH 2289/4088] praat: update to 6.1.55

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 9d574875bd7b..f6a1e8c1ebc6 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.54
+version=6.1.55
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=ffd4a2c482d2bc561409ebf7688ca1408e9fe25b0f2a8338e5d190043ddcc689
+checksum=100d2dda42556ee816bbec7fd3dd4433987947e1feb5fcc7d58406710ff108f6
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From 216a6ce24fd23adf6150799c350acaed1702f7e1 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Fri, 29 Oct 2021 16:24:43 +0530
Subject: [PATCH 2290/4088] legendary: update to 0.20.18.

---
 srcpkgs/legendary/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/legendary/template b/srcpkgs/legendary/template
index ae35ba48ccae..faedae89c5a9 100644
--- a/srcpkgs/legendary/template
+++ b/srcpkgs/legendary/template
@@ -1,6 +1,6 @@
 # Template file for 'legendary'
 pkgname=legendary
-version=0.20.16
+version=0.20.18
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,5 +10,5 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/derrod/legendary"
 distfiles="https://github.com/derrod/legendary/archive/${version}.tar.gz"
-checksum=116efe7455a8e40235862912fbe1d532db8a1b3fa23c1e8b3628bde42aee89dd
+checksum=bf7f216f32b22293522d25a225915a393f988a22143d35a2474e3b7f10b507ef
 make_check=no # doesn't contain any tests

From c751b60f5356e2a7e3e68462da0bbd7d45d8f609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 29 Oct 2021 00:49:22 -0300
Subject: [PATCH 2291/4088] sudo: update to 1.9.8p2.

Remove mksigname patch because upstream now uses HOSTCC here.
---
 srcpkgs/sudo/patches/mksigname-for-host.patch | 15 ---------------
 srcpkgs/sudo/template                         |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/sudo/patches/mksigname-for-host.patch

diff --git a/srcpkgs/sudo/patches/mksigname-for-host.patch b/srcpkgs/sudo/patches/mksigname-for-host.patch
deleted file mode 100644
index bde2d267a19a..000000000000
--- a/srcpkgs/sudo/patches/mksigname-for-host.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lib/util/Makefile.in	2015-07-17 07:53:22.343559193 +0200
-+++ b/lib/util/Makefile.in	2015-07-17 07:53:47.419297775 +0200
-@@ -160,10 +160,10 @@ signame.c: mksigname
- 	./mksigname > $@
- 
- mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@
-+	$(BUILD_CC) $(CPPFLAGS) $(BUILD_CFLAGS) $(srcdir)/mksiglist.c -o $@
- 
- mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksigname.c -o $@
-+	$(BUILD_CC) $(CPPFLAGS) $(BUILD_CFLAGS) $(srcdir)/mksigname.c -o $@
- 
- $(srcdir)/mksiglist.h: $(srcdir)/siglist.in
- 	@if [ -n "$(DEVEL)" ]; then \
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index f70418dd6b75..659e78a013ca 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.9.7
+version=1.9.8p2
 revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
 distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=2bbe7c2d6699b84d950ef9a43f09d4d967b8bc244b73bc095c4202068ddbe549
+checksum=9e3b8b8da7def43b6e60c257abe80467205670fd0f7c081de1423c414b680f2d
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes
 

From 378ca9ed8c5697b11e0d9c6dd799ed9a447d2ebe Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 29 Oct 2021 13:51:46 +0200
Subject: [PATCH 2292/4088] google-chrome: update to 95.0.4638.69

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ec8e421212eb..c9b36309f4f5 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=95.0.4638.54
+version=95.0.4638.69
 revision=1
 _channel=stable
 archs="x86_64"
@@ -19,7 +19,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=2a90957a8104649bda067b62d87380ad6e5d5ff8cd52f47cf8d39acfbf93c955
+checksum=57aa747fee7c3b3c060382719c2cafe8b4ee9deea65ce0ad7dfbd1a645a81dca
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 451f0cce9241b243232ad69307cd33de5e6e0016 Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Wed, 27 Oct 2021 10:34:40 +0200
Subject: [PATCH 2293/4088] avidemux: update to 2.7.8.

---
 srcpkgs/avidemux/template | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..81774db15fe4 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
-version=2.7.6
-revision=2
+version=2.7.8
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
@@ -11,14 +11,20 @@ makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-
  vapoursynth-devel libmp4v2-devel sqlite-devel libva-devel libvdpau-devel
  qt5-multimedia-devel qt5-script-devel qt5-tools-devel ffmpeg-devel
  liba52-devel libmad-devel x264-devel x265-devel xvidcore-devel"
-depends="python"
 short_desc="Video editing and processing application"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://avidemux.sourceforge.net/"
 changelog="http://avidemux.sourceforge.net/news.html"
 distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz"
-checksum=9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf
+checksum=628a404f521ff2812760700ae3e2aa78e5816b0ff3fb6fd05ac3e75248d97401
+
+# On i686 the build fails with "error: 'asm' operand has impossible constraints"
+# due to not enough available CPU registers. Using the -fno-PIC flag frees up
+# one additional register for the compiler/assembler to use.
+case "${XBPS_TARGET_MACHINE}" in
+	i686*) CFLAGS="-fno-PIC";;
+esac
 
 do_configure() {
 	MAKEFLAGS=${makejobs} \
@@ -29,6 +35,7 @@ do_configure() {
 		--with-system-libmp4v2 \
 		${cross_compile}
 }
+
 do_install() {
 	mv install/usr/lib{${XBPS_TARGET_WORDSIZE},}
 	cp -aR install/usr ${DESTDIR}

From 94fba493431bcaeebeef96287d2c718e5ed243e9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 18 Oct 2021 16:30:24 +0200
Subject: [PATCH 2294/4088] libgnt: update to 2.14.3.

---
 srcpkgs/libgnt/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
index f362d1561357..1cccf79e346c 100644
--- a/srcpkgs/libgnt/template
+++ b/srcpkgs/libgnt/template
@@ -1,9 +1,10 @@
 # Template file for 'libgnt'
 pkgname=libgnt
-version=2.14.2
+version=2.14.3
 revision=1
 build_style=meson
 build_helper=gir
+configure_args="-Dpython2=false"
 hostmakedepends="pkg-config glib-devel gtk-doc"
 makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
 short_desc="GLib Ncurses Toolkit"
@@ -11,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://keep.imfreedom.org/libgnt/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+checksum=57f5457f72999d0bb1a139a37f2746ec1b5a02c094f2710a339d8bcea4236123
 
 pre_configure() {
 	# disable doc for cross builds

From 21b9f7ce75aa5a00a1c6dd0a981557a2a5addbda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 18 Oct 2021 16:30:32 +0200
Subject: [PATCH 2295/4088] pidgin: update to 2.14.8.

---
 srcpkgs/pidgin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..196718504a47 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,6 +1,6 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
+version=2.14.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+checksum=3f8085c0211c4ca1ba9f8a03889b3d60738432c1673b57b0086070ef6e094cca
 python_version=2
 lib32disabled=yes
 

From de10fceaa152b7499a88dfe5c87fd705b59b0b6c Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 22 Oct 2021 00:19:53 +0200
Subject: [PATCH 2296/4088] pipewire: update to 0.3.39

---
 srcpkgs/pipewire/patches/1042.patch         | 77 +++++++++++++++++++++
 srcpkgs/pipewire/patches/f8817b4.patch      | 25 -------
 srcpkgs/pipewire/patches/no-LIB-token.patch | 27 ++++++++
 srcpkgs/pipewire/template                   | 17 +++--
 4 files changed, 117 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/pipewire/patches/1042.patch
 delete mode 100644 srcpkgs/pipewire/patches/f8817b4.patch
 create mode 100644 srcpkgs/pipewire/patches/no-LIB-token.patch

diff --git a/srcpkgs/pipewire/patches/1042.patch b/srcpkgs/pipewire/patches/1042.patch
new file mode 100644
index 000000000000..fc4c5f2f35cd
--- /dev/null
+++ b/srcpkgs/pipewire/patches/1042.patch
@@ -0,0 +1,77 @@
+From cf3c0431c387a72fdbc66ec78086f695d0b6de3c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 26 Oct 2021 11:14:06 +1000
+Subject: [PATCH 1/2] test: fix tmpdir value after setenv
+
+Introduced in a2856c6e0f692b7a379e06d3ed6ac8107f9b946b
+
+set_test_env() modifies TMPDIR so we must not use getenv until after
+that call.
+
+Fixes #1736
+---
+ test/pwtest.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/pwtest.c b/test/pwtest.c
+index fbf16cb2f..a000153fd 100644
+--- a/test/pwtest.c
++++ b/test/pwtest.c
+@@ -915,9 +915,7 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
+ 	pid_t pw_daemon = 0;
+ 	int read_fds[_FD_LAST], write_fds[_FD_LAST];
+ 	int r;
+-	const char *tmpdir = getenv("TMPDIR");
+-
+-	spa_assert_se(tmpdir != NULL);
++	const char *tmpdir;
+ 
+ 	if (t->result == PWTEST_SKIP) {
+ 		char *buf = pw_array_add(&t->logs[FD_LOG], 64);
+@@ -934,6 +932,8 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
+ 	}
+ 
+ 	set_test_env(ctx, t);
++	tmpdir = getenv("TMPDIR");
++	spa_assert_se(tmpdir != NULL);
+ 	r = chdir(tmpdir);
+ 	if (r < 0) {
+ 		t->sig_or_errno = -errno;
+-- 
+GitLab
+
+
+From 07c5511aedf0b0606c0d3f92ce829c5402436d58 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 26 Oct 2021 11:03:22 +1000
+Subject: [PATCH 2/2] test: handle chdir errors correctly
+
+When we get to this code, we already updated the environment variables
+so we need to use the usual error path to restore them.
+
+And where chdir does fail, print an error to the log. 256 chars should
+be enough here, if your tmpdir exceeds that you just have the error
+message cut off.
+---
+ test/pwtest.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/test/pwtest.c b/test/pwtest.c
+index a000153fd..35e7b003c 100644
+--- a/test/pwtest.c
++++ b/test/pwtest.c
+@@ -936,8 +936,10 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
+ 	spa_assert_se(tmpdir != NULL);
+ 	r = chdir(tmpdir);
+ 	if (r < 0) {
++		char *buf = pw_array_add(&t->logs[FD_LOG], 256);
++		spa_scnprintf(buf, 256, "pwtest: failed to chdir to '%s'\n", tmpdir);
+ 		t->sig_or_errno = -errno;
+-		return;
++		goto error;
+ 	}
+ 
+ 	if (t->args.pw_daemon) {
+-- 
+GitLab
+
diff --git a/srcpkgs/pipewire/patches/f8817b4.patch b/srcpkgs/pipewire/patches/f8817b4.patch
deleted file mode 100644
index ab410b061bd1..000000000000
--- a/srcpkgs/pipewire/patches/f8817b4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
----
- spa/plugins/support/cpu-arm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c
-index d80b8ad87..de07ebf41 100644
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- 	int arch;
- 
- 	if (!(cpuinfo = get_cpuinfo())) {
--		spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+		spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- 		return 1;
- 	}
- 
--- 
-GitLab
-
diff --git a/srcpkgs/pipewire/patches/no-LIB-token.patch b/srcpkgs/pipewire/patches/no-LIB-token.patch
new file mode 100644
index 000000000000..6573e2aeb7f4
--- /dev/null
+++ b/srcpkgs/pipewire/patches/no-LIB-token.patch
@@ -0,0 +1,27 @@
+As void doesn't support multiarch, remove the glibc specific $LIB dynamic string
+token, which otherwise breaks musl.
+diff --git a/meson.build.orig b/meson.build
+index 7172ee4..7af3373 100644
+--- a/meson.build
++++ b/meson.build
+@@ -39,19 +39,7 @@ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
+ pipewire_confdatadir = pipewire_datadir / 'pipewire'
+ modules_install_dir = pipewire_libdir / pipewire_name
+ 
+-if host_machine.system() == 'linux'
+-  # glibc ld.so interprets ${LIB} in a library loading path with an
+-  # appropriate value for the current architecture, typically something
+-  # like lib, lib64 or lib/x86_64-linux-gnu.
+-  # This allows the same pw-jack script to work for both 32- and 64-bit
+-  # applications on biarch/multiarch distributions, by setting something
+-  # like LD_LIBRARY_PATH='/usr/${LIB}/pipewire-0.3/jack'.
+-  # Note that ${LIB} is a special token expanded by the runtime linker,
+-  # not an environment variable, and must be passed through literally.
+-  modules_install_dir_dlopen = prefix / '${LIB}' / pipewire_name
+-else
+-  modules_install_dir_dlopen = modules_install_dir
+-endif
++modules_install_dir_dlopen = modules_install_dir
+ 
+ spa_plugindir = pipewire_libdir / spa_name
+ spa_datadir = pipewire_datadir / spa_name
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 53ab873c9d87..fc8b75f3aaf9 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,8 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.38
+version=0.3.39
 revision=1
+_pms_version=0.4.0
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -13,6 +14,7 @@ configure_args="
  -Dsystemd=disabled
  -Dudevrulesdir=/usr/lib/udev/rules.d
  -Dvulkan=enabled
+ -Dmedia-session:systemd=disabled
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -21,14 +23,17 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
- libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
+ libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
+ libspa-v4l2>=${version}_${revision}"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
 license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=2a2424cea5bfdca88503fd8616fff891aa8355e850cab19e875050fe60c35ce7
+distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
+checksum="2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
+ c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
@@ -47,6 +52,10 @@ else
 	configure_args+=" -Dbluez5-codec-ldac=disabled"
 fi
 
+post_extract() {
+	mv ${XBPS_BUILDDIR}/media-session-${_pms_version} ${wrksrc}/subprojects/media-session
+}
+
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"

From 21e9a663359395e74a8ce08b07774cd9d9eba60e Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 7 Apr 2021 22:50:49 -0700
Subject: [PATCH 2297/4088] intellij-idea-ultimate-edition: update to 2021.2.3.

---
 .../intellij-idea-ultimate-edition/template   | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index d7a2adb865f0..e3b32fea16d8 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,17 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2.1
+version=2021.2.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.5080.55"
+create_wrksrc="true"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
-distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=9cf405e13bb25768050779a6fd923021ba1cee7f559253ad6ecb0f985a52a788
+_filename="ideaIU-${version}-no-jbr.tar.gz"
+distfiles="https://download.jetbrains.com/idea/${_filename}"
+checksum=0d879d4b16f096b81f401e0ab76a8b565d8142c632f9667cdb7fe5e6bd9813b4
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -18,39 +19,50 @@ nopie=yes
 noverifyrdeps=yes
 python_version=3
 
+do_extract() {
+	bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
+}
+
 post_extract() {
 	# Remove files for other OSes
-	rm -rf plugins/webp/lib/libwebp/win
-	rm -rf plugins/webp/lib/libwebp/mac
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
 	rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
 	rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
 	rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
 	rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf **/*.dll
-	rm -rf **/*.dylib
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/webp/lib/libwebp/mac
+	rm -rf plugins/webp/lib/libwebp/win
 
 	# Remove files for other CPU architectures
-	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf bin/fsnotifier-arm
 	rm -rf lib/pty4j-native/linux/aarch64
-	rm -rf lib/pty4j-native/linux/mips64el
 	rm -rf lib/pty4j-native/linux/arm
+	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/ppc64le
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
+			rm -rf bin/idea.vmoptions
 			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
 			rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
 			rm -rf plugins/performanceTesting/bin/libyjpagent.so
+			rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
 			;;
 		i686)
-			rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
-			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf bin/idea64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
+			rm -rf lib/pty4j-native/linux/x86_64
+			rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
 			rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
 			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
+			rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
 			;;
 	esac
 }

From 44e72030896ba3dbd57d357b53f352243175f525 Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 17 Oct 2021 23:23:32 +0200
Subject: [PATCH 2298/4088] intel-gmmlib: update to 21.3.2.

---
 common/shlibs                 | 2 +-
 srcpkgs/intel-gmmlib/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8e5cf6f4a2f0..990a224bf7d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3858,7 +3858,7 @@ libnvpair.so.3 zfs-2.0.3_2
 libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
-libigdgmm.so.11 intel-gmmlib-19.4.1_1
+libigdgmm.so.11 intel-gmmlib-21.3.1_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
 librdkafka.so.1 librdkafka-1.4.4_3
 librdkafka++.so.1 librdkafka-1.4.4_3
diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index 8f71e6d0780b..284449a30415 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-gmmlib'
 pkgname=intel-gmmlib
-version=21.2.1
+version=21.3.2
 revision=1
 archs="i686* x86_64*"
 wrksrc=gmmlib-intel-gmmlib-${version}
@@ -19,7 +19,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
 license="MIT"
 homepage="https://github.com/intel/gmmlib"
 distfiles="https://github.com/intel/gmmlib/archive/intel-gmmlib-${version}.tar.gz"
-checksum=912cd86e4cb564b6fa549d69a28b72b9cdcb5a3eab9320955ed70ac37381fc2f
+checksum=a6a61ff7e66cb710be1593f2afbda3b21c679fe953bf5e80a5b3f047c1cbdb6c
 
 lib32disabled=yes
 

From fc696651028e2749069005c1bbb3a2cbf0b8bc95 Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 17 Oct 2021 23:24:57 +0200
Subject: [PATCH 2299/4088] libva: update to 2.13.0

---
 common/shlibs          | 8 ++++----
 srcpkgs/libva/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 990a224bf7d3..7879b58fc97e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -844,11 +844,11 @@ libwebp.so.7 libwebp-0.6.0_1
 libwebpmux.so.3 libwebp-0.6.0_1
 libwebpdemux.so.2 libwebp-0.5.0_1
 libwebpdecoder.so.3 libwebp-0.6.0_1
-libva-x11.so.2 libva-2.2.0_1
-libva.so.2 libva-2.2.0_1
+libva-x11.so.2 libva-2.13.0_1
+libva.so.2 libva-2.13.0_1
 libva-glx.so.2 libva-glx-2.2.0_1
-libva-drm.so.2 libva-2.2.0_1
-libva-wayland.so.2 libva-2.2.0_1
+libva-drm.so.2 libva-2.13.0_1
+libva-wayland.so.2 libva-2.13.0_1
 libv4l2.so.0 v4l-utils-0.8.5_1
 libv4lconvert.so.0 v4l-utils-0.8.5_1
 libv4l1.so.0 v4l-utils-0.8.5_1
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 7c10764e3fbe..cc2334fcc3c6 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,7 +1,7 @@
 # Template file for 'libva'
 # NOTE: keep this pkg synchronized with libva-glx
 pkgname=libva
-version=2.12.0
+version=2.13.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
 distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=7bca8c8a854653e15e602f243e2452e84e4b454b26549bf80a932ab29d7d6b21
+checksum=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
 
 build_options="wayland"
 build_options_default="wayland"

From bd174100e949b40383571c53f38e1849ba0c37eb Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 17 Oct 2021 23:25:09 +0200
Subject: [PATCH 2300/4088] libva-glx: update to 2.13.0

---
 common/shlibs              | 2 +-
 srcpkgs/libva-glx/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7879b58fc97e..f7c1a790b201 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -846,7 +846,7 @@ libwebpdemux.so.2 libwebp-0.5.0_1
 libwebpdecoder.so.3 libwebp-0.6.0_1
 libva-x11.so.2 libva-2.13.0_1
 libva.so.2 libva-2.13.0_1
-libva-glx.so.2 libva-glx-2.2.0_1
+libva-glx.so.2 libva-glx-2.13.0_1
 libva-drm.so.2 libva-2.13.0_1
 libva-wayland.so.2 libva-2.13.0_1
 libv4l2.so.0 v4l-utils-0.8.5_1
diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template
index 685988ebf6d0..268daeda3f3e 100644
--- a/srcpkgs/libva-glx/template
+++ b/srcpkgs/libva-glx/template
@@ -7,7 +7,7 @@
 # KEEP THIS PACKAGE SYNCHRONIZED WITH "libva".
 #
 pkgname=libva-glx
-version=2.12.0
+version=2.13.0
 revision=1
 wrksrc="libva-${version}"
 build_style=meson
@@ -20,7 +20,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
 distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=7bca8c8a854653e15e602f243e2452e84e4b454b26549bf80a932ab29d7d6b21
+checksum=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
 
 post_install() {
 	# We are only interested in the glx component, remove everything else.

From c70f620349601332a37939543dcaaac8996ef19b Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 17 Oct 2021 23:25:50 +0200
Subject: [PATCH 2301/4088] libva-utils: update to 2.13.0

---
 srcpkgs/libva-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template
index 55fa5be3cc6d..0cf9bd48088c 100644
--- a/srcpkgs/libva-utils/template
+++ b/srcpkgs/libva-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'libva-utils'
 pkgname=libva-utils
-version=2.12.0
+version=2.13.0
 revision=1
 build_style=meson
 configure_args="-Ddrm=true -Dx11=true -Dwayland=true"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva-utils/master/NEWS"
 distfiles="https://github.com/intel/libva-utils/archive/${version}.tar.gz"
-checksum=bcab647f42147aa5cf83b324b6c3fe69e392e44d34aababfafcb6c3b4310377d
+checksum=128333faa9792a3b87586a80bfb70859dcdd81847ec9a722f785a601a48e1731
 
 post_install() {
 	vlicense COPYING

From a5742b1227b7ba5c5c88905e946bb7c3c855904f Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 17 Oct 2021 23:26:41 +0200
Subject: [PATCH 2302/4088] intel-media-driver: update to 21.3.5

---
 common/shlibs                       | 1 +
 srcpkgs/intel-media-driver/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f7c1a790b201..0633c64ad83e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3859,6 +3859,7 @@ libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-21.3.1_1
+libigfxcmrt.so.7 intel-media-driver-21.3.5_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
 librdkafka.so.1 librdkafka-1.4.4_3
 librdkafka++.so.1 librdkafka-1.4.4_3
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index f8864e717229..531aedd1786a 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-media-driver'
 pkgname=intel-media-driver
-version=21.2.3
+version=21.3.5
 revision=1
 archs="x86_64*"
 wrksrc=media-driver-intel-media-${version}
@@ -13,7 +13,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
-checksum=7b190a980447284508969da38971cfdaaf6e69d840d49e81f5969e124bf17e16
+checksum=182925ed21c0a9843a63865e34dc35bf713294260d14ceb29e8de0de2e34733f
 
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"

From 5e6ed3432443d36e390a44e1dea638d7247f7f6e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 29 Oct 2021 00:37:47 +0200
Subject: [PATCH 2303/4088] kmod: update to 29.

---
 srcpkgs/kmod/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template
index e9b8c26161e8..4a10a0f7f533 100644
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@@ -1,7 +1,7 @@
 # Template file for 'kmod'
 pkgname=kmod
-version=27
-revision=3
+version=29
+revision=1
 build_style=gnu-configure
 configure_args="--with-zlib --with-xz"
 hostmakedepends="pkg-config"
@@ -16,7 +16,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"
 distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz"
-checksum=c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c
+checksum=0b80eea7aa184ac6fd20cafa2a1fdf290ffecc70869a797079e2cc5c6225a52a
+make_check=no # needs access to /lib/modules/$(uname -r)/build
 
 post_install() {
 	vinstall ${FILESDIR}/depmod-search.conf 644 usr/lib/depmod.d search.conf

From cc70fc0f778c06e061af53d61b4f164bc169b311 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 30 Oct 2021 15:08:55 +0200
Subject: [PATCH 2304/4088] s3cmd: update to 2.2.0.

---
 .../patches/python-3.9-compatibility.patch    | 54 -------------------
 srcpkgs/s3cmd/template                        |  9 ++--
 2 files changed, 5 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/s3cmd/patches/python-3.9-compatibility.patch

diff --git a/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch b/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch
deleted file mode 100644
index beec572e7880..000000000000
--- a/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-# This patch has been already merged into `master`
-# and should be dropped after next release.
-# See https://github.com/s3tools/s3cmd/pull/1137
-
-From 328ced84fe688db5ef0385f5c763cd948087d81f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
-Date: Fri, 2 Oct 2020 14:24:09 +0200
-Subject: [PATCH] fix compatibility with Python 3.9
-
-getchildren() method was removed from the ElementTree and Element classes in
-Python 3.9. See the release notes:
-
-https://docs.python.org/3.9/whatsnew/3.9.html#removed
----
- S3/Exceptions.py | 2 +-
- S3/Utils.py      | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/S3/Exceptions.py
-+++ b/S3/Exceptions.py
-@@ -127,7 +127,7 @@ def parse_error_xml(tree):
-         if not error_node.tag == "Error":
-             error_node = tree.find(".//Error")
-         if error_node is not None:
--            for child in error_node.getchildren():
-+            for child in error_node:
-                 if child.text != "":
-                     debug("ErrorXML: " + child.tag + ": " + repr(child.text))
-                     info[child.tag] = child.text
---- a/S3/Utils.py
-+++ b/S3/Utils.py
-@@ -65,9 +65,9 @@ def parseNodes(nodes):
-     retval = []
-     for node in nodes:
-         retval_item = {}
--        for child in node.getchildren():
-+        for child in node:
-             name = decode_from_s3(child.tag)
--            if child.getchildren():
-+            if len(child):
-                 retval_item[name] = parseNodes([child])
-             else:
-                 found_text = node.findtext(".//%s" % child.tag)
-@@ -124,8 +124,8 @@ def getListFromXml(xml, node):
- 
- def getDictFromTree(tree):
-     ret_dict = {}
--    for child in tree.getchildren():
--        if child.getchildren():
-+    for child in tree:
-+        if len(child):
-             ## Complex-type child. Recurse
-             content = getDictFromTree(child)
-         else:
diff --git a/srcpkgs/s3cmd/template b/srcpkgs/s3cmd/template
index 56671c568562..96da980e5296 100644
--- a/srcpkgs/s3cmd/template
+++ b/srcpkgs/s3cmd/template
@@ -1,17 +1,18 @@
 # Template file for 's3cmd'
 pkgname=s3cmd
-version=2.1.0
-revision=4
+version=2.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-dateutil"
 short_desc="Command line tool for Amazon S3"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
-changelog="https://github.com/s3tools/s3cmd/raw/master/NEWS"
 homepage="http://s3tools.org/s3cmd"
+changelog="https://github.com/s3tools/s3cmd/raw/master/NEWS"
 distfiles="https://github.com/s3tools/${pkgname}/archive/v${version}.tar.gz"
-checksum=2293f775fde77201bf8e489f20516fd594168c77897168f129e5c1a2b33b7e37
+checksum=97283ed51f0fe46d2fa82c196f775603f90dbe1d080fcb81acb361106599258d
+make_check="no" # requires a s3 server
 
 pre_install() {
 	export S3CMD_INSTPATH_DOC="share/doc"

From 8a0d78b605a65ea7544d1a64a13cf927582d5584 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Oct 2021 20:15:38 +0200
Subject: [PATCH 2305/4088] lnav: update to 0.10.1.

---
 srcpkgs/lnav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..a4e86c5b7940 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,6 +1,6 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=4af855a463493105ae0746fc0da80304a689b5394eb6abfeede4dd843127c8bc
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 62237a79ad78f2f3e76e4ecd1951f11e5c3003dd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Oct 2021 20:54:47 +0200
Subject: [PATCH 2306/4088] ugrep: update to 3.3.8.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..39891a0af99f 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.8
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=1bdc73ca5fc12a41c2f7949900edee0972ca3e5f39066c8d68449846df4cf1d7
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From be5ee4e446b069c0c490580bf331d7f15e4de6a7 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Wed, 20 Oct 2021 14:24:41 +0300
Subject: [PATCH 2307/4088] nvidia: fix fbc and ifr libs

Remove unnecessary installs, which were overwriting 64bit fbc and ifr libraries
with 32bit.
---
 srcpkgs/nvidia/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 6a36471c1079..d792d3123fb6 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.74
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -103,10 +103,6 @@ _install_libs() {
 		${DESTDIR}/${libdir}/libnvidia-allocator.so.1
 	ln -sf libnvidia-allocator.so.1 \
 		${DESTDIR}/${libdir}/libnvidia-allocator.so
-
-	# helper libs for approved partners' GRID remote apps
-	vinstall libnvidia-ifr.so.${version} 755 usr/lib
-	vinstall libnvidia-fbc.so.${version} 755 usr/lib
 }
 
 do_extract() {

From bee7d77495f9470fd8367e6dd2004795033b7cda Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Thu, 14 Oct 2021 07:38:53 +1000
Subject: [PATCH 2308/4088] kubernetes-helm: update to 3.7.1

---
 srcpkgs/kubernetes-helm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template
index 4a8c2e4597cd..67784ab94544 100644
--- a/srcpkgs/kubernetes-helm/template
+++ b/srcpkgs/kubernetes-helm/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-helm'
 pkgname=kubernetes-helm
-version=3.7.0
+version=3.7.1
 revision=1
 wrksrc="helm-${version}"
 hostmakedepends="go make git mercurial tar"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://helm.sh/"
 distfiles="https://github.com/helm/helm/archive/v${version}.tar.gz"
-checksum=2d71d0524f358aeec0ff290194680e98b7268ac8fee4d9b69b0315b7dae15900
+checksum=5243dd0e07840404a7d19ca0917b2202ee3a5ad70a081cfa455ffd705a8d3624
 conflicts="helm"
 nopie=true
 

From 2c38af716912a15518ce81c1dd6361f93e984993 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Thu, 7 Oct 2021 15:44:54 -0500
Subject: [PATCH 2309/4088] php: patch to use enchant2

Upstream commit which documents change for enchant2:
https://github.com/php/php-src/commit/66d42e98844de694c6f77c299a3dc045ac5a3261

This patch is based on
https://github.com/archlinux/svntogit-packages/blob/10e873a1e11e7911f9e5e7ba604fe53c44d48c6c/trunk/enchant-2.patch
---
 srcpkgs/php/patches/php-enchant2.patch | 103 +++++++++++++++++++++++++
 srcpkgs/php/template                   |   4 +-
 2 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/php/patches/php-enchant2.patch

diff --git a/srcpkgs/php/patches/php-enchant2.patch b/srcpkgs/php/patches/php-enchant2.patch
new file mode 100644
index 000000000000..b82c41211123
--- /dev/null
+++ b/srcpkgs/php/patches/php-enchant2.patch
@@ -0,0 +1,103 @@
+diff --git a/configure b/configure
+index 3ece7a4..b832a68 100755
+--- a/configure
++++ b/configure
+@@ -28123,19 +28123,19 @@ $as_echo "$ext_output" >&6; }
+ if test "$PHP_ENCHANT" != "no"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant" >&5
+-$as_echo_n "checking for enchant... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5
++$as_echo_n "checking for enchant-2... " >&6; }
+ 
+ if test -n "$ENCHANT_CFLAGS"; then
+     pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "enchant") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant" 2>/dev/null`
++  pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant-2" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -28147,12 +28147,12 @@ if test -n "$ENCHANT_LIBS"; then
+     pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "enchant") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant" 2>/dev/null`
++  pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant-2" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -28173,14 +28173,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant" 2>&1`
++	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant-2" 2>&1`
+         else
+-	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant" 2>&1`
++	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant-2" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ENCHANT_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (enchant) were not met:
++	as_fn_error $? "Package requirements (enchant-2) were not met:
+ 
+ $ENCHANT_PKG_ERRORS
+ 
+diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
+index 6ce9d4b..1923726 100644
+--- a/ext/enchant/enchant.c
++++ b/ext/enchant/enchant.c
+@@ -738,7 +738,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
+ 			for (i = 0; i < n_sugg; i++) {
+ 				add_next_index_string(sugg, suggs[i]);
+ 			}
+-			enchant_dict_free_suggestions(pdict->pdict, suggs);
++			enchant_dict_free_string_list(pdict->pdict, suggs);
+ 		}
+ 
+ 
+@@ -793,7 +793,7 @@ PHP_FUNCTION(enchant_dict_suggest)
+ 			add_next_index_string(return_value, suggs[i]);
+ 		}
+ 
+-		enchant_dict_free_suggestions(pdict->pdict, suggs);
++		enchant_dict_free_string_list(pdict->pdict, suggs);
+ 	}
+ }
+ /* }}} */
+@@ -813,7 +813,7 @@ PHP_FUNCTION(enchant_dict_add_to_personal)
+ 
+ 	PHP_ENCHANT_GET_DICT;
+ 
+-	enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
++	enchant_dict_add(pdict->pdict, word, wordlen);
+ }
+ /* }}} */
+ 
+@@ -851,7 +851,7 @@ PHP_FUNCTION(enchant_dict_is_in_session)
+ 
+ 	PHP_ENCHANT_GET_DICT;
+ 
+-	RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
++	RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
+ }
+ /* }}} */
+ 
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 927bbf8504f8..141f7fee310d 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,9 +1,9 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=6
+revision=7
 hostmakedepends="bison pkg-config apache-devel"
-makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
  postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel

From 7feb1f18a225a34c965c6f76690ba3100a41e9b9 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 17 Oct 2021 09:05:41 +0200
Subject: [PATCH 2310/4088] xcb-proto: adjust to automake 1.16.4 changes

---
 srcpkgs/xcb-proto/patches/automake.patch | 15 +++++++++++++++
 srcpkgs/xcb-proto/template               |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xcb-proto/patches/automake.patch

diff --git a/srcpkgs/xcb-proto/patches/automake.patch b/srcpkgs/xcb-proto/patches/automake.patch
new file mode 100644
index 000000000000..86261a813160
--- /dev/null
+++ b/srcpkgs/xcb-proto/patches/automake.patch
@@ -0,0 +1,15 @@
+Adjust to automake 1.16.4 changes
+
+Source:
+https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/25
+
+--- a/xcb-proto.pc.in	2020-10-09 00:29:51.000000000 +0200
++++ b/xcb-proto.pc.in	2021-10-17 08:41:54.133860291 +0200
+@@ -4,6 +4,7 @@
+ datadir=@datadir@
+ libdir=@libdir@
+ xcbincludedir=${pc_sysrootdir}@xcbincludedir@
++PYTHON_PREFIX=@PYTHON_PREFIX@
+ pythondir=${pc_sysrootdir}@pythondir@
+ 
+ Name: XCB Proto
diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template
index 406869052bcf..f32af68c5ca1 100644
--- a/srcpkgs/xcb-proto/template
+++ b/srcpkgs/xcb-proto/template
@@ -1,7 +1,7 @@
 # Template file for 'xcb-proto'
 pkgname=xcb-proto
 version=1.14.1
-revision=2
+revision=3
 wrksrc="xcbproto-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="python3 automake"

From f5370c1c2f2cf87cedea49b7728becd28c42e515 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 17 Oct 2021 10:10:46 +0200
Subject: [PATCH 2311/4088] compizconfig-python: adjust to automake 1.16.4
 changes

---
 srcpkgs/compizconfig-python/patches/automake.patch | 12 ++++++++++++
 srcpkgs/compizconfig-python/template               |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/compizconfig-python/patches/automake.patch

diff --git a/srcpkgs/compizconfig-python/patches/automake.patch b/srcpkgs/compizconfig-python/patches/automake.patch
new file mode 100644
index 000000000000..58095b8251a1
--- /dev/null
+++ b/srcpkgs/compizconfig-python/patches/automake.patch
@@ -0,0 +1,12 @@
+Adjust to automake 1.16.4 changes
+
+--- a/compizconfig-python.pc.in	2020-04-04 20:41:47.000000000 +0200
++++ b/compizconfig-python.pc.in	2021-10-17 10:02:14.836742131 +0200
+@@ -2,6 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++PYTHON_EXEC_PREFIX=@PYTHON_EXEC_PREFIX@
+ pyexecdir=@pyexecdir@
+ 
+ Name: compizconfig-python
diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template
index f8d0e01dd054..aef631800dd5 100644
--- a/srcpkgs/compizconfig-python/template
+++ b/srcpkgs/compizconfig-python/template
@@ -1,7 +1,7 @@
 # Template file for 'compizconfig-python'
 pkgname=compizconfig-python
 version=0.8.18
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config glib-devel gettext-devel

From 7cadfc0a9439355b5066ae093ee0f0bd8955b57c Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Fri, 15 Oct 2021 14:18:19 +0200
Subject: [PATCH 2312/4088] asciidoc: update to 9.1.1.

---
 srcpkgs/asciidoc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index 1b2ec9bd3fee..376f4d3be5f3 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -1,6 +1,6 @@
 # Template file for 'asciidoc'
 pkgname=asciidoc
-version=9.1.0
+version=9.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="docbook-xsl libxslt python3"
@@ -9,7 +9,7 @@ conf_files="/etc/asciidoc/filters/*/*.conf /etc/asciidoc/*.conf"
 short_desc="Text based document generation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://asciidoc.org/"
-changelog="https://asciidoc.org/CHANGELOG.html"
+homepage="https://asciidoc-py.github.io"
+changelog="https://asciidoc-py.github.io/CHANGELOG.html"
 distfiles="https://github.com/asciidoc-py/asciidoc-py/releases/download/$version/asciidoc-$version.tar.gz"
-checksum=fd499fcf51317b1aaf27336fb5e919c44c1f867f1ae6681ee197365d3065238b
+checksum=ea39760ac2739496c14002902571592dc2ae2fa673296ec141a9e491d9c11fca

From 0e4e5f64634ba56f3ab225261678fcb6fd74485f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 9 Jan 2018 23:00:22 -0300
Subject: [PATCH 2313/4088] New package: givaro-4.1.1

---
 common/shlibs           |  1 +
 srcpkgs/givaro-devel    |  1 +
 srcpkgs/givaro/template | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/givaro-devel
 create mode 100644 srcpkgs/givaro/template

diff --git a/common/shlibs b/common/shlibs
index 0633c64ad83e..ca6325a1ceec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3999,6 +3999,7 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
 libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
+libgivaro.so.9 givaro-4.1.1_1
 libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/givaro-devel b/srcpkgs/givaro-devel
new file mode 120000
index 000000000000..587339b2c069
--- /dev/null
+++ b/srcpkgs/givaro-devel
@@ -0,0 +1 @@
+givaro
\ No newline at end of file
diff --git a/srcpkgs/givaro/template b/srcpkgs/givaro/template
new file mode 100644
index 000000000000..9c16de5b1974
--- /dev/null
+++ b/srcpkgs/givaro/template
@@ -0,0 +1,37 @@
+# Template file for 'givaro'
+pkgname=givaro
+version=4.1.1
+revision=1
+build_style=gnu-configure
+makedepends="gmpxx-devel"
+short_desc="C++ library for arithmetic and algebraic computations"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="CECILL-B"
+homepage="https://github.com/linbox-team/givaro"
+distfiles="https://github.com/linbox-team/givaro/releases/download/v${version}/givaro-${version}.tar.gz"
+checksum=628049899386e91da245aee6cd446350fbca87e94863bc0d815066c08150487f
+nocross=yes
+
+build_options="native_build"
+
+if [ -z "$build_option_native_build" ]; then
+	configure_args="--enable-sse --enable-sse2
+	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
+	  --disable-avx --disable-avx2 --disable-fma --disable-fma4"
+fi
+
+post_install() {
+	vlicense "Licence_CeCILL-B_V1-en.txt"
+}
+
+givaro-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/bin
+	}
+}

From b2d4f04116e065a2cd07ce61b5ca0cf03676cf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 9 Jan 2018 23:39:59 -0300
Subject: [PATCH 2314/4088] New package: fflas-ffpack-2.4.3

---
 srcpkgs/fflas-ffpack/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/fflas-ffpack/template

diff --git a/srcpkgs/fflas-ffpack/template b/srcpkgs/fflas-ffpack/template
new file mode 100644
index 000000000000..557c644c00a4
--- /dev/null
+++ b/srcpkgs/fflas-ffpack/template
@@ -0,0 +1,24 @@
+# Template file for 'fflas-ffpack'
+pkgname=fflas-ffpack
+version=2.4.3
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="givaro-devel openblas-devel"
+depends="${makedepends}"
+short_desc="Finite Field Linear Algebra Subroutines / Package"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="LGPL-2.1-or-later"
+homepage="http://linbox-team.github.io/fflas-ffpack/"
+distfiles="https://github.com/linbox-team/fflas-ffpack/releases/download/${version}/fflas-ffpack-${version}.tar.gz"
+checksum=f372783a17a9899ee9f88d4c9421d80facccb95556146dad7020d07a03791cc9
+nocross=yes
+
+build_options="native_build"
+
+if [ -z "$build_option_native_build" ]; then
+	configure_args="--enable-sse --enable-sse2
+	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
+	  --disable-avx --disable-avx2 --disable-fma --disable-fma4
+	  --disable-avx512f --disable-avx512dq --disable-avx512vl"
+fi

From e0836487557c9f4f38be4f5810e1f39fb08f129c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 10 Jan 2018 00:14:35 -0300
Subject: [PATCH 2315/4088] New package: linbox-1.6.3

---
 common/shlibs                                 |  1 +
 srcpkgs/linbox-devel                          |  1 +
 ...8adade10641f1f04f04b589753d928fb5443.patch | 35 +++++++++++++++++++
 srcpkgs/linbox/template                       | 35 +++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 120000 srcpkgs/linbox-devel
 create mode 100644 srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
 create mode 100644 srcpkgs/linbox/template

diff --git a/common/shlibs b/common/shlibs
index ca6325a1ceec..7e95fce39f7e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,6 +4000,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libgivaro.so.9 givaro-4.1.1_1
+liblinbox.so.0 linbox-1.6.3_1
 libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/linbox-devel b/srcpkgs/linbox-devel
new file mode 120000
index 000000000000..4b90ac79c1e7
--- /dev/null
+++ b/srcpkgs/linbox-devel
@@ -0,0 +1 @@
+linbox
\ No newline at end of file
diff --git a/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch b/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
new file mode 100644
index 000000000000..5afa078ec7b8
--- /dev/null
+++ b/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
@@ -0,0 +1,35 @@
+From 892f8adade10641f1f04f04b589753d928fb5443 Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance@piedmont.edu>
+Date: Sun, 9 May 2021 12:14:19 -0400
+Subject: [PATCH] Use std::ptrdiff_t for vector iterator difference type
+
+It was previously long (64-bit integers), but this will not be the
+case on 32-bit systems.
+
+Closes: #273
+---
+ linbox/vector/bit-vector.inl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/linbox/vector/bit-vector.inl b/linbox/vector/bit-vector.inl
+index 5fa84b421..23a22ba47 100644
+--- a/linbox/vector/bit-vector.inl
++++ b/linbox/vector/bit-vector.inl
+@@ -46,7 +46,7 @@ namespace std
+ 		typedef LinBox::BitVector::reference reference;
+ 		typedef bool *pointer;
+ 		typedef bool value_type;
+-		typedef long difference_type;
++		typedef std::ptrdiff_t difference_type;
+ 	};
+ 
+ 	template <>
+@@ -56,7 +56,7 @@ namespace std
+ 		typedef LinBox::BitVector::const_reference reference;
+ 		typedef const bool *pointer;
+ 		typedef bool value_type;
+-		typedef long difference_type;
++		typedef std::ptrdiff_t difference_type;
+ 	};
+ }
+ 
diff --git a/srcpkgs/linbox/template b/srcpkgs/linbox/template
new file mode 100644
index 000000000000..3ea51f5dcce1
--- /dev/null
+++ b/srcpkgs/linbox/template
@@ -0,0 +1,35 @@
+# Template file for 'linbox'
+pkgname=linbox
+version=1.6.3
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="fflas-ffpack"
+short_desc="C++ library for exact, high-performance linear algebra"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="LGPL-2.1-or-later"
+homepage="https://linalg.org"
+distfiles="https://github.com/linbox-team/linbox/releases/download/v${version}/linbox-${version}.tar.gz"
+checksum=a58a188307b07c57964e844bceb99321d3043a8a4a1fccc082a54928bb9a0057
+nocross=yes
+
+build_options="native_build"
+
+if [ -z "$build_option_native_build" ]; then
+	configure_args="--enable-sse --enable-sse2
+	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
+	  --disable-avx --disable-avx2 --disable-fma --disable-fma4"
+fi
+
+linbox-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/bin
+		vmove usr/share
+	}
+}

From 5eb4595b12052bda48bb199ce41d1f69349ad73b Mon Sep 17 00:00:00 2001
From: Marisa Smith <priparadigm@gmail.com>
Date: Sat, 30 Oct 2021 16:23:52 -0500
Subject: [PATCH 2316/4088] heyu: update to 2.10.3.

Closes: #33834 [via git-merge-pr]
---
 srcpkgs/heyu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/heyu/template b/srcpkgs/heyu/template
index 2537b473e4fa..8ecb3311c72f 100644
--- a/srcpkgs/heyu/template
+++ b/srcpkgs/heyu/template
@@ -1,7 +1,7 @@
 # Template file for 'heyu'
 pkgname=heyu
-version=2.10.1
-revision=4
+version=2.10.3
+revision=1
 build_style=configure
 configure_script="./Configure"
 configure_args="linux"
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.heyu.org"
 distfiles="https://github.com/HeyuX10Automation/heyu/archive/v${version}.tar.gz"
-checksum=621a20f45eef62070b3f95ad17ecbc3e7e1f7352d25dac86093ff6938b606baa
+checksum=0c3435ea9cd57cd78c29047b9c961f4bfbec39f42055c9949acd10dd9853b628
 
 CFLAGS="-fcommon"
 

From 9c3ad9ac57cac5b574d9dd5321a339f295f4c7b6 Mon Sep 17 00:00:00 2001
From: Marisa Smith <priparadigm@gmail.com>
Date: Sat, 30 Oct 2021 16:55:27 -0500
Subject: [PATCH 2317/4088] goreleaser: update to 0.183.0.

---
 srcpkgs/goreleaser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index a748c0925115..79443ae4e538 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,6 +1,6 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
-version=0.180.3
+version=0.183.0
 revision=1
 build_style=go
 go_import_path=github.com/goreleaser/goreleaser
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://goreleaser.com/"
 distfiles="https://github.com/goreleaser/goreleaser/archive/refs/tags/v$version.tar.gz"
-checksum=8cfd8e09638a5ad4a8d3e3bdb61a05244e8190546f2c97b1cee2190a6b94cca8
+checksum=880d91c4e3dc04cfc835a4ae598539e529ef0ad764211dcc27670dcddca02af2
 
 post_install() {
 	vlicense LICENSE.md

From f281767eb9876168533e3c6c15e600c4da0ad753 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 30 Oct 2021 22:28:25 +0300
Subject: [PATCH 2318/4088] gops: update to 0.3.22.

---
 srcpkgs/gops/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index 1277341396b9..661df9c52c06 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.22
 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=a8092305465b28b0db83eb7087edca958de6522bc3ebb14656ecb8aef521e07b
 
 post_install() {
 	vlicense LICENSE

From 7caa92d665c371f8cb01a48e7e3c19b8c5eea622 Mon Sep 17 00:00:00 2001
From: Marisa Smith <priparadigm@gmail.com>
Date: Sat, 30 Oct 2021 17:24:46 -0500
Subject: [PATCH 2319/4088] ssl_exporter: update to 2.3.1.

---
 srcpkgs/ssl_exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c80c96c52cc..b14f1c657420 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
-version=2.1.1
+version=2.3.1
 revision=1
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/ribbybibby/ssl_exporter"
 distfiles="https://github.com/ribbybibby/ssl_exporter/archive/v$version.tar.gz"
-checksum=570875ad6497657e50c097cc5d88eaf06f60b3023bef3abc0e8ca76f8f1b497d
+checksum=78b72da0da14be809712d416a270bef97b0118dac9b7410a49fcec80e0816be8
 
 post_install() {
 	vsv ssl_exporter

From 298dcc1b70dbc70216571e5fe08407742eef6163 Mon Sep 17 00:00:00 2001
From: Marisa Smith <priparadigm@gmail.com>
Date: Sat, 30 Oct 2021 17:52:34 -0500
Subject: [PATCH 2320/4088] loki: update to 2.3.0.

---
 srcpkgs/loki/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7e187bf67d6b..22fb3b9c2f4e 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,6 +1,6 @@
 # Template file for 'loki'
 pkgname=loki
-version=2.1.0
+version=2.3.0
 revision=1
 build_style=go
 go_import_path="github.com/grafana/loki"
@@ -8,8 +8,8 @@ go_package="${go_import_path}/cmd/loki
  ${go_import_path}/cmd/logcli
  ${go_import_path}/cmd/loki-canary"
 short_desc="Like Prometheus, but for logs"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grafana.com/oss/loki/"
 distfiles="https://github.com/grafana/loki/archive/v$version.tar.gz"
-checksum=ceccc4e42a7158ca0bc49903a3fbe31c8cd55f85f50bac8a8bba9843b4f8cd6f
+checksum=c71174a2fbb7b6183cb84fc3a5e328cb4276a495c7c0be8ec53c377ec0363489

From 40b976bb725833dc77c9a4375bcbd54ed5990230 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 23 Oct 2021 12:27:39 +0200
Subject: [PATCH 2321/4088] New package: pgmetrics-1.12.0

---
 srcpkgs/pgmetrics/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/pgmetrics/template

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
new file mode 100644
index 000000000000..944110d782cf
--- /dev/null
+++ b/srcpkgs/pgmetrics/template
@@ -0,0 +1,16 @@
+# Template file for 'pgmetrics'
+pkgname=pgmetrics
+version=1.12.0
+revision=1
+build_style=go
+go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+short_desc="Collect and display statistics from running Postgresql"
+maintainer="Gerardo Di iorio <arete74@gmail.com>"
+license="Apache-2.0"
+homepage="https://pgmetrics.io"
+distfiles="https://github.com/rapidloop/pgmetrics/archive/refs/tags/v${version}.tar.gz"
+checksum=82f2527b4754f3b96282d14de7ddbd98fa7030ede193361062b6a83f51c68acf
+
+post_install() {
+	vdoc README.md
+}

From b27c87be1d76cfb147a02f80e6ef951acc445115 Mon Sep 17 00:00:00 2001
From: Arthur Weagel <aweagel@users.noreply.github.com>
Date: Thu, 21 Oct 2021 00:44:38 -0600
Subject: [PATCH 2322/4088] New package: xh-0.13.0

---
 srcpkgs/xh/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/xh/template

diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
new file mode 100644
index 000000000000..b1e4ce1b76f6
--- /dev/null
+++ b/srcpkgs/xh/template
@@ -0,0 +1,28 @@
+# Template file for 'xh'
+pkgname=xh
+version=0.13.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Friendly and fast tool for sending HTTP requests"
+maintainer="Arthur Weagel <arthur.contrib@gmail.com>"
+license="MIT"
+homepage="https://github.com/ducaale/xh"
+changelog="https://github.com/ducaale/xh/blob/master/CHANGELOG.md"
+distfiles="https://github.com/ducaale/xh/archive/v${version}.tar.gz"
+checksum=d3e46b6db5a131237d5f980ccaae6f04c5ba7b06922d97c7f98f36f03cf581fe
+
+post_install() {
+	ln -sf /usr/bin/${pkgname} ${DESTDIR}/usr/bin/${pkgname}s
+
+	vcompletion completions/xh.bash bash
+	vcompletion completions/_xh zsh
+	vcompletion completions/xh.fish fish
+
+	vlicense LICENSE
+	vdoc README.md
+	for m in doc/*.1; do
+		vman "$m"
+	done
+}

From ef4496ec110de3183b24eb1339714a0a6113fdfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 24 Sep 2021 10:15:54 +0200
Subject: [PATCH 2323/4088] New package: git-cliff-0.3.0

---
 srcpkgs/git-cliff/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/git-cliff/template

diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
new file mode 100644
index 000000000000..b001ed458c70
--- /dev/null
+++ b/srcpkgs/git-cliff/template
@@ -0,0 +1,13 @@
+# Template file for 'git-cliff'
+pkgname=git-cliff
+version=0.3.0
+revision=1
+build_style=cargo
+make_install_args="--path git-cliff"
+make_check_args="-- --skip repo::test::git_log" # This test fails without a git repo
+short_desc="Changelog generator based on conventional commits"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-only"
+homepage="https://github.com/orhun/git-cliff"
+distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
+checksum=a2961e97837c40e3b3b00a31e3221585932ac65981bc31d0c20d061c003e9462

From 2a6248e4ef7e35367bb5f2dbf73f27ef9a3e6062 Mon Sep 17 00:00:00 2001
From: 674Y3r <87250374+674Y3r@users.noreply.github.com>
Date: Sun, 12 Sep 2021 19:40:33 +0200
Subject: [PATCH 2324/4088] palapeli: update to 21.08.2.

---
 srcpkgs/palapeli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/palapeli/template b/srcpkgs/palapeli/template
index f8ba459d127f..be43eec728b3 100644
--- a/srcpkgs/palapeli/template
+++ b/srcpkgs/palapeli/template
@@ -1,6 +1,6 @@
 # Template file for 'palapeli'
 pkgname=palapeli
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/palapeli"
 distfiles="${KDE_SITE}/release-service/${version}/src/palapeli-${version}.tar.xz"
-checksum=5ceb635f2bde6bb0455f1d03a21ad2f9c38851053de4fccc6131bd3aa6d7af86
+checksum=12db496b33183ee28c6e48a39ab794edff9a8f0e95c5f686fe46b9c24084865e

From 63b9752937af8d57a97a96625ce0efc4600ea529 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 31 Oct 2021 01:21:56 +0200
Subject: [PATCH 2325/4088] jitterentropy: update to 3.3.1.

---
 srcpkgs/jitterentropy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index 7a4c920ba86f..e90089d9a99d 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,6 +1,6 @@
 # Template file for 'jitterentropy'
 pkgname=jitterentropy
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="${pkgname}-library-${version}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://www.chronox.de/jent.html"
 distfiles="https://github.com/smuellerDD/jitterentropy-library/archive/v${version}.tar.gz"
-checksum=4868c169444e548b55f0149f3d688e53c02d1494f035e88b966e8979b58a2cc6
+checksum=4a50cb02b4836cd5550016e2fc2263e6982abaa11467a9e1cea260c1c2f7d487
 
 post_install() {
 	vlicense LICENSE

From 4ffcd85317a711eadb2545fad3d0d0153e97e272 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 31 Oct 2021 01:45:23 +0200
Subject: [PATCH 2326/4088] termshark: update to 2.3.0.

---
 srcpkgs/termshark/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 1b9c8765e748..4656690cb609 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
-version=2.2.0
-revision=2
+version=2.3.0
+revision=1
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"
@@ -12,7 +12,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="MIT"
 homepage="https://github.com/gcla/termshark"
 distfiles="https://github.com/gcla/termshark/archive/v${version}.tar.gz"
-checksum=deefdb0b65e5d5b97c305cf280770724542f8dd122502f616e394c62c91db0c4
+checksum=8e2a22534773b1ab0ce4327e929bbbe413d3695bab2d55c985d1f61961698610
 
 post_install() {
 	vlicense LICENSE

From e9b58ab9c94c914ea247f8825f8191f6d56ef8e6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 30 Oct 2021 16:26:58 -0400
Subject: [PATCH 2327/4088] cargo-crev: update to 0.21.1

---
 srcpkgs/cargo-crev/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 4b6121655aff..05b0635dcf51 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
-version=0.19.2
+version=0.21.1
 revision=1
 build_style=cargo
 make_install_args="--path ./cargo-crev"
@@ -10,8 +10,8 @@ short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"
 homepage="https://github.com/crev-dev/cargo-crev"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d4b1ab0089ce25d73f2516209d80102e7e674dc851cf49f08e34a963d16e97ad
+distfiles="https://github.com/crev-dev/cargo-crev/archive/refs/tags/${version}.tar.gz"
+checksum=223f2603afe739a618275b89c4b79528fc5b766beab70614f22dddfebef3935d
 
 post_install() {
 	vlicense LICENSE-APACHE

From 7cd43180b2140a2d2b1368ab0629e5317888441e Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@bx612.space>
Date: Sat, 30 Oct 2021 21:28:21 -0400
Subject: [PATCH 2328/4088] GPaste: update to 3.40.3.

---
 srcpkgs/GPaste/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 7286be4a9fb7..449f66793e0a 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
 # Template file for 'GPaste'
 pkgname=GPaste
-version=3.38.5
+version=3.40.3
 revision=1
 wrksrc="gpaste-${version}"
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.imagination-land.org/tags/GPaste.html"
 distfiles="https://www.imagination-land.org/files/gpaste/gpaste-${version}.tar.xz"
-checksum=43698005b4c45719256dee4d3150ed652ce21d7a88f87b441145a29c78248146
+checksum=e00f67f2186dc6a939c699931624f3b4061ddbc9b11582bfed8cb6e9870db2f9
 
 build_options="gnome_shell"
 desc_option_gnome_shell="Build GNOME Shell integration and extension"

From c9e0248270c3863bd3aac51779011ce042dd3350 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 31 Oct 2021 08:30:33 +0400
Subject: [PATCH 2329/4088] calibre: update to 5.31.1.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 1e9aed0bab5c..f018b3035a8d 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.30.0
+version=5.31.1
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=8ef87f24ba4ca56d842252951690c96402f4ef6096b6187424f40e063bc60d15
+checksum=dcb1845ae1e6b39e238bd1964b22e5f1c15621106a1d8d497ff08d3c93b2c2b5
 lib32disabled=yes
 nocross=yes
 

From 96233ce93d28015b8d0bdead1160cf713e5a131f Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sun, 31 Oct 2021 07:21:24 +0700
Subject: [PATCH 2330/4088] kamoso: update to 21.08.2

---
 srcpkgs/kamoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..78bdba655f34 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.08.2
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=f72c81d9b8039ea5961e97d8a9a0c29051642bf697e71424200abe7c664d6d66

From b8ebab9bc9c990a3c1b0f7d3cbe9f81590af0afb Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Tue, 10 Aug 2021 22:06:30 +0100
Subject: [PATCH 2331/4088] New package: StyLua-0.10.1

---
 srcpkgs/StyLua/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/StyLua/template

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
new file mode 100644
index 000000000000..e62ba29789aa
--- /dev/null
+++ b/srcpkgs/StyLua/template
@@ -0,0 +1,23 @@
+# Template file for 'StyLua'
+pkgname=StyLua
+version=0.11.0
+revision=1
+build_style=cargo
+configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
+short_desc="Opinionated Lua code formatter"
+maintainer="Omar Zeghouani <omarzeghouanii@gmail.com>"
+license="MPL-2.0"
+homepage="https://github.com/JohnnyMorganz/StyLua"
+changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
+distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
+checksum=39f0bad4cc175202eae2551e4ddaf3dd6a229943e8da3e462d4fa15a024fd0fa
+
+build_options="lua52 luau"
+build_options_default="lua52 luau"
+
+desc_option_lua52="Enable support for Lua 5.2 syntax"
+desc_option_luau="Enable support for Luau syntax"
+
+post_install() {
+	vlicense LICENSE.md
+}

From 589c7ffbf6c78d715de1787a2a44f504ceeec1a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Oct 2021 14:14:16 +0100
Subject: [PATCH 2332/4088] dovecot: update to 2.3.17.

---
 srcpkgs/dovecot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..c1392de6a745 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.17
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=224412cd77a23a3ffb857da294da200883d956082cff7257942eff2789bd2df9
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 48cba44d37f839d2f808a90937b4a430c1cfdbd1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Oct 2021 14:14:20 +0100
Subject: [PATCH 2333/4088] dovecot-plugin-pigeonhole: update to 0.5.17.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..209c2b23595b 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.17
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=031e823966c53121e289b3ecdcfa4bc35ed9d22ecbf5d93a8eb140384e78d648
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8b06f71e5a134b015bbd4b03a0ec9f20260d0c45 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Oct 2021 14:22:43 +0100
Subject: [PATCH 2334/4088] halibut: update to 1.3.

---
 srcpkgs/halibut/patches/pie.patch | 11 -----------
 srcpkgs/halibut/template          | 19 ++++++-------------
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/halibut/patches/pie.patch

diff --git a/srcpkgs/halibut/patches/pie.patch b/srcpkgs/halibut/patches/pie.patch
deleted file mode 100644
index 4295314f95c8..000000000000
--- a/srcpkgs/halibut/patches/pie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -110,7 +110,7 @@
- 	$(CC) $(CFLAGS) -MD -c $<
- 
- version.o: FORCE
--	$(CC) $(VDEF) -MD -c $(SRC)version.c
-+	$(CC) $(CFLAGS) $(VDEF) -MD -c $(SRC)version.c
- 
- spotless:: clean
- 	rm -f *.d
diff --git a/srcpkgs/halibut/template b/srcpkgs/halibut/template
index e428d771ea86..2debc0197569 100644
--- a/srcpkgs/halibut/template
+++ b/srcpkgs/halibut/template
@@ -1,8 +1,8 @@
 # Template file for 'halibut'
 pkgname=halibut
-version=1.2
+version=1.3
 revision=1
-build_style=gnu-makefile
+build_style=cmake
 hostmakedepends="perl"
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" halibut"
@@ -12,20 +12,13 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/halibut/"
 distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=1aedfb6240f27190c36a390fcac9ce732edbdbaa31c85ee675b994e2b083163f
+checksum=aaa0f7696f17f74f42d97d0880aa088f5d68ed3079f3ed15d13b6e74909d3132
 
-CFLAGS='-I../charset -I../build -fcommon'
-
-pre_build() {
-	export LIBS="$LDFLAGS"
-}
 do_install() {
+	vbin build/halibut
 	if [ "$CROSS_BUILD" ]; then
-		export HALIBUT=/usr/bin/halibut
+		halibut doc/manpage.but --man=build/doc/halibut.1
 	fi
-	make -e -C doc
-	vman doc/halibut.1
-	vdoc doc/halibut.txt
-	vbin build/halibut
+	vman build/doc/halibut.1
 	vlicense LICENCE LICENSE
 }

From 281ecf24641e10118756ca881bb6116036fdcc22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Oct 2021 14:24:31 +0100
Subject: [PATCH 2335/4088] perltidy: update to 20211029.

---
 srcpkgs/perltidy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perltidy/template b/srcpkgs/perltidy/template
index cd4ec9af7bfb..279568c0d9a6 100644
--- a/srcpkgs/perltidy/template
+++ b/srcpkgs/perltidy/template
@@ -1,6 +1,6 @@
 # Template file for 'perltidy'
 pkgname=perltidy
-version=20210717
+version=20211029
 revision=1
 wrksrc="Perl-Tidy-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://metacpan.org/release/Perl-Tidy"
 distfiles="${CPAN_SITE}/Perl/Perl-Tidy-${version}.tar.gz"
-checksum=4d1bd38e1c3a39a2fabb2ddf61a57e3d6cf2778a7b2aebcbf618ad205972cf14
+checksum=ec03b1e36a57d094569a30082688f722253401c7cc934ac64d2e3eb4de880eda

From c477f22d4935d0c18cf8eb95840e4e0b96b88fac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Oct 2021 14:25:53 +0100
Subject: [PATCH 2336/4088] xtruss: update to 20211025.c25bf48.

---
 srcpkgs/xtruss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xtruss/template b/srcpkgs/xtruss/template
index 450de0ade11f..950f2e717909 100644
--- a/srcpkgs/xtruss/template
+++ b/srcpkgs/xtruss/template
@@ -1,6 +1,6 @@
 # Template file for 'xtruss'
 pkgname=xtruss
-version=20210911.854c36a
+version=20211025.c25bf48
 revision=1
 build_style=cmake
 hostmakedepends="halibut"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/xtruss/"
 distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=94609812c613477201048e10757d185fe2e9e08f42949249e4ea713bce843f04
+checksum=8a4b8a1ed5c49f65152c4eb697ba83f6a73d65493a8e202a8f9aeedfabe07479
 
 CFLAGS="-UNDEBUG"
 

From 856dbb915b96d1507b9f4f9dd7c99c385a69977c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Oct 2021 18:03:06 +0100
Subject: [PATCH 2337/4088] New package: jet-0.1.0

---
 srcpkgs/jet/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/jet/template

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
new file mode 100644
index 000000000000..58b209817581
--- /dev/null
+++ b/srcpkgs/jet/template
@@ -0,0 +1,23 @@
+# Template file for 'jet'
+pkgname=jet
+version=0.1.0
+revision=1
+hostmakedepends="mandrel leiningen"
+makedepends="zlib-devel"
+short_desc="CLI to transform between JSON, EDN and Transit"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="EPL-1.0"
+homepage="https://github.com/borkdude/jet"
+distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
+checksum=faed01c3d31631332fa60fd6f1bb39ae4a2f6cfc396a8747d5cfce4f1053a99c
+nocross="mandrel"
+
+do_build() {
+	export GRAALVM_HOME=/usr/lib/jvm/mandrel11
+	script/compile
+}
+
+do_install() {
+	vbin jet
+	vlicense LICENSE
+}

From 2bc708432b1c242410c6965879bcfc5bb56ea301 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 31 Oct 2021 12:15:51 -0400
Subject: [PATCH 2338/4088] websocat: update to 1.9.0

---
 srcpkgs/websocat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index 120039714059..3303dd5344f9 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,7 +1,7 @@
 # Template file for 'websocat'
 pkgname=websocat
-version=1.6.0
-revision=2
+version=1.9.0
+revision=1
 build_style=cargo
 configure_args="--features=ssl"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"
 homepage="https://github.com/vi/websocat"
 distfiles="https://github.com/vi/websocat/archive/v${version}.tar.gz"
-checksum=3f7e5e99d766b387292af56c8e4b39ce9a7f0da54ff558a6080ddc1024a33896
+checksum=8ad0d3048662e321af11fc7e9e66d9fa4bebcd9aefad6e56c97df7d7eaab6b44
 
 post_install() {
 	vlicense LICENSE

From 2a134428eb842f63b66068695f568301aafa3695 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Oct 2021 15:45:37 +0300
Subject: [PATCH 2339/4088] opera: change distfile to rpm, adopt.

 Also:
     - enable sandboxing with user namespaces.
---
 srcpkgs/opera/template | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index e71fb90b9313..09e301a7f394 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,35 +1,33 @@
 # Template file for 'opera'
 pkgname=opera
 version=80.0.4170.72
-revision=1
+revision=2
 archs="x86_64"
+create_wrksrc=yes
+hostmakedepends="rpmextract"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
 short_desc="Fast, secure, easy to use browser"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
-distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=f6b9e132c9cd2f7343ffb5fae1edb80a08087bac90ddb53d5fb2e475f834177a
+distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
+checksum=3f3ece9bae6576b6ef5e2908733c112695ea535801bc6fb422b9fe7a79c097cc
 repository="nonfree"
 nostrip=yes
 
-do_extract() {
-	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}_amd64.deb
-	bsdtar xf data.tar.xz --exclude=./usr/share/{lintian,menu}
-}
-
 do_install() {
-	vmkdir /usr/lib
-	vcopy usr/lib/x86_64-linux-gnu/opera /usr/lib
-
-	vmkdir /usr/bin
-	ln -s ../lib/opera/opera ${DESTDIR}/usr/bin/opera
+	# Create necessary dirs
+	vmkdir usr/bin
+	vmkdir usr/lib
 
-	vlicense usr/share/doc/opera-stable/copyright
-	rm -rf usr/share/doc
+	# Copy files
+	vcopy usr/lib64/opera /usr/lib/
+	vcopy usr/share /usr/share/
 
-	vcopy usr/share /usr
+	# Link executable in path
+	ln -s ../lib/opera/opera "${DESTDIR}/usr/bin/opera"
 
-	# suid opera_sandbox
-	chmod 4755 ${DESTDIR}/usr/lib/opera/opera_sandbox
+	# Install licenses
+	vlicense usr/lib64/opera/resources/eula_desktop_eea.txt
+	vlicense usr/lib64/opera/resources/eula_desktop_row.txt
 }

From e353c2e491ef0471528e95aa603523d50e734986 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Oct 2021 17:06:24 -0400
Subject: [PATCH 2340/4088] zfsbootmenu: update to 1.11.0.

---
 srcpkgs/zfsbootmenu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index c5d1a481c836..8739a3e62569 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,6 +1,6 @@
 # Template file for 'zfsbootmenu'
 pkgname=zfsbootmenu
-version=1.10.1
+version=1.11.0
 revision=1
 build_style=gnu-makefile
 conf_files="/etc/zfsbootmenu/config.yaml"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/zbm-dev/zfsbootmenu"
 changelog="https://raw.githubusercontent.com/zbm-dev/zfsbootmenu/master/CHANGELOG.md"
 distfiles="https://github.com/zbm-dev/zfsbootmenu/archive/v${version}.tar.gz"
-checksum=4992e058ba82f62b0dfb0be4bca665592b028812dfb63130906be9323b60371c
+checksum=864ffc148b33223c9c7659dff42a89869db1aa56821b0633030e6ea1e41cb39c
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)

From 6443017907003012cd4cd428f4457cc6374c8360 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 31 Oct 2021 19:56:19 +0100
Subject: [PATCH 2341/4088] x42-plugins: update to 20211016.

---
 srcpkgs/x42-plugins/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index cb74c5c19d79..5bd9bec91cfe 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20210714
+version=20211016
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="Collection of LV2 plugins"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://x42-plugins.com"
-distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=5f7f3d6c0f9c7f7379789a409690e7fc2250eb1338ab3ac1438edf60f2322079
+distfiles="https://gareus.org/misc/x42-plugins/x42-plugins-${version}.tar.xz"
+checksum=676957689c1e38f07d8563aecb6731d4ff7f08027e20c73b26d3c32808366e85
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From e66f4a50a08b2bc4b785d6353b5e521dc2293dac Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Fri, 29 Oct 2021 12:25:09 +0200
Subject: [PATCH 2342/4088] nvimpager: update to 0.10.3

This also fixes a wrong path being passed to neovim, because the
makefile inserts the PREFIX into the script, which is not set during
do_build. As there aren't any binary build steps, do_build is skipped.
---
 srcpkgs/nvimpager/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvimpager/template b/srcpkgs/nvimpager/template
index 8bff26dc2439..9df927579740 100644
--- a/srcpkgs/nvimpager/template
+++ b/srcpkgs/nvimpager/template
@@ -1,6 +1,6 @@
 # Template file for 'nvimpager'
 pkgname=nvimpager
-version=0.10.2
+version=0.10.3
 revision=1
 build_style=gnu-makefile
 hostmakedepends="neovim scdoc"
@@ -10,7 +10,11 @@ maintainer="Adrian Herath <adrianisuru@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/lucc/nvimpager"
 distfiles="https://github.com/lucc/nvimpager/archive/v${version}.tar.gz"
-checksum=58d77fe301a6451098eef2677011cc99138c3735b34859a17cbaa6caba7e0ef4
+checksum=c369c75f3de0c95d8ceca5ab13deaae22626b08bcd2f98b2b42df85ca60d7609
+
+do_build() {
+	: # nothing to build
+}
 
 post_install() {
 	vlicense LICENSE

From 8f1cc527b576dac08f6a60df769d2203f8faae24 Mon Sep 17 00:00:00 2001
From: Denis Gruzdev <codingjerk@gmail.com>
Date: Sun, 31 Oct 2021 10:22:21 +0000
Subject: [PATCH 2343/4088] kmod: add zstd module compression support

---
 srcpkgs/kmod/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template
index 4a10a0f7f533..6f5f93d273ac 100644
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@@ -1,11 +1,11 @@
 # Template file for 'kmod'
 pkgname=kmod
 version=29
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --with-xz"
+configure_args="--with-zlib --with-xz --with-zstd"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel liblzma-devel"
+makedepends="zlib-devel liblzma-devel libzstd-devel"
 make_dirs="
  /etc/depmod.d 0755 root root
  /etc/modprobe.d 0755 root root

From 3bce2a57357698c63cc5012df876c74f56dbf19e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Nov 2021 00:10:39 +0100
Subject: [PATCH 2344/4088] godot: update to 3.3.4.

closes #33848
---
 srcpkgs/godot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa63677d6d8c..5b2ddee3a011 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.3
-revision=2
+version=3.3.4
+revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
 build_style=scons
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=595ff16eaef3d0b6c030575f4b7fcae8b805e407b90a2f71af3e4142362c1794
+checksum=4e3a4baa60b196db1d0109cfd6c32f0f1126d0ead466ae8bd1f16557ea6b9bf0
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From f2bd673c8e9cf825440de234925fe3027e2a0307 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Nov 2021 01:36:31 +0100
Subject: [PATCH 2345/4088] qt5-webengine: add missing ppc64le patch to fix
 build

---
 .../0092-ppc64le-sandbox-linux-stat.patch     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 srcpkgs/qt5-webengine/patches/0092-ppc64le-sandbox-linux-stat.patch

diff --git a/srcpkgs/qt5-webengine/patches/0092-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt5-webengine/patches/0092-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..b3a439a0e162
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0092-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ // On 32-bit systems, we default to the 64-bit stat struct like libc

From 9a9bac02b5f5757dbf066fc73d19525b344f30c2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Nov 2021 09:15:39 +0700
Subject: [PATCH 2346/4088] cointop: orphan

---
 srcpkgs/cointop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cointop/template b/srcpkgs/cointop/template
index a32af0d7b088..3bbb7644e53c 100644
--- a/srcpkgs/cointop/template
+++ b/srcpkgs/cointop/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path="github.com/miguelmota/${pkgname}"
 short_desc="Terminal based application for tracking cryptocurrencies"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/miguelmota/cointop"
 distfiles="https://github.com/miguelmota/cointop/archive/v${version}.tar.gz"

From 3434ffa8ca642dee042d10a97901388702fb0e6b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Nov 2021 09:16:18 +0700
Subject: [PATCH 2347/4088] exa: orphan

---
 srcpkgs/exa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index fd5d7266f589..d2eb81a34ec0 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -6,7 +6,7 @@ build_style=cargo
 hostmakedepends="pkg-config libgit2-devel"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://the.exa.website/"
 distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz

From 680f45adf59d1d1979a6a9959628075046c30590 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Nov 2021 09:16:34 +0700
Subject: [PATCH 2348/4088] qalculate-qt: orphan

---
 srcpkgs/qalculate-qt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
index 610c93d8ca70..c960ee0eed61 100644
--- a/srcpkgs/qalculate-qt/template
+++ b/srcpkgs/qalculate-qt/template
@@ -9,7 +9,7 @@ hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
 makedepends="libqalculate-devel qt5-devel"
 depends="gnuplot"
 short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"

From e0f07a25740b1dd480d8724aa342d81d8bafd679 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Nov 2021 09:16:48 +0700
Subject: [PATCH 2349/4088] qutebrowser: orphan

---
 srcpkgs/qutebrowser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index c49a9040c39f..5dc61ab30aa9 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-yaml
  python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite"
 short_desc="Keyboard-focused browser with a minimal GUI"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"

From cdf537b3f76ec22251c767a2fa9136edc019a7dc Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Nov 2021 09:17:03 +0700
Subject: [PATCH 2350/4088] snapper: orphan

---
 srcpkgs/snapper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index c2aae59e586d..4e481e6ab995 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -13,7 +13,7 @@ makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
  json-c-devel"
 depends="dbus"
 short_desc="Tool for Linux filesystem snapshot management"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://snapper.io"
 distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"

From c8041c4bb37393cdf1c61e108932a0715e756cc4 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Nov 2021 09:17:19 +0700
Subject: [PATCH 2351/4088] vivid: orphan

---
 srcpkgs/vivid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vivid/template b/srcpkgs/vivid/template
index 7b9c8b3f9eef..421be378fc6a 100644
--- a/srcpkgs/vivid/template
+++ b/srcpkgs/vivid/template
@@ -4,7 +4,7 @@ version=0.7.0
 revision=1
 build_style=cargo
 short_desc="LS_COLORS with support for multiple color themes"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/vivid"
 distfiles="https://github.com/sharkdp/vivid/archive/v${version}.tar.gz"

From e5344632260d6f6bead1e9be414ba81be9c4f835 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Nov 2021 05:02:24 +0100
Subject: [PATCH 2352/4088] pipewire: fix build outside x86/arm

---
 ...0decea5f83730c271e9bed03cdd0048fcd49.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch

diff --git a/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch b/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch
new file mode 100644
index 000000000000..b0866c5b4309
--- /dev/null
+++ b/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch
@@ -0,0 +1,22 @@
+From 651f0decea5f83730c271e9bed03cdd0048fcd49 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 21 Oct 2021 11:09:48 +0200
+Subject: [PATCH] cpu: fix compilation on some architectures
+
+---
+ spa/plugins/support/cpu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spa/plugins/support/cpu.c b/spa/plugins/support/cpu.c
+index ee1816512..01cff4854 100644
+--- a/spa/plugins/support/cpu.c
++++ b/spa/plugins/support/cpu.c
+@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory,
+ 		if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL)
+ 			this->vm_type = atoi(str);
+ 		if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL)
+-			impl_cpu_zero_denormals(this, spa_atob(str));
++			spa_cpu_zero_denormals(&this->cpu, spa_atob(str));
+ 	}
+ 
+ 	spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x",

From 56a9a198300f759df352b8973063ed4f39256ce1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Nov 2021 14:12:07 +0100
Subject: [PATCH 2353/4088] telegram-desktop: update to 3.1.11.

---
 srcpkgs/telegram-desktop/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 24e4b45bee20..063da2de496d 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,13 +1,12 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=3.1.9
+version=3.1.11
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DTDESKTOP_API_ID=209235
  -DTDESKTOP_API_HASH=169ee702e1df4b6e66d80311db36cc43
- -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
  -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
  -DTDESKTOP_LAUNCHER_BASENAME=org.telegram.desktop.desktop
  -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')
@@ -27,7 +26,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=569555194f8c8396ee21de44971709dc0d331fe9b3d99cce49977d6dd19fcecf
+checksum=0f7ee7bd7c5746026744de2eb447b11f83e77eb30be49e9e894bc37008b49d4a
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From b956934652a4046f69b6b98e831178c689aae387 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Nov 2021 14:41:59 +0100
Subject: [PATCH 2354/4088] tg_owt: update to 0.0.0.20211012.

---
 srcpkgs/tg_owt/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..97e444e3ef1e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,8 +1,8 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
-version=0.0.0.20210627
-revision=2
-_commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
+version=0.0.0.20211012
+revision=1
+_commit=d578c760dc6f1ae5f0f3bb5317b0b2ed04b79138
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 wrksrc="tg_owt-$_commit"
@@ -21,9 +21,9 @@ homepage="https://github.com/desktop-app/tg_owt"
 distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
  https://chromium.googlesource.com/webm/libvpx/+archive/${_libvpx_commit}.tar.gz
  https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz"
-checksum="@7ed013e552aa06a4778cc1d9f4a82340024f5d7866bf910b3a342d3e3264d686
- @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9
- @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
+checksum="d21f136e502966bdac57826d4be96149c080c1bba97677d3fe9c5d68b657df12
+ 5583904fcd457b54b4945b37ac2c0228ea33835bc54aa29c2fdaf098942c031e
+ 080f4bc18d725dfeb4b9b2f91244acc90a45168ec7ee9f6e7ad2f210209f7c1b"
 skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 87e2c52d1fc4914b2a7e07e110a4158a3b95e99d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Nov 2021 15:39:05 +0100
Subject: [PATCH 2355/4088] tg_owt: use content checksums

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 97e444e3ef1e..d1477736d0a7 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -21,9 +21,9 @@ homepage="https://github.com/desktop-app/tg_owt"
 distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
  https://chromium.googlesource.com/webm/libvpx/+archive/${_libvpx_commit}.tar.gz
  https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz"
-checksum="d21f136e502966bdac57826d4be96149c080c1bba97677d3fe9c5d68b657df12
- 5583904fcd457b54b4945b37ac2c0228ea33835bc54aa29c2fdaf098942c031e
- 080f4bc18d725dfeb4b9b2f91244acc90a45168ec7ee9f6e7ad2f210209f7c1b"
+checksum="@25b7609f41020d1b2270f87aead2b1dd8e1f2e8365243ebeef9a8bc0e6e616b7
+ @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9
+ @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
 skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 0af1dac43471d7c72730c9ba7d56ec3c249c1554 Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Mon, 1 Nov 2021 13:59:54 +0100
Subject: [PATCH 2356/4088] noise-repellent: fix install path

---
 srcpkgs/noise-repellent/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..f66bb489c123 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,7 +1,7 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
 version=0.1.5
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
@@ -11,3 +11,8 @@ license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
 checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+
+post_install() {
+	vmkdir /usr/lib/lv2
+	mv ${PKGDESTDIR}/usr/nrepel.lv2 ${PKGDESTDIR}/usr/lib/lv2
+}

From 4bfbcf5e71b3d102f067ae0c8bb099093f8611b7 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 1 Nov 2021 14:06:24 +0100
Subject: [PATCH 2357/4088] bitwise: update to 0.43

---
 srcpkgs/bitwise/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bitwise/template b/srcpkgs/bitwise/template
index 16b8b2a23fe4..04e0456cbcf3 100644
--- a/srcpkgs/bitwise/template
+++ b/srcpkgs/bitwise/template
@@ -1,6 +1,6 @@
 # Template file for 'bitwise'
 pkgname=bitwise
-version=0.42
+version=0.43
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
@@ -11,4 +11,4 @@ maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/mellowcandle/bitwise"
 distfiles="${homepage}/releases/download/v${version}/bitwise-v${version}.tar.gz"
-checksum=d3d43cef47bf8f49e85f7ed381c3eaf1df921ca51805e0962f1a97a517e1d1d2
+checksum=f524f794188a10defc4df673d8cf0b3739f93e58e93aff0cdb8a99fbdcca2ffb

From 96437f36f32a821d53302542119dfb2cc256ae3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Nov 2021 16:55:19 +0100
Subject: [PATCH 2358/4088] squashfs-tools: fix symlinks

closes #33858
---
 srcpkgs/squashfs-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 35022327c734..04b0bef6df6a 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'squashfs-tools'
 pkgname=squashfs-tools
 version=4.5
-revision=1
+revision=2
 build_wrksrc="squashfs-tools"
 build_style=gnu-makefile
 make_use_env=yes
@@ -17,6 +17,6 @@ checksum=b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd
 do_install() {
 	vbin mksquashfs
 	vbin unsquashfs
-	ln -sf mkshquashfs ${DESTDIR}/usr/bin/sqfstar
-	ln -sf unshquashfs ${DESTDIR}/usr/bin/sqfscat
+	ln -sf mksquashfs ${DESTDIR}/usr/bin/sqfstar
+	ln -sf unsquashfs ${DESTDIR}/usr/bin/sqfscat
 }

From 027c1072bd66d2f1c6f663c6cd39ed9faa071683 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Nov 2021 17:30:58 +0100
Subject: [PATCH 2359/4088] xh: restrict to x86/arm (ring dependency)

---
 srcpkgs/xh/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
index b1e4ce1b76f6..7b628101b2b7 100644
--- a/srcpkgs/xh/template
+++ b/srcpkgs/xh/template
@@ -2,6 +2,8 @@
 pkgname=xh
 version=0.13.0
 revision=1
+# depends on ring
+archs="x86_64* i686* armv[67]* aarch64*"
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"

From a59b5ee642d08554630ccec1e1f85c6440d8aede Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 1 Nov 2021 16:27:03 +0100
Subject: [PATCH 2360/4088] hopper: update to 4.9.5.

---
 srcpkgs/hopper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index e017cd6059bf..a560cad68ed7 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.9.3
+version=4.9.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9b462341a92da25e7aba6dcca185495e974029578db34b07fad2e89dde7b1121
+checksum=2ae6c31282b14dd7f41ea0d06cbc199259f6ef7762d080b789f9ee093fa89981
 
 archs="x86_64"
 restricted=yes

From d4799a6aae53e81b4a28de83627aaa518a7802b3 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 1 Nov 2021 16:27:24 +0100
Subject: [PATCH 2361/4088] kubernetes: update to 1.22.3.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 255ae62a9097..a4c324c19caf 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.22.2
+version=1.22.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=ad0a9184843265e71b8b4222d970dcafe938bbe3b312b88301ca2f048b0ce250
+checksum=c1b20d29a25c7eb4a294e29196cfe78c594f61b60c49b5337715f45b3fa6efd9
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From 795ced80ecf83a060db05597109a1e5c63081eca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Nov 2021 19:03:14 +0100
Subject: [PATCH 2362/4088] sleuthkit: update to 4.11.1.

---
 srcpkgs/sleuthkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f26d6700a2fe 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.11.1
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=81432c57458e9369dbdfbade096f8e779b0f169683a833675e787c34014d4d3f
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h

From e2e58fd50bb37dfdebd8618765a2c39ab4d1075b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Nov 2021 19:03:40 +0100
Subject: [PATCH 2363/4088] bdf2psf: update to 1.206.

---
 srcpkgs/bdf2psf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index e96bb8fbdec2..d74be3507177 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -1,6 +1,6 @@
 # Template file for 'bdf2psf'
 pkgname=bdf2psf
-version=1.205
+version=1.206
 revision=1
 wrksrc="console-setup-${version}"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/bdf2psf"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=7a0ca1d868b44fa8b95bcc21d0d439be2ce5a67b0c5b7508c996d55bab6f0534
+checksum=856d0f123911779f5285a9c1479ea505c89981054df5b7ab4cd49fdd32663d2c
 
 post_extract() {
 	sed -i '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf

From dc963043448ea533d801db7767ca27aaca640155 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Nov 2021 21:36:10 +0100
Subject: [PATCH 2364/4088] godot: fix ppc64* build

---
 srcpkgs/godot/patches/ppc.patch | 87 +++++++++++++++++++++++++++++++++
 srcpkgs/godot/template          |  4 +-
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
new file mode 100644
index 000000000000..a6e4d3638fd4
--- /dev/null
+++ b/srcpkgs/godot/patches/ppc.patch
@@ -0,0 +1,87 @@
+From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Mon, 1 Nov 2021 21:05:31 +0100
+Subject: [PATCH] add ppc detection
+
+---
+ core/os/os.cpp                    | 14 ++++++++++++++
+ modules/lightmapper_cpu/config.py |  3 +++
+ modules/raycast/config.py         |  3 +++
+ platform/x11/detect.py            |  8 ++++++++
+ 4 files changed, 28 insertions(+)
+
+diff --git a/core/os/os.cpp b/core/os/os.cpp
+index 35896d8..948c79a 100644
+--- a/core/os/os.cpp
++++ b/core/os/os.cpp
+@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
+ 	if (p_feature == "arm") {
+ 		return true;
+ 	}
++#elif defined(__powerpc__)
++#if defined(__powerpc64__)
++#if defined(__LITTLE_ENDIAN__)
++	if (p_feature == "ppc64le") {
++		return true;
++	}
++#endif
++	if (p_feature == "ppc64") {
++		return true;
++	}
++#endif
++	if (p_feature == "ppc") {
++		return true;
++	}
+ #endif
+ 
+ 	if (_check_internal_feature_support(p_feature))
+diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
+index a3a33b3..842f9ae 100644
+--- a/modules/lightmapper_cpu/config.py
++++ b/modules/lightmapper_cpu/config.py
+@@ -15,6 +15,9 @@ def can_build(env, platform):
+     if env["bits"] == "32":
+         return False
+ 
++    if env["arch"].startswith("ppc"):
++        return False
++
+     return True
+ 
+ 
+diff --git a/modules/raycast/config.py b/modules/raycast/config.py
+index 6ea8e0a..bc2d40c 100644
+--- a/modules/raycast/config.py
++++ b/modules/raycast/config.py
+@@ -14,6 +14,9 @@ def can_build(env, platform):
+     if env["bits"] == "32":
+         return False
+ 
++    if env["arch"].startswith("ppc"):
++        return False
++
+     return True
+ 
+ 
+diff --git a/platform/x11/detect.py b/platform/x11/detect.py
+index b6472e2..c1858a7 100644
+--- a/platform/x11/detect.py
++++ b/platform/x11/detect.py
+@@ -119,6 +119,14 @@ def configure(env):
+     if env["bits"] == "default":
+         env["bits"] = "64" if is64 else "32"
+ 
++    if env["arch"] == "":
++        if platform.machine() == "ppc64le":
++            env["arch"] = "ppc64le"
++        elif platform.machine() == "ppc64":
++            env["arch"] = "ppc64"
++        elif platform.machine() == "ppc":
++            env["arch"] = "ppc"
++
+     ## Compiler configuration
+ 
+     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
+-- 
+2.33.0
+
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b2ddee3a011..2637d01eefd4 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -48,7 +48,9 @@ do_install() {
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*|ppc64*) vbin bin/godot.x11.opt.tools.64 godot;;
+		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
+		ppc64le*) vbin bin/godot.x11.opt.tools.ppc64le godot;;
+		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
 		*) vbin bin/godot.x11.opt.tools.32 godot;;
 	esac
 }

From 665ce88cab3da4f1a296b867f172f081483150f1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 2 Nov 2021 00:59:55 +0100
Subject: [PATCH 2365/4088] automake: saner checkdepends list

While this will make some tests skipped (particularly the libtool
based ones) it's still worth it as most tests still run and this
allows cycle-free check-enabled builds.
---
 srcpkgs/automake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template
index c6e0657bfe9e..7a7fa112153c 100644
--- a/srcpkgs/automake/template
+++ b/srcpkgs/automake/template
@@ -7,8 +7,8 @@ build_style=gnu-configure
 make_check_args="${makejobs}"
 hostmakedepends="perl autoconf"
 depends="${hostmakedepends}"
-checkdepends="cscope dejagnu emacs expect flex gettext-devel glib-devel libtool perl pkg-config
- sharutils texinfo vala lzip xz zip zstd"
+# ideally we'd like libtool here too, but that creates a build cycle
+checkdepends="flex gettext-devel pkg-config"
 short_desc="GNU Standards-compliant Makefile generator"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From b266e7219242504fc800f0791da0905bb21e7067 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Nov 2021 10:40:23 -0400
Subject: [PATCH 2366/4088] python-nose: remove package

python3-nose: fix for Python 3.10

This package is unmaintained but still used in tests for other packages,
so let's keep it hobbling along for awhile longer.

Fixes #33788.
---
 srcpkgs/python-nose/template                  | 28 -------------------
 srcpkgs/python3-nose                          |  1 -
 .../patches/setup.py.patch                    |  0
 srcpkgs/python3-nose/template                 | 23 +++++++++++++++
 4 files changed, 23 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/python-nose/template
 delete mode 120000 srcpkgs/python3-nose
 rename srcpkgs/{python-nose => python3-nose}/patches/setup.py.patch (100%)
 create mode 100644 srcpkgs/python3-nose/template

diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template
deleted file mode 100644
index 76a0cd0a0406..000000000000
--- a/srcpkgs/python-nose/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-nose'
-pkgname=python-nose
-version=1.3.7
-revision=7
-wrksrc="nose-${version}"
-build_style=python-module
-pycompile_module="nose"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="The nicer testing for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/nose-devs/nose"
-#changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG"
-distfiles="${PYPI_SITE}/n/nose/nose-${version}.tar.gz"
-checksum=f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98
-alternatives="nose:nosetests:/usr/bin/nosetests2"
-
-python3-nose_package() {
-	pycompile_module="nose"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="nose:nosetests:/usr/bin/nosetests3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-nose b/srcpkgs/python3-nose
deleted file mode 120000
index 32467a70a1ea..000000000000
--- a/srcpkgs/python3-nose
+++ /dev/null
@@ -1 +0,0 @@
-python-nose
\ No newline at end of file
diff --git a/srcpkgs/python-nose/patches/setup.py.patch b/srcpkgs/python3-nose/patches/setup.py.patch
similarity index 100%
rename from srcpkgs/python-nose/patches/setup.py.patch
rename to srcpkgs/python3-nose/patches/setup.py.patch
diff --git a/srcpkgs/python3-nose/template b/srcpkgs/python3-nose/template
new file mode 100644
index 000000000000..58a676fd9f32
--- /dev/null
+++ b/srcpkgs/python3-nose/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-nose'
+pkgname=python3-nose
+version=1.3.7
+revision=8
+wrksrc="nose-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Nicer testing for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/nose-devs/nose"
+changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG"
+distfiles="${PYPI_SITE}/n/nose/nose-${version}.tar.gz"
+checksum=f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98
+conflicts="python-nose>=0"
+# Tests don't work and this package is no longer maintained, just skip them
+make_check=no
+
+post_patch() {
+	# Convert py2 syntax to py3 since setuptools no longer does it
+	2to3-${py3_ver} -w bin nose unit_tests functional_tests
+}

From 7e6f7bb5f8c24f0191dcc6ee793186a3516c9a8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Nov 2021 10:42:44 -0400
Subject: [PATCH 2367/4088] removed-packages: add python-nose

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3781b64247bc..8a6164c31e11 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=52
+revision=53
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -250,6 +250,7 @@ replaces="
  python-matplotlib<=2.2.4_2
  python-matplotlib-data<=2.2.4_2
  python-netifaces<=0.10.9_3
+ python-nose<=1.3.7_7
  python-pivy<=0.6.4_2
  python-pyenet<=1.3.13.post7_2
  python-pyside<=1.2.2_7

From 0a5635d5e5e35577107748c8d2a200b983edbb1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Nov 2021 10:50:37 -0400
Subject: [PATCH 2368/4088] python3-ipython: update to 7.29.0.

---
 srcpkgs/python3-ipython/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 23bfbeee1caf..c2a1120bcac4 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.28.0
+version=7.29.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,9 +16,19 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11
+checksum=4f69d7423a5a1972f6347ff233e38bbf4df6a150ef20fbb00c635442ac3060aa
 conflicts="python-ipython<=5.8.0_2"
 
+do_check() {
+	# Tests fail when building (and have for awhile) but don't hinder use
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest \
+		-k "not test_all_completions_dups and \
+			not test_deduplicate_completions and \
+			not test_magic_arguments and \
+			not test_pinfo_docstring_if_detail_and_no_source and \
+			not test_pprint_heap_allocated_type"
+}
+
 post_install() {
 	# remove iptest
 	rm -f ${DESTDIR}/usr/bin/iptest*

From c8b31bef597e902ac0915049446d7687b85efa03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Nov 2021 11:01:27 -0400
Subject: [PATCH 2369/4088] python3-packaging: update to 21.2.

---
 srcpkgs/python3-packaging/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-packaging/template b/srcpkgs/python3-packaging/template
index 204674f670f4..d29713e53865 100644
--- a/srcpkgs/python3-packaging/template
+++ b/srcpkgs/python3-packaging/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-packaging'
 pkgname=python3-packaging
-version=21.0
-revision=2
+version=21.2
+revision=1
 wrksrc="packaging-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, BSD-2-Clause"
 homepage="https://github.com/pypa/packaging"
 distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7
+checksum=096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966
 
 do_check() {
 	: provides no tests

From b708936e7eea2e50179e0f8241b14d14a4160c4a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Nov 2021 11:02:54 -0400
Subject: [PATCH 2370/4088] python3-pybind11: update to 2.8.1.

---
 srcpkgs/python3-pybind11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template
index 038b3efb0439..043a4db095cb 100644
--- a/srcpkgs/python3-pybind11/template
+++ b/srcpkgs/python3-pybind11/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pybind11'
 pkgname=python3-pybind11
-version=2.8.0
+version=2.8.1
 revision=1
 wrksrc="pybind11-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pybind/pybind11"
 distfiles="https://github.com/pybind/pybind11/archive/v${version}.tar.gz"
-checksum=9ca7770fc5453b10b00a4a2f99754d7a29af8952330be5f5602e7c2635fa3e79
+checksum=f1bcc07caa568eb312411dde5308b1e250bd0e1bc020fae855bf9f43209940cc
 
 post_patch() {
 	# These dependencies are not packaged and don't affect the man page

From c51320f550196a6053ff494b93f350d9ec1540d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Nov 2021 11:03:16 -0400
Subject: [PATCH 2371/4088] python3-pytools: update to 2021.2.9.

---
 srcpkgs/python3-pytools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a19a57e6c588..a8497fb47f76 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
-revision=2
+version=2021.2.9
+revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755
 
 post_install() {
 	vlicense LICENSE

From d3cbcbea1e7eda985e0532cafaea6f479ee8a779 Mon Sep 17 00:00:00 2001
From: Maxim Karasev <begs@disroot.org>
Date: Mon, 1 Nov 2021 20:26:34 +0300
Subject: [PATCH 2372/4088] telegram-tg: drop maintainership

---
 srcpkgs/telegram-tg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-tg/template b/srcpkgs/telegram-tg/template
index a8a5c9c617d5..16f22a8419ce 100644
--- a/srcpkgs/telegram-tg/template
+++ b/srcpkgs/telegram-tg/template
@@ -1,13 +1,13 @@
 # Template file for 'telegram-tg'
 pkgname=telegram-tg
 version=0.17.0
-revision=2
+revision=3
 wrksrc=tg-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-telegram"
 short_desc="Terminal Telegram client"
-maintainer="Maxim Karasev <begs@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unlicense"
 homepage="https://github.com/paul-nameless/tg"
 distfiles="${PYPI_SITE}/t/tg/tg-${version}.tar.gz"

From 04f518c149120cbf5b17ca9679b30e31ce410ee4 Mon Sep 17 00:00:00 2001
From: Maxim Karasev <begs@disroot.org>
Date: Mon, 1 Nov 2021 20:31:29 +0300
Subject: [PATCH 2373/4088] python3-telegram: drop maintainership

---
 srcpkgs/python3-telegram/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-telegram/template b/srcpkgs/python3-telegram/template
index 3c442a0a22f2..b9eebe0fde9a 100644
--- a/srcpkgs/python3-telegram/template
+++ b/srcpkgs/python3-telegram/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-telegram'
 pkgname=python3-telegram
 version=0.14.0
-revision=2
+revision=3
 wrksrc=python-telegram-${version}
 build_style=python3-module
 hostmakedepends="python3"
 depends="libtd python3-setuptools"
 short_desc="Python library for building Telegram clients"
-maintainer="Maxim Karasev <begs@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/alexander-akhmetov/python-telegram"
 distfiles="https://github.com/alexander-akhmetov/python-telegram/archive/${version}.tar.gz"

From 099c5708c94b995efca02909b4135a7799a3d2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 2 Nov 2021 16:24:06 +0100
Subject: [PATCH 2374/4088] doctl: update to 1.66.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index e9de76f41666..2120ab291877 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.65.0
+version=1.66.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=b2ab4f123813ee3fdcc750b7c8f7bd9764dfa1647c54514413940449ef78cab5
+checksum=ac15f584f4ccfbdc2b74ce7d708c71e0e1f201f80ef0f0d39faca6bafc0fda10

From a21790dfafd1603f7102921a4ef36e4c659190b7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 2 Nov 2021 11:58:32 -0400
Subject: [PATCH 2375/4088] synapse: update to 1.46.0.

---
 srcpkgs/synapse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 4dd2de2caf7f..57f8a3b06822 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.45.1
-revision=2
+version=1.46.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=61f279dd7260285fb6e6b89ceb8d314590309905415defb8aa9ff31d2a5374a6
+checksum=5f730958e57b8196ee9352b8abc32da612296f8febf675dec76e0b9d3a322ec5
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 1662b6c92e9fcee7b1d6d0b45eace131a6ee9e9d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 31 Oct 2021 01:53:39 +0200
Subject: [PATCH 2376/4088] xmlsec1: update to 1.2.33.

---
 srcpkgs/xmlsec1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 5aa19215a75a..5e924fb02e6f 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,6 +1,6 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
-version=1.2.32
+version=1.2.33
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://www.aleksey.com/xmlsec/"
 distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"
-checksum=e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043
+checksum=26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931
 
 pre_configure() {
 	autoreconf -if

From e8d49e2e6f4f5195ea3469696642949cd246e8f8 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 31 Oct 2021 02:15:11 +0200
Subject: [PATCH 2377/4088] vte3: update to 0.66.0.

---
 srcpkgs/vte3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..4ecc45b1d07a 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.64.2
-revision=2
+version=0.66.0
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=2b3c820b65a667c1d8859ba20478be626d1519cc3159dac25f703330c6d07e18
+checksum=d0813ac00fb1d74d88851e765f755d496c83e097097358ea1baadb38b37b7b33
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From ebf64b4d76b934cba7a527c1cad3b48915b5c2f5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Nov 2021 21:50:55 +0100
Subject: [PATCH 2378/4088] fairy-stockfish: properly enable largeboards, ship
 Stockfish release NNUE

---
 srcpkgs/fairy-stockfish/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fairy-stockfish/template b/srcpkgs/fairy-stockfish/template
index ad091a69bca5..ea50fd08dd8f 100644
--- a/srcpkgs/fairy-stockfish/template
+++ b/srcpkgs/fairy-stockfish/template
@@ -1,8 +1,8 @@
 # Template file for 'fairy-stockfish'
 pkgname=fairy-stockfish
 version=14
-revision=1
-#_net_file= No redistributable NNUE available.
+revision=2
+_net_file=nn-3475407dc199.nnue  # Only Chess, but redistributable.
 wrksrc="Fairy-Stockfish-fairy_sf_${version}"
 build_wrksrc=src
 build_style=gnu-makefile
@@ -14,13 +14,16 @@ short_desc="Free UCI chess variant engine (supporting Xiangqi, Shogi, ...)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ianfab/Fairy-Stockfish"
-distfiles="https://github.com/ianfab/Fairy-Stockfish/archive/fairy_sf_${version}.tar.gz"
-checksum=db5e96cf47faf4bfd4a500f58ae86e46fee92c2f5544e78750fc01ad098cbad2
+distfiles="https://github.com/ianfab/Fairy-Stockfish/archive/fairy_sf_${version}.tar.gz
+ https://tests.stockfishchess.org/api/nn/${_net_file}"
+checksum="db5e96cf47faf4bfd4a500f58ae86e46fee92c2f5544e78750fc01ad098cbad2
+ 3475407dc19973ea44467678634cce023d620e419770c111cc8937fe6689ec87"
+skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
 
 # We know how to optimize ourselves
-make_build_args="optimize=no "
+make_build_args+=" optimize=no "
 
 case $XBPS_TARGET_MACHINE in
 	x86_64*) make_build_args+="ARCH=x86-64" ;;
@@ -38,6 +41,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+post_extract() {
+	cp $XBPS_SRCDISTDIR/${pkgname}-${version}/${_net_file} ./src
+}
+
 do_install() {
 	vbin stockfish fairy-stockfish
 }

From 3e9b92a37659ffc308fa56d7ce64a5abd01d8868 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 29 Oct 2021 17:09:27 +0200
Subject: [PATCH 2379/4088] meson: update to 0.59.4.

---
 srcpkgs/meson/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 93464f832ee4..6cbcd3c9e966 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=2
+version=0.59.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 5787d6693c7284223a3a8286e4cba0f6697a306d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 2 Nov 2021 23:50:21 +0100
Subject: [PATCH 2380/4088] firefox: update to 94.0.

---
 ...0293649628d32911c909219d514bebb8ce63.patch | 50 -------------------
 srcpkgs/firefox/patches/skia-sucks3.patch     | 24 ---------
 srcpkgs/firefox/template                      |  4 +-
 3 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch

diff --git a/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch b/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch
deleted file mode 100644
index 6a0f7b6c4a2b..000000000000
--- a/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-# HG changeset patch
-# User Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
-# Date 1631000649 0
-# Node ID eac40293649628d32911c909219d514bebb8ce63
-# Parent  6582d77235867224aaf8621bad8ee167dfb31460
-Bug 1729124 - [MIPS64][ARM64] Fix gcc build issue. r=lth
-
-The SpecificRegs struct needs a constructor.
-
-Differential Revision: https://phabricator.services.mozilla.com/D124535
-
-diff --git a/js/src/wasm/WasmBCRegDefs.h b/js/src/wasm/WasmBCRegDefs.h
---- a/js/src/wasm/WasmBCRegDefs.h
-+++ b/js/src/wasm/WasmBCRegDefs.h
-@@ -374,25 +374,31 @@ struct SpecificRegs {
- };
- #elif defined(JS_CODEGEN_ARM)
- struct SpecificRegs {
-   RegI64 abiReturnRegI64;
- 
-   SpecificRegs() : abiReturnRegI64(ReturnReg64) {}
- };
- #elif defined(JS_CODEGEN_ARM64)
--struct SpecificRegs {};
-+struct SpecificRegs {
-+  // Required by gcc.
-+  SpecificRegs() {}
-+};
- #elif defined(JS_CODEGEN_MIPS32)
- struct SpecificRegs {
-   RegI64 abiReturnRegI64;
- 
-   SpecificRegs() : abiReturnRegI64(ReturnReg64) {}
- };
- #elif defined(JS_CODEGEN_MIPS64)
--struct SpecificRegs {};
-+struct SpecificRegs {
-+  // Required by gcc.
-+  SpecificRegs() {}
-+};
- #else
- struct SpecificRegs {
- #  ifndef JS_64BIT
-   RegI64 abiReturnRegI64;
- #  endif
- 
-   SpecificRegs() { MOZ_CRASH("BaseCompiler porting interface: SpecificRegs"); }
- };
-
diff --git a/srcpkgs/firefox/patches/skia-sucks3.patch b/srcpkgs/firefox/patches/skia-sucks3.patch
index 38657e80cf12..4bf77e684405 100644
--- a/srcpkgs/firefox/patches/skia-sucks3.patch
+++ b/srcpkgs/firefox/patches/skia-sucks3.patch
@@ -30,27 +30,3 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
    mCanvas->saveLayer(saveRec);
  
    SetPermitSubpixelAA(aOpaque);
---- a/gfx/layers/composite/CompositableHost.cpp
-+++ b/gfx/layers/composite/CompositableHost.cpp
-@@ -13,6 +13,7 @@
- #include "Effects.h"  // for EffectMask, Effect, etc
- #include "gfxUtils.h"
- #include "Layers.h"
-+#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/template b/srcpkgs/firefox/template
index 768d56ed528a..b36392274960 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=93.0
+version=94.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 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=a78f080f5849bc284b84299f3540934a12e961a7ea368b592ae6576ea1f97102
+checksum=b7bb8c5fcc74a74e9d2b55d1e9415b891305fe86520fb854cec25024d7e5de67
 
 lib32disabled=yes
 

From 7833ab5aa05d42ada00867e1b7af73072a490b8b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 2 Nov 2021 23:55:44 +0100
Subject: [PATCH 2381/4088] firefox-i18n: update to 94.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index c1459b7dae64..93eb253f2485 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=93.0
+version=94.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="205196fab018220eb8b61936f1de3ba35e19daf72a866c31a2943a669de8bdf6
- 30d632e9f12a7a31bb3c40c763f4232a91ece7064a4504814eb463467a2a59a9
- 07c2e6b8fb048b0b9f86320466f2c1d79dd98cbffd6f55151a12d2f888695381
- 690177541fce49dee39b0dd8f83cffd4abf7efb284e4074b3378309b5840b2a6
- b2ee763e4ad39dabbea73b0b091b8e5b8e11a4e990d92cac62ca588dbec0e5c6
- 35533681d0b3ca46034ee1e6090ded3bb2f0f4f38d657e95cc03865bb0cb0536
- 264181cac8d091da6a3be50107e2e1ccc995ed90f62c25331c7a127123a7e78a
- e13ab64fcf53d0671114e478f2de8f4e27d2257dbc916dd4502ed63ae222dc13
- e2f8df73d3532857176efac61a024bf6751a16311db09ac394dcc4d85304eb12
- 56f7b66997483f9e10e237a9c8ea221b095701ec8cccb3d7e4050dd70db7893f
- 0470602f1119f6264945d433ae079a64b03e7d8e433b0fc78f541458687e3844
- a9db270fe486050e1d58046f16e61ba6792f1479fc45bae9fefbae0797a21b6b
- b2b0496bba90a942d2e35c39878ea92bc5258d611af0100a92e37c77d0083456
- 4cbba00afe27435510697f971ae18a52e2cb360f5efeaf74639073edf50ee987
- 54dda701522cb3a1d3c1d13105f013e565adc842646961e7da06ff088470aed5
- 16a0059573fc1be855e8f35ce35f83e9b4ee1ec7554f20dad65bcba5e2921ebf
- efa487757370f0c96b4d0c781e5ed7fb3b730b3338a1078c255703c6e6a7eb1c
- 4c54311cbbf508be0340b2913702050fd3ccc59cf51f2122d43c978d2f17424f
- a76d9cc440ad223cff7e7a57aa7d2cf3da5b0a46a65917747983d7a6523eb23d
- a8b398e3cfa4f65387d3fee858a46a405266aa4168489c4dc5dd9da3e38c33e9
- c087924fbfed5b560c2e34663703bb37ef44d851c147773619eeac46575dbce9
- a05952cbe9d561a006fab28c30caae17a07eba9ccd984445870f62ac982661fa
- 4f0fc3a1509db5401e0fa2b4fd2403dbeaeb82643e8313130e70325f5edd4aed
- 71eebc3d09460e237531ee118ec4b88fe56814079d384efc30d94549af9c53ec
- f1cfb868eb637e30e220a54320ff76f6d3f0451a248c968784bfec0fb9df0b0b
- 94764abce683d7edf9a5bab08336254a053ab55f7f476ef25c5cde823aa816c2
- bbc6e26f73d015d15640748d9e9f1cdf13eeb5b10e5b57d427cd5e9a752b8337
- e2affd7dd6f514551b0c6879e34a51f2d59808095c7edfeb1329f757e09b3eab
- 43cae94d429045aa839bd36ac49c5c1f682a919bd79a67c2deb7874ecd87eb21
- 7f5461b1c3ecebcb17dc99db48a3f97a59eb4075db2aa177e351f1c8dd78a48e
- 7319ab081347df1e5ef935e5cb9adcd24dc1cff4441e389d22e21da624cdecb1
- eb39d71646de48d3ae2dbbc9dd6bedd8d99ff9138c60a8c18ffcd5afd2e1958a
- 59e84e7396a15872307870ef1ef3d93126405129174c1f8ff988f555fbb0a38a
- dae5f559a446fd8e5ce05db2c9fc927988ca0c7e45baaa1d147c9c7f71b64567
- 04488a756824bacc67d6147b71e4453ebce6d399d77e4a4a963489bd6cfe6362
- 101ff43850da5237ad14d5c81f81fff70c8e997dce5f638f7dc8ce6e3f331e0f
- c708cd6b49dffc393e8e08fc4ab985bdd463cd59e57a21eb440350cbf5b1b219
- 2064a493a8471abbf426f6a22373478abb3215794707a856dbe1ea89fdf03f21
- f2dd6ac46e8c02dd15e0eea716169d00caad126df4b02cb94695bfd3865ae4a2
- c4ccfcd6aaca3caa0b4942679b50db3f4383b4d5958ce491804524e097eb5772
- 3e0629b328f289686d23e108fc302d5b49d2866fa688a0d40487c66227a6728a
- ef461c1a4ec1dc205097cf183f093594013b95e8b358ef4b7004cca811a31f0e
- 5c396fcff01d9a87ea7bd30d5acccfcba4a92d29c07bfeb04a8b000d2c9948d4
- 03003d6e28dcba6c6bf48bb9b910728780badc43b1fd9a11561522bd2e3dd6a5
- 707cec518b6ee76a55beb2cfc273ab40c63dce5291b45eafe5f807567d14f184
- 51240964df10e0869f26a3fc1256b7ef9f53882eae227c7f9cc9f9cc43f54c41
- a57a6a15677d1a80d882b85aed91d628166acd9e2ca96c4d23a9b78f65fd3047
- 454c643379da0862f6dba701cdac9cbc731e1c0341603b69f2ae6623c7545902
- 933a1af28467d8d73a06dd31dbf3055ce100f1dc05ad041e07f7c5464368d6af
- 65846aa1dd9f2f5f527ca5377c0ca6af11da46f2b687512591191d7bd7d27550
- dc57eacef684cae17e1b1a126b56cf8cf1b22cdb30fb61314b3440bfd652b525
- 885cc218fba7cf694d47ff7f65ee0696bf0f0b36c48f8982853c63e840028fc8
- f5fbc21f3883857e26c106c5a15b499a4e56cfdf01674c6dc20fcaf5cc9aab0c
- df6d621267a99c03be813a05a9ab95dbb024cdd543514c05334cbf6cee3a4e41
- 153a48967ff40697f2607bb84fcac215960ff91f501fde8870e7f659f7339b4a
- 7dbaeeb8fde6c997505baea730ba056fa1b312d117cf2f0f24f237166c8a6efe
- a7abe1aedd1dc391aa0c47cf8c8cddb3ebcd230c80d7b06f61b066aad067d4fb
- ba2890a377d56707ba6462b6013bca1a1f7be9b6e24e130d8f1b0139a30dff2f
- ca5141ec8f50e39242dc8b7b3464d7da01d45db360fddc2538fbdf9b9d9aadb9
- c2ccd05e593292cb049f6c03aba5defbcbe0aecbbb02543beb4474bcf2f84a87
- 758efb23999160306d846c9f0be809bd8c81909341bd262703c6268eff7b0ac6
- 7ca5aa56abb9d4ab37dfb049079e03be1470ff7fc9796a15056f0c12a5db6abf
- 5f4f6cd6034d5084bc5511acd01c9892438c5e98d82e3d336807e7c83a1ea1a1
- 8e9f39dcc20013e728133400eda3fa12a4174754287d917cbea9e2fc0fc0b55c
- f028d25b60ba7eb0007b9f0692cd50ce5b7c02a357dd825ed85e5e6efa17acc0
- 1de3b542d9cfd802be8f9eff12f3a38e7cae659c6079587fd3e6187f1911c3c4
- 85b6c6d61fb57cc7e9f691dee9b13570ed5fc0c3b8272b07a415bdce474cdd78
- 7db4dd2742c0281cd00b397e9d81b8220a9fe6df318b2c08c1d4ef3cb65f564a
- f9f88ed6b9bbf5f37c9d79c5246be4494ccfe108b4c57503319f40fbafd525a4
- 9370edacc24a3c88a876bdd0ca6f3dea32a90da1d2f265861963b2d3bddb4199
- 95c24b9a11ea9b5f10002e0c0f40e2effdbddaa82db0d862c24b0a4b79d88926
- 043f768cd79c61face5697953f22b626e7d0bc4aad6836bee3cfeac93d1cc17f
- a02f8d3d66feb947fd86848a8b68a2208a33518ef3739ba622781421f3916ce6
- 2f760748ea106e691db0732d70c6435d1862961d8cb1146d62da89e1489d98d9
- 76b91012a0026e324ee7c46d41f6be9733e4b9fccf00642accb42aee75875d9a
- 3b8a176e8b5b886cf3770fc2ce5eb1856bf2dcb6a7f6d8151e493c7c16d7c791
- 594ab045a7df211e4a9a021b9f528d4112aa2cbd92b26f7e399d2d2e32c5ca0b
- 66786e5ebe6411746b21bc0037f6bde0f25f06b54e6394aefb71df3b9d323611
- d1fa02e67204c831de6dfb4a1361382d2ae413a78ad9f17278913b6a916d992b
- 3f2c13ba290cece3d0a2aeee479bbb4c86f079ff2569e990962c7b219bf7cce0
- 15687d53325dfbac6acbf6d9e680a3d010d809cc3aa0cbdb1b040a11faec8fac
- ceff983ce091dbfd9d115e795b32d0a4011802d1b5003d79776c34f7401a7eb2
- 00e7ec42efb67c7ee4ba589f05b469e3f55ead59f8745c12711d38eedb2dfbf9
- 66e33c127b1f9a67cf5fa3c96eb858531121f6230d6e44b4b804397dfba4dc71
- 3b389289c421b39765acf4fd9406a68593718abd85b7b8d056904c4071ab4ed9
- df9ffb4bbe0fc617ffd5cc7ae501f8cfa202a53f19d8e7b202d8a380f5171806
- 6a424899c2bfeef4adf50797c43b2523b84938d3eb48a5d996165148d2f864b5
- d4026f0925aa07f7c9525064c38a2ed12227a19ef4d9e88f0a1632f26a828d9d
- 2469899daa5bb1ee012c3f4741fb409a9158b044aa262597d2f6d617555e42e8
- ec19dae4249b7c6d1301072c3368454b251a81db23e9448bdca503c64d42755f
- 54702199fdc7f736925ebe1c62ecae030ad3b52d068f59edce5bee0aab800c8e
- a04f54f6743c00b9fe3adc5dbf0c7c3f9e47fae33fcdf909f3aab990db575ee9
- b42452476c04b284654a9ccc97b6207753b317dfa1c4ba9b2328c38d4c4663b7
- fb2606fecf5310d19650e18c4e2da6b51517afe3d7c0282d4152d7a753d8761d
- 5074ad3b60f5ce72a2a882475d8bfb6a57a0f06a43bf9ecb8aa1abb75b925c5a
- f37dc20001682438b7795e9c27124b9ca034ef7d7f0a4f70bdd0e7529f60021a"
+checksum="aedd5e13aabd5c130dcd1a7567a2c94fa69d2c454e2f310d58e44c282da38ca1
+ 5130cf8407d76864a94533db04008831ebae9d4d900c98025be17dbe7e943861
+ fb2913edec316b5bbc6e09c3ffa5662040802359e37a6ed968adc81a642c5a85
+ f82e3cce9b27940be860a8dc0340f0e917328742e79c616b5906661f10097c50
+ 682d1ffd0d1027c76cbc1dfd109a76361dc4866597c4645a5ece68d7a5cdf440
+ ad4485c1b09238e8bcc8258d313f987e25e35585af84cf832f29bc67e92f87cf
+ be4b89d6251429052d9ae512c75b59ab8dba174a9cebf6cc40eea350dbf73e42
+ 55eff9a1b7cb7e0e8c6a5fb97c1e4f9de66c380c6b4b512fd843a68f3da880af
+ 45858174eb26f6265eca5792693e4c051a9bdb5effc6eaee511864e7ee02b910
+ 65ced255598f0d7e98ae70b71914a65ed67789efa9b2a64688c6ef63a13bfced
+ 4632431d7969125cdd8f27e177ef25fa674c92ffe8960321722851941b2b05a4
+ 3d6bf8211550e77ca9f673d870a1cae47fa6ee6f7a7e372e8f9a4f630d215305
+ 9aa0f7f417b72f72e3447c0e4f438ca044c3fc91e5ed46be4f74293064d14df2
+ 814b58191af0087f871e69163eb4fa9b7d7ba78eb66782324168c1043d355dd5
+ 6b2c9b1e8ef5fbd29b3fc7a887be2fda0d37db3ed02e3904d2b5dc18a40852a1
+ 2e6c9f036f60788a65b5c05d2e54ac60790e634ff8f94f06800df2c6a8113821
+ 0e6201e35752963fb3591aa846fec5cf425faea90cbd390497846a6ad3b1f8fc
+ 29f97b363c02e3b23a7a6d8319aa4909827a800b076a84addedf0e7d21f42fee
+ 482eda912151c317060db889fa567c5ff9e6c3da4d08b40e6858e381f11264e2
+ 61d09abbca0f43594d9adaf2272f3c8752aa02165f7cb4fb06387171accd4b82
+ d01d6a426eb0038e88e1bc98a9572d88edd4321d2eb4f02457bfc400bf07cb73
+ 79d72c3fbc531d09cecb02051760149f8d3166ff709519aea4c1219c0e280acd
+ 1fe9bbdf961e9114544d7ec0de62c7a45b44f1de76028ac989c217db28d51aa6
+ 4b9131de001c2bde0454717098d2d2a10221a7ec106eeed855e21dfa6a138b8b
+ 54d2a8a58de684a096e2d960d08e00418564a40dfba6e10779bff7535c485642
+ 4f6ebbf1ee4677907b06d1e6d1fc525ce5e083c19f6f57d584b12649bc0b8f8b
+ bc635613551146140af4b09fc8ff6db42f12da25a763984f278c17e7093be0c1
+ 0e08d3c9010c96874086c0e4b9d0cc7d30a3f3109b0555d2b93a5268b46f4214
+ 9b03a928056312676a6cf480709fdf9e1b8169d35f7470dd14cce28cf6659b28
+ 8eb95e2cc114fcb5a38005bc24b158754e5c50dcaa2355de27bd10de3c2f4b0f
+ 2cbd800c3926d41b3efb443e5560109d464c1b68830bc49da543e6187fba62d9
+ 06708befcba04b7351b513b5e2e81885ef3b3eb773290fbf62a929f50ad58836
+ 113fdb182c31eedf0c20103f0bdbeae9afd107eb1e39be0d7d034a5d3f0acc8f
+ f4659230aac688047521bdda68d99eabe7e72b6b52bd8bb5c566829aef79a4cb
+ c1005571dd2e2ba27a908bb7f721df6d7bca518de149f2720756e0894d705759
+ 3eb7337ed218f9d5591a347359beec7b4ed08c8ce22460e4620f59d78ab1c61f
+ 6841e57c4c30df75e7fe63ea5785dbcb1f2e1e15c3fe7dba52b11cbf56ced2a0
+ 46c8f62f7663853e2b3d201e04d2bea3b5f6d2a3d6604985376b009c6ed77672
+ 98addd1a8e45f962b803325a40cbbe614083b654d0a0fabd13bda96caa5496d1
+ 865ede37b99859fbb5ee74a81e0cdca24315ec5f20682a4c90da39a3b190eccb
+ 9eaebfd15bdfd2f52a8dae5752cf69130b7c99a4bc1021ac85e42eec7ac5ffa7
+ eee43cdcce6e15cd86f7f73641644a660963584de8a67ec233b3855716cd51fd
+ c7bce562daded83cd3be09ab36d1914d6e84a282805efd9f677fe15adcf1b0dc
+ f9838ea7a29192827b3712f96df2ecad792d1197d73ea80c213d328ac5d31700
+ c7069b3b3596ef69ba3f946a6eb2d2bf8ee86d6d93ddc5398e067c88599af5bd
+ 6088d27920345998e0244514a14f9f8fb7d1f58dca181982d3438bce28de3172
+ 3a322aef898889a564776fcacf2c763cf2ce9a56708022ee8cd2939734fe0aa8
+ 977bb9140273387973be872f41febc2b5ca66b6bd902a07f162f091139b3bef7
+ ef67fcbaec50eeb88cc50cbf74d574a4a158c9408b662db472d29ca98197d201
+ f4543a90bc9c8b94dd0a85ca810671e6e4c1a627817c93542bb22def01b832c2
+ 522f3fffcf223c8f747d21a95e0a30e5868279e920e395fba7e87c7cd6378842
+ ada2079706cf0fa2ff2a7644900b92d8b2d612caa524d05a1dcd2bd55e56b8f0
+ aab7d9d162fe4477f71182aa6bc9e1a1ca002d140de0a6eb39eb19e5843c80b0
+ 39fabe2b514b0c5089a5b9b62b2473d5c92bea654eb2f62979c3ca0fd95b6f64
+ 81906ac1f2005ab7f5c589d7469e3be258ad5463af6f0446459476f1e62318eb
+ de420d1e5198422a93d7db84887156f684478931a4b07355292759b09611b925
+ be3cc85c5f6517f37bf3da7785f097d0ef16bf4fd017daf3aa17f9587ec15034
+ 3e2619459ab0af0287dc0e0a26bf50f1f7abd5508086f9dc8d1b3e6a465565d2
+ 3742b78d332b06855217f5023a8530e436cfa3bec2d9c1a7e93e8c949b30e3d2
+ 261b50cc92d768cd88a02894f8d710003989d87de2deb3f6bcca822acb0338a5
+ 11717d312e58f4377aa4262dc4c868da2297ea1cc618eb3c68a1da49ba2b3107
+ 772b846575b0e5fa0c5b8484d9f8c93266ac3004ef286ee527a3e2e1cdae8dfb
+ 8f446b76f69f217dbd4b4154b516893b528adc535a264ad3f764537d24271e9c
+ f0464a95c2378d422a2a739186664d455332637bf4b3829bfaaf36de9722dc37
+ aaf831bbb84fed8b39e33b2d907c41acb82500fb3e536561aea3e674b8980d5f
+ df351e87eb7f6ad1c24f8a05cd0d600c452ba39b0951ffca0323fa4e273e3a96
+ a7d5d1163f600a2387e010524bba504c21770ffe287374d6bad588c240d90b8e
+ 9ace163e1a66b355c384c9e62536c048f547a1071814bc38b6608aaf11836c58
+ 6737fa293f0ea7f92dfaa4710f679c86c6df0c61e523edfe8e954ef20c3886af
+ a51449afb34fae45a4d043364b117d6f905098cf7643def4c40f3f7713a14c0e
+ dbd34b425896b456f9e5e2a1ee373aae679e43cb5dfdd0a2e01af9f017c98e6c
+ a609d06a53441e8da089e609d61c24c15577cc38f2c82774d361ee97a16b5712
+ 53a739f37e07f83e7515c6bac6a452bb93b215dde9ce1c8ca694b68a2ec0df60
+ 5873abdce7be403aa25c07fae5b4e2622cc0b2ecd09ec06ef0ee2b555b871c60
+ 5c519a41933cd074cb5d69a89a0f22d070c4c3800f2984c365e841abb0f1ad7e
+ fd0faa8c92305fe19dbd94d1ed80cb87dfb9f231f6deec7cedc4c4bd9788398b
+ cd9ce95d036585f16d29773a9468d80e262070a975334a6fe38cc7d9a9b38848
+ 3675607c387d3bc0cb848a695814f4f67e0d98278c49659df6f5b9d85771e7c2
+ 2a39d04d3878a38bdf51ceb88f2abb1673308cfdbba8b15ba949037a2e63c0e5
+ 8e07afed85f39f9b802f07bc3e8db88ff52382202b927fa72aa4edb92e756781
+ 290c2d1c5102260c36dbb0a1fb4e15003584d3daad5cb558b154650281574d70
+ 875ac1629fff7a72bb1ff4abc49fa1495123bf9040d8a8031493c84499357721
+ bd56ddb376f48a7eb0ddff5cbe84f947f86c39bc25fd50df1f2667c8ad51c4cc
+ c69d76f82a2aba7e8547f5899def998457c1c0cbb452504bb6f79ffc68c18cfa
+ 72c735116d9b0fc2500300868a9c373bc8db6317d6721f739855e643d83fa4ab
+ 41a7de596d02f3f7457217f36694978bce3e4006c3a0558fd30c7c03adbb76c7
+ 309d532ee07a175cc8ec40bd53a6d094f99aabae0d7c3337180747ef497cc068
+ 63d9b14746125d42ea4b01c315e7d8186a5a8bda779ee8623d57e4aae415b5fc
+ 06413dbec086907cbda0a130f89effe752121f596b3e9299c309d89e9cc4e678
+ 6a0c6c355897ceb309f8c07fc09f99f538a18e339cef1e3141efb8b2823554ea
+ b9923737190e2e5a59c00b79724b0116dbb407c5698c8e986b92bf4ee56f85df
+ b013ab217c22270e9b39116f00bc1e4b09eeb15a38d709355fd424cfbf5ea065
+ 2e667b87e19385f2a6b018ed01dc959e31ae71a21b6f3c11742cde51dec62a2f
+ 0ecebf97293852f95ab9a7e8394c70773c5cb6067085bb689d113282104f47a4
+ 055eedea0a2d9614809e4af9011747dca2013cf1616e2856d09e7232cfaee591
+ a315dc4c412d58ae2a1771d27e364922b85b5d88953fc33e3962f54c2771eb3a"

From d353bb32b090c7ecdc2ea3ec0f2acc4efc3bbac3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 2 Nov 2021 19:56:09 +0100
Subject: [PATCH 2382/4088] gtest: update to 1.11.0..

---
 srcpkgs/gtest/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtest/template b/srcpkgs/gtest/template
index 321c830ec14b..4302c1e6cf90 100644
--- a/srcpkgs/gtest/template
+++ b/srcpkgs/gtest/template
@@ -1,6 +1,6 @@
 # Template file for 'gtest'
 pkgname=gtest
-version=1.10.0
+version=1.11.0
 revision=1
 wrksrc="googletest-release-${version}"
 build_style=cmake
@@ -10,8 +10,8 @@ short_desc="Google's framework for writing C++ tests"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/googletest"
-distfiles="https://github.com/google/googletest/archive/release-${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
+distfiles="https://github.com/google/googletest/archive/release-${version}.tar.gz"
+checksum=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
 
 post_install() {
 	vlicense LICENSE

From 2e4687faee39e5a2083667753f6a546058f74fd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 2 Nov 2021 19:38:48 +0100
Subject: [PATCH 2383/4088] grpc: correct absl pkgconfig sed-hack

---
 srcpkgs/grpc/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index dcbfa82d1997..20718758b2e7 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.39.1
-revision=2
+revision=3
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -45,17 +45,17 @@ post_patch() {
 post_build() {
 	# Clean up unneeded absl linker arguments from pkgconfig files
 	sed -e 's/-labsl_[^[:space:]]\+[[:space:]]*//g' \
-		-i build/libs/opt/pkgconfig/*.pc
-
-	# Add custom absl include root to grpcpp cflags
-	sed -e 's,^Cflags:.*,& -I${includedir}/grpc_absl,' \
-		-i build/libs/opt/pkgconfig/grpc++*.pc
+		-i build/lib/pkgconfig/*.pc
 }
 
 post_install() {
 	# Remove unnecessary absl static libs and cmake modules
 	rm "${DESTDIR}"/usr/lib/libabsl*.a
 	rm -rf "${DESTDIR}/usr/lib/cmake/absl"
+	
+	# Add custom absl include root to grpcpp cflags
+	vsed -e 's,^Cflags:.*,& -I${includedir}/grpc_absl,' \
+		-i ${DESTDIR}/usr/lib/pkgconfig/grpc++*.pc
 }
 
 grpc-devel_package() {

From aeaa46b2f6e1fe4d1598e0706a71ef928d09e2d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 2 Nov 2021 19:16:41 +0100
Subject: [PATCH 2384/4088] Bear: update to 3.0.16.

---
 srcpkgs/Bear/template | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 97db1a9541e8..9d8686d5af35 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,15 +1,20 @@
 # Template file for 'Bear'
 pkgname=Bear
-version=2.4.4
+version=3.0.16
 revision=1
 build_style=cmake
-hostmakedepends="python3"
-depends="python3"
+hostmakedepends="pkg-config protobuf protobuf-devel grpc"
+makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
+checkdepends="python3" # Should need python3-lit
 short_desc="Tool that generates a compilation database for clang tooling"
-maintainer="Alain Kalker <a.c.kalker@gmail.com>"
+maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rizsotto/Bear"
 changelog="https://raw.githubusercontent.com/rizsotto/Bear/master/ChangeLog.md"
 distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=5e95c9fe24714bcb98b858f0f0437aff76ad96b1d998940c0684c3a9d3920e82
-python_version=3
+checksum=877ee5e89e8445f74df95f2f3896597f04b86a4e5d0dbbca07ac71027dcb362d
+conflicts="interception-tools>=0" # /usr/bin/intercept
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-DENABLE_FUNC_TESTS=OFF -DENABLE_UNIT_TESTS=OFF"
+fi

From de1b654e7b633b7d1dcc23b97d6739f054c548e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Nov 2021 20:31:33 +0100
Subject: [PATCH 2385/4088] protontricks: update to 1.6.1.

---
 srcpkgs/protontricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 63065a6bf878..30b450cd3532 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,7 +1,7 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
-revision=2
+version=1.6.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-vdf winetricks"
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
 changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=7fe1bcc4cf029947850d8032b8a389e07ffb4e60e2d25a9c7535fa6e845b3ad8
 make_check=no # no tests in pypi tarball
 
 post_install() {

From 81bbcaa32f83eb6a5c8a42f397b859477608e3c3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Nov 2021 12:30:48 +0100
Subject: [PATCH 2386/4088] bdf2psf: update to 1.207.

---
 srcpkgs/bdf2psf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index d74be3507177..89cd33844ad5 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -1,6 +1,6 @@
 # Template file for 'bdf2psf'
 pkgname=bdf2psf
-version=1.206
+version=1.207
 revision=1
 wrksrc="console-setup-${version}"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/bdf2psf"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=856d0f123911779f5285a9c1479ea505c89981054df5b7ab4cd49fdd32663d2c
+checksum=5c9ff5d48d5fd57d3bc874de8f508ccc7b7df21fd64f651db5a83bda0c91c5e9
 
 post_extract() {
 	sed -i '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf

From 8bdac5b8ef1fc4380d07bb8a0f328170a4ce33de Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Nov 2021 12:31:37 +0100
Subject: [PATCH 2387/4088] debootstrap: update to 1.0.125.

---
 srcpkgs/debootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index 0c2813d9b0ce..44c63e226aa0 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.124
+version=1.0.125
 revision=1
 build_style=fetch
 depends="binutils gnupg gzip tar wget xz zstd"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
  ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb"
-checksum="df202f7e485be563270e803d25072d0c027d9ba3f624d1dd370dcaeaaa493210
+checksum="71d8a4cb030ed2696a2637a24fde6c110eb61b6ab69bb0abab8d1844d518e9f4
  9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361"
 
 case "$XBPS_TARGET_MACHINE" in

From 7af38c09a9b7c23e7ca86e356e11cf85b743125a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Nov 2021 12:47:29 +0100
Subject: [PATCH 2388/4088] skaffold: update to 1.34.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index d24100513d3a..815e232c5447 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.33.1
+version=1.34.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=fc9d5d274d60fd106d1ea7f00155e4070be76cdb3cc782a45840e44bf727efd3
+checksum=ab83edd467871ea2ad246180aa8a63ca06c560b59aee6aebd087b83ec226adce

From 9d8ebb120c13034bd37d53dbf7cd1e8dbfd937e2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Nov 2021 12:58:47 +0100
Subject: [PATCH 2389/4088] debootstrap: use debian-archive-keyring 2021.1.1.

---
 srcpkgs/debootstrap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index 44c63e226aa0..a1dbbd35c350 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -9,9 +9,9 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
- ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb"
+ ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2021.1.1_all.deb"
 checksum="71d8a4cb030ed2696a2637a24fde6c110eb61b6ab69bb0abab8d1844d518e9f4
- 9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361"
+ 56beca470dcd9b6d7e6c3c9e9d702101e01e9467e62810a8c357bd7b9c26251d"
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5*l*) _debarch=armel;;
@@ -27,7 +27,7 @@ esac
 
 do_install() {
 	bsdtar xOf ${pkgname}_${version}_all.deb data.tar.gz | bsdtar xvzf - -C ${DESTDIR}
-	bsdtar xOf debian-archive-keyring_2019.1_all.deb data.tar.xz | bsdtar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
+	bsdtar xOf debian-archive-keyring_2021.1.1_all.deb data.tar.xz | bsdtar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
 	mv ${DESTDIR}/usr/sbin ${DESTDIR}/usr/bin
 	sed -i 's|export PATH|export PATH="/usr/sbin:/sbin:/usr/bin:/bin"|' ${DESTDIR}/usr/bin/debootstrap
 	vlicense ${DESTDIR}/usr/share/doc/debootstrap/copyright LICENSE

From b05e8f438fc6ec8a12ed18d36b9e03c58cb6fc63 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Wed, 3 Nov 2021 13:55:24 +0100
Subject: [PATCH 2390/4088] proftpd: update to 1.3.7c.

---
 srcpkgs/proftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/proftpd/template b/srcpkgs/proftpd/template
index ee73c33f83cf..8b20d7697e81 100644
--- a/srcpkgs/proftpd/template
+++ b/srcpkgs/proftpd/template
@@ -1,6 +1,6 @@
 # Template file for 'proftpd'
 pkgname=proftpd
-version=1.3.7a
+version=1.3.7c
 revision=1
 build_style=gnu-configure
 makedepends="libcap-devel"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.proftpd.org/"
 changelog="https://github.com/proftpd/proftpd/blob/${version}/RELEASE_NOTES"
 distfiles="https://github.com/proftpd/proftpd/archive/v${version}.tar.gz"
-checksum=8b7bbf9757988935352d9dec5ebf96b6a1e6b63a6cdac2e93202ac6c42c4cd96
+checksum=7070968b9b6cf614ce7f756c8c1a66c32c1afa4f961784a62301790a801400da
 conf_files="/etc/proftpd.conf"
 
 proftpd-devel_package() {

From 1213dc160ddf2ef54b05bf1e4635a5b22b43a15d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:38:45 +0200
Subject: [PATCH 2391/4088] qt6-3d: update to 6.2.1.

---
 srcpkgs/qt6-3d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 3946df557887..3c9e560e892d 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
-checksum=304352ae74fc8e7fe50a822413d69094efb25f15a2323e083a2a53dc5a43a6c6
+checksum=730c0e8e1a1a59c4acbeca68e206bab14ef770f5dacb94b84103a82243cfeeb3
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bfe5e87f948dbdcd757abecc813abc506b5385e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:40:06 +0200
Subject: [PATCH 2392/4088] qt6-base: update to 6.2.1.

---
 srcpkgs/qt6-base/patches/qtbug-97811.patch | 53 ++++++++++++++++++++++
 srcpkgs/qt6-base/template                  |  4 +-
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/qtbug-97811.patch

diff --git a/srcpkgs/qt6-base/patches/qtbug-97811.patch b/srcpkgs/qt6-base/patches/qtbug-97811.patch
new file mode 100644
index 000000000000..e3ea6b09d843
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtbug-97811.patch
@@ -0,0 +1,53 @@
+From ffc9323671d045e3566980d9ed4567f071004e65 Mon Sep 17 00:00:00 2001
+From: Volker Hilsheimer <volker.hilsheimer@qt.io>
+Date: Thu, 28 Oct 2021 16:55:33 +0200
+Subject: Fix performance regression when avoiding scrollbar flipping
+
+Amends 6c4dc722cb9bf765904feefff4fb00bdb0b3dc9f.
+
+Don't search for the optimal size of the scrollarea's widget if it can't
+be found anyway. Try the size with scrollbar first, which covers the
+vast majority of sizes.
+
+Optimizing the loop with e.g. a binary search adds no value, as the size
+is often just a pixel too small.
+
+Since we can't rely on the number of height-for-width calls, we can't
+meaningfully test this behavior. The number of calls is still very high
+during showing and resizing; optimizing this further is for a separate
+commit.
+
+Fixes: QTBUG-97811
+Pick-to: 6.2 5.15
+Change-Id: If145302e6414b32cf1ce7251ff33b0039f584867
+Reviewed-by: Jonas Kvinge <jonas@jkvinge.net>
+Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
+---
+ src/widgets/widgets/qscrollarea.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
+index f880240ea7..e8fdadb648 100644
+--- a/src/widgets/widgets/qscrollarea.cpp
++++ b/src/widgets/widgets/qscrollarea.cpp
+@@ -203,10 +203,13 @@ void QScrollAreaPrivate::updateScrollBars()
+             if (vbarpolicy == Qt::ScrollBarAsNeeded) {
+                 int vbarWidth = vbar->sizeHint().width();
+                 QSize m_hfw = m.expandedTo(min).boundedTo(max);
+-                while (h > m.height() && vbarWidth) {
+-                    --vbarWidth;
+-                    --m_hfw.rwidth();
+-                    h = widget->heightForWidth(m_hfw.width());
++                // is there any point in searching?
++                if (widget->heightForWidth(m_hfw.width() - vbarWidth) <= m.height()) {
++                    while (h > m.height() && vbarWidth) {
++                        --vbarWidth;
++                        --m_hfw.rwidth();
++                        h = widget->heightForWidth(m_hfw.width());
++                    }
+                 }
+                 max = QSize(m_hfw.width(), qMax(m_hfw.height(), h));
+             }
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 4fea74a5b09a..d1bcbe898e9d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
@@ -29,7 +29,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
-checksum=fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769
+checksum=2c5f07b5c3ea27d3fc1a46686ea3fb6724f94dddf1fb007de3eb0bdb87429079
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From de8b2ac42354c944361826546ad1146c78dd1ec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:40:16 +0200
Subject: [PATCH 2393/4088] qt6-charts: update to 6.2.1.

---
 srcpkgs/qt6-charts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 88764df95f41..77adbc9061ec 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
-checksum=9114d4e05e63f5b9d5f07d53d72bf2fbfb22ffae283cc98d3371d73f04b6f4fc
+checksum=f92ad16abd382a1488e6aafa129d88887a14300cb0f237fe37bca9173cf5a688
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 941f85eadc8c5efa86665a3879adf70381f38da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:41:10 +0200
Subject: [PATCH 2394/4088] qt6-declarative: update to 6.2.1.

---
 srcpkgs/qt6-declarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index ebedd84ad61c..bb8d976201e1 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=46737feceb9e54d63ad0c87a08d33f08ca58f4b8920ccefad8f1ebd64f0d1270
+checksum=5aeb841a5665f79672a302569754ea7d541c69102c551707e43489e797213c71
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then

From d65ccb58aa93259eec4f38c7f2f57bb8aae24b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:41:14 +0200
Subject: [PATCH 2395/4088] qt6-imageformats: update to 6.2.1.

---
 srcpkgs/qt6-imageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index fe5400ba7287..47def09028f8 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz"
-checksum=fdaa35536c3d0f8f5f313d0d52dedfbf6d8fcd81a82d6a56f473253f135072ad
+checksum=df61dc1a517988bfa123117c78a7dbeda859cbb6d9cbd080ce60058277bca3df

From 3b6fd9d481815eae9b645a2daf8a4c332abb502d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:41:15 +0200
Subject: [PATCH 2396/4088] qt6-lottie: update to 6.2.1.

---
 srcpkgs/qt6-lottie/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index be9c41bf120c..168068542276 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz"
-checksum=aa129261d409b5d935221acd6e38f56d68eac5e467a1990c96c654e81a2522ff
+checksum=6f896b47aa3c9a0ea3905a3d49b8737ff42a444c2deb54d80426da80b2fabfd3
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 82890ecf4b34301f97cb3bd83dc283445c645253 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:41:17 +0200
Subject: [PATCH 2397/4088] qt6-networkauth: update to 6.2.1.

---
 srcpkgs/qt6-networkauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index bb3bc0fae104..7bb9d9e0345c 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz"
-checksum=e71504c8d6ae4cf4d573f1d91ff756f90f441e22b0af12eae2424f7e0c01d450
+checksum=8027f85095a9c56d8cada988527454f786a5f8dd4157206db4f21299016d1c9e
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 20c246597990533be9c042fca8b552eff30c69e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:41:29 +0200
Subject: [PATCH 2398/4088] qt6-qt5compat: update to 6.2.1.

---
 srcpkgs/qt6-qt5compat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index fd3b0d42bc7e..dba256935ffd 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
-checksum=c2e2f058ecee36a96c1b15937badeda9b7b03eb5278fa01af4ff386c4f1854fb
+checksum=3865c031450a3c2616de1e20104ca9470ac5447adf51faa918f8b01a2c425de7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From efaf75b4d84130197b3147e5f8612f618184df96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:42:53 +0200
Subject: [PATCH 2399/4088] qt6-quick3d: update to 6.2.1.

---
 srcpkgs/qt6-quick3d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 1ef03c32b1cf..3f864bee6f4f 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=e8f8163237468e158ace7737d60a0a722209ffda444c57c786fc53db1af851e1
+checksum=4022ce0e40a5d1c93a9593037a151cf7abe64c91a8b9882d9549f6a3c002a1b2
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually

From 1876ca4c9f575d1d7af4e6976e754448d6243f00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:42:55 +0200
Subject: [PATCH 2400/4088] qt6-quicktimeline: update to 6.2.1.

---
 srcpkgs/qt6-quicktimeline/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 4c0912d93347..c605cc230949 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz"
-checksum=67d644ad12df94e937bac3a1cb8a81a96213ec0102759a86c59ba7834ac90c8c
+checksum=55f571ee2adcf7b12473b8df8b9e2e60d3778d8c9055c301d4c11d7c2327de63
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 26b2e9ac420f2f81fe091c0528f64a2890a6ac7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:43:00 +0200
Subject: [PATCH 2401/4088] qt6-scxml: update to 6.2.1.

---
 srcpkgs/qt6-scxml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 36bc0fc689b2..e2aef5375678 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz"
-checksum=90d4af011a17f04a003cbd453c7e0720787e6cdacb8dfce7167179c2cd7dc839
+checksum=cff613f68af98f4bdc1e40df0b6515b69175e10e83c551a57ee5db4359505767
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 6efd85235d76028310b423013fbab484e05a8a45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:43:03 +0200
Subject: [PATCH 2402/4088] qt6-shadertools: update to 6.2.1.

---
 srcpkgs/qt6-shadertools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9fc700d72927..13c320c8eba4 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=5f66d43610a3a6739fc360d836a2c045135107c0ecd40eb3ed18ce5f3dd79c42
+checksum=2c8d38724181b31cd828a56e377775c2d461ee2ea0d6362ebec411c3b288067e
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From c286846e20bf74e8830f62b39a34cade1167cfa8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:43:07 +0200
Subject: [PATCH 2403/4088] qt6-svg: update to 6.2.1.

---
 srcpkgs/qt6-svg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index 81a0c5ad25c0..18ad60a94038 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=af9eabefbb0dcb772f18fae4d2c39bcc23579a5dfff569c35ea7e497591db3d4
+checksum=86e27e005c2421052ca90e619c8d13f1bd19c6bf1a7b84dd4e0f7855fc884fd7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 8b85758e3446bbb68d587d8fdb2067b27de59ba2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:43:25 +0200
Subject: [PATCH 2404/4088] qt6-tools: update to 6.2.1.

---
 srcpkgs/qt6-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index 576a7aef7449..094016b331de 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=a903d005f8ab39545aed88a13b04f13ddbbe073da7007203a91fb8b42b890057
+checksum=5a856d3d3d5fe6e15dc3f1af707a0ef1df2e687850403fc94af635edb9312bfb
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 52871248239f4d0ccdabfc65763b33a6391ed4f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:43:28 +0200
Subject: [PATCH 2405/4088] qt6-translations: update to 6.2.1.

---
 srcpkgs/qt6-translations/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index 19d44548bc8f..8a1ffbd7d1c7 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=5b4ecb1ee35363444f03b1eb10637d79af1d19be5a5cc53657dc0925a78b2240
+checksum=3f680b520da585697fc725697a52c7d2074a6a728f6830366b491a6f8b9183c7

From a3b51171f8ad0f84fa70476442b7e9a00601e1b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:43:35 +0200
Subject: [PATCH 2406/4088] qt6-virtualkeyboard: update to 6.2.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index f5188228e6bd..e39dceb4f10b 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
-checksum=1055e7fe1dfaecbfd4b69f40ec1135fda1980e6e21adbe757a8a4affbfb9bcee
+checksum=61baa6be64b41f3b1e526ed11896f818a50eb50d282906d4464eb8e0fa98f0fe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From c673c2dd25d4caefaf86169ac6018773ea2b50d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Oct 2021 18:43:38 +0200
Subject: [PATCH 2407/4088] qt6-wayland: update to 6.2.1.

---
 srcpkgs/qt6-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index 06b2cbbaa08c..4c432a560e6b 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.2.0
+version=6.2.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=d6787fce74bde1a3386bcbe43c078c712471bab09f1946c40fc2327232d27d4c
+checksum=051e6bd0a6fed988436fd86ad5146a556151f3a51f8bd5c4a31c99845a54efd7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From a1fc402493b0f83e5b477f492b0bdcea126d5556 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 26 Jun 2021 12:23:48 +0200
Subject: [PATCH 2408/4088] New package: qt6-websockets-6.2.1

---
 common/shlibs                   |  2 ++
 srcpkgs/qt6-websockets-devel    |  1 +
 srcpkgs/qt6-websockets/template | 27 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-websockets-devel
 create mode 100644 srcpkgs/qt6-websockets/template

diff --git a/common/shlibs b/common/shlibs
index 7e95fce39f7e..45e8aa46e3af 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2052,6 +2052,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
+libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
+libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-websockets-devel b/srcpkgs/qt6-websockets-devel
new file mode 120000
index 000000000000..a3c674e42954
--- /dev/null
+++ b/srcpkgs/qt6-websockets-devel
@@ -0,0 +1 @@
+qt6-websockets
\ No newline at end of file
diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
new file mode 100644
index 000000000000..71bedf3123a1
--- /dev/null
+++ b/srcpkgs/qt6-websockets/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-websockets'
+pkgname=qt6-websockets
+version=6.2.1
+revision=1
+wrksrc="qtwebsockets-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - websockets"
+maintainer="John <me@johnnynator.dev>"
+license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebsockets-everywhere-src-${version}.tar.xz"
+checksum=23344e21e96a839697abed7bf7931a8c08a752f08bf25edf240748501aba3816
+
+qt6-websockets-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0f642bda175e5cf61ce1c9c842ffc2a9d63fa921 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 26 Jun 2021 12:16:54 +0200
Subject: [PATCH 2409/4088] New package: qt6-serialport-6.2.1

---
 srcpkgs/qt6-serialport-devel    |  1 +
 srcpkgs/qt6-serialport/template | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/qt6-serialport-devel
 create mode 100644 srcpkgs/qt6-serialport/template

diff --git a/srcpkgs/qt6-serialport-devel b/srcpkgs/qt6-serialport-devel
new file mode 120000
index 000000000000..f6a498cf2653
--- /dev/null
+++ b/srcpkgs/qt6-serialport-devel
@@ -0,0 +1 @@
+qt6-serialport
\ No newline at end of file
diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
new file mode 100644
index 000000000000..f268851732c3
--- /dev/null
+++ b/srcpkgs/qt6-serialport/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-serialport'
+pkgname=qt6-serialport
+version=6.2.1
+revision=1
+wrksrc="qtserialport-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel pkg-config"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - serialport"
+maintainer="John <me@johnnynator.dev>"
+license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtserialport-everywhere-src-${version}.tar.xz"
+checksum=ec77f4c9d6096588f3e735315f873976103479be453985b27f27fe8994e0776a
+
+qt6-serialport-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From b76333b4edd360d7bdf452043d17fa174a3ac4ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Jun 2021 16:00:28 +0200
Subject: [PATCH 2410/4088] New package: qt6-location-6.2.1

---
 common/shlibs                 |  2 ++
 srcpkgs/qt6-location-devel    |  1 +
 srcpkgs/qt6-location/template | 27 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-location-devel
 create mode 100644 srcpkgs/qt6-location/template

diff --git a/common/shlibs b/common/shlibs
index 45e8aa46e3af..60647122b3dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2054,6 +2054,8 @@ libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
+libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
+libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-location-devel b/srcpkgs/qt6-location-devel
new file mode 120000
index 000000000000..7924c82dd3f4
--- /dev/null
+++ b/srcpkgs/qt6-location-devel
@@ -0,0 +1 @@
+qt6-location
\ No newline at end of file
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
new file mode 100644
index 000000000000..7767df810207
--- /dev/null
+++ b/srcpkgs/qt6-location/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-location'
+pkgname=qt6-location
+version=6.2.1
+revision=1
+wrksrc="qtlocation-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
+short_desc="Cross-platform application and UI framework - location"
+maintainer="John <me@johnnynator.dev>"
+license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlocation-everywhere-src-${version}.tar.xz"
+checksum=a99e92c762d45b17e14685cd8a3c1564a3da0ce1cfd1a68ffd5b3fd7c409dcad
+
+qt6-location-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From ffcbed64ff85d063ebba14d2d7d6c40528348ea9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 3 Nov 2021 15:52:06 -0500
Subject: [PATCH 2411/4088] bucklespring: update to 1.5.1.

---
 srcpkgs/bucklespring/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bucklespring/template b/srcpkgs/bucklespring/template
index 0764042d75c0..6e0972398234 100644
--- a/srcpkgs/bucklespring/template
+++ b/srcpkgs/bucklespring/template
@@ -1,6 +1,6 @@
 # Template file for 'bucklespring'
 pkgname=bucklespring
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -11,8 +11,8 @@ short_desc="Emulate the sound of the IBM Model-M while typing"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/zevv/bucklespring"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b9505abde912775dd78d8396d2282a6d89e3ad3342b3f150c207becb40d34ab
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8d75d9809aa1f45b6f613bd6547f52a4ba9b207119775e48497c1a17fe98d541
 replaces="bucklespring-data>=0"
 
 if [ $XBPS_CROSS_BASE ]; then

From 7f7f6795cc902aa6376566d48d0109700f1268d0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 3 Nov 2021 15:53:43 -0500
Subject: [PATCH 2412/4088] cackey: update to 0.7.11.

---
 srcpkgs/cackey/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cackey/template b/srcpkgs/cackey/template
index 468dcd1c7b1b..a2f4509ff35a 100644
--- a/srcpkgs/cackey/template
+++ b/srcpkgs/cackey/template
@@ -1,6 +1,6 @@
 # Template file for 'cackey'
 pkgname=cackey
-version=0.7.10
+version=0.7.11
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="http://www.rkeene.org/projects/info/wiki/161"
 distfiles="http://cackey.rkeene.org/download/$version/cackey-$version.tar.gz"
-checksum=e2074055bab8eb1c277bfa3355767c50f792d5b87bf41f9c0d1af0e77f311583
+checksum=0ed459814fb4753f6e5fa80034c55d1b312f55f88ee7317446dff49fa6e570f3
 CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/PCSC"
 
 pre_configure() {

From 8b0fd942fe4b15b4c04f0cb2f99f32008f3e9681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 1 Feb 2018 16:32:51 -0300
Subject: [PATCH 2413/4088] New package: lcalc-1.23

---
 srcpkgs/lcalc-devel          |   1 +
 srcpkgs/lcalc/files/test     |  30 ++++++++++
 srcpkgs/lcalc/files/test.out | 112 +++++++++++++++++++++++++++++++++++
 srcpkgs/lcalc/template       |  71 ++++++++++++++++++++++
 4 files changed, 214 insertions(+)
 create mode 120000 srcpkgs/lcalc-devel
 create mode 100644 srcpkgs/lcalc/files/test
 create mode 100644 srcpkgs/lcalc/files/test.out
 create mode 100644 srcpkgs/lcalc/template

diff --git a/srcpkgs/lcalc-devel b/srcpkgs/lcalc-devel
new file mode 120000
index 000000000000..ec3437a2fb19
--- /dev/null
+++ b/srcpkgs/lcalc-devel
@@ -0,0 +1 @@
+lcalc
\ No newline at end of file
diff --git a/srcpkgs/lcalc/files/test b/srcpkgs/lcalc/files/test
new file mode 100644
index 000000000000..de1f2a6b34e1
--- /dev/null
+++ b/srcpkgs/lcalc/files/test
@@ -0,0 +1,30 @@
+#! /bin/sh
+#
+# Quick minimal test for lcalc.
+#
+# Test running the main binary (lcalc) and running the provided
+# example program which is dynamically linked to the library.
+# Also test that loading of L-function data files works.
+#
+# The precision is truncated at 13 (rather than the default 14),
+# otherwise the output could vary a little bit depending on
+# architecture and compiler flags. For the example program we
+# patch-round using sed the two outputs that seem to vary.
+#
+echo "### First 1000 zeros of zeta function"
+./lcalc -z 10 -P 13
+echo
+echo "### Analytic rank of elliptic curve 5077a1"
+./lcalc -e --a1=0 --a2=0 --a3=1 --a4=-7 --a6=6 -r
+echo
+echo "### run example program"
+# do some ad hoc rounding to avoid minor differences
+LD_LIBRARY_PATH=. example_programs/example | sed -e '
+	s/\(L4(1,0) = ([0-9.]*\)[0-9],/\1,/;
+	s/6.123[0-9]*e-17/6.123e-17/'
+echo
+echo "### test data files: zeros of data_mass"
+./lcalc -F example_data_files/data_maass -z 10 -P 13
+echo
+echo "### test data files: zeros of data_tau"
+./lcalc -F example_data_files/data_tau -z 10 -P 13
diff --git a/srcpkgs/lcalc/files/test.out b/srcpkgs/lcalc/files/test.out
new file mode 100644
index 000000000000..b8e661e7e6c8
--- /dev/null
+++ b/srcpkgs/lcalc/files/test.out
@@ -0,0 +1,112 @@
+### First 1000 zeros of zeta function
+ 14.1347251417
+ 21.0220396388
+ 25.0108575801
+ 30.4248761259
+ 32.9350615877
+ 37.5861781588
+ 40.9187190121
+ 43.3270732809
+ 48.0051508812
+ 49.7738324777
+
+### Analytic rank of elliptic curve 5077a1
+analytic rank equals 3
+
+### run example program
+-----------------------------------------------
+
+Name of L_function: zeta
+All coefficients are equal to 1
+
+Q = 0.564189583548
+OMEGA = (1,0)
+a = 1 (the quasi degree)
+gamma[1] =0.5    lambda[1] =(0,0)
+
+
+number of poles (of the completed L function) = 2
+pole[1] =(1,0)    residue[1] =(1,0)
+pole[2] =(0,0)    residue[2] =(-1,0)
+-----------------------------------------------
+
+-----------------------------------------------
+
+Name of L_function: L4
+number of dirichlet coefficients = 4
+coefficients are periodic
+b[1] = 1
+b[2] = 0
+b[3] = -1
+b[4] = 0
+
+Q = 1.1283791671
+OMEGA = (1,0)
+a = 1 (the quasi degree)
+gamma[1] =0.5    lambda[1] =(0.5,0)
+
+
+number of poles (of the completed L function) = 0
+-----------------------------------------------
+
+-----------------------------------------------
+
+Name of L_function: L5
+number of dirichlet coefficients = 5
+coefficients are periodic
+b[1] = (1,0)
+b[2] = (0,1)
+b[3] = (-0,-1)
+b[4] = (-1,0)
+b[5] = (0,0)
+
+Q = 1.26156626101
+OMEGA = (0.850650808352,0.525731112119)
+a = 1 (the quasi degree)
+gamma[1] =0.5    lambda[1] =(0.5,0)
+
+
+number of poles (of the completed L function) = 0
+-----------------------------------------------
+
+zeta(0.5,0) = (-1.46035450881,0)
+L4(0.5,0) = (0.6676914571896,0)
+L5(0.5,0) = (0.7637478801173,0.2169647675189)
+L4(1,0) = (0.785398163397,0)
+L5(1,0) = (0.8648062659772,0.2041530661384)
+0.4285714285714
+1.5
+0.1666666666667
+0.6666666666667
+0.5714285714286
+0
+0.5714285714286
+0.5714285714286
+0
+0.8888888888889
+6.123e-17
+-0.7071067811865
+
+### test data files: zeros of data_mass
+ 2.8977246783
+ 5.5912453153
+ 21.0903775087
+ 23.1575104846
+ 25.4393003898
+ 29.1892067135
+ 31.0617394845
+ 32.4527182375
+ 34.027279684
+ 36.9312371969
+
+### test data files: zeros of data_tau
+ 9.22237939992
+ 13.9075498614
+ 17.4427769782
+ 19.656513142
+ 22.3361036372
+ 25.2746365481
+ 26.8043911584
+ 28.8316826242
+ 31.1782094984
+ 32.7748753822
diff --git a/srcpkgs/lcalc/template b/srcpkgs/lcalc/template
new file mode 100644
index 000000000000..0c1784fff871
--- /dev/null
+++ b/srcpkgs/lcalc/template
@@ -0,0 +1,71 @@
+# Template file for 'lcalc'
+pkgname=lcalc
+version=1.23
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+makedepends="gmp-devel pari-devel"
+short_desc="Michael Rubinstein's L-function calculator"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://mirrors.mit.edu/sage/spkg/upstream/lcalc/"
+distfiles="https://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-${version}.tar.bz2"
+checksum="83d4253ec2f38553b21190d6d0c6b71bab7ea14717f6dde5bd18f60775d3cdb0
+ bd39a43b24a332e1826e667f85ca2ce2ca14749d56f60069cd886c96f55e9e3c
+ d8c660f68f33b6eeb4b801d4028faaaaccbfff5797efe654bb6367e0a687542d
+ dadf6fc6d481595cb041f8b0dd92bc2e2bc390cbb3e0dd36b7fe63b74942db26
+ 342cde1c9effda48597bfee439acb37c91458a100580c97c84da6a142d2cc5b6
+ 55c6c9f969593f24c75a85e7a150b876671356aa68ceb8e77c563a645897643e
+ 906ef33de15bb0d94883b7797d8cb3c889b9f59bceebeb171e65f1546faf1c37
+ 437e3870342ef4cb5749398ead9381504403e7e1f99efadab95f4a607678b400
+ 6471f2f30497486e289fc8977cbb89c495cf0d5ff58af2b1f479a497a28165e6
+ dde1f80b0ca42fb43917c24e6016c19e4a8d28de9c50cd0a523a318866bdc0eb
+ 941d4ac025f5d6f0142fb785b27f7a221729466dc83d45fd206cce102c012eaf
+ 045f23ea9131b8039001c8f13d22152f7b3c2e91adcf8c555354eaf39e7a7b48"
+
+# get patches from sagemath
+_patchurl="https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches"
+_patchtag="?h=9.3.rc2"
+_patches="
+ Lcommon.h.patch
+ Lvalue.h.patch
+ Makefile.patch
+ clang.patch
+ lcalc-1.23_default_parameters_1.patch
+ lcalc-1.23_default_parameters_2.patch
+ pari-2.7.patch
+ pari-mem.patch
+ pari_include.patch
+ time.h.patch
+ using_namespace_std.patch"
+for patch in $_patches ; do
+	distfiles+=" ${_patchurl}/${patch}${_patchtag}>${patch}"
+done
+skip_extraction="$_patches"
+
+post_extract() {
+	for patch in $_patches ; do
+		patch -p1 < "$XBPS_SRCDISTDIR/${pkgname}-${version}/${patch}"
+	done
+}
+
+CXXFLAGS="-fPIC -Wno-deprecated"
+
+pre_install() {
+	mkdir -p ${DESTDIR}/usr/{bin,lib,include}
+	make_install_args+=" INSTALL_DIR=${DESTDIR}/usr"
+}
+
+do_check() {
+	echo "Testing lcalc ..."
+	sh "${FILESDIR}"/test > test.log
+	diff "${FILESDIR}"/test.out test.log && echo PASS
+}
+
+lcalc-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From 938b06ed60b665b03db093e980a0cb4adee994ee Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Sat, 11 Sep 2021 19:11:05 +0600
Subject: [PATCH 2414/4088] pgbouncer: update to 1.16.0.

---
 srcpkgs/pgbouncer/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 1049a1594d06..f20a2957eaaf 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
-version=1.15.0
-revision=2
+version=1.16.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"
@@ -12,7 +12,8 @@ license="ISC"
 homepage="https://pgbouncer.github.io/"
 changelog="https://raw.githubusercontent.com/pgbouncer/pgbouncer/master/NEWS.md"
 distfiles="https://pgbouncer.github.io/downloads/files/${version}/pgbouncer-${version}.tar.gz"
-checksum=e05a9e158aa6256f60aacbcd9125d3109155c1001a1d1c15d33a37c685d31380
+checksum=a4a391618bb83caaee2a8cd9653974f4c1b98b95987d5cabbbeb801da6342652
+make_check=ci-skip # Postgres server can't be run as root
 
 pre_check() {
 	. /etc/profile.d/postgresql13.sh

From b6e2a585ed275a7ae490d95ab1d2470a2310dc99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 3 Nov 2021 22:31:25 +0100
Subject: [PATCH 2415/4088] common/lint-commits: error out on non-conventional
 subject

---
 common/scripts/lint-commits | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index 65f584f5f84e..01c4eda17007 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -38,7 +38,7 @@ do
 	(NF > 2) && (length > 80) { print C ": long line: " $0; exit 1 }
 	!subject {
 		if (length > 50) { print C ": subject is a bit long" }
-		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print C ": subject does not follow CONTRIBUTING.md guildelines" }
+		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
 		# Below check is too noisy?
 		# if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) {
 		# 	print C ": not new package/update/removal?"

From 511429876b8db95b388867d77264fd97bdec9145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 3 Nov 2021 22:09:19 +0100
Subject: [PATCH 2416/4088] fetchmail: update to 6.4.23.

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 91fa37c38b41..d1bbe5f33432 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.22
+version=6.4.23
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cc6818bd59435602169fa292d6d163d56b21c7f53112829470a3aceabe612c84
+checksum=5f7a5e13731431134a2ca535bbced7adc666d3aeb93169a0830945d91f492300
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 6795e46debd41e766f9244e7dd3f1972a2a80fc2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 4 Nov 2021 00:19:19 +0100
Subject: [PATCH 2417/4088] hugo: update to 0.89.0.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index b583de7ac1ac..e21dc9634025 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.88.1
+version=0.89.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=da5f52437bfc7521b194b39d36a8cf7b2775e70e1ba8c443f81a14f468608507
+checksum=0fbee83dd04927b6c467caad245cf3159463c5114e0624edc1536f75e4c6cf17
 
 post_install() {
 	vdoc README.md

From d6629e96bbd0b43cdeda6bb3805745bcb6f51cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 4 Nov 2021 06:42:48 +0700
Subject: [PATCH 2418/4088] Documentation: replace git protocol with https

git protocol will be retired by GitHub soon.
Replace it with supported https instead.
---
 CONTRIBUTING.md | 2 +-
 Manual.md       | 2 +-
 README.md       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b68c4c601cd4..da3bef29c883 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-li
 
 To keep your forked repository up to date, setup the `upstream` remote to pull in new changes:
 
-    $ git remote add upstream git://github.com/void-linux/void-packages.git
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
     $ git pull --rebase upstream master
 
 ### Creating a new template
diff --git a/Manual.md b/Manual.md
index 0f268fa79ea0..5996e1502887 100644
--- a/Manual.md
+++ b/Manual.md
@@ -2124,7 +2124,7 @@ a github pull request.
 To keep your forked repository always up to date, setup the `upstream` remote
 to pull in new changes:
 
-    $ git remote add upstream git://github.com/void-linux/void-packages.git
+    $ git remote add upstream https://github.com/void-linux/void-packages.git
     $ git pull --rebase upstream master
 
 <a id="help"></a>
diff --git a/README.md b/README.md
index 40c85db25128..7047a958b669 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ methods.
 Clone the `void-packages` git repository and install the bootstrap packages:
 
 ```
-$ git clone git://github.com/void-linux/void-packages.git
+$ git clone https://github.com/void-linux/void-packages.git
 $ cd void-packages
 $ ./xbps-src binary-bootstrap
 ```
@@ -441,7 +441,7 @@ try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
-    $ git clone git://github.com/void-linux/void-packages
+    $ git clone https://github.com/void-linux/void-packages.git
 
 and `xbps-src` should be fully functional; just start the `bootstrap` process, i.e:
 

From 3c1bcd8c43689993f4e4c2473f5f5b85a76d5622 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 3 Nov 2021 19:48:49 -0400
Subject: [PATCH 2419/4088] just: update to 0.10.3

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index a8428aac9af2..f36999e50cea 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.10.2
+version=0.10.3
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz"
-checksum=7be0c7f895191407c70affedc8640fcbc64b50cf72d4d301a1f2391e12478f14
+checksum=10ee1caaedb2e92257338942fce146e5d3aadd6f9f5e98fbc21e422e2d863169
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 2e6259817ea49f2c39b4fd5deac18c03947475b9 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 1 Oct 2021 09:28:28 +0200
Subject: [PATCH 2420/4088] revive: update to 1.1.2.

---
 srcpkgs/revive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index 93955b8d081a..e6895a6daf1c 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,6 +1,6 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.version=$version -X main.builtBy=xbps"
@@ -10,7 +10,7 @@ maintainer="Roberto Ricci <ricci@disroot.org>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=4ca423be81a92a32cc9b550d46bc6cc947ce9b938ee2827a094e6582ed162fc6
+checksum=b2dd477895e11de93ef076a7ad8186003c5ccc87416909e281eed63d8e26d1db
 
 do_check() {
 	go test -v ./...

From b93cd0b2ba232d500a1ff20d572dcdef1b68edc1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 3 Nov 2021 19:12:06 +0100
Subject: [PATCH 2421/4088] sigil: update to 1.8.0.

---
 srcpkgs/sigil/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index d8e4f32e88b6..ce12835e5a53 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,7 +1,7 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
-revision=2
+version=1.8.0
+revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
 pycompile_dirs="usr/share/sigil/python3lib"
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=33d84331f259ab8d92fc2c5fed6f05fd5f011695c48f83537423635a7afdd2ec
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 59c9a239ec480a221df2540677bafe53fbc0ce85 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 28 Oct 2021 12:41:19 +0200
Subject: [PATCH 2422/4088] zoom: update to 5.8.3.145.

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ec2aa182857a..166bc27e9a46 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.8.0.16
+version=5.8.3.145
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=cdf94c3ef9ee8d8694a71ff305f4e25cb7d0d1076a7f4dfa4ca33e949dcb5bdf
+checksum=4bc1a6fb54d375fc0fdc02ea599b89f9efb655c082724c369c3e45f6d9a9c191
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 13ce8e545ae848540cffb106e0c611a14ad07993 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 3 Nov 2021 19:02:56 +0100
Subject: [PATCH 2423/4088] fluidsynth: update to 2.2.3.

---
 srcpkgs/fluidsynth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index c2c5fc003b35..da9666cf60d5 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.2.2
+version=2.2.3
 revision=1
 build_style=cmake
 make_check_target=check
@@ -13,7 +13,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=695aedbfd53160fef7a9a1f66cd6d5cc8a5da0fd472eee458d82b848b6065f9a
+checksum=b31807cb0f88e97f3096e2b378c9815a6acfdc20b0b14f97936d905b536965c4
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From d919c038564aafd1c4902462161f39c4f5a40de5 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Tue, 2 Nov 2021 19:12:27 -0700
Subject: [PATCH 2424/4088] sakura: update to 3.8.4.

---
 srcpkgs/sakura/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template
index 9659e182986a..36627625740f 100644
--- a/srcpkgs/sakura/template
+++ b/srcpkgs/sakura/template
@@ -1,6 +1,6 @@
 # Template file for 'sakura'
 pkgname=sakura
-version=3.8.3
+version=3.8.4
 revision=1
 build_style=cmake
 hostmakedepends="perl pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://launchpad.net/sakura"
 distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2"
-checksum=5040dcdd38e8aa32cd66d586948641dd54d5402fb7d403f4012407d1fbbe53e4
+checksum=c3f610168796b3d44f69a6431f7b0d032be958ca42f7117a17380869bb1816b5

From b2a30cd430e1b1e2417bf6d6f85352ce8620df6c Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Tue, 2 Nov 2021 19:11:15 -0700
Subject: [PATCH 2425/4088] fnott: update to 1.1.2.

---
 srcpkgs/fnott/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fnott/template b/srcpkgs/fnott/template
index c4cd3416a96d..3172bee55f17 100644
--- a/srcpkgs/fnott/template
+++ b/srcpkgs/fnott/template
@@ -1,6 +1,6 @@
-# Template file for 'fnott'.
+# Template file for 'fnott'
 pkgname=fnott
-version=1.1.0
+version=1.1.2
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fnott/"
 distfiles="https://codeberg.org/dnkl/fnott/archive/${version}.tar.gz"
-checksum=ffe7671d845e7885d056624bfa854e0e73ad464fcd11196a6b48bd2222d53991
+checksum=9390048c5a1b1b47718ba30c8fd0110d538749525b40f21c00ad0c1e90d25045
 
 post_install() {
 	vlicense LICENSE

From 650f857d787b87957f9da39c308ac39576292b7e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 1 Nov 2021 22:54:12 -0400
Subject: [PATCH 2426/4088] chezmoi: update to 2.7.4.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 252ea71b4f04..f97aed9b70eb 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.7.3
+version=2.7.4
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=a9dbaa9bd55f1c1e1c82c7ae5b7b1933f907703d5bd9976b2c14321b8c1e0d90
+checksum=71cdf60840a1674e929f9faa5220e0175077f5a6e72b58dcc5d1b17596aa3ae2
 
 export CGO_ENABLED=1
 

From 2cd4b60bd103c8239b87f0440fbd2a5569a4974f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 1 Nov 2021 17:46:52 +0100
Subject: [PATCH 2427/4088] dbeaver: update to 21.2.4.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 0668672afa3f..76964c2401c7 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.2.3
+version=21.2.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=ea3bbbad9d09962fb2711309b56e74c75e973028cea395e3e27e454e831bb676
+checksum=a129f5369723039348502f7e6e9e1579bbe155f3886a5e8b7511c7bc737770e7
 nopie=true
 
 do_build() {

From 94378ecf61438f5dd7ab7e7585b6b77ac04a7159 Mon Sep 17 00:00:00 2001
From: xaltsc <hey+dev@xaltsc.dev>
Date: Tue, 26 Oct 2021 08:08:02 +0200
Subject: [PATCH 2428/4088] when: update to 1.1.41.

---
 srcpkgs/when/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/when/template b/srcpkgs/when/template
index 5280274b25d4..fdea7a1f2424 100644
--- a/srcpkgs/when/template
+++ b/srcpkgs/when/template
@@ -1,15 +1,19 @@
 # Template file for 'when'
 pkgname=when
-version=1.1.40
+version=1.1.41
 revision=1
-wrksrc=when_dist
+hostmakedepends="perl"
 depends="perl"
 short_desc="Minimalistic personal calendar program"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://www.lightandmatter.com/when/when.html"
-distfiles="http://www.lightandmatter.com/when/when.tar.gz>when-${version}.tar.gz"
-checksum=2224cdba55cd4b3776cc328fbec2758aae4ccab3bf8acfc03ecab66591aedeb3
+distfiles="https://github.com/bcrowell/when/archive/refs/tags/${version}.tar.gz"
+checksum=78bfd3f18e0d3e42797c7aacb16829d2354d935f12e04db9e467d4bec389c884
+
+do_build() {
+	make when.1
+}
 
 do_install() {
 	vbin when

From ecb4c8ceb9f3a102cb5e315c6cd881f6ae38aa8f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 2429/4088] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..708b8a193d9b
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 353e1d524e3195971ce8904a439a31da571a4702 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 2430/4088] New package: python3-Brotli-1.0.9

---
 .../patches/missing-test-cases.patch          |  16 +++
 .../patches/use-system-brotli.patch           | 103 ++++++++++++++++++
 srcpkgs/python3-Brotli/template               |  19 ++++
 3 files changed, 138 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/patches/missing-test-cases.patch
 create mode 100644 srcpkgs/python3-Brotli/patches/use-system-brotli.patch
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/patches/missing-test-cases.patch b/srcpkgs/python3-Brotli/patches/missing-test-cases.patch
new file mode 100644
index 000000000000..cbefb7557a2d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/patches/missing-test-cases.patch
@@ -0,0 +1,16 @@
+diff --git a/python/tests/_test_utils.py b/python/tests/_test_utils.py
+index 104e654..6cf12b0 100644
+--- a/python/tests/_test_utils.py
++++ b/python/tests/_test_utils.py
+@@ -36,10 +36,7 @@ TESTDATA_DIR = os.path.join(test_dir, 'testdata')
+ 
+ TESTDATA_FILES = [
+     'empty',  # Empty file
+-    '10x10y',  # Small text
+-    'alice29.txt',  # Large text
+-    'random_org_10k.bin',  # Small data
+-    'mapsdatazrh',  # Large data
++    'ukkonooa',  # Small text
+ ]
+ 
+ TESTDATA_PATHS = [os.path.join(TESTDATA_DIR, f) for f in TESTDATA_FILES]
diff --git a/srcpkgs/python3-Brotli/patches/use-system-brotli.patch b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch
new file mode 100644
index 000000000000..d24964295cb0
--- /dev/null
+++ b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch
@@ -0,0 +1,103 @@
+diff --git a/setup.py b/setup.py
+index 25626ec..fdf27a2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -181,93 +181,18 @@ EXT_MODULES = [
+         '_brotli',
+         sources=[
+             'python/_brotli.cc',
+-            'c/common/constants.c',
+-            'c/common/context.c',
+-            'c/common/dictionary.c',
+-            'c/common/platform.c',
+-            'c/common/transform.c',
+-            'c/dec/bit_reader.c',
+-            'c/dec/decode.c',
+-            'c/dec/huffman.c',
+-            'c/dec/state.c',
+-            'c/enc/backward_references.c',
+-            'c/enc/backward_references_hq.c',
+-            'c/enc/bit_cost.c',
+-            'c/enc/block_splitter.c',
+-            'c/enc/brotli_bit_stream.c',
+-            'c/enc/cluster.c',
+-            'c/enc/command.c',
+-            'c/enc/compress_fragment.c',
+-            'c/enc/compress_fragment_two_pass.c',
+-            'c/enc/dictionary_hash.c',
+-            'c/enc/encode.c',
+-            'c/enc/encoder_dict.c',
+-            'c/enc/entropy_encode.c',
+-            'c/enc/fast_log.c',
+-            'c/enc/histogram.c',
+-            'c/enc/literal_cost.c',
+-            'c/enc/memory.c',
+-            'c/enc/metablock.c',
+-            'c/enc/static_dict.c',
+-            'c/enc/utf8_util.c',
+         ],
+         depends=[
+-            'c/common/constants.h',
+-            'c/common/context.h',
+-            'c/common/dictionary.h',
+-            'c/common/platform.h',
+-            'c/common/transform.h',
+             'c/common/version.h',
+-            'c/dec/bit_reader.h',
+-            'c/dec/huffman.h',
+-            'c/dec/prefix.h',
+-            'c/dec/state.h',
+-            'c/enc/backward_references.h',
+-            'c/enc/backward_references_hq.h',
+-            'c/enc/backward_references_inc.h',
+-            'c/enc/bit_cost.h',
+-            'c/enc/bit_cost_inc.h',
+-            'c/enc/block_encoder_inc.h',
+-            'c/enc/block_splitter.h',
+-            'c/enc/block_splitter_inc.h',
+-            'c/enc/brotli_bit_stream.h',
+-            'c/enc/cluster.h',
+-            'c/enc/cluster_inc.h',
+-            'c/enc/command.h',
+-            'c/enc/compress_fragment.h',
+-            'c/enc/compress_fragment_two_pass.h',
+-            'c/enc/dictionary_hash.h',
+-            'c/enc/encoder_dict.h',
+-            'c/enc/entropy_encode.h',
+-            'c/enc/entropy_encode_static.h',
+-            'c/enc/fast_log.h',
+-            'c/enc/find_match_length.h',
+-            'c/enc/hash.h',
+-            'c/enc/hash_composite_inc.h',
+-            'c/enc/hash_forgetful_chain_inc.h',
+-            'c/enc/hash_longest_match64_inc.h',
+-            'c/enc/hash_longest_match_inc.h',
+-            'c/enc/hash_longest_match_quickly_inc.h',
+-            'c/enc/hash_rolling_inc.h',
+-            'c/enc/hash_to_binary_tree_inc.h',
+-            'c/enc/histogram.h',
+-            'c/enc/histogram_inc.h',
+-            'c/enc/literal_cost.h',
+-            'c/enc/memory.h',
+-            'c/enc/metablock.h',
+-            'c/enc/metablock_inc.h',
+-            'c/enc/params.h',
+-            'c/enc/prefix.h',
+-            'c/enc/quality.h',
+-            'c/enc/ringbuffer.h',
+-            'c/enc/static_dict.h',
+-            'c/enc/static_dict_lut.h',
+-            'c/enc/utf8_util.h',
+-            'c/enc/write_bits.h',
+         ],
+         include_dirs=[
+             'c/include',
+         ],
++        libraries=[
++            'brotlicommon',
++            'brotlidec',
++            'brotlienc',
++        ],
+         language='c++'),
+ ]
+ 
diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..3f4cfafc3f7d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel brotli-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="https://github.com/google/brotli/archive/v${version}.tar.gz"
+checksum=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
+
+post_install() {
+	vlicense LICENSE
+}

From 9f9180c4b4b855b0f223b0536f064ba05afc0708 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 2431/4088] New package: python3-multivolumefile-0.2.3

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..4aa4ee9c4577
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.3
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=a0648d0aafbc96e59198d5c17e9acad7eb531abea51035d08ce8060dcad709d6

From 008e080642d868c4bd8b87394844e29abc46b9b2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 2432/4088] New package: python3-pybcj-0.5.0

---
 srcpkgs/python3-pybcj/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-pybcj/template

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
new file mode 100644
index 000000000000..9e0e806f9583
--- /dev/null
+++ b/srcpkgs/python3-pybcj/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-pybcj'
+pkgname=python3-pybcj
+version=0.5.0
+revision=1
+wrksrc="pybcj-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="BCJ(Branch-Call-Jump) filter for python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/pybcj"
+distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
+checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f

From d4d195e995a9c0cfef5b3e4d13b16bd54004dc49 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 2433/4088] New package: python3-pyppmd-0.17.1

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..6449ad14345f
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.1
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=ebc65d393d58b5463fdfbdf9b27e51b6aef9a9142052a50685a5dfdba91f5808
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From a491b0be2e4a44e939c964b54569404401b09006 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 2434/4088] New package: python3-py7zr-0.16.2

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..674347e85cc9
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.2
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=e741f0271ebb12551e4a4b57bf01fca226e7136ff301d15c083cd262f8c4a0d6
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From 6a3cd4f9c46c9a288071adbbbdf1ed3d3910b7d1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 2435/4088] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 9b5947b7ba95f6ce7bf3fb73bda26cab1bc659fc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 2436/4088] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From 1d806f4c802cd0d9a6c28bb070ef02c12549b12c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 2437/4088] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From ab81e43215e9738fdfac435f2b2d21044d791409 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 2438/4088] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..62b47885bba8
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="${depends} python3-pytest"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 27e17b50568e1d1ffc370e2039223ed31cafb712 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 2439/4088] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index adb2acc85cc8..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=5
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

From 3b35a859b401dcdc2a0df9296b939367da3fba00 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Fri, 15 Oct 2021 23:32:46 -0400
Subject: [PATCH 2440/4088] New package: xfce4-i3-workspaces-plugin-1.4.0

Close: #33582
---
 srcpkgs/xfce4-i3-workspaces-plugin/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/xfce4-i3-workspaces-plugin/template

diff --git a/srcpkgs/xfce4-i3-workspaces-plugin/template b/srcpkgs/xfce4-i3-workspaces-plugin/template
new file mode 100644
index 000000000000..e9c29525e0f7
--- /dev/null
+++ b/srcpkgs/xfce4-i3-workspaces-plugin/template
@@ -0,0 +1,17 @@
+# Template file for 'xfce4-i3-workspaces-plugin'
+pkgname=xfce4-i3-workspaces-plugin
+version=1.4.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="gettext-devel intltool pkg-config xfce4-dev-tools"
+makedepends="xfce4-panel-devel i3ipc-glib-devel"
+short_desc="Workspace switcher for i3 window manager and Xfce4 panel"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/denesb/xfce4-i3-workspaces-plugin"
+distfiles="https://github.com/denesb/${pkgname}/archive/refs/tags/${version}.tar.gz"
+checksum=ff7dcdb7c1f89209844e4d903abb15d90bd47845962832d80d15fb9e8f31bbcf
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From bcb02c919737ec89759d83a40d6012a77c4a9ee8 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 3 Nov 2021 15:40:24 +0100
Subject: [PATCH 2441/4088] i3: update to 4.20.1.

Close: #33877
---
 srcpkgs/i3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index 27128cb5025d..66d0da022f9a 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,6 +1,6 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.20
+version=4.20.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config perl"
@@ -14,7 +14,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-3-Clause"
 homepage="https://i3wm.org/"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.xz"
-checksum=8cf4f174f6cf554f38563380681abe25868e9955883791e0986ecd89c53ac322
+checksum=23e1ecaf208c1d162a0c8c66c4590b301a424ee5c011227eabb96e36fd6bfce6
 
 do_check() {
 	: "Michael disables tests in Debian rules, too"

From 1bd1f34142eb06d2865ad30ec935f9b541aca8db Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 3 Nov 2021 23:01:10 -0400
Subject: [PATCH 2442/4088] mdcat: update to 0.24.1

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index bbd815ce7258..ea836a88c750 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,6 +1,6 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.23.2
+version=0.24.1
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
@@ -12,7 +12,7 @@ license="MPL-2.0"
 homepage="https://github.com/lunaryorn/mdcat"
 changelog="https://raw.githubusercontent.com/lunaryorn/mdcat/main/CHANGELOG.md"
 distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=354f1bea0a53c5547693b7de9731d6e2648a0da10aa485ca16e4e643e49be14c
+checksum=f0e400f2060a460e347546932fcb501da71fab5af602413c7932fac35136b89f
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 39dff1465c6126dc2f8f7857b0898e10b45c1745 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 3 Nov 2021 23:57:09 -0400
Subject: [PATCH 2443/4088] gifsicle: use pre-generated tarball, build gifview

---
 srcpkgs/gifsicle/template | 14 ++++++++------
 srcpkgs/gifsicle/update   |  2 ++
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gifsicle/update

diff --git a/srcpkgs/gifsicle/template b/srcpkgs/gifsicle/template
index d466886ae54e..bf1461300a1d 100644
--- a/srcpkgs/gifsicle/template
+++ b/srcpkgs/gifsicle/template
@@ -1,18 +1,20 @@
 # Template file for 'gifsicle'
 pkgname=gifsicle
 version=1.93
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
+makedepends="libX11-devel"
+checkdepends="perl"
 short_desc="Command-line tool for information about GIF images"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.lcdf.org/gifsicle/"
-distfiles="https://github.com/kohler/gifsicle/archive/refs/tags/v${version}.tar.gz"
-checksum=941c0b1c3ebc748949a0d14363f0fb3c9d2c06ee122b3548315b9233eb956d88
+changelog="https://www.lcdf.org/gifsicle/changes.html"
+distfiles="${homepage}/gifsicle-${version}.tar.gz"
+checksum=92f67079732bf4c1da087e6ae0905205846e5ac777ba5caa66d12a73aa943447
 
-pre_configure() {
-	autoreconf -fi
+do_check() {
+	./test/testie -p ./src ./test
 }
 
 Gifsicle_package() {
diff --git a/srcpkgs/gifsicle/update b/srcpkgs/gifsicle/update
new file mode 100644
index 000000000000..4ecd4d7c083e
--- /dev/null
+++ b/srcpkgs/gifsicle/update
@@ -0,0 +1,2 @@
+site="https://www.lcdf.org/gifsicle/changes.html"
+pattern='<b>\K[0-9\.]+(?=</b>)'

From ebacb6a09746cac570f1f330a084a1a281a3089a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 3 Nov 2021 22:16:03 -0300
Subject: [PATCH 2444/4088] chroot: create chroot-curl subpackage, adopt.

The new potential build infrastructure needs a curl binary to send build
results to outside the chroot, but we don't want it to be picked up by
build systems. libcurl is part of the masterdir environment already,
through binutils -> libdebuginfod -> libcurl, so we can simply copy the
binary with a different name, and have the package also depend on
libcurl.
---
 srcpkgs/chroot-curl   |  1 +
 srcpkgs/curl/template | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/chroot-curl

diff --git a/srcpkgs/chroot-curl b/srcpkgs/chroot-curl
new file mode 120000
index 000000000000..8b258ec33430
--- /dev/null
+++ b/srcpkgs/chroot-curl
@@ -0,0 +1 @@
+curl
\ No newline at end of file
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 1ccf71d6d3d7..abc91167ee8e 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.79.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -19,7 +19,7 @@ depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="python3 stunnel nghttp2"
 short_desc="Client that groks URLs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
@@ -71,3 +71,10 @@ libcurl-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+chroot-curl_package() {
+	short_desc+=" - for build infra use"
+	pkg_install() {
+		vbin $DESTDIR/usr/bin/curl chroot-curl
+	}
+}

From 5c3ff39785b807303c73feb91a62b9fbd3030c46 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Thu, 4 Nov 2021 16:28:41 +0100
Subject: [PATCH 2445/4088] mesa: separate out libgbm-devel

---
 srcpkgs/libgbm-devel  |  1 +
 srcpkgs/mesa/template | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/libgbm-devel

diff --git a/srcpkgs/libgbm-devel b/srcpkgs/libgbm-devel
new file mode 120000
index 000000000000..1ad1bbec7ab3
--- /dev/null
+++ b/srcpkgs/libgbm-devel
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index d6f47316bdc1..37ba69371a46 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -37,7 +37,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libOSMesa"
+subpackages="libglapi libgbm libgbm-devel libOSMesa"
 
 # Replace old mesa pkgs, superseded by libglvnd.
 replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -246,6 +246,16 @@ libgbm_package() {
 	}
 }
 
+libgbm-devel_package() {
+	short_desc="Mesa Generic buffer management API - development files"
+	depends="libgbm>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/gbm.h
+		vmove usr/lib/libgbm.so
+		vmove usr/lib/pkgconfig/gbm.pc
+	}
+}
+
 libOSMesa_package() {
 	short_desc="Mesa Off-Screen interface library"
 	pkg_install() {
@@ -257,7 +267,7 @@ MesaLib-devel_package() {
 	depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel
 	 libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
 	 libdrm-devel libglvnd-devel
-	 libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
+	 libOSMesa>=${version}_${revision} libgbm-devel>=${version}_${revision}
 	 mesa>=${version}_${revision}"
 	if [ "$_have_vmware" ]; then
 		depends+=" libxatracker>=${version}_${revision}"
@@ -272,7 +282,6 @@ MesaLib-devel_package() {
 		vmove usr/lib/libEGL_mesa.so
 		vmove usr/lib/libGLX_mesa.so
 		vmove usr/lib/libOSMesa.so
-		vmove usr/lib/libgbm.so
 		vmove usr/lib/libglapi.so
 		if [ "$_have_vmware" ]; then
 			vmove usr/lib/libxatracker.so

From 1faf8450d045b40ef136a9279f5730f20bd0c255 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 4 Nov 2021 16:05:41 +0100
Subject: [PATCH 2446/4088] mesa: use symlinks for megadrivers + correctness
 fixes

This is now using symlinks for megadrivers, which should eliminate
pretty much all of the sketchy strip stuff. In addition:

1) pipe drivers are now installed in opencl where they should be
2) ditched redundant devel dependencies (most of those were made
   redundant by glvnd, some of them were always redundant)
---
 .../mesa/patches/megadriver-symlinks.patch    | 25 ++++++++++++++++++
 .../mesa/patches/no-unlink-megadrivers.patch  | 15 -----------
 srcpkgs/mesa/template                         | 26 +++++--------------
 3 files changed, 31 insertions(+), 35 deletions(-)
 create mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch
 delete mode 100644 srcpkgs/mesa/patches/no-unlink-megadrivers.patch

diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
new file mode 100644
index 000000000000..c19c42719422
--- /dev/null
+++ b/srcpkgs/mesa/patches/megadriver-symlinks.patch
@@ -0,0 +1,25 @@
+This converts megadriver installation to use symlinks so that we do
+not have to deal with skipping the strip stage for some files, as
+a result simplifying our template greatly.
+
+--- a/bin/install_megadrivers.py
++++ b/bin/install_megadrivers.py
+@@ -56,7 +56,7 @@ def main():
+         if os.path.lexists(abs_driver):
+             os.unlink(abs_driver)
+         print('installing {} to {}'.format(args.megadriver, abs_driver))
+-        os.link(master, abs_driver)
++        os.symlink(os.path.basename(master), abs_driver)
+ 
+         try:
+             ret = os.getcwd()
+@@ -71,8 +71,7 @@ def main():
+         finally:
+             os.chdir(ret)
+ 
+-    # Remove meson-created master .so and symlinks
+-    os.unlink(master)
++    # Remove meson-created symlinks
+     name, ext = os.path.splitext(master)
+     while ext != '.so':
+         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/patches/no-unlink-megadrivers.patch b/srcpkgs/mesa/patches/no-unlink-megadrivers.patch
deleted file mode 100644
index acad4dd6390e..000000000000
--- a/srcpkgs/mesa/patches/no-unlink-megadrivers.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch is needed to retain the master .so, so that only that filename is
-stripped while the related hard links are excluded.
-diff --git bin/install_megadrivers.py bin/install_megadrivers.py
-index 470137e..7d56def 100644
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -71,7 +71,7 @@ def main():
-             os.chdir(ret)
- 
-     # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    #os.unlink(master)
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 37ba69371a46..6c3b705002cb 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=21.2.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -264,17 +264,15 @@ libOSMesa_package() {
 }
 
 MesaLib-devel_package() {
-	depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel
-	 libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
-	 libdrm-devel libglvnd-devel
-	 libOSMesa>=${version}_${revision} libgbm-devel>=${version}_${revision}
-	 mesa>=${version}_${revision}"
+	depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
+	 libgbm-devel>=${version}_${revision}"
 	if [ "$_have_vmware" ]; then
 		depends+=" libxatracker>=${version}_${revision}"
 	fi
 	if [ "$_have_opencl" ]; then
 		depends+=" mesa-opencl>=${version}_${revision}"
 	fi
+	depends+=" libdrm-devel libglvnd-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -304,6 +302,7 @@ mesa-opencl_package() {
 	depends="libclc"
 	pkg_install() {
 		vmove etc/OpenCL
+		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
 	}
 }
@@ -313,14 +312,7 @@ mesa-dri_package() {
 	depends="mesa-${version}_${revision}"
 	shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
 	pkg_install() {
-		# Only strip each megadriver once, via its master filename
-		nostrip_files=$(find "${DESTDIR}/usr/lib/dri" \
-		 ! -name 'libmesa_dri_drivers.so' ! -name 'libgallium_dri.so' \
-		  -type f -printf '%f ')
-		vmove "usr/lib/dri"
-		if [ -d "$DESTDIR/usr/lib/gallium-pipe" ]; then
-			vmove "usr/lib/gallium-pipe/pipe_*.so"
-		fi
+		vmove usr/lib/dri
 	}
 }
 
@@ -328,8 +320,6 @@ mesa-vaapi_package() {
 	short_desc="Mesa VA-API drivers"
 	shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
 	pkg_install() {
-		nostrip_files=$(find "${DESTDIR}/usr/lib/dri" \
-		 ! -name 'libgallium_drv_video.so' -type f -printf '%f ')
 		vmove "usr/lib/dri/*_drv_video.so"
 	}
 }
@@ -337,8 +327,6 @@ mesa-vaapi_package() {
 mesa-vdpau_package() {
 	short_desc="Mesa VDPAU drivers"
 	pkg_install() {
-		nostrip_files=$(find "${DESTDIR}/usr/lib/vdpau" \
-		 ! -name 'libvdpau_gallium.so*' -type f -printf '%f ')
 		vmove "usr/lib/vdpau/libvdpau_*"
 	}
 }
@@ -346,8 +334,6 @@ mesa-vdpau_package() {
 mesa-XvMC_package() {
 	short_desc="Mesa XvMC drivers"
 	pkg_install() {
-		nostrip_files=$(find "${DESTDIR}/usr/lib/libXvMC"* \
-		 ! -name 'libXvMCgallium.so' -type f -printf '%f ')
 		vmove "usr/lib/libXvMC*"
 	}
 }

From 1c206bbd0e13f453976379fe7a77c6dcbe1cd7bb Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Thu, 15 Apr 2021 19:44:16 -0700
Subject: [PATCH 2447/4088] wlroots: replace MesaLib-devel with libgbm-devel
 and libglvnd-devel.

---
 srcpkgs/wlroots/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index da514da32304..8fdc2ba6ab40 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -7,7 +7,7 @@ build_style=meson
 # https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
 configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false"
 hostmakedepends="pkg-config wayland-devel"
-_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
+_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel
  libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel"
 makedepends="${_devel_depends}

From 24f7978007445ca3ade57978ca07e623d502dd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 3 Nov 2021 23:53:42 -0300
Subject: [PATCH 2448/4088] linux5.14: update to 5.14.16.

---
 srcpkgs/linux5.14/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.14/template b/srcpkgs/linux5.14/template
index c637523b1e93..f508174e5c82 100644
--- a/srcpkgs/linux5.14/template
+++ b/srcpkgs/linux5.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.14'
 pkgname=linux5.14
-version=5.14.14
+version=5.14.16
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2
- 980f6c10adfb866ec6060fc28a1adc4b2d766ccdf9062a3c6bf618eb16d752d3"
+ e96f1d8ea64bf66cd2e01e54e0929117feafe443161bc665af1ef48474cb45e2"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From bd1c4648ca7b5988111209a718c1af43e9f67451 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Wed, 27 Oct 2021 19:39:14 +0530
Subject: [PATCH 2449/4088] linux-firmware: update to 20211027

---
 srcpkgs/linux-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index d5ecfbe866db..91f604749740 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20210818
+version=20211027
 revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=ccf1b5ffece2eee801ae787e81010ab89786e4f0ffb4bd4f2209413901988220
+checksum=7667d054faed0cc07c3dfc858503987b21e7cfb4ba44368e3e138c8ea87859d9
 python_version=3
 nostrip=yes
 

From 2f61de4254145dd67e27b1f0c5d2af5114e3d582 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 4 Nov 2021 09:32:15 -0400
Subject: [PATCH 2450/4088] cpp-utilities: update to 5.11.3.

---
 srcpkgs/cpp-utilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 366f7a40f6f1..78c7239ac571 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.11.2
+version=5.11.3
 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=4ff8d2a8844c754d1c64f151e91d8b13365a8f1e4a68b49e314d110881479f1a
+checksum=50866353d43c6cc0282b13c385ecbed1ebc68767cf7d22365174a0afc9b9325c
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From cd7be41bb3b0515dba4804f28ed9d8c7a7935af5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 4 Nov 2021 13:47:52 -0400
Subject: [PATCH 2451/4088] qtutilities: update to 6.5.2.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 4ba04f48dfd3..75fb6b76a62d 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.1
+version=6.5.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a0bb997e9ea8b53c4ba7ae40affd945d015c757f43d7a313b575a8a425bea180
+checksum=01afcb59312615129de29d339255224ca09c5fee050659b7896ea880483bd311
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From 41d25daedd7987dbc2d7774a46fb6ea137534614 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 4 Nov 2021 13:50:12 -0400
Subject: [PATCH 2452/4088] python3-prompt_toolkit: update to 3.0.22.

---
 srcpkgs/python3-prompt_toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 405142b86949..f7dbc0c33666 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.21
+version=3.0.22
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=27f13ff4e4850fe8f860b77414c7880f67c6158076a7b099062cc8570f1562e5
+checksum=449f333dd120bd01f5d296a8ce1452114ba3a71fae7288d2f0ae2c918764fa72
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From ecbc4a8720041942077f503f5ab5b25522db6999 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 4 Nov 2021 13:50:23 -0400
Subject: [PATCH 2453/4088] python3-tifffile: update to 2021.11.2.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index edb815401f07..c8f0a748ba4c 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.10.12
+version=2021.11.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d239b9bf1d549128f710d5671bccc22bc863b4b7e73eb2c8337e2a51df89f4d2
+checksum=68e4ec10bc189f7ea9526619bf4787ec7d9decb857c6f15a06a999bdff4abfc0
 # Tests require unpackaged fsspec
 make_check=no
 

From 2a827fe3dff795c257ec261c70bd967688c12c39 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 4 Nov 2021 14:51:38 +0100
Subject: [PATCH 2454/4088] netpbm: update to 10.96.02.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c2d2411fdac0..5d90924439d1 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.96.01
+version=10.96.02
 revision=1
-_githash=0919dabcdcf52c26d3330ba65b2a3b3a34852d0d
-_githash_guide=c7569ba2267a4971b19a78a8b44488b28e86b5ee
+_githash=4d5728723616f3713725d85df790666e8d75b963
+_githash_guide=54910a3304543a702b0720c3b9c6d6be4ba12100
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="98009a9bacdf8bc37c6b15f9070ccbb82a28ddafb9c8ef424c0f6cce99468863
- dbcdfd4164e1ce5a888727beb92d09f67e8cc7dde2d46ad03a1b58e1427c70ce"
+checksum="7b88f49bb1c7cf20ad1ad94ac8d5b6dd1648ababe3a5a70cace704a7fee7f20e
+ b966580dcf5d72fc6a3cfa6c95d46206b9b4c252ec911e14633113c45cb49626"
 
 post_extract() {
 	cd $build_wrksrc

From 83bfcb2a8a13aecedf11b1f36c1739ef3be22bae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 4 Nov 2021 14:52:02 +0100
Subject: [PATCH 2455/4088] python3-pyinfra: update to 1.4.18.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index a3601516c126..1b80c9d1a381 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.17
+version=1.4.18
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=cfaa82e45aebf74f2299e3b72d0347521a0b9fe38589930d33c46805015d99d5
+checksum=4b69c99d59b0744ad48534cb08bd15c8f4a34d16f45d2ae95117f6edb7f5551b
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From dd9805a43b90a48e4783cfe81e08b0531418492d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 4 Nov 2021 19:26:47 +0100
Subject: [PATCH 2456/4088] erlang: update to 24.1.4.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 3a4883b93086..29f3c7ffb4b3 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.1.2
+version=24.1.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=c141a046bb7184a7bb5c3d6da2ed013e465d1fbe4ff5cd16e0fbb7a0e786a152
+checksum=aa31ba689740dc446dfa5bb256474df5fb5e5459b981b4d2155afa91010ca66a
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 096fe761c0a4919c8e4950d8253d1db2ab2aeff3 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Fri, 5 Nov 2021 05:45:22 +1100
Subject: [PATCH 2457/4088] qemu: fix typo resulting in broken build when
 disabling Jack

---
 srcpkgs/qemu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index cbb6bd8b89d2..cb21578cfed2 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -69,7 +69,7 @@ do_configure() {
 		want_sdl="--enable-sdl"
 		audio_sdl=",sdl"
 	fi
-	if [ $"build_option_jack" ]; then
+	if [ "$build_option_jack" ]; then
 		audio_jack=",jack"
 	fi
 

From c0beac567cdc14051e7ea798ca9ffe365f74188b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Nov 2021 01:42:12 +0100
Subject: [PATCH 2458/4088] common/hooks/do-patch/00-patches: drop -l option

The -l option causes a looser behavior of patch(1), where patches
are applied when there is a match with no regard to leading
whitespace. This means that it is possible to get false positives:
for example, in srcpkgs/glu, there is a patch that was supposed
to be long gone (since the release already includes it) but it
was overlooked since with -l it happens to apply in a different
portion of the source (where it is wrong).

Avoid these cases.
---
 common/hooks/do-patch/00-patches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/do-patch/00-patches.sh b/common/hooks/do-patch/00-patches.sh
index f8ce2d37fee5..9f7e21f017dc 100644
--- a/common/hooks/do-patch/00-patches.sh
+++ b/common/hooks/do-patch/00-patches.sh
@@ -31,7 +31,7 @@ _process_patch() {
 
 	cd "$wrksrc"
 	msg_normal "$pkgver: patching: ${_patch}.\n"
-	patch -sl ${_args} -i ${_patch} 2>/dev/null
+	patch -s ${_args} -i ${_patch} 2>/dev/null
 }
 
 hook() {

From bb3b5013197d0a51e397bf9fc1bc046d14ae453c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Nov 2021 01:44:39 +0100
Subject: [PATCH 2459/4088] glu: drop bad upstreamed patch

---
 srcpkgs/glu/patches/fix-memory-leak.patch | 33 -----------------------
 srcpkgs/glu/template                      |  2 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 srcpkgs/glu/patches/fix-memory-leak.patch

diff --git a/srcpkgs/glu/patches/fix-memory-leak.patch b/srcpkgs/glu/patches/fix-memory-leak.patch
deleted file mode 100644
index e2ab2f749c08..000000000000
--- a/srcpkgs/glu/patches/fix-memory-leak.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0bf42e41c8b63fc2488dd8d41f696310b5a5a6a7 Mon Sep 17 00:00:00 2001
-From: Amarnath Valluri <amarnath.valluri@intel.com>
-Date: Fri, 10 Jun 2016 05:30:00 -0600
-Subject: libutils/mipmap.c: Fixed possible memory leak
-
-In case of malloc() failure memory allocated for both 'srcImage'
-and 'dstImage' is leaked.
-
-Patch simplified by Brian Paul.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96480
-Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
-Reviewed-by: Brian Paul <brianp@vmware.com>
----
- src/libutil/mipmap.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libutil/mipmap.c b/src/libutil/mipmap.c
-index c475c96..483c3fe 100644
---- a/src/libutil/mipmap.c
-+++ b/src/libutil/mipmap.c
-@@ -4509,6 +4509,8 @@ static int gluBuild2DMipmapLevelsCore(GLenum target, GLint internalFormat,
- 	     glPixelStorei(GL_UNPACK_SKIP_PIXELS, psm.unpack_skip_pixels);
- 	     glPixelStorei(GL_UNPACK_ROW_LENGTH, psm.unpack_row_length);
- 	     glPixelStorei(GL_UNPACK_SWAP_BYTES, psm.unpack_swap_bytes);
-+	     free(srcImage);
-+	     free(dstImage);
- 	     return GLU_OUT_OF_MEMORY;
- 	  }
- 
--- 
-cgit v1.1
-
diff --git a/srcpkgs/glu/template b/srcpkgs/glu/template
index dd54bebdd921..da1338aef7d0 100644
--- a/srcpkgs/glu/template
+++ b/srcpkgs/glu/template
@@ -1,7 +1,7 @@
 # Template file for 'glu'
 pkgname=glu
 version=9.0.2
-revision=1
+revision=2
 build_style=meson
 configure_args="-Ddefault_library=shared"
 hostmakedepends="pkg-config"

From f3d2d07269a367d8e61fd41b4b98c6e466239ec2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Nov 2021 15:09:10 +0100
Subject: [PATCH 2460/4088] openradtool: update to 0.14.0.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 51078a394335..d43f36ececf8 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.9
+version=0.14.0
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=9371577b5ffac498422edc964102b77819c9768e225f354d9cd796cf87d9977f
+checksum=d44242e9e8e598053cb00e32584dd9f7b87bc73b76ed5f9de8469aabd98977c9
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From c751213fc55dbeb28af152d2b86b73657df63128 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Nov 2021 15:24:06 +0100
Subject: [PATCH 2461/4088] knot: update to 3.1.4.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 2bcb3fd04d32..a612ebac72ff 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.3
+version=3.1.4
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=a3fc448cbce3209575f93a3cf1224fa37802fc6606f7c7d4bb3aa6dbeaed2c64
+checksum=05ebca053b4ce62205a095b6885ed1a1167c629ccac2b3c8dcc431bd2deedf70
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 73d0a5ef2e5004416a4abd0a487c7372059658c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 4 Nov 2021 06:40:16 +0700
Subject: [PATCH 2462/4088] chroot-git: allow to fetch from http(s) remotes

libcurl has been part of stage2 chroot from a long time ago due to:

	binutils -> libdebuginfod -> libcurl
---
 srcpkgs/chroot-git/template | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 66a46988cdcd..3a65c9c0617b 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
 version=2.33.1
-revision=1
+revision=2
 bootstrap=yes
 wrksrc="git-${version}"
 makedepends="zlib-devel"
@@ -14,6 +14,7 @@ checksum=e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
+	makedepends+=" libcurl-devel"
 fi
 
 do_configure() {
@@ -30,7 +31,6 @@ do_configure() {
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
 	USE_LIBPCRE2 :=
-	NO_CURL = Yes
 	NO_EXPAT = Yes
 	NO_PERL = Yes
 	NO_PYTHON = Yes
@@ -50,12 +50,18 @@ do_configure() {
 		EOF
 	fi
 	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+		cat <<-EOF >>config.mak
+		ZLIB_PATH = ${XBPS_MASTERDIR}/usr
+		NO_CURL = Yes
+		EOF
 	fi
 }
 
 do_build() {
 	make ${makejobs} git
+	if [ "$CHROOT_READY" ]; then
+		make ${makejobs} git-http-fetch git-remote-http
+	fi
 }
 
 do_check() {
@@ -68,4 +74,10 @@ do_install() {
 	ln -s ../../bin/chroot-git $DESTDIR/usr/libexec/chroot-git/git
 	ln -s git $DESTDIR/usr/libexec/chroot-git/git-upload-pack
 	ln -s git $DESTDIR/usr/libexec/chroot-git/git-receive-pack
+	if [ "$CHROOT_READY" ]; then
+		vinstall git-http-fetch 755 usr/libexec/chroot-git
+		vinstall git-remote-http 755 usr/libexec/chroot-git
+		ln -s git-remote-http \
+			$DESTDIR/usr/libexec/chroot-git/git-remote-https
+	fi
 }

From fd347daeb4e13014bc2c69fdb329509366e8d6ea Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Fri, 5 Nov 2021 19:06:53 +0530
Subject: [PATCH 2463/4088] picard: update to 2.6.4.

---
 ...0001-Fix-TypeErrors-with-Python-3.10.patch | 64 -------------------
 srcpkgs/picard/template                       | 10 +--
 2 files changed, 5 insertions(+), 69 deletions(-)
 delete mode 100644 srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch

diff --git a/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch b/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch
deleted file mode 100644
index 29afe48c07fd..000000000000
--- a/srcpkgs/picard/patches/0001-Fix-TypeErrors-with-Python-3.10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1a462bf718f9fc4b24a0c8daefe5c7d547712ae9 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Fri, 27 Aug 2021 00:43:48 +0200
-Subject: [PATCH] Fix TypeErrors with Python 3.10
-
-Without these changes, running Picard with Python 3.10 results in errors
-such as:
-  File "./picard/ui/coverartbox.py", line 74, in __init__
-    self.shadow = self.shadow.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
-TypeError: arguments did not match any overloaded call:
-  scaled(self, int, int, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float'
-  scaled(self, QSize, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float'
----
- picard/ui/coverartbox.py | 2 +-
- picard/ui/itemviews.py   | 6 +++---
- picard/util/__init__.py  | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py
-index 2457de5f..cd0cce2a 100644
---- a/picard/ui/coverartbox.py
-+++ b/picard/ui/coverartbox.py
-@@ -136,7 +136,7 @@ class CoverArtThumbnail(ActiveLabel):
-             event.acceptProposedAction()
- 
-     def scaled(self, *dimensions):
--        return (self.pixel_ratio * dimension for dimension in dimensions)
-+        return (round(self.pixel_ratio * dimension) for dimension in dimensions)
- 
-     def show(self):
-         self.set_data(self.data, True)
-diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
-index cddbf50a..bb88e984 100644
---- a/picard/ui/itemviews.py
-+++ b/picard/ui/itemviews.py
-@@ -137,9 +137,9 @@ def get_match_color(similarity, basecolor):
-     c1 = (basecolor.red(), basecolor.green(), basecolor.blue())
-     c2 = (223, 125, 125)
-     return QtGui.QColor(
--        c2[0] + (c1[0] - c2[0]) * similarity,
--        c2[1] + (c1[1] - c2[1]) * similarity,
--        c2[2] + (c1[2] - c2[2]) * similarity)
-+        int(c2[0] + (c1[0] - c2[0]) * similarity),
-+        int(c2[1] + (c1[1] - c2[1]) * similarity),
-+        int(c2[2] + (c1[2] - c2[2]) * similarity))
- 
- 
- class MainPanel(QtWidgets.QSplitter):
-diff --git a/picard/util/__init__.py b/picard/util/__init__.py
-index e47af34c..d12ef890 100644
---- a/picard/util/__init__.py
-+++ b/picard/util/__init__.py
-@@ -333,7 +333,7 @@ def throttle(interval):
-             else:
-                 decorator.args = args
-                 decorator.kwargs = kwargs
--                QtCore.QTimer.singleShot(r, later)
-+                QtCore.QTimer.singleShot(int(r), later)
-                 decorator.is_ticking = True
-             mutex.unlock()
- 
--- 
-2.32.0
-
diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index 4e5a14dcf26c..b5ea59ed5e07 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,14 +1,14 @@
 # Template file for 'picard'
 pkgname=picard
-version=2.5
-revision=4
+version=2.6.4
+revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 make_install_args="--disable-autoupdate"
 hostmakedepends="gettext python3-setuptools"
 makedepends="python3-devel"
 depends="python3-PyQt5-multimedia chromaprint python3-mutagen
- python3-dateutil python3-discid desktop-file-utils
+ python3-dateutil python3-discid python3-fasteners desktop-file-utils
  hicolor-icon-theme"
 checkdepends="python3-pytest $depends"
 short_desc="MusicBrainz's audio tagger"
@@ -16,5 +16,5 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://picard.musicbrainz.org/"
 changelog="https://picard.musicbrainz.org/changelog/"
-distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version%.0}.tar.gz"
-checksum=f9df2882c1fcb46d69c89c87485c77bcff7d9c738b004694fa0fb31280677963
+distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=c71ec4605842e24bbe6d92639e1cafac943548afed3a05193488d4bcc3d95370

From 30bcfe3a6516e2467c5faae694aef6ad77f0257a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 4 Nov 2021 22:21:49 -0400
Subject: [PATCH 2464/4088] delta: update to 0.9.2

---
 srcpkgs/delta/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index fc8f52b70609..15481ba9a01b 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,14 +1,15 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.8.3
+version=0.9.2
 revision=1
 build_style=cargo
+checkdepends="git"
 short_desc="Syntax-highlighting pager for git"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cf48d52d20a12e11a3a6afd436a75550e78fc39c358e85a75caa08b39e4e75c6
+checksum=f002a94119cd5b6fd9deede7f344667358baf5015d0051e055fec6334ee0653f
 
 post_install() {
 	vlicense LICENSE

From 1ae38440b9c239c02568aacd6f4661753fc1736c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 5 Nov 2021 14:45:33 +0100
Subject: [PATCH 2465/4088] stress-ng: update to 0.13.06

upstream moved to github.com
---
 srcpkgs/stress-ng/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 8d3e2236c941..34d7278c9cda 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,12 +1,12 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.05
+version=0.13.06
 revision=1
 build_style=gnu-makefile
 make_use_env=1
 short_desc="Load and stress a computer system"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
-homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
-distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f058c8fba37596ab32c3a4b2aedbdbf5f2b8a8ba1d312059e733290543ad00ac
+homepage="https://github.com/ColinIanKing/stress-ng/"
+distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
+checksum=5b11df6495831e2e6a7eebf06aa83cc895cf013e08a9dc706ed1fdfba9a3052f

From 7c9a1b8ff16cd93b730cfcd14e29c9107efd0acd Mon Sep 17 00:00:00 2001
From: foo <krowlaxs@gmail.com>
Date: Fri, 5 Nov 2021 16:16:38 +0000
Subject: [PATCH 2466/4088] firefox: fix patch whitespace

---
 srcpkgs/firefox/patches/fix-i686-ppc-musl.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
index 717f3cd2f9c2..38a85b5922cd 100644
--- a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
---- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+--- a/mozglue/misc/StackWalk.cpp	2021-11-05 15:55:03.614609706 +0000
++++ b/mozglue/misc/StackWalk.cpp	2021-10-28 19:03:47.000000000 +0100
+@@ -45,7 +45,7 @@
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
- 
--#if (defined(linux) && \
+
+-#if (defined(linux) &&                                            \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1

From 5e35031352f91d7d7893f47944e15c513a486b98 Mon Sep 17 00:00:00 2001
From: foo <krowlaxs@gmail.com>
Date: Fri, 5 Nov 2021 17:33:34 +0000
Subject: [PATCH 2467/4088] firefox-esr: fix patch whitespace

---
 .../firefox-esr/patches/fix-i686-ppc-musl.patch    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
index 717f3cd2f9c2..38a85b5922cd 100644
--- a/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
---- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+--- a/mozglue/misc/StackWalk.cpp	2021-11-05 15:55:03.614609706 +0000
++++ b/mozglue/misc/StackWalk.cpp	2021-10-28 19:03:47.000000000 +0100
+@@ -45,7 +45,7 @@
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
- 
--#if (defined(linux) && \
+
+-#if (defined(linux) &&                                            \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1

From 71429a139f84c3b44c63acf85744d72eb36c85cd Mon Sep 17 00:00:00 2001
From: foo <krowlaxs@gmail.com>
Date: Fri, 5 Nov 2021 17:34:34 +0000
Subject: [PATCH 2468/4088] thunderbird: fix patch whitespace

---
 .../thunderbird/patches/fix-i686-ppc-musl.patch    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
index 717f3cd2f9c2..38a85b5922cd 100644
--- a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
---- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+--- a/mozglue/misc/StackWalk.cpp	2021-11-05 15:55:03.614609706 +0000
++++ b/mozglue/misc/StackWalk.cpp	2021-10-28 19:03:47.000000000 +0100
+@@ -45,7 +45,7 @@
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
- 
--#if (defined(linux) && \
+
+-#if (defined(linux) &&                                            \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1

From eea66f4bedbc9c4e7f0e044a439349b5abc6809a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Nov 2021 15:47:34 -0400
Subject: [PATCH 2469/4088] firefox-esr: patch to fix building with Python 3.10

---
 .../firefox-esr/patches/fix-python3.10.patch  | 826 ++++++++++++++++++
 1 file changed, 826 insertions(+)
 create mode 100644 srcpkgs/firefox-esr/patches/fix-python3.10.patch

diff --git a/srcpkgs/firefox-esr/patches/fix-python3.10.patch b/srcpkgs/firefox-esr/patches/fix-python3.10.patch
new file mode 100644
index 000000000000..143e58782581
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-python3.10.patch
@@ -0,0 +1,826 @@
+diff -ur a/python/mach/mach/config.py b/python/mach/mach/config.py
+--- a/python/mach/mach/config.py	2021-09-01 13:26:18.000000000 -0400
++++ b/python/mach/mach/config.py	2021-11-05 15:29:12.000000000 -0400
+@@ -144,7 +144,7 @@
+     return _
+ 
+ 
+-class ConfigSettings(collections.Mapping):
++class ConfigSettings(collections.abc.Mapping):
+     """Interface for configuration settings.
+ 
+     This is the main interface to the configuration.
+@@ -190,7 +190,7 @@
+     will result in exceptions being raised.
+     """
+ 
+-    class ConfigSection(collections.MutableMapping, object):
++    class ConfigSection(collections.abc.MutableMapping, object):
+         """Represents an individual config section."""
+         def __init__(self, config, name, settings):
+             object.__setattr__(self, '_config', config)
+diff -ur a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
+--- a/python/mach/mach/decorators.py	2021-09-01 13:26:18.000000000 -0400
++++ b/python/mach/mach/decorators.py	2021-11-05 15:29:12.000000000 -0400
+@@ -140,7 +140,7 @@
+               'Conditions argument must take a list ' + \
+               'of functions. Found %s instead.'
+ 
+-        if not isinstance(command.conditions, collections.Iterable):
++        if not isinstance(command.conditions, collections.abc.Iterable):
+             msg = msg % (command.name, type(command.conditions))
+             raise MachError(msg)
+ 
+diff -ur a/python/mach/mach/main.py b/python/mach/mach/main.py
+--- a/python/mach/mach/main.py	2021-09-01 13:26:23.000000000 -0400
++++ b/python/mach/mach/main.py	2021-11-05 15:29:12.000000000 -0400
+@@ -16,7 +16,7 @@
+ import sys
+ import traceback
+ import uuid
+-from collections import Iterable
++from collections.abc import Iterable
+ 
+ from six import string_types
+ 
+diff -ur a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
+--- a/python/mozbuild/mozbuild/backend/configenvironment.py	2021-09-01 13:26:34.000000000 -0400
++++ b/python/mozbuild/mozbuild/backend/configenvironment.py	2021-11-05 15:29:12.000000000 -0400
+@@ -9,7 +9,8 @@
+ import sys
+ import json
+ 
+-from collections import Iterable, OrderedDict
++from collections import OrderedDict
++from collections.abc import Iterable
+ from types import ModuleType
+ 
+ import mozpack.path as mozpath
+diff -ur a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py
+--- a/python/mozbuild/mozbuild/makeutil.py	2021-09-01 13:26:18.000000000 -0400
++++ b/python/mozbuild/mozbuild/makeutil.py	2021-11-05 15:29:12.000000000 -0400
+@@ -7,7 +7,7 @@
+ import os
+ import re
+ import six
+-from collections import Iterable
++from collections.abc import Iterable
+ 
+ 
+ class Makefile(object):
+diff -ur a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+--- a/python/mozbuild/mozbuild/util.py	2021-09-01 13:26:18.000000000 -0400
++++ b/python/mozbuild/mozbuild/util.py	2021-11-05 15:29:12.000000000 -0400
+@@ -782,7 +782,7 @@
+         self._strings = StrictOrderingOnAppendList()
+         self._children = {}
+ 
+-    class StringListAdaptor(collections.Sequence):
++    class StringListAdaptor(collections.abc.Sequence):
+         def __init__(self, hsl):
+             self._hsl = hsl
+ 
+diff -ur a/testing/marionette/client/marionette_driver/wait.py b/testing/marionette/client/marionette_driver/wait.py
+--- a/testing/marionette/client/marionette_driver/wait.py	2021-09-01 13:26:30.000000000 -0400
++++ b/testing/marionette/client/marionette_driver/wait.py	2021-11-05 15:29:12.000000000 -0400
+@@ -82,7 +82,7 @@
+ 
+         exceptions = []
+         if ignored_exceptions is not None:
+-            if isinstance(ignored_exceptions, collections.Iterable):
++            if isinstance(ignored_exceptions, collections.abc.Iterable):
+                 exceptions.extend(iter(ignored_exceptions))
+             else:
+                 exceptions.append(ignored_exceptions)
+diff -ur a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py
+--- a/testing/mozbase/manifestparser/manifestparser/filters.py	2021-09-01 13:26:23.000000000 -0400
++++ b/testing/mozbase/manifestparser/manifestparser/filters.py	2021-11-05 15:29:12.000000000 -0400
+@@ -12,7 +12,8 @@
+ 
+ import itertools
+ import os
+-from collections import defaultdict, MutableSequence
++from collections import defaultdict
++from collections.abc import MutableSequence
+ 
+ import six
+ from six import string_types
+diff -ur a/testing/mozbase/versioninfo.py b/testing/mozbase/versioninfo.py
+--- a/testing/mozbase/versioninfo.py	2021-09-01 13:26:23.000000000 -0400
++++ b/testing/mozbase/versioninfo.py	2021-11-05 15:29:12.000000000 -0400
+@@ -11,7 +11,7 @@
+ 
+ from __future__ import absolute_import, print_function
+ 
+-from collections import Iterable
++from collections.abc import Iterable
+ from distutils.version import StrictVersion
+ import argparse
+ import os
+diff -ur a/testing/web-platform/tests/tools/manifest/typedata.py b/testing/web-platform/tests/tools/manifest/typedata.py
+--- a/testing/web-platform/tests/tools/manifest/typedata.py	2021-09-01 13:26:40.000000000 -0400
++++ b/testing/web-platform/tests/tools/manifest/typedata.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,4 +1,4 @@
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ 
+ from six import itervalues, iteritems
+ 
+diff -ur a/testing/web-platform/tests/tools/manifest/vcs.py b/testing/web-platform/tests/tools/manifest/vcs.py
+--- a/testing/web-platform/tests/tools/manifest/vcs.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/manifest/vcs.py	2021-11-05 15:29:12.000000000 -0400
+@@ -3,7 +3,7 @@
+ import os
+ import stat
+ from collections import deque
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ 
+ from six import with_metaclass, PY2
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py b/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py
+--- a/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py	2021-09-01 13:26:56.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py	2021-11-05 15:29:12.000000000 -0400
+@@ -4,7 +4,8 @@
+ 
+ from __future__ import absolute_import, division, print_function
+ 
+-from collections import Mapping, OrderedDict, Sequence
++from collections import OrderedDict
++from collections.abc import Mapping, Sequence
+ 
+ import pytest
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py
+--- a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py	2021-11-05 15:32:28.817737357 -0400
+@@ -88,7 +88,7 @@
+         )
+ 
+ 
+-class Settings(collections.MutableMapping):
++class Settings(collections.abc.MutableMapping):
+     """
+     An object that encapsulates HTTP/2 settings state.
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py
+--- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,6 +1,6 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+-from collections import Mapping
++from collections.abc import Mapping
+ 
+ 
+ class Trie(Mapping):
+diff -ur a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py
+--- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,7 +1,7 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+ 
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ from xml.dom import minidom, Node
+ import weakref
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py
+--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py	2021-09-01 13:27:00.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py	2021-11-05 15:29:12.000000000 -0400
+@@ -10,7 +10,7 @@
+ from hyper.common.util import to_bytestring, to_bytestring_tuple
+ 
+ 
+-class HTTPHeaderMap(collections.MutableMapping):
++class HTTPHeaderMap(collections.abc.MutableMapping):
+     """
+     A structure that contains HTTP headers.
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py
+--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py	2021-09-01 13:26:56.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py	2021-11-05 15:29:12.000000000 -0400
+@@ -151,7 +151,7 @@
+         )
+ 
+ 
+-class Settings(collections.MutableMapping):
++class Settings(collections.abc.MutableMapping):
+     """
+     An object that encapsulates HTTP/2 settings state.
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py
+--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py	2021-09-01 13:27:00.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py	2021-11-05 15:29:12.000000000 -0400
+@@ -10,7 +10,7 @@
+ import socket
+ import base64
+ 
+-from collections import Iterable, Mapping
++from collections.abc import Iterable, Mapping
+ 
+ import collections
+ from hyperframe.frame import SettingsFrame
+@@ -295,7 +295,7 @@
+                 return
+ 
+             # Iterables that set a specific content length.
+-            elif isinstance(body, collections.Iterable):
++            elif isinstance(body, collections.abc.Iterable):
+                 for item in body:
+                     try:
+                         self._sock.send(item)
+diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py
+--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py	2021-11-05 15:29:12.000000000 -0400
+@@ -11,7 +11,7 @@
+ Flag = collections.namedtuple("Flag", ["name", "bit"])
+ 
+ 
+-class Flags(collections.MutableSet):
++class Flags(collections.abc.MutableSet):
+     """
+     A simple MutableSet implementation that will only accept known flags as elements.
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py
+--- a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py	2021-09-01 13:26:39.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py	2021-11-05 15:29:12.000000000 -0400
+@@ -11,7 +11,7 @@
+ Flag = collections.namedtuple("Flag", ["name", "bit"])
+ 
+ 
+-class Flags(collections.MutableSet):
++class Flags(collections.abc.MutableSet):
+     """
+     A simple MutableSet implementation that will only accept known flags as
+     elements.
+diff -ur a/testing/web-platform/tests/tools/wptserve/wptserve/config.py b/testing/web-platform/tests/tools/wptserve/wptserve/config.py
+--- a/testing/web-platform/tests/tools/wptserve/wptserve/config.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/wptserve/wptserve/config.py	2021-11-05 15:29:12.000000000 -0400
+@@ -2,7 +2,8 @@
+ import logging
+ import os
+ 
+-from collections import defaultdict, Mapping
++from collections import defaultdict
++from collections.abc import Mapping
+ from six import integer_types, iteritems, itervalues, string_types
+ 
+ from . import sslutils
+diff -ur a/testing/web-platform/tests/webdriver/tests/support/sync.py b/testing/web-platform/tests/webdriver/tests/support/sync.py
+--- a/testing/web-platform/tests/webdriver/tests/support/sync.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/webdriver/tests/support/sync.py	2021-11-05 15:29:12.000000000 -0400
+@@ -81,7 +81,7 @@
+ 
+         exceptions = []
+         if ignored_exceptions is not None:
+-            if isinstance(ignored_exceptions, collections.Iterable):
++            if isinstance(ignored_exceptions, collections.abc.Iterable):
+                 exceptions.extend(iter(ignored_exceptions))
+             else:
+                 exceptions.append(ignored_exceptions)
+diff -ur a/third_party/python/gyp/pylib/gyp/common.py b/third_party/python/gyp/pylib/gyp/common.py
+--- a/third_party/python/gyp/pylib/gyp/common.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/gyp/pylib/gyp/common.py	2021-11-05 15:29:12.000000000 -0400
+@@ -494,7 +494,7 @@
+ 
+ 
+ # Based on http://code.activestate.com/recipes/576694/.
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+   def __init__(self, iterable=None):
+     self.end = end = []
+     end += [None, end, end]         # sentinel node for doubly linked list
+diff -ur a/third_party/python/gyp/pylib/gyp/msvs_emulation.py b/third_party/python/gyp/pylib/gyp/msvs_emulation.py
+--- a/third_party/python/gyp/pylib/gyp/msvs_emulation.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/gyp/pylib/gyp/msvs_emulation.py	2021-11-05 15:30:47.757760820 -0400
+@@ -91,7 +91,7 @@
+   """Add |prefix| to |element| or each subelement if element is iterable."""
+   if element is None:
+     return element
+-  if (isinstance(element, collections.Iterable) and
++  if (isinstance(element, collections.abc.Iterable) and
+       not isinstance(element, basestring)):
+     return [prefix + e for e in element]
+   else:
+@@ -104,7 +104,7 @@
+   if map is not None and element is not None:
+     if not callable(map):
+       map = map.get # Assume it's a dict, otherwise a callable to do the remap.
+-    if (isinstance(element, collections.Iterable) and
++    if (isinstance(element, collections.abc.Iterable) and
+         not isinstance(element, basestring)):
+       element = filter(None, [map(elem) for elem in element])
+     else:
+@@ -117,7 +117,7 @@
+   then add |element| to it, adding each item in |element| if it's a list or
+   tuple."""
+   if append is not None and element is not None:
+-    if (isinstance(element, collections.Iterable) and
++    if (isinstance(element, collections.abc.Iterable) and
+         not isinstance(element, basestring)):
+       append.extend(element)
+     else:
+diff -ur a/third_party/python/gyp/test/lib/TestGyp.py b/third_party/python/gyp/test/lib/TestGyp.py
+--- a/third_party/python/gyp/test/lib/TestGyp.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/gyp/test/lib/TestGyp.py	2021-11-05 15:30:37.671763157 -0400
+@@ -496,7 +496,7 @@
+     if status is None:
+       kw['status'] = None
+     else:
+-      if not isinstance(status, collections.Iterable): status = (status,)
++      if not isinstance(status, collections.abc.Iterable): status = (status,)
+       kw['status'] = list(itertools.chain((0,), status))
+     self.cmake_build(gyp_file, target, **kw)
+     kw['status'] = status
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
+@@ -319,7 +319,7 @@
+ try:
+     callable = callable
+ except NameError:   # pragma: no cover
+-    from collections import Callable
++    from collections.abc import Callable
+ 
+     def callable(obj):
+         return isinstance(obj, Callable)
+@@ -475,7 +475,7 @@
+ try:
+     from collections import ChainMap
+ except ImportError: # pragma: no cover
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+ 
+     try:
+         from reprlib import recursive_repr as _recursive_repr
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,7 +1,7 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+ 
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ from xml.dom import minidom, Node
+ import weakref
+ 
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py	2021-11-05 15:29:12.000000000 -0400
+@@ -940,7 +940,7 @@
+     def __dir__(self):
+         return (dir(type(self)) + list(self.keys()))
+ 
+-collections.MutableMapping.register(ParseResults)
++collections.abc.MutableMapping.register(ParseResults)
+ 
+ def col (loc,strg):
+     """Returns current column within a string, counting newlines as line separators.
+@@ -3223,7 +3223,7 @@
+ 
+         if isinstance( exprs, basestring ):
+             self.exprs = [ ParserElement._literalStringClass( exprs ) ]
+-        elif isinstance( exprs, collections.Iterable ):
++        elif isinstance( exprs, collections.abc.Iterable ):
+             exprs = list(exprs)
+             # if sequence of strings provided, wrap with Literal
+             if all(isinstance(expr, basestring) for expr in exprs):
+@@ -4564,7 +4564,7 @@
+     symbols = []
+     if isinstance(strs,basestring):
+         symbols = strs.split()
+-    elif isinstance(strs, collections.Iterable):
++    elif isinstance(strs, collections.abc.Iterable):
+         symbols = list(strs)
+     else:
+         warnings.warn("Invalid argument to oneOf, expected string or iterable",
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
+@@ -169,7 +169,7 @@
+     """
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py	2021-11-05 15:31:35.745749692 -0400
+@@ -174,10 +174,10 @@
+         if event not in self.hooks:
+             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
+ 
+-        if isinstance(hook, collections.Callable):
++        if isinstance(hook, collections.abc.Callable):
+             self.hooks[event].append(hook)
+         elif hasattr(hook, '__iter__'):
+-            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
++            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
+ 
+     def deregister_hook(self, event, hook):
+         """Deregister a previously registered hook.
+@@ -461,7 +461,7 @@
+ 
+         is_stream = all([
+             hasattr(data, '__iter__'),
+-            not isinstance(data, (basestring, list, tuple, collections.Mapping))
++            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
+         ])
+ 
+         try:
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
+@@ -12,7 +12,7 @@
+ from .compat import OrderedDict
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """A case-insensitive ``dict``-like object.
+ 
+     Implements all methods and operations of
+@@ -71,7 +71,7 @@
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, collections.abc.Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py	2021-11-05 15:31:40.157748665 -0400
+@@ -262,7 +262,7 @@
+     if isinstance(value, (str, bytes, bool, int)):
+         raise ValueError('cannot encode objects that are not 2-tuples')
+ 
+-    if isinstance(value, collections.Mapping):
++    if isinstance(value, collections.abc.Mapping):
+         value = value.items()
+ 
+     return list(value)
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from collections import Mapping, MutableMapping
++from collections.abc import Mapping, MutableMapping
+ try:
+     from threading import RLock
+ except ImportError:  # Platform-specific: No threads available
+diff -ur a/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py b/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py
+--- a/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py	2021-11-05 15:29:12.000000000 -0400
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+diff -ur a/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py b/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py
+--- a/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py	2021-11-05 15:29:12.000000000 -0400
+@@ -482,7 +482,7 @@
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py	2021-09-01 13:27:05.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
+@@ -319,7 +319,7 @@
+ try:
+     callable = callable
+ except NameError:   # pragma: no cover
+-    from collections import Callable
++    from collections.abc import Callable
+ 
+     def callable(obj):
+         return isinstance(obj, Callable)
+@@ -475,7 +475,7 @@
+ try:
+     from collections import ChainMap
+ except ImportError: # pragma: no cover
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+ 
+     try:
+         from reprlib import recursive_repr as _recursive_repr
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,7 +1,7 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+ 
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ from xml.dom import minidom, Node
+ import weakref
+ 
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py	2021-11-05 15:29:12.000000000 -0400
+@@ -940,7 +940,7 @@
+     def __dir__(self):
+         return (dir(type(self)) + list(self.keys()))
+ 
+-collections.MutableMapping.register(ParseResults)
++collections.abc.MutableMapping.register(ParseResults)
+ 
+ def col (loc,strg):
+     """Returns current column within a string, counting newlines as line separators.
+@@ -3223,7 +3223,7 @@
+ 
+         if isinstance( exprs, basestring ):
+             self.exprs = [ ParserElement._literalStringClass( exprs ) ]
+-        elif isinstance( exprs, collections.Iterable ):
++        elif isinstance( exprs, collections.abc.Iterable ):
+             exprs = list(exprs)
+             # if sequence of strings provided, wrap with Literal
+             if all(isinstance(expr, basestring) for expr in exprs):
+@@ -4564,7 +4564,7 @@
+     symbols = []
+     if isinstance(strs,basestring):
+         symbols = strs.split()
+-    elif isinstance(strs, collections.Iterable):
++    elif isinstance(strs, collections.abc.Iterable):
+         symbols = list(strs)
+     else:
+         warnings.warn("Invalid argument to oneOf, expected string or iterable",
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
+@@ -169,7 +169,7 @@
+     """
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py	2021-11-05 15:31:52.397745825 -0400
+@@ -174,10 +174,10 @@
+         if event not in self.hooks:
+             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
+ 
+-        if isinstance(hook, collections.Callable):
++        if isinstance(hook, collections.abc.Callable):
+             self.hooks[event].append(hook)
+         elif hasattr(hook, '__iter__'):
+-            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
++            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
+ 
+     def deregister_hook(self, event, hook):
+         """Deregister a previously registered hook.
+@@ -461,7 +461,7 @@
+ 
+         is_stream = all([
+             hasattr(data, '__iter__'),
+-            not isinstance(data, (basestring, list, tuple, collections.Mapping))
++            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
+         ])
+ 
+         try:
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py	2021-11-05 15:32:02.765743413 -0400
+@@ -12,7 +12,7 @@
+ from .compat import OrderedDict
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """A case-insensitive ``dict``-like object.
+ 
+     Implements all methods and operations of
+@@ -71,7 +71,7 @@
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, collections.abc.Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py	2021-11-05 15:31:57.123744724 -0400
+@@ -262,7 +262,7 @@
+     if isinstance(value, (str, bytes, bool, int)):
+         raise ValueError('cannot encode objects that are not 2-tuples')
+ 
+-    if isinstance(value, collections.Mapping):
++    if isinstance(value, collections.abc.Mapping):
+         value = value.items()
+ 
+     return list(value)
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from collections import Mapping, MutableMapping
++from collections.abc import Mapping, MutableMapping
+ try:
+     from threading import RLock
+ except ImportError:  # Platform-specific: No threads available
+diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/vendor/requests/cookies.py
+--- a/third_party/python/pipenv/pipenv/vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
+@@ -169,7 +169,7 @@
+     """
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/models.py b/third_party/python/pipenv/pipenv/vendor/requests/models.py
+--- a/third_party/python/pipenv/pipenv/vendor/requests/models.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/requests/models.py	2021-11-05 15:32:09.732741793 -0400
+@@ -174,10 +174,10 @@
+         if event not in self.hooks:
+             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
+ 
+-        if isinstance(hook, collections.Callable):
++        if isinstance(hook, collections.abc.Callable):
+             self.hooks[event].append(hook)
+         elif hasattr(hook, '__iter__'):
+-            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
++            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
+ 
+     def deregister_hook(self, event, hook):
+         """Deregister a previously registered hook.
+@@ -461,7 +461,7 @@
+ 
+         is_stream = all([
+             hasattr(data, '__iter__'),
+-            not isinstance(data, (basestring, list, tuple, collections.Mapping))
++            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
+         ])
+ 
+         try:
+diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/structures.py b/third_party/python/pipenv/pipenv/vendor/requests/structures.py
+--- a/third_party/python/pipenv/pipenv/vendor/requests/structures.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
+@@ -12,7 +12,7 @@
+ from .compat import OrderedDict
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """A case-insensitive ``dict``-like object.
+ 
+     Implements all methods and operations of
+@@ -71,7 +71,7 @@
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, collections.abc.Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/utils.py b/third_party/python/pipenv/pipenv/vendor/requests/utils.py
+--- a/third_party/python/pipenv/pipenv/vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/requests/utils.py	2021-11-05 15:32:13.776740860 -0400
+@@ -262,7 +262,7 @@
+     if isinstance(value, (str, bytes, bool, int)):
+         raise ValueError('cannot encode objects that are not 2-tuples')
+ 
+-    if isinstance(value, collections.Mapping):
++    if isinstance(value, collections.abc.Mapping):
+         value = value.items()
+ 
+     return list(value)
+diff -ur a/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py
+--- a/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from collections import Mapping, MutableMapping
++from collections.abc import Mapping, MutableMapping
+ try:
+     from threading import RLock
+ except ImportError:  # Platform-specific: No threads available
+diff -ur a/third_party/python/pyyaml/lib3/yaml/constructor.py b/third_party/python/pyyaml/lib3/yaml/constructor.py
+--- a/third_party/python/pyyaml/lib3/yaml/constructor.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pyyaml/lib3/yaml/constructor.py	2021-11-05 15:29:12.000000000 -0400
+@@ -123,7 +123,7 @@
+         mapping = {}
+         for key_node, value_node in node.value:
+             key = self.construct_object(key_node, deep=deep)
+-            if not isinstance(key, collections.Hashable):
++            if not isinstance(key, collections.abc.Hashable):
+                 raise ConstructorError("while constructing a mapping", node.start_mark,
+                         "found unhashable key", key_node.start_mark)
+             value = self.construct_object(value_node, deep=deep)
+diff -ur a/third_party/python/requests/requests/cookies.py b/third_party/python/requests/requests/cookies.py
+--- a/third_party/python/requests/requests/cookies.py	2021-09-01 13:27:05.000000000 -0400
++++ b/third_party/python/requests/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
+@@ -161,7 +161,7 @@
+     Use .get and .set and include domain and path args in order to be more specific."""
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+diff -ur a/third_party/python/requests/requests/packages/urllib3/_collections.py b/third_party/python/requests/requests/packages/urllib3/_collections.py
+--- a/third_party/python/requests/requests/packages/urllib3/_collections.py	2021-09-01 13:27:13.000000000 -0400
++++ b/third_party/python/requests/requests/packages/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from collections import Mapping, MutableMapping
++from collections.abc import Mapping, MutableMapping
+ try:
+     from threading import RLock
+ except ImportError:  # Platform-specific: No threads available
+diff -ur a/third_party/python/requests/requests/structures.py b/third_party/python/requests/requests/structures.py
+--- a/third_party/python/requests/requests/structures.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/requests/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
+@@ -11,7 +11,7 @@
+ import collections
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """
+     A case-insensitive ``dict``-like object.
+ 
+@@ -71,7 +71,7 @@
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, collections.abc.Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+diff -ur a/third_party/python/requests/requests/utils.py b/third_party/python/requests/requests/utils.py
+--- a/third_party/python/requests/requests/utils.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/requests/requests/utils.py	2021-11-05 15:30:55.420759045 -0400
+@@ -189,7 +189,7 @@
+     if isinstance(value, (str, bytes, bool, int)):
+         raise ValueError('cannot encode objects that are not 2-tuples')
+ 
+-    if isinstance(value, collections.Mapping):
++    if isinstance(value, collections.abc.Mapping):
+         value = value.items()
+ 
+     return list(value)
+diff -ur a/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py b/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py
+--- a/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
+@@ -481,7 +481,7 @@
+ try:
+     from collections import ChainMap
+ except ImportError: # pragma: no cover
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+ 
+     try:
+         from reprlib import recursive_repr as _recursive_repr
+diff -ur a/third_party/python/voluptuous/voluptuous/schema_builder.py b/third_party/python/voluptuous/voluptuous/schema_builder.py
+--- a/third_party/python/voluptuous/voluptuous/schema_builder.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/voluptuous/voluptuous/schema_builder.py	2021-11-05 15:30:32.399764374 -0400
+@@ -280,7 +280,7 @@
+             return schema.__voluptuous_compile__(self)
+         if isinstance(schema, Object):
+             return self._compile_object(schema)
+-        if isinstance(schema, collections.Mapping):
++        if isinstance(schema, collections.abc.Mapping):
+             return self._compile_dict(schema)
+         elif isinstance(schema, list):
+             return self._compile_list(schema)

From 59f3246e86f353c52683174bcbca66b74d52981c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 5 Nov 2021 20:42:40 +0100
Subject: [PATCH 2470/4088] arandr: add missing dependency

---
 srcpkgs/arandr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arandr/template b/srcpkgs/arandr/template
index dc77641f3c15..9853f0d674f3 100644
--- a/srcpkgs/arandr/template
+++ b/srcpkgs/arandr/template
@@ -1,10 +1,10 @@
 # Template file for 'arandr'
 pkgname=arandr
 version=0.1.10
-revision=5
+revision=6
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools python3-docutils"
-depends="python3-gobject xrandr python3"
+depends="python3-gobject gtk+3 xrandr"
 short_desc="Graphical frontend for XRandR"
 maintainer="mid-kid <esteve.varela@gmail.com>"
 license="GPL-3.0-or-later"

From 4898de504699a52c49e3e57eae377823ba686629 Mon Sep 17 00:00:00 2001
From: Roger Roger <me@rogerrogert.de>
Date: Thu, 4 Nov 2021 17:20:49 +0100
Subject: [PATCH 2471/4088] gnome-tweaks: fix libhandy dependency

---
 srcpkgs/gnome-tweaks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index 8f7a3eda15d2..e2ef4e83d274 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
 version=40.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="gettext"
-depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy"
-short_desc="GNOME3 tool to customize advanced options"
+depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy1"
+short_desc="GNOME tool to customize advanced options"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"

From fc34eaea0729dc80892c9e5c9fcef0dfb880d7f5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 2 Nov 2021 07:59:29 +0400
Subject: [PATCH 2472/4088] python3-regex: update to 2021.11.2.

---
 srcpkgs/python3-regex/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index c7b70acbaa73..0309559185a3 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.10.23
+version=2021.11.2
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 makedepends="python3-devel"
+depends="python3"
 short_desc="Alternative regular expression module (Python3)"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=f3f9a91d3cc5e5b0ddf1043c0ae5fa4852f18a1c0050318baf5fc7930ecc1f9c
+checksum=5e85dcfc5d0f374955015ae12c08365b565c6f1eaf36dd182476a4d8e5a1cdb7
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From d18e46e5ddb660c59cbd727514bdd869a2fab174 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 4 Nov 2021 19:05:52 +0200
Subject: [PATCH 2473/4088] opera: update to 81.0.4196.31.

---
 srcpkgs/opera/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 09e301a7f394..3c13f3b8603e 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,7 +1,7 @@
 # Template file for 'opera'
 pkgname=opera
-version=80.0.4170.72
-revision=2
+version=81.0.4196.31
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 hostmakedepends="rpmextract"
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
-checksum=3f3ece9bae6576b6ef5e2908733c112695ea535801bc6fb422b9fe7a79c097cc
+checksum=f84bf86d8cfcb6f2d71d1d59cd94e0fc6cee7e891b1d7885bb5361e97f595f90
 repository="nonfree"
 nostrip=yes
 

From 82005e9b40aa43936bae97fc773bc01a053415ff Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Nov 2021 17:36:46 -0500
Subject: [PATCH 2474/4088] Amass: update to 3.14.3.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 46783d6888b4..082dac6aa9ce 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.14.2
+version=3.14.3
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=18600a607b10fd672ad21b48e9c5f87b5b8a49a4a7e2cde520c246b499521278
+checksum=ec9e05bd9aef561bbbfaf26ca1fb3b67ce598723e6309d486897ddc1c15eb123
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From 88eecb48eb4ac1944ab6f432a747245285477d7a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Nov 2021 17:38:43 -0500
Subject: [PATCH 2475/4088] sqlmap: update to 1.5.11.

---
 srcpkgs/sqlmap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 72fb632e23f4..e22e945419da 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,7 +1,7 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.10
-revision=2
+version=1.5.11
+revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
 short_desc="Automatic SQL injection and database takeover tool"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=7147ba8c9ac98fe55daa4928c34f7b6e314bfa7fa60a4f073689f70533128bcb
+checksum=69b91d6bba6d053b300a89692d5ebe98cc3ce9803d5f25e600a31943afa7fc6e
 python_version=3
 
 do_install() {

From 2c4f98851de52389027e73f8831c47f800585cb5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 5 Nov 2021 17:39:33 -0500
Subject: [PATCH 2476/4088] mongo-c-driver: update to 1.19.2.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index fcc28113fb96..ee79f2e3d329 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.1
+version=1.19.2
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=1732251e3f65bc02ce05c04ce34ef2819b154479108df669f0c045486952521d
+checksum=b6feb4fd65423140cdee02df392cd9db2bb459731e992a5385afa554a7515762
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 64d90698bf22b6a80e2c5b5ed562c295fcfc1217 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 3 Nov 2021 15:43:02 +0100
Subject: [PATCH 2477/4088] i3-gaps: udpate to 4.20.1.

---
 srcpkgs/i3-gaps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index 8ad27a261f40..93a3696e3029 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,6 +1,6 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.20
+version=4.20.1
 revision=1
 wrksrc="i3-${version}"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=6ae967b31b35bdf0856faae49f66db95e77aa55266764950f9665dfce16cdfbf
+checksum=717f2499e1c6eb5c04e5c6d30442234387181e2b731366274b40bbf682f93d95
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"

From cafe5f68404473ee63247c31a873c59c68902813 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Tue, 2 Nov 2021 17:27:01 -0700
Subject: [PATCH 2478/4088] proot: update to 5.2.0.

- Delete obsolete patches and fix the rest.
- Add pkg-config (otherwise, undefined talloc_* refs abound).
- Use docs/GNUMakefile to generate manpage.
- Force Makefile to recognize package version.

Closes: #33272 [via git-merge-pr]
---
 ...ent-tracees-from-becoming-undumpable.patch |  48 -----
 srcpkgs/proot/patches/arm64.patch             | 134 ------------
 .../disable-seccomp-based-tracing.patch       |  27 +--
 srcpkgs/proot/patches/linux4.8.patch          | 193 ------------------
 srcpkgs/proot/patches/linux_wait_h.patch      |  34 ---
 srcpkgs/proot/patches/loader.patch            |  40 ----
 srcpkgs/proot/patches/makefile-fix-vars.patch |  21 +-
 srcpkgs/proot/patches/musl_execinfo.patch     |  28 ---
 srcpkgs/proot/patches/ptrace_compat.patch     |   8 +-
 srcpkgs/proot/template                        |   9 +-
 10 files changed, 24 insertions(+), 518 deletions(-)
 delete mode 100644 srcpkgs/proot/patches/1001-prevent-tracees-from-becoming-undumpable.patch
 delete mode 100644 srcpkgs/proot/patches/arm64.patch
 delete mode 100644 srcpkgs/proot/patches/linux4.8.patch
 delete mode 100644 srcpkgs/proot/patches/linux_wait_h.patch
 delete mode 100644 srcpkgs/proot/patches/loader.patch
 delete mode 100644 srcpkgs/proot/patches/musl_execinfo.patch

diff --git a/srcpkgs/proot/patches/1001-prevent-tracees-from-becoming-undumpable.patch b/srcpkgs/proot/patches/1001-prevent-tracees-from-becoming-undumpable.patch
deleted file mode 100644
index b067b0da7e64..000000000000
--- a/srcpkgs/proot/patches/1001-prevent-tracees-from-becoming-undumpable.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# upstream: yes
-# https://github.com/proot-me/proot/pull/203
-
-# adapted to fit proot's old release
-
-From 2e796c5a0ed3c04d0816405422c8d6a25eccf5c2 Mon Sep 17 00:00:00 2001
-From: Michal Bednarski <bednarski.michal2@gmail.com>
-Date: Thu, 5 Sep 2019 15:19:08 +0200
-Subject: [PATCH] Prevent tracees from becoming undumpable
-
---- a/src/syscall/enter.c
-+++ b/src/syscall/enter.c
-@@ -26,7 +26,8 @@
- #include <linux/net.h>   /* SYS_*, */
- #include <fcntl.h>       /* AT_FDCWD, */
- #include <limits.h>      /* PATH_MAX, */
--
-+#include <string.h>      /* strcpy */
-+#include <sys/prctl.h>   /* PR_SET_DUMPABLE */
- #include "syscall/syscall.h"
- #include "syscall/sysnum.h"
- #include "syscall/socket.h"
-@@ -563,6 +564,15 @@
- 
- 		status = translate_path2(tracee, newdirfd, newpath, SYSARG_3, SYMLINK);
- 		break;
-+
-+	case PR_prctl:
-+		/* Prevent tracees from setting dumpable flag.
-+		* (Otherwise it could break tracee memory access)  */
-+		if (peek_reg(tracee, CURRENT, SYSARG_1) == PR_SET_DUMPABLE) {
-+			set_sysnum(tracee, PR_void);
-+			status = 0;
-+		}
-+		break;
- 	}
- 
- end:
---- a/src/syscall/seccomp.c
-+++ b/src/syscall/seccomp.c
-@@ -377,6 +377,7 @@
- 	{ PR_open,		0 },
- 	{ PR_openat,		0 },
- 	{ PR_pivot_root,	0 },
-+	{ PR_prctl,         0 },
- 	{ PR_ptrace,		FILTER_SYSEXIT },
- 	{ PR_readlink,		FILTER_SYSEXIT },
- 	{ PR_readlinkat,	FILTER_SYSEXIT },
diff --git a/srcpkgs/proot/patches/arm64.patch b/srcpkgs/proot/patches/arm64.patch
deleted file mode 100644
index 51dbd3bf3665..000000000000
--- a/srcpkgs/proot/patches/arm64.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -ru proot-5.1.0.orig/src/arch.h proot-5.1.0/src/arch.h
---- a/src/arch.h
-+++ b/src/arch.h
-@@ -125,6 +125,9 @@
-     #define OFFSETOF_STAT_UID_32 0
-     #define OFFSETOF_STAT_GID_32 0
- 
-+    #define EXEC_PIC_ADDRESS   0x500000000000
-+    #define INTERP_PIC_ADDRESS 0x6f0000000000
-+
- #elif defined(ARCH_X86)
- 
-     #define SYSNUMS_HEADER1 "syscall/sysnums-i386.h"
-diff -ru proot-5.1.0.orig/src/loader/assembly-arm64.h proot-5.1.0/src/loader/assembly-arm64.h
---- /dev/null
-+++ b/src/loader/assembly-arm64.h
-@@ -0,0 +1,93 @@
-+/* -*- c-set-style: "K&R"; c-basic-offset: 8 -*-
-+ *
-+ * This file is part of PRoot.
-+ *
-+ * Copyright (C) 2014 STMicroelectronics
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+ * 02110-1301 USA.
-+ */
-+
-+#define BRANCH(stack_pointer, destination) do {			\
-+	asm volatile (						\
-+		"// Restore initial stack pointer.	\n\t"	\
-+		"mov sp, %0				\n\t"	\
-+		"					\n\t"	\
-+		"// Clear rtld_fini.			\n\t"	\
-+		"mov x0, #0				\n\t"	\
-+		"					\n\t"	\
-+		"// Start the program.			\n\t"	\
-+		"br %1					\n"	\
-+		: /* no output */				\
-+		: "r" (stack_pointer), "r" (destination)	\
-+		: "memory", "sp", "x0");			\
-+	__builtin_unreachable();				\
-+	} while (0)
-+
-+#define PREPARE_ARGS_1(arg1_)				\
-+	register word_t arg1 asm("x0") = arg1_;		\
-+
-+#define PREPARE_ARGS_3(arg1_, arg2_, arg3_)		\
-+	PREPARE_ARGS_1(arg1_)				\
-+	register word_t arg2 asm("x1") = arg2_;		\
-+	register word_t arg3 asm("x2") = arg3_;		\
-+
-+#define PREPARE_ARGS_4(arg1_, arg2_, arg3_, arg4_)	\
-+	PREPARE_ARGS_3(arg1_, arg2_, arg3_)		\
-+	register word_t arg4 asm("x3") = arg4_;
-+
-+#define PREPARE_ARGS_6(arg1_, arg2_, arg3_, arg4_, arg5_, arg6_)	\
-+	PREPARE_ARGS_3(arg1_, arg2_, arg3_)				\
-+	register word_t arg4 asm("x3") = arg4_;				\
-+	register word_t arg5 asm("x4") = arg5_;				\
-+	register word_t arg6 asm("x5") = arg6_;
-+
-+#define OUTPUT_CONTRAINTS_1			\
-+	"r" (arg1)
-+
-+#define OUTPUT_CONTRAINTS_3			\
-+	OUTPUT_CONTRAINTS_1,			\
-+	"r" (arg2), "r" (arg3)
-+
-+#define OUTPUT_CONTRAINTS_4			\
-+	OUTPUT_CONTRAINTS_3,			\
-+	"r" (arg4)
-+
-+#define OUTPUT_CONTRAINTS_6				\
-+	OUTPUT_CONTRAINTS_3,				\
-+	"r" (arg4), "r" (arg5), "r" (arg6)
-+
-+#define SYSCALL(number_, nb_args, args...)			\
-+	({							\
-+		register word_t number asm("w8") = number_;	\
-+		register word_t result asm("x0");		\
-+		PREPARE_ARGS_##nb_args(args)			\
-+			asm volatile (				\
-+				"svc #0x00000000	\n\t"	\
-+				: "=r" (result)			\
-+				: "r" (number),			\
-+				OUTPUT_CONTRAINTS_##nb_args	\
-+				: "memory");			\
-+			result;					\
-+	})
-+
-+#define OPENAT	56
-+#define CLOSE	57
-+#define MMAP	222
-+#define MMAP_OFFSET_SHIFT 0
-+#define EXECVE	221
-+#define EXIT	93
-+#define PRCTL	167
-+
-diff -ru proot-5.1.0.orig/src/loader/loader.c proot-5.1.0/src/loader/loader.c
---- a/src/loader/loader.c
-+++ b/src/loader/loader.c
-@@ -39,6 +39,8 @@
- #    include "loader/assembly-x86_64.h"
- #elif defined(ARCH_ARM_EABI)
- #    include "loader/assembly-arm.h"
-+#elif defined(ARCH_ARM64)
-+#    include "loader/assembly-arm64.h"
- #elif defined(ARCH_X86)
- #    include "loader/assembly-x86.h"
- #else
-@@ -134,7 +136,11 @@
- 			/* Fall through.  */
- 
- 		case LOAD_ACTION_OPEN:
-+#ifdef OPENAT
-+			fd = SYSCALL(OPENAT, 4, AT_FDCWD, stmt->open.string_address, O_RDONLY, 0);
-+#else
- 			fd = SYSCALL(OPEN, 3, stmt->open.string_address, O_RDONLY, 0);
-+#endif
- 			if (unlikely((int) fd < 0))
- 				FATAL();
- 
diff --git a/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch b/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
index 9257f2ea48d8..76cb4e048b6f 100644
--- a/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
+++ b/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
@@ -1,28 +1,17 @@
-# reason: https://github.com/proot-me/proot/issues/106
-# src: Debian10
+# Based on a patch by Simon McVittie <smcv@debian.org>:
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=847292#16
 
-From: Simon McVittie <smcv@debian.org>
-Date: Sat, 14 Jan 2017 15:52:13 +0000
-X-Dgit-Generated: 5.1.0-1.2 dcc5f0999759be03aed5b62a8683e0b965d0219d
-Subject: Disable seccomp-based tracing performance improvement
-
-It is faster (according to upstream documentation), but on current
-(4.8.4+) kernels it just segfaults. Software that works slowly seems
-better than software that doesn't work at all.
-
-Bug: https://github.com/proot-me/PRoot/issues/106
-
----
+# Stops proot from segfaulting by disabling seccomp.
+# https://github.com/proot-me/proot/issues/106
 
 --- a/src/GNUmakefile
 +++ b/src/GNUmakefile
-@@ -105,7 +105,7 @@ CHECK_VERSION = VERSION=$$($(GIT) descri
- 		then /bin/echo -e "\#undef VERSION\n\#define VERSION \"$${VERSION}\""; \
- 		fi;
- 
+@@ -132,7 +132,7 @@ ifneq ($(and $(HAS_SWIG),$(HAS_PYTHON_CONFIG)),)
+        CHECK_PYTHON_EXTENSION = /bin/echo -e "\#define HAVE_PYTHON_EXTENSION"
+ endif
+
 -CHECK_FEATURES = process_vm seccomp_filter
 +CHECK_FEATURES = process_vm
  CHECK_PROGRAMS = $(foreach feature,$(CHECK_FEATURES),.check_$(feature))
  CHECK_OBJECTS  = $(foreach feature,$(CHECK_FEATURES),.check_$(feature).o)
  CHECK_RESULTS  = $(foreach feature,$(CHECK_FEATURES),.check_$(feature).res)
-
diff --git a/srcpkgs/proot/patches/linux4.8.patch b/srcpkgs/proot/patches/linux4.8.patch
deleted file mode 100644
index 33bceffd7e3f..000000000000
--- a/srcpkgs/proot/patches/linux4.8.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From 25e8461cbe56a3f035df145d9d762b65aa3eedb7 Mon Sep 17 00:00:00 2001
-From: Jorge Gomes <jorge@lip.pt>
-Date: Mon, 13 Feb 2017 20:37:17 +0000
-Subject: [PATCH] fix event.c for seccomp and ptrace
-
----
- src/tracee/event.c | 129 ++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 88 insertions(+), 41 deletions(-)
-
-diff --git src/tracee/event.c src/tracee/event.c
-index bafc3c5..64166f6 100644
---- a/src/tracee/event.c
-+++ b/src/tracee/event.c
-@@ -20,6 +20,7 @@
-  * 02110-1301 USA.
-  */
- 
-+#include <stdio.h>
- #include <sched.h>      /* CLONE_*,  */
- #include <sys/types.h>  /* pid_t, */
- #include <sys/ptrace.h> /* ptrace(1), PTRACE_*, */
-@@ -47,6 +48,7 @@
- #include "attribute.h"
- #include "compat.h"
- 
-+
- /**
-  * Start @tracee->exe with the given @argv[].  This function
-  * returns -errno if an error occurred, otherwise 0.
-@@ -205,6 +207,27 @@ static void print_talloc_hierarchy(int signum, siginfo_t *siginfo UNUSED, void *
- static int last_exit_status = -1;
- 
- /**
-+ * Check if kernel >= 4.8
-+ */
-+bool is_kernel_4_8(void) {
-+	struct utsname utsname;
-+        int status;
-+        static bool version_48 = false;
-+        static int major = 0;
-+        static int minor = 0;
-+        if (! major) {
-+		status = uname(&utsname);
-+		if (status < 0)
-+			return false;
-+		sscanf(utsname.release, "%d.%d", &major, &minor);
-+		if (major >= 4)
-+			if (minor >= 8)
-+				version_48 = true;
-+	}
-+	return version_48;
-+}
-+
-+/**
-  * Check if this instance of PRoot can *technically* handle @tracee.
-  */
- static void check_architecture(Tracee *tracee)
-@@ -362,6 +385,7 @@ int event_loop()
- int handle_tracee_event(Tracee *tracee, int tracee_status)
- {
- 	static bool seccomp_detected = false;
-+        static bool seccomp_enabled = false;
- 	pid_t pid = tracee->pid;
- 	long status;
- 	int signal;
-@@ -432,6 +456,7 @@ int handle_tracee_event(Tracee *tracee, int tracee_status)
- 			status = ptrace(PTRACE_SETOPTIONS, tracee->pid, NULL,
- 					default_ptrace_options | PTRACE_O_TRACESECCOMP);
- 			if (status < 0) {
-+				seccomp_enabled = false;
- 				/* ... otherwise use default options only.  */
- 				status = ptrace(PTRACE_SETOPTIONS, tracee->pid, NULL,
- 						default_ptrace_options);
-@@ -440,8 +465,71 @@ int handle_tracee_event(Tracee *tracee, int tracee_status)
- 					exit(EXIT_FAILURE);
- 				}
- 			}
-+                        else { 
-+				if (getenv("PROOT_NO_SECCOMP") == NULL)
-+					seccomp_enabled = true;
-+			}
- 		}
- 			/* Fall through. */
-+		case SIGTRAP | PTRACE_EVENT_SECCOMP2 << 8:
-+		case SIGTRAP | PTRACE_EVENT_SECCOMP << 8:
-+
-+			if (is_kernel_4_8()) { 
-+	                	if (seccomp_enabled) {
-+					if (!seccomp_detected) {
-+						VERBOSE(tracee, 1, "ptrace acceleration (seccomp mode 2) enabled");
-+						tracee->seccomp = ENABLED;
-+						seccomp_detected = true;
-+					}
-+	
-+					unsigned long flags = 0;
-+					status = ptrace(PTRACE_GETEVENTMSG, tracee->pid, NULL, &flags);
-+					if (status < 0)
-+						break;
-+           	             	}
-+			}
-+			else if (signal == (SIGTRAP | PTRACE_EVENT_SECCOMP2 << 8) ||
-+                                 signal == (SIGTRAP | PTRACE_EVENT_SECCOMP << 8)) {
-+				unsigned long flags = 0;
-+
-+				signal = 0;
-+
-+                	        if (!seccomp_detected) {
-+                        	        VERBOSE(tracee, 1, "ptrace acceleration (seccomp mode 2) enabled");
-+                                	tracee->seccomp = ENABLED;
-+         	                	seccomp_detected = true;
-+                	        }
-+
-+                        	/* Use the common ptrace flow if seccomp was
-+				 * explicitely disabled for this tracee.  */
-+        	                if (tracee->seccomp != ENABLED)
-+                	                break;
-+
-+                        	status = ptrace(PTRACE_GETEVENTMSG, tracee->pid, NULL, &flags);
-+                        	if (status < 0)
-+                                	break;
-+
-+                        	/* Use the common ptrace flow when
-+				 * sysexit has to be handled.  */
-+                        	if ((flags & FILTER_SYSEXIT) != 0) {
-+                                	tracee->restart_how = PTRACE_SYSCALL;
-+                                	break;
-+                        	}
-+
-+                        	/* Otherwise, handle the sysenter
-+                        	 * stage right now.  */
-+                        	tracee->restart_how = PTRACE_CONT;
-+                        	translate_syscall(tracee);
-+
-+                        	/* This syscall has disabled seccomp, so move
-+                        	 * the ptrace flow back to the common path to
-+                       		 * ensure its sysexit will be handled.  */
-+                        	if (tracee->seccomp == DISABLING)
-+                                	tracee->restart_how = PTRACE_SYSCALL;
-+                        	break;
-+                	}
-+
-+			/* Fall through. */
- 		case SIGTRAP | 0x80:
- 			signal = 0;
- 
-@@ -490,47 +578,6 @@ int handle_tracee_event(Tracee *tracee, int tracee_status)
- 			}
- 			break;
- 
--		case SIGTRAP | PTRACE_EVENT_SECCOMP2 << 8:
--		case SIGTRAP | PTRACE_EVENT_SECCOMP << 8: {
--			unsigned long flags = 0;
--
--			signal = 0;
--
--			if (!seccomp_detected) {
--				VERBOSE(tracee, 1, "ptrace acceleration (seccomp mode 2) enabled");
--				tracee->seccomp = ENABLED;
--				seccomp_detected = true;
--			}
--
--			/* Use the common ptrace flow if seccomp was
--			 * explicitely disabled for this tracee.  */
--			if (tracee->seccomp != ENABLED)
--				break;
--
--			status = ptrace(PTRACE_GETEVENTMSG, tracee->pid, NULL, &flags);
--			if (status < 0)
--				break;
--
--			/* Use the common ptrace flow when
--			 * sysexit has to be handled.  */
--			if ((flags & FILTER_SYSEXIT) != 0) {
--				tracee->restart_how = PTRACE_SYSCALL;
--				break;
--			}
--
--			/* Otherwise, handle the sysenter
--			 * stage right now.  */
--			tracee->restart_how = PTRACE_CONT;
--			translate_syscall(tracee);
--
--			/* This syscall has disabled seccomp, so move
--			 * the ptrace flow back to the common path to
--			 * ensure its sysexit will be handled.  */
--			if (tracee->seccomp == DISABLING)
--				tracee->restart_how = PTRACE_SYSCALL;
--			break;
--		}
--
- 		case SIGTRAP | PTRACE_EVENT_VFORK << 8:
- 			signal = 0;
- 			(void) new_child(tracee, CLONE_VFORK);
diff --git a/srcpkgs/proot/patches/linux_wait_h.patch b/srcpkgs/proot/patches/linux_wait_h.patch
deleted file mode 100644
index ab9b1ecbec01..000000000000
--- a/srcpkgs/proot/patches/linux_wait_h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/ptrace/ptrace.c	2014-12-15 15:18:11.000000000 +0100
-+++ b/src/ptrace/ptrace.c	2015-07-12 13:13:45.970093333 +0200
-@@ -28,6 +28,7 @@
- #include <sys/uio.h>    /* struct iovec, */
- #include <sys/param.h>  /* MIN(), MAX(), */
- #include <string.h>     /* memcpy(3), */
-+#include <linux/wait.h> /* __WALL, __WCLONE */
- 
- #include "ptrace/ptrace.h"
- #include "ptrace/user.h"
---- a/src/ptrace/wait.c	2014-12-15 15:18:11.000000000 +0100
-+++ b/src/ptrace/wait.c	2015-07-12 13:16:41.930106019 +0200
-@@ -26,6 +26,7 @@
- #include <stdbool.h>    /* bool, true, false, */
- #include <signal.h>     /* SIG*, */
- #include <talloc.h>     /* talloc*, */
-+#include <linux/wait.h> /* __WALL, __WCLONE */
- 
- #include "ptrace/wait.h"
- #include "ptrace/ptrace.h"
---- a/src/tracee/tracee.c	2014-12-15 15:18:11.000000000 +0100
-+++ b/src/tracee/tracee.c	2015-07-12 13:20:01.058120375 +0200
-@@ -31,6 +31,11 @@
- #include <signal.h>     /* kill(2), SIGKILL, */
- #include <sys/ptrace.h> /* ptrace(2), PTRACE_*, */
- #include <errno.h>      /* E*, */
-+#include <linux/wait.h> /* __WALL, __WCLONE */
-+
-+#if !defined(__W_STOPCODE)
-+#define __W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
- 
- #include "tracee/tracee.h"
- #include "tracee/reg.h"
diff --git a/srcpkgs/proot/patches/loader.patch b/srcpkgs/proot/patches/loader.patch
deleted file mode 100644
index 3e0219545a19..000000000000
--- a/srcpkgs/proot/patches/loader.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d649854ddb66779950954aac99d960379c631a71 Mon Sep 17 00:00:00 2001
-From: Nicolas Cornu <ncornu@aldebaran.com>
-Date: Wed, 29 Jul 2015 14:52:57 +0200
-Subject: [PATCH] Fix use of size
-
----
- src/execve/enter.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git src/execve/enter.c b/src/execve/enter.c
-index 8f22d9c..4c163a1 100644
---- a/src/execve/enter.c
-+++ b/src/execve/enter.c
-@@ -454,10 +454,10 @@ static int expand_runner(Tracee* tracee, char host_path[PATH_MAX], char user_pat
- }
- 
- extern unsigned char _binary_loader_exe_start;
--extern unsigned char _binary_loader_exe_size;
-+extern unsigned char _binary_loader_exe_end;
- 
- extern unsigned char WEAK _binary_loader_m32_exe_start;
--extern unsigned char WEAK _binary_loader_m32_exe_size;
-+extern unsigned char WEAK _binary_loader_m32_exe_end;
- 
- /**
-  * Extract the built-in loader.  This function returns NULL if an
-@@ -483,11 +483,11 @@ static char *extract_loader(const Tracee *tracee, bool wants_32bit_version)
- 
- 	if (wants_32bit_version) {
- 		start = (void *) &_binary_loader_m32_exe_start;
--		size  = (size_t) &_binary_loader_m32_exe_size;
-+		size  = (size_t)(&_binary_loader_m32_exe_end-&_binary_loader_m32_exe_start);
- 	}
- 	else {
- 		start = (void *) &_binary_loader_exe_start;
--		size  = (size_t) &_binary_loader_exe_size;
-+		size  = (size_t) (&_binary_loader_exe_end-&_binary_loader_exe_start);
- 	}
- 
- 	status2 = write(fd, start, size);
diff --git a/srcpkgs/proot/patches/makefile-fix-vars.patch b/srcpkgs/proot/patches/makefile-fix-vars.patch
index b617f6f07b20..3136b007e6c4 100644
--- a/srcpkgs/proot/patches/makefile-fix-vars.patch
+++ b/srcpkgs/proot/patches/makefile-fix-vars.patch
@@ -1,6 +1,8 @@
+diff --git a/src/GNUmakefile b/src/GNUmakefile
+index 777b058..3f25193 100644
 --- a/src/GNUmakefile
 +++ b/src/GNUmakefile
-@@ -8,11 +8,11 @@
+@@ -8,11 +8,11 @@ SRC    = $(dir $(firstword $(MAKEFILE_LIST)))
  GIT      = git
  RM       = rm
  INSTALL  = install
@@ -13,10 +15,10 @@
 +STRIP    = :
 +OBJCOPY  ?= $(CROSS_COMPILE)objcopy
 +OBJDUMP  ?= $(CROSS_COMPILE)objdump
+ PYTHON   = python3
  
- CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I. -I$(VPATH)
- CFLAGS   += -Wall -Wextra -O2
-@@ -86,7 +86,7 @@
+ HAS_SWIG := $(shell swig -version 2>/dev/null)
+@@ -104,7 +104,7 @@ quiet_CC  = @echo "  CC	$@"; $(CC)
  quiet_LD  = @echo "  LD	$@"; $(LD)
  quiet_INSTALL = @echo "  INSTALL	$?"; $(INSTALL)
  
@@ -25,14 +27,3 @@
  ifeq ($(V), 0)
      quiet = quiet_
      Q     = @
-@@ -140,8 +140,8 @@
- 
- OBJIFY = $($(quiet)GEN)									\
- 	$(OBJCOPY)									\
--		--input binary								\
--		--output `env LANG=C $(OBJDUMP) -f cli/cli.o |				\
-+		--input-target binary \
-+		--output-target `env LANG=C $(OBJDUMP) -f cli/cli.o | \
- 			grep 'file format' | awk '{print $$4}'`				\
- 		--binary-architecture `env LANG=C $(OBJDUMP) -f cli/cli.o |		\
- 				grep architecture | cut -f 1 -d , | awk '{print $$2}'`	\
diff --git a/srcpkgs/proot/patches/musl_execinfo.patch b/srcpkgs/proot/patches/musl_execinfo.patch
deleted file mode 100644
index 901f8e7edd09..000000000000
--- a/srcpkgs/proot/patches/musl_execinfo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/cli/cli.c	2014-12-15 15:18:11.000000000 +0100
-+++ b/src/cli/cli.c	2015-07-12 13:18:46.548115003 +0200
-@@ -30,7 +30,9 @@
- #include <sys/types.h>     /* getpid(2),  */
- #include <unistd.h>        /* getpid(2),  */
- #include <errno.h>         /* errno(3), */
-+#if defined(__GLIBC__)
- #include <execinfo.h>      /* backtrace_symbols(3), */
-+#endif
- #include <limits.h>        /* INT_MAX, */
- 
- #include "cli/cli.h"
-@@ -555,6 +557,7 @@
- void __cyg_profile_func_enter(void *this_function, void *call_site) DONT_INSTRUMENT;
- void __cyg_profile_func_enter(void *this_function, void *call_site)
- {
-+#if defined(__GLIBC__)
- 	void *const pointers[] = { this_function, call_site };
- 	char **symbols = NULL;
- 
-@@ -567,6 +570,7 @@
- end:
- 	if (symbols != NULL)
- 		free(symbols);
-+#endif /* defined(__GLIBC__) */
- 
- 	if (indent_level < INT_MAX)
- 		indent_level++;
diff --git a/srcpkgs/proot/patches/ptrace_compat.patch b/srcpkgs/proot/patches/ptrace_compat.patch
index fb4318933e1d..731615ff18c6 100644
--- a/srcpkgs/proot/patches/ptrace_compat.patch
+++ b/srcpkgs/proot/patches/ptrace_compat.patch
@@ -1,5 +1,5 @@
---- a/src/tracee/tracee.h	2014-12-15 15:18:11.000000000 +0100
-+++ b/src/tracee/tracee.h	2015-07-12 13:12:10.726086466 +0200
+--- a/src/tracee/tracee.h      2014-12-15 15:18:11.000000000 +0100
++++ b/src/tracee/tracee.h      2021-09-30 00:24:54.834523917 -0700
 @@ -28,6 +28,9 @@
  #include <stdbool.h>   /* bool,  */
  #include <sys/queue.h> /* LIST_*, */
@@ -8,5 +8,5 @@
 +#include "ptrace_compat.h"
 +#endif
  #include <talloc.h>    /* talloc_*, */
- 
- #include "arch.h" /* word_t, user_regs_struct, */
+ #include <stdint.h>    /* *int*_t, */
+ #include <sys/wait.h>  /* __WAIT_* */
diff --git a/srcpkgs/proot/template b/srcpkgs/proot/template
index bf03af65a909..70594139d169 100644
--- a/srcpkgs/proot/template
+++ b/srcpkgs/proot/template
@@ -1,18 +1,20 @@
 # Template file for 'proot'
 pkgname=proot
-version=5.1.0
-revision=7
+version=5.2.0
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
+make_build_args="VERSION=${version}"
+hostmakedepends="pkg-config python3-docutils python3-lxml"
 makedepends="libarchive-devel talloc-devel"
 short_desc="User-space implementation of chroot, mount --bind, and binfmt_misc"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later"
 homepage="https://proot-me.github.io"
 distfiles="https://github.com/proot-me/PRoot/archive/v${version}.tar.gz"
-checksum=ce0a3baca8312613bd10f65bb436a3aaa28e1034f498a22c35ad0693600e01dd
+checksum=1f25f9ef147bc96c9d7cd23218b7a7229f149757d91c832482b1a865b52aa62e
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -25,5 +27,6 @@ pre_build() {
 
 do_install() {
 	vbin proot
+	make -C ../doc
 	vman ../doc/proot/man.1 proot.1
 }

From bb1a57159f91d3d798c1b37805915620652f4832 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 4 Nov 2021 16:22:26 -0400
Subject: [PATCH 2479/4088] coredns: update to 1.8.6.

---
 srcpkgs/coredns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index ebd7f2ce2af5..fe48c2347f91 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,6 +1,6 @@
 # Template file for 'coredns'
 pkgname=coredns
-version=1.7.1
+version=1.8.6
 revision=1
 build_style=go
 go_import_path=github.com/coredns/coredns
@@ -10,7 +10,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"
 homepage="https://coredns.io"
 distfiles="https://github.com/coredns/coredns/archive/v${version}.tar.gz"
-checksum=766455a8beb6728da1a0f9dfa9368badddd282db51c7abae5fa99c82bfb53882
+checksum=cbe3764afe2148b8047ea7e5cbba5108c298dee3a9a0391028e2980e35beaa2b
 make_dirs="/etc/coredns 0750 root root"
 
 _git_commit=f59c03d09c3a3a12f571ad1087b979325f3dae30

From 789fd6c9a583f7b6599d6d3487062105b37c88ce Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 25 Oct 2021 22:56:25 -0400
Subject: [PATCH 2480/4088] New package: hobbits-0.52.0

---
 srcpkgs/hobbits/patches/python_version.patch | 11 ++++++++
 srcpkgs/hobbits/template                     | 27 ++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/hobbits/patches/python_version.patch
 create mode 100644 srcpkgs/hobbits/template

diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
new file mode 100644
index 000000000000..47b1490c4b0a
--- /dev/null
+++ b/srcpkgs/hobbits/patches/python_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
++++ b/CMakeLists.txt	2021-10-25 21:16:59.429406408 -0400
+@@ -124,7 +124,7 @@
+ 	set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
+ endif()
+ 
+-find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED)
++find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
new file mode 100644
index 000000000000..4c5e752a0aaf
--- /dev/null
+++ b/srcpkgs/hobbits/template
@@ -0,0 +1,27 @@
+# Template file for 'hobbits'
+pkgname=hobbits
+version=0.52.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3"
+makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel"
+short_desc="Multi-platform GUI for bit-based analysis, processing and visualization"
+maintainer="classabbyamp <dev@kb6.ee>"
+license="MIT, GPL-2.0-or-later"
+homepage="https://mahlet-inc.github.io"
+distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz"
+checksum=3332e02380ab46649f0ec2066b63b6e0fb04b55cdca973d28880f1607ebbf27e
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
+esac
+
+pre_configure() {
+	# upstream provides no way to set the version through configure_args
+	echo "${version}" > .version
+}
+
+post_install() {
+	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	vlicense LICENSE.txt
+}

From 7ea6f0530395cd37cc21f7b9b1e37c991efe435e Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@dissimulo.com>
Date: Thu, 4 Nov 2021 19:37:39 +1100
Subject: [PATCH 2481/4088] g810-led: install udev rules

---
 srcpkgs/g810-led/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/g810-led/template b/srcpkgs/g810-led/template
index 57a8c4c124d9..d3ed6a0a0d0a 100644
--- a/srcpkgs/g810-led/template
+++ b/srcpkgs/g810-led/template
@@ -1,7 +1,7 @@
 # Template file for 'g810-led'
 pkgname=g810-led
 version=0.4.2
-revision=1
+revision=2
 build_style=gnu-makefile
 makedepends="hidapi-devel"
 short_desc="LED controller for Logitech G213,410,512,610,810,910,PRO keyboards"
@@ -18,6 +18,8 @@ do_install() {
 	done
 	vmkdir usr/lib
 	vcopy "lib/*.so.*" usr/lib
+	vmkdir usr/lib/udev/rules.d/
+	vinstall udev/g810-led.rules 0644 usr/lib/udev/rules.d 70-g810-led.rules
 	vdoc README.md
 	vdoc INSTALL.md
 	for i in sample_profiles/*; do

From ce2634ec83ce996293934ed1573359ad2a1d487c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 3 Nov 2021 10:00:26 +0100
Subject: [PATCH 2482/4088] rclone: update to 1.57.0

- Add mount helper
---
 srcpkgs/rclone/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 4f0d695053ae..a16eb3bd5e5b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,6 +1,6 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.56.2
+version=1.57.0
 revision=1
 wrksrc="rclone-v${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://rclone.org/"
 changelog="https://rclone.org/changelog/"
 distfiles="https://downloads.rclone.org/v${version}/rclone-v${version}.tar.gz"
-checksum=a8813d25c4640e52495fee83e525e76283c63f01d1cce8fbb58d8486b0c20c8a
+checksum=3a762c02c202a9142c2d5c1a3927563a556d1683abadd25d2f695e237e4ea693
 
 pre_build() {
 	if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -32,6 +32,7 @@ do_check() {
 }
 
 post_install() {
+	ln -sf rclone ${DESTDIR}/usr/bin/mount.rclone
 	vlicense COPYING
 	vman rclone.1
 }

From 8ad9ebae124593df07e330cb5cff7259c4e5c0ea Mon Sep 17 00:00:00 2001
From: Bikutoso <10584311+Bikutoso@users.noreply.github.com>
Date: Thu, 4 Nov 2021 13:42:12 +0100
Subject: [PATCH 2483/4088] makeself: update to 2.4.5.

---
 srcpkgs/makeself/patches/header.patch | 4 ++--
 srcpkgs/makeself/template             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/makeself/patches/header.patch b/srcpkgs/makeself/patches/header.patch
index a11442697dfd..1d07b6c7a4c9 100644
--- a/srcpkgs/makeself/patches/header.patch
+++ b/srcpkgs/makeself/patches/header.patch
@@ -1,11 +1,11 @@
 --- a/makeself.sh	2019-06-13 07:22:52.406415309 +0000
 +++ b/makeself.sh		2019-06-13 07:23:10.116346635 +0000
-@@ -185,7 +185,7 @@
+@@ -208,7 +208,7 @@
  TAR_EXTRA=""
  GPG_EXTRA=""
  DU_ARGS=-ks
 -HEADER=`dirname "$0"`/makeself-header.sh
 +HEADER=`dirname "$0"`/makeself-header
+ SIGNATURE=""
  TARGETDIR=""
  NOOVERWRITE=n
- DATE=`LC_ALL=C date`
diff --git a/srcpkgs/makeself/template b/srcpkgs/makeself/template
index 4c498dce7734..82f66c7dc534 100644
--- a/srcpkgs/makeself/template
+++ b/srcpkgs/makeself/template
@@ -1,14 +1,14 @@
 # Template file for 'makeself'
 pkgname=makeself
-version=2.4.2
-revision=2
+version=2.4.5
+revision=1
 wrksrc="makeself-release-${version}"
 short_desc="Make self-extractable archives on Unix"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://makeself.io"
 distfiles="https://github.com/megastep/makeself/archive/release-$version.tar.gz"
-checksum=8789312db5e93fc471a1e4fb88ec13227ef63a9c7aad297f3bbf35f9511f8d62
+checksum=91deafdbfddf130abe67d7546f0c50be6af6711bb1c351b768043bd527bd6e45
 
 do_install() {
 	vmkdir usr/share/man/man1

From 9c9f8b2b8473a0547bb3cb122dea30f0f22785fd Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Thu, 4 Nov 2021 02:21:06 -0400
Subject: [PATCH 2484/4088] opensm: update to 3.3.24

---
 srcpkgs/opensm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opensm/template b/srcpkgs/opensm/template
index 101bf3a27ce2..bb07688f4c51 100644
--- a/srcpkgs/opensm/template
+++ b/srcpkgs/opensm/template
@@ -1,16 +1,16 @@
 # Template file for 'opensm'
 pkgname=opensm
-version=3.3.22
+version=3.3.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake bison flex libtool"
 makedepends="rdma-core-devel"
 short_desc="InfiniBand Subnet Manager and Administrator"
-maintainer="Rich G <rich@richgannon.net>"
+maintainer="uhohspaghetios <rich@servermonkeys.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/linux-rdma/opensm"
 distfiles="https://github.com/linux-rdma/opensm/releases/download/${version}/opensm-${version}.tar.gz"
-checksum=1e0dc56a5cf5f8e5cd68bd534591405a5f5f1975ace40509f61a43cc2fe74ca7
+checksum=a3335e371a4b044427574dff9d324c6c334e502e8facdf58bc070ee151d7e460
 
 pre_configure() {
 	./autogen.sh

From 3b328fd5becfa4c847737779f44b73d6a3b41e27 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Thu, 4 Nov 2021 01:54:47 -0400
Subject: [PATCH 2485/4088] keepalived: update to 2.2.4

---
 srcpkgs/keepalived/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index af2d38eb6de8..c8dea3862abf 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,6 +1,6 @@
 # Template file for 'keepalived'
 pkgname=keepalived
-version=2.2.2
+version=2.2.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-sha1"
@@ -9,9 +9,9 @@ makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.keepalived.org/"
-distfiles="http://www.keepalived.org/software/${pkgname}-${version}.tar.gz"
-checksum=103692bd5345a4ed9f4581632ea636214fdf53e45682e200aab122c4fa674ece
+homepage="https://www.keepalived.org/"
+distfiles="https://www.keepalived.org/software/keepalived-${version}.tar.gz"
+checksum=0138d69087d44beaaa589527f0cfa6885958b320a837147d02b6b7df73ebc1df
 
 conf_files="/etc/keepalived/keepalived.conf"
 

From affe23fea76fcde386e6d309177754d19a97c406 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Thu, 4 Nov 2021 01:50:49 -0400
Subject: [PATCH 2486/4088] haproxy: update to 2.4.8

---
 srcpkgs/haproxy/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 40e6b2efc5c0..ffa473d66df3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.4
+version=2.4.8
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -11,8 +11,9 @@ short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
+changelog="https://www.haproxy.org/download/2.4/src/CHANGELOG"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=116b7329cebee5dab8ba47ad70feeabd0c91680d9ef68c28e41c34869920d1fe
+checksum=e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From 905de9d15088e85dadad9f54d1c3baaac1f2a045 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Thu, 4 Nov 2021 01:19:24 -0400
Subject: [PATCH 2487/4088] glusterfs: update to 9.4

---
 srcpkgs/glusterfs/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index da372c56c5fb..9fe039d4efeb 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
-version=9.0
-revision=2
+version=9.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
@@ -9,7 +9,7 @@ configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
 makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
- liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
+ liburcu-devel liburing-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"
 short_desc="Free and open source software scalable network filesystem (client)"
@@ -17,7 +17,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://www.gluster.org/"
 distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
-checksum=6f29ae4ab2c270ade0cd14a3f733d7d33fda78e79e81b148cd50711f65069d87
+checksum=07f360c9b43cb1101a857706494e310328e9d6a4e6b2f0697a3bc3f165c2652a
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="not yet supported";;

From b698a0a2e7c58fb62a757c05607d31e71dbe4ee6 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 4 Nov 2021 16:35:15 +0100
Subject: [PATCH 2488/4088] python3-pikepdf: update to 4.0.0.

---
 srcpkgs/python3-pikepdf/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 8a7e57ed946d..2ff62d25ecf0 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,19 +1,20 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=3.2.0
+version=4.0.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
 hostmakedepends="python3-pybind11 python3-setuptools_scm python3-wheel"
 makedepends="libqpdf-devel python3-pybind11"
-depends="python3-lxml python3-Pillow"
-checkdepends="python3-dateutil python3-hypothesis python3-psutil python3-pytest $depends"
+depends="python3-lxml python3-Pillow python3-setuptools"
+checkdepends="python3-dateutil python3-hypothesis python3-psutil python3-pytest
+ $depends"
 short_desc="Python library for reading and writing PDF files"
 maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a0582f00440668c07edb8403e82724961c7812c8e6c30655e34825b2645f15cd
+checksum=487be40a2ec463a272b4490396787c9fba2b0bbe6c44e7254e1867b1d3c02df9
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 01450dad0efe904f76fa9ee68db100965ca32aad Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 6 Nov 2021 14:52:29 +0100
Subject: [PATCH 2489/4088] syncthing: update to 1.18.4.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index a8d18c7c5c32..db74bf1f9e34 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.3
+version=1.18.4
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=b985779be61582c70e86d5e439d7a4a93eeeeed8bbc65de28d1e3d97aeb00e01
+checksum=ec4947d4119f21b50f444a0eb1d054c24db30cde0ac8a95261c8f3d122da4453
 
 pre_build() {
 	GOARCH= go generate \

From 0cd0f22d4cc2fbc4ae179c96a86b413345e2d55d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 6 Nov 2021 19:32:48 +0100
Subject: [PATCH 2490/4088] fakeroot: fix on musl

---
 srcpkgs/fakeroot/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template
index f9d2cf9bb085..b56fea7f19e1 100644
--- a/srcpkgs/fakeroot/template
+++ b/srcpkgs/fakeroot/template
@@ -1,7 +1,7 @@
 # Template file for 'fakeroot'
 pkgname=fakeroot
 version=1.25.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool"
@@ -39,6 +39,8 @@ post_patch() {
 		#ls doesn't report owner as root
 		vsed -i test/Makefile.am \
 			-e '/  t\.touchinstall/d'
+		vsed -i -i configure.ac \
+			-e 's/__${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}/${PRE}${FUNC}/'
 	fi
 }
 

From b3e0b75ea9bb00677d8721c94fd15a89368e6c8f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 6 Nov 2021 19:33:49 +0100
Subject: [PATCH 2491/4088] fakeroot: fix typo

---
 srcpkgs/fakeroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template
index b56fea7f19e1..46b0b07183e5 100644
--- a/srcpkgs/fakeroot/template
+++ b/srcpkgs/fakeroot/template
@@ -39,7 +39,7 @@ post_patch() {
 		#ls doesn't report owner as root
 		vsed -i test/Makefile.am \
 			-e '/  t\.touchinstall/d'
-		vsed -i -i configure.ac \
+		vsed -i configure.ac \
 			-e 's/__${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}/${PRE}${FUNC}/'
 	fi
 }

From 81ec7e7351bcac17617da6a558ab68d415c6df41 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 3 Nov 2021 04:01:25 +0200
Subject: [PATCH 2492/4088] gpsd: move libgpsdpacket.so under -devel subpackage

---
 srcpkgs/gpsd/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index cf2bb26beefb..668e3885487f 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -1,7 +1,7 @@
 # Template file for 'gpsd'
 pkgname=gpsd
 version=3.23.1
-revision=2
+revision=3
 build_style=scons
 make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin
  udevdir=/usr/lib/udev CC=${CC} qt_versioned=5"
@@ -105,6 +105,7 @@ gpsd-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/pkgconfig/libgps*.pc"
 		vmove usr/lib/libgps.so
+		vmove usr/lib/libgpsdpacket.so
 		vmove "usr/share/man/man3/libgps*"
 	}
 }

From 21f01b37b3616c4fa81b2e193129b482e9ffaa7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Nov 2021 21:22:17 +0100
Subject: [PATCH 2493/4088] libmygui: update to 3.4.1.

---
 common/shlibs                           |  2 +-
 srcpkgs/libmygui/patches/0001-OIS.patch | 11 -----------
 srcpkgs/libmygui/template               |  4 ++--
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/libmygui/patches/0001-OIS.patch

diff --git a/common/shlibs b/common/shlibs
index 60647122b3dd..422360f934a5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3055,7 +3055,7 @@ libsctp.so.1 lksctp-tools-1.0.17_1
 libwithsctp.so.1 lksctp-tools-1.0.17_1
 libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4
 libunshield.so.0 libunshield-0.6_1
-libMyGUIEngine.so.3.4.0 libmygui-3.4.0_1
+libMyGUIEngine.so.3.4.1 libmygui-3.4.1_1
 libproj.so.18 proj-6.3.0_1
 libnlopt.so.0 nlopt-2.4.2_1
 libeb.so.16 libeb-4.3.3_1
diff --git a/srcpkgs/libmygui/patches/0001-OIS.patch b/srcpkgs/libmygui/patches/0001-OIS.patch
deleted file mode 100644
index eaee573e4057..000000000000
--- a/srcpkgs/libmygui/patches/0001-OIS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Common/Input/OIS/InputManager.h	2015-01-26 16:32:35.000000000 +0100
-+++ b/Common/Input/OIS/InputManager.h2	2017-04-15 14:45:38.090187301 +0200
-@@ -8,7 +8,7 @@
- #define INPUT_MANAGER_H_
- 
- #include <MyGUI.h>
--#include <OIS.h>
-+#include <OIS/OIS.h>
- 
- namespace input
- {
diff --git a/srcpkgs/libmygui/template b/srcpkgs/libmygui/template
index 902ad67b0d58..bdc5f3628f37 100644
--- a/srcpkgs/libmygui/template
+++ b/srcpkgs/libmygui/template
@@ -1,6 +1,6 @@
 # Template file for 'mygui'
 pkgname=libmygui
-version=3.4.0
+version=3.4.1
 revision=1
 wrksrc="mygui-MyGUI${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="http://mygui.info"
 distfiles="https://github.com/MyGUI/mygui/archive/MyGUI${version}.tar.gz"
-checksum=d1d5f294670ae71f7200ed4b30859018281d8cfd45d6a38d18b97a4aba604c42
+checksum=bdf730bdeb4ad89e6b8223967db01aa5274d2b93adc2c0d6aa4842faeed4de1a
 
 libmygui-devel_package() {
 	short_desc+=" - development files"

From a842fae92c153396490c586c26ded5495a008ee8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Nov 2021 21:22:20 +0100
Subject: [PATCH 2494/4088] openmw: update to 0.47.0.

---
 srcpkgs/openmw/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index b6c7b8ffb587..581e2cbb081e 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,20 +1,24 @@
 # Template file for 'openmw'
 pkgname=openmw
-version=0.46.0
-revision=2
+version=0.47.0
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
-configure_args="-DDESIRED_QT_VERSION=5"
+# System bullet doesn't use double precision (double precision would break vdrift)
+# LTO gives a measurable performance boost, while not hurting compile time too much
+configure_args="-DDESIRED_QT_VERSION=5 -DOPENMW_USE_SYSTEM_BULLET=OFF
+ -DOPENMW_LTO_BUILD=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="SDL2-devel boost-devel bullet-devel ffmpeg-devel libXt-devel
- libmygui-devel libopenal-devel libunshield-devel osg-devel qt5-devel"
+makedepends="SDL2-devel boost-devel ffmpeg-devel libXt-devel
+ libmygui-devel libopenal-devel libunshield-devel osg-devel qt5-devel
+ liblz4-devel"
 short_desc="Open Implementation of Morrowind's Engine"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="http://openmw.org"
-changelog="https://openmw.org/2018/openmw-0-44-0-released/"
+changelog="https://openmw.org/2021/openmw-0-47-0-released/"
 distfiles="https://gitlab.com/OpenMW/openmw/-/archive/openmw-${version}/openmw-openmw-${version}.tar.gz"
-checksum=07a35a8f15f67f5aa7210c2a307a6db5660a9b61fe34983c35b172c8671afd58
+checksum=bd7f77e1527c2180e9b0dfcbe401d6fb48f24dbb37701dac7747697873d6edb4
 
 if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
 	broken="https://gitlab.com/OpenMW/openmw/issues/564"
@@ -31,7 +35,7 @@ openmw-cs_package() {
 		vmove usr/bin/openmw-cs
 		vmove usr/share/applications/org.openmw.cs.desktop
 		vmove usr/share/pixmaps/openmw-cs.png
-		vmove etc/openmw/openmw-cs.cfg
+		vmove etc/openmw/defaults-cs.bin
 	}
 }
 

From 0b0a8c3dd013ef2e41582d15a8765c99052917e1 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Thu, 4 Nov 2021 02:14:41 -0400
Subject: [PATCH 2495/4088] bind: update to 9.16.22

---
 common/shlibs         | 14 +++++++-------
 srcpkgs/bind/template |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 422360f934a5..99da7f5200bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -987,13 +987,13 @@ libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
 libtirpc.so.3 libtirpc-1.0.2_1
 libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9-9.16.15.so bind-libs-9.16.15_1
-libdns-9.16.15.so bind-libs-9.16.15_1
-libirs-9.16.15.so bind-libs-9.16.15_1
-libisc-9.16.15.so bind-libs-9.16.15_1
-libisccc-9.16.15.so bind-libs-9.16.15_1
-libisccfg-9.16.15.so bind-libs-9.16.15_1
-libns-9.16.15.so bind-libs-9.16.15_1
+libbind9-9.16.22.so bind-libs-9.16.22_1
+libdns-9.16.22.so bind-libs-9.16.22_1
+libirs-9.16.22.so bind-libs-9.16.22_1
+libisc-9.16.22.so bind-libs-9.16.22_1
+libisccc-9.16.22.so bind-libs-9.16.22_1
+libisccfg-9.16.22.so bind-libs-9.16.22_1
+libns-9.16.22.so bind-libs-9.16.22_1
 libplist-2.0.so.3 libplist-2.2.0_1
 libplist++-2.0.so.3 libplist++-2.2.0_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 81641dd20990..4021b3875670 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,6 +1,6 @@
 # Template file for 'bind'
 pkgname=bind
-version=9.16.15
+version=9.16.22
 revision=1
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
@@ -19,7 +19,7 @@ license="MPL-2.0"
 homepage="https://www.isc.org/downloads/bind/"
 changelog="https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/CHANGES"
 distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.xz"
-checksum=98b6f432d878a7bf8f57eb7b3c28be27278cf6b9989154bfe6c81104b38e7839
+checksum=65e7b2af6479db346e2fc99bcfb6ec3240066468e09dbec575ebc7c57d994061
 # guarantee subpackage ordering
 subpackages="bind-libs bind-utils bind-devel"
 # requires special network setup

From 79b23fd2cd04ac2329bad7933e73e25aabdd7891 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Thu, 4 Nov 2021 17:05:05 +0200
Subject: [PATCH 2496/4088] mpv: update to 0.34.0

---
 srcpkgs/mpv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f3ac99c6c335..e7fe729f33d4 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.33.1
+version=0.34.0
 revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
@@ -29,7 +29,7 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
+checksum=f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 48de60447a66c227fa45a4102c70ace03ce94ece Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Thu, 4 Nov 2021 17:12:16 +0200
Subject: [PATCH 2497/4088] libplacebo: update to 4.157.0.

Build for armv6l-musl fails without libatomic explicitly set.
---
 common/shlibs               | 2 +-
 srcpkgs/libplacebo/template | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 99da7f5200bc..1011051af4d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3436,7 +3436,7 @@ libSoapySDR.so.0.7 SoapySDR-0.7.0_1
 libeditorconfig.so.0 editorconfig-0.12.2_1
 libcfitsio.so.9 cfitsio-3.480_1
 libapparmor.so.1 libapparmor-2.12.0_1
-libplacebo.so.72 libplacebo-2.72.0_1
+libplacebo.so.157 libplacebo-4.157.0_1
 libw2xc.so waifu2x-converter-cpp-5.2_1
 libnova-0.15.so.0 libnova-0.15.0_1
 libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index 9d843e26af13..365249d96515 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,6 +1,6 @@
 # Template file for 'libplacebo'
 pkgname=libplacebo
-version=2.72.2
+version=4.157.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -14,7 +14,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://code.videolan.org/videolan/libplacebo"
 distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz"
-checksum=5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979
+checksum=8ee7773fb7813520b6b1e5f8f207cdf0071a7cf48ca0ce871e956ae6f4d0d538
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -latomic"
+fi
 
 build_options="lcms opengl"
 build_options_default="lcms opengl"

From 4924eec63d333327051ed1b0627de4ebcf5994fd Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Wed, 3 Nov 2021 16:15:06 +0200
Subject: [PATCH 2498/4088] vlc: revbump for libplacebo-4.157.0.

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index c18324de4345..99281ee664bf 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread

From 0bf0edd910d961bd0a6f09baa293a02f2feb1d71 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Nov 2021 15:41:14 +0100
Subject: [PATCH 2499/4088] New package: linux5.15-5.15.1

---
 srcpkgs/linux5.15-dbg                         |     1 +
 srcpkgs/linux5.15-headers                     |     1 +
 srcpkgs/linux5.15/files/arm64-dotconfig       | 12023 ++++++++++++++++
 srcpkgs/linux5.15/files/i386-dotconfig        | 10253 +++++++++++++
 srcpkgs/linux5.15/files/mv-debug              |     7 +
 srcpkgs/linux5.15/files/ppc-dotconfig         |  8320 +++++++++++
 srcpkgs/linux5.15/files/ppc64-dotconfig       | 10346 +++++++++++++
 srcpkgs/linux5.15/files/ppc64le-dotconfig     | 10072 +++++++++++++
 srcpkgs/linux5.15/files/x86_64-dotconfig      | 10479 ++++++++++++++
 .../linux5.15/patches/fix-musl-objtool.patch  |    16 +
 srcpkgs/linux5.15/patches/ppc-vas-on-4k.patch |    13 +
 .../linux5.15/patches/ppc64-be-elfv2.patch    |    86 +
 srcpkgs/linux5.15/template                    |   325 +
 13 files changed, 61942 insertions(+)
 create mode 120000 srcpkgs/linux5.15-dbg
 create mode 120000 srcpkgs/linux5.15-headers
 create mode 100644 srcpkgs/linux5.15/files/arm64-dotconfig
 create mode 100644 srcpkgs/linux5.15/files/i386-dotconfig
 create mode 100755 srcpkgs/linux5.15/files/mv-debug
 create mode 100644 srcpkgs/linux5.15/files/ppc-dotconfig
 create mode 100644 srcpkgs/linux5.15/files/ppc64-dotconfig
 create mode 100644 srcpkgs/linux5.15/files/ppc64le-dotconfig
 create mode 100644 srcpkgs/linux5.15/files/x86_64-dotconfig
 create mode 100644 srcpkgs/linux5.15/patches/fix-musl-objtool.patch
 create mode 100644 srcpkgs/linux5.15/patches/ppc-vas-on-4k.patch
 create mode 100644 srcpkgs/linux5.15/patches/ppc64-be-elfv2.patch
 create mode 100644 srcpkgs/linux5.15/template

diff --git a/srcpkgs/linux5.15-dbg b/srcpkgs/linux5.15-dbg
new file mode 120000
index 000000000000..9880cc897b79
--- /dev/null
+++ b/srcpkgs/linux5.15-dbg
@@ -0,0 +1 @@
+linux5.15
\ No newline at end of file
diff --git a/srcpkgs/linux5.15-headers b/srcpkgs/linux5.15-headers
new file mode 120000
index 000000000000..9880cc897b79
--- /dev/null
+++ b/srcpkgs/linux5.15-headers
@@ -0,0 +1 @@
+linux5.15
\ No newline at end of file
diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
new file mode 100644
index 000000000000..e75c7ade762a
--- /dev/null
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -0,0 +1,12023 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm64 5.15.0 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=100201
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23501
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23501
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=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_WERROR is not set
+CONFIG_LOCALVERSION="_1"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_SIM=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
+CONFIG_GENERIC_IRQ_IPI=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_MSI_IOMMU=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_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_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+CONFIG_USERMODE_DRIVER=y
+# CONFIG_BPF_PRELOAD is not set
+CONFIG_BPF_LSM=y
+# end of BPF subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_SCHED_CORE=y
+
+#
+# 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_PRINTK_INDEX is not set
+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_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_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_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_HAVE_ARCH_USERFAULTFD_MINOR=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=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_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_ARM64=y
+CONFIG_64BIT=y
+CONFIG_MMU=y
+CONFIG_ARM64_PAGE_SHIFT=12
+CONFIG_ARM64_CONT_PTE_SHIFT=4
+CONFIG_ARM64_CONT_PMD_SHIFT=4
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CSUM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=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_SUNXI=y
+CONFIG_ARCH_ALPINE=y
+CONFIG_ARCH_APPLE=y
+CONFIG_ARCH_BCM2835=y
+CONFIG_ARCH_BCM4908=y
+CONFIG_ARCH_BCM_IPROC=y
+CONFIG_ARCH_BERLIN=y
+CONFIG_ARCH_BITMAIN=y
+CONFIG_ARCH_BRCMSTB=y
+CONFIG_ARCH_EXYNOS=y
+CONFIG_ARCH_SPARX5=y
+# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_LAYERSCAPE=y
+CONFIG_ARCH_LG1K=y
+CONFIG_ARCH_HISI=y
+CONFIG_ARCH_KEEMBAY=y
+CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_MESON=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_MXC=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_REALTEK=y
+# CONFIG_ARCH_RENESAS is not set
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_S32=y
+CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_INTEL_SOCFPGA=y
+CONFIG_ARCH_SYNQUACER=y
+CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_SPRD=y
+CONFIG_ARCH_THUNDER=y
+CONFIG_ARCH_THUNDER2=y
+# CONFIG_ARCH_UNIPHIER is not set
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VISCONTI=y
+CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_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_LD_HAS_FIX_ERRATUM_843419=y
+CONFIG_ARM64_ERRATUM_1024718=y
+CONFIG_ARM64_ERRATUM_1418040=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
+CONFIG_ARM64_ERRATUM_1165522=y
+CONFIG_ARM64_ERRATUM_1319367=y
+CONFIG_ARM64_ERRATUM_1530923=y
+CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
+CONFIG_ARM64_ERRATUM_1286807=y
+CONFIG_ARM64_ERRATUM_1463225=y
+CONFIG_ARM64_ERRATUM_1542419=y
+CONFIG_ARM64_ERRATUM_1508412=y
+CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23144=y
+CONFIG_CAVIUM_ERRATUM_23154=y
+CONFIG_CAVIUM_ERRATUM_27456=y
+CONFIG_CAVIUM_ERRATUM_30115=y
+CONFIG_CAVIUM_TX2_ERRATUM_219=y
+CONFIG_FUJITSU_ERRATUM_010001=y
+CONFIG_HISILICON_ERRATUM_161600802=y
+CONFIG_QCOM_FALKOR_ERRATUM_1003=y
+CONFIG_QCOM_FALKOR_ERRATUM_1009=y
+CONFIG_QCOM_QDF2400_ERRATUM_0065=y
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=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_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+CONFIG_SCHED_HRTICK=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_KEXEC=y
+# CONFIG_KEXEC_FILE is not set
+CONFIG_CRASH_DUMP=y
+CONFIG_TRANS_TABLE=y
+# CONFIG_XEN is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
+# CONFIG_ARM64_SW_TTBR0_PAN is not set
+CONFIG_ARM64_TAGGED_ADDR_ABI=y
+CONFIG_COMPAT=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+
+#
+# ARMv8.1 architectural features
+#
+CONFIG_ARM64_HW_AFDBM=y
+CONFIG_ARM64_PAN=y
+CONFIG_AS_HAS_LDAPR=y
+CONFIG_AS_HAS_LSE_ATOMICS=y
+CONFIG_ARM64_LSE_ATOMICS=y
+CONFIG_ARM64_USE_LSE_ATOMICS=y
+# end of ARMv8.1 architectural features
+
+#
+# ARMv8.2 architectural features
+#
+CONFIG_ARM64_PMEM=y
+CONFIG_ARM64_RAS_EXTN=y
+CONFIG_ARM64_CNP=y
+# end of ARMv8.2 architectural features
+
+#
+# ARMv8.3 architectural features
+#
+CONFIG_ARM64_PTR_AUTH=y
+CONFIG_ARM64_PTR_AUTH_KERNEL=y
+CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
+CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
+CONFIG_AS_HAS_PAC=y
+CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
+# end of ARMv8.3 architectural features
+
+#
+# ARMv8.4 architectural features
+#
+CONFIG_ARM64_AMU_EXTN=y
+CONFIG_AS_HAS_ARMV8_4=y
+CONFIG_ARM64_TLB_RANGE=y
+# end of ARMv8.4 architectural features
+
+#
+# ARMv8.5 architectural features
+#
+CONFIG_AS_HAS_ARMV8_5=y
+CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
+CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
+CONFIG_ARM64_E0PD=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_ARM64_AS_HAS_MTE=y
+CONFIG_ARM64_MTE=y
+# end of ARMv8.5 architectural features
+
+#
+# ARMv8.7 architectural features
+#
+CONFIG_ARM64_EPAN=y
+# end of ARMv8.7 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
+
+#
+# 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_ACPI_CPPC_CPUFREQ_FIE=y
+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_MEDIATEK_CPUFREQ_HW=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
+
+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_PLATFORM_PROFILE=m
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HED=y
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
+CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
+CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_HMAT=y
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_SEA=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_ACPI_IORT=y
+CONFIG_ACPI_GTDT=y
+CONFIG_ACPI_PPTT=y
+CONFIG_PMIC_OPREGION=y
+CONFIG_ACPI_VIOT=y
+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_XFER_TO_GUEST_WORK=y
+# CONFIG_NVHE_EL2_DEBUG is not set
+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_TRACE_IRQFLAGS_SUPPORT=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_ARCH_WANTS_NO_INSTR=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=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_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_HAVE_ARCH_COMPILER_H=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_RELR=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_GZIP is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_DEV_BSG_COMMON=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_WBT=y
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+# CONFIG_BLK_CGROUP_FC_APPID is not set
+CONFIG_BLK_CGROUP_IOCOST=y
+CONFIG_BLK_CGROUP_IOPRIO=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
+CONFIG_BLOCK_HOLDER_DEPRECATED=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_SPARSEMEM=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_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_MHP_MEMMAP_ON_MEMORY=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SYSFS=y
+CONFIG_CMA_AREAS=7
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
+CONFIG_PAGE_IDLE_FLAG=y
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
+CONFIG_DEVICE_PRIVATE=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+CONFIG_READ_ONLY_THP_FOR_FS=y
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_SECRETMEM=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_DBGFS=y
+# end of Data Access Monitoring
+# 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_AF_UNIX_OOB=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_IPV6_IOAM6_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_HOOK=m
+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_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XTABLES_COMPAT=y
+
+#
+# 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
+CONFIG_IP_VS_TWOS=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_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BPFILTER=y
+# CONFIG_BPFILTER_UMH is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_MEDIA_IB is not set
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+# CONFIG_BRIDGE_CFM is not set
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=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_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_NET_TC_SKB_EXT=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=m
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BATMAN_V=y
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+CONFIG_BATMAN_ADV_DEBUG=y
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+CONFIG_NET_NCSI=y
+CONFIG_NCSI_OEM_CMD_GET_MAC=y
+# CONFIG_NCSI_OEM_CMD_KEEP_PHY is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=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_STREAM_PARSER=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
+CONFIG_CAN_ISOTP=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_FLEXCAN=m
+# CONFIG_CAN_GRCAN is not set
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_XILINXCAN=m
+CONFIG_CAN_C_CAN=m
+# CONFIG_CAN_C_CAN_PLATFORM is not set
+CONFIG_CAN_C_CAN_PCI=m
+# CONFIG_CAN_CC770 is not set
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PCI=m
+CONFIG_CAN_M_CAN_PLATFORM=m
+CONFIG_CAN_M_CAN_TCAN4X5X=m
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_F81601=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PLX_PCI=m
+# CONFIG_CAN_SJA1000_ISA is not set
+# CONFIG_CAN_SJA1000_PLATFORM is not set
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_HI311X=m
+# CONFIG_CAN_MCP251X is not set
+# CONFIG_CAN_MCP251XFD is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_ETAS_ES58X=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_AOSPEXT=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
+CONFIG_BT_VIRTIO=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_MCTP=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+# CONFIG_NFC_TRF7970A is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_VIRTUAL_NCI=m
+# CONFIG_NFC_FDP is not set
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_ST21NFCA=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_S3FWRN82_UART=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=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_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_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+CONFIG_PCI_AARDVARK=y
+CONFIG_PCIE_XILINX_NWL=y
+CONFIG_PCI_FTPCI100=y
+CONFIG_PCI_TEGRA=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_XILINX=y
+CONFIG_PCIE_XILINX_CPM=y
+CONFIG_PCI_XGENE=y
+CONFIG_PCI_XGENE_MSI=y
+CONFIG_PCIE_IPROC=m
+CONFIG_PCIE_IPROC_PLATFORM=m
+CONFIG_PCIE_IPROC_MSI=y
+CONFIG_PCIE_ALTERA=y
+CONFIG_PCIE_ALTERA_MSI=y
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCIE_ROCKCHIP_EP=y
+CONFIG_PCIE_MEDIATEK=y
+CONFIG_PCIE_MEDIATEK_GEN3=m
+CONFIG_PCIE_BRCMSTB=m
+CONFIG_PCIE_MICROCHIP_HOST=y
+CONFIG_PCIE_HISI_ERR=y
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCIE_DW_EP=y
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCIE_DW_PLAT_EP=y
+CONFIG_PCI_EXYNOS=y
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCI_LAYERSCAPE_EP=y
+CONFIG_PCI_HISI=y
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_ROCKCHIP_DW_HOST=y
+CONFIG_PCIE_KEEMBAY=y
+CONFIG_PCIE_KEEMBAY_HOST=y
+CONFIG_PCIE_KEEMBAY_EP=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_VISCONTI_HOST=y
+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
+CONFIG_PCI_EPF_NTB=m
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=m
+CONFIG_CXL_MEM=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_ACPI=m
+CONFIG_CXL_PMEM=m
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_RAPIDIO=m
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+# CONFIG_RAPIDIO_DEBUG is not set
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_CACHE=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
+CONFIG_REGMAP_SOUNDWIRE_MBQ=m
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_I3C=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+CONFIG_GENERIC_ARCH_NUMA=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_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_FSL_MC_UAPI_SUPPORT=y
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
+CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_HAVE_MSG=y
+CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+CONFIG_ARM_SCMI_TRANSPORT_VIRTIO=y
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+# end of ARM System Control and Management Interface Protocol
+
+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_SYSFB=y
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_TURRIS_MOX_RWTM=m
+CONFIG_ARM_FFA_TRANSPORT=m
+CONFIG_ARM_FFA_SMCCC=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_SOFT_RESERVE=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB=y
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=m
+# CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_ARM=y
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+CONFIG_IMX_DSP=m
+CONFIG_IMX_SCU=y
+CONFIG_IMX_SCU_PD=y
+CONFIG_MESON_SM=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
+
+#
+# Tegra firmware driver
+#
+CONFIG_TEGRA_IVC=y
+CONFIG_TEGRA_BPMP=y
+# end of Tegra firmware driver
+
+#
+# Zynq MPSoC Firmware Drivers
+#
+CONFIG_ZYNQMP_FIRMWARE=y
+# CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set
+# end of Zynq MPSoC Firmware Drivers
+# end of Firmware Drivers
+
+CONFIG_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_OF_PARTS_BCM4908=y
+CONFIG_MTD_OF_PARTS_LINKSYS_NS=y
+CONFIG_MTD_AFS_PARTS=m
+CONFIG_MTD_PARSER_TRX=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
+CONFIG_MTD_QCOMSMEM_PARTS=m
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+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_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_MCHP48L640=m
+# CONFIG_MTD_SST25L is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+# CONFIG_MTD_NAND_DENALI_PCI is not set
+CONFIG_MTD_NAND_DENALI_DT=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_BRCMNAND is not set
+CONFIG_MTD_NAND_GPMI_NAND=m
+CONFIG_MTD_NAND_FSL_IFC=m
+CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=m
+CONFIG_MTD_NAND_HISI504=m
+CONFIG_MTD_NAND_QCOM=m
+CONFIG_MTD_NAND_MTK=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_TEGRA=m
+CONFIG_MTD_NAND_MESON=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_CADENCE=m
+CONFIG_MTD_NAND_ARASAN=m
+CONFIG_MTD_NAND_INTEL_LGM=m
+CONFIG_MTD_NAND_ROCKCHIP=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+CONFIG_SPI_HISI_SFC=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+CONFIG_HBMC_AM654=m
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
+CONFIG_OF_NUMA=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_CDROM=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=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_HI6421V600_IRQ=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_DW_XDATA_PCIE=m
+CONFIG_PCI_ENDPOINT_TEST=m
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_HISI_HIKEY_USB=m
+CONFIG_C2PORT=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+CONFIG_ECHO=m
+CONFIG_BCM_VK=m
+# CONFIG_BCM_VK_TTY is not set
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
+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_BLK_DEV_BSG=y
+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_HISI_SAS_DEBUGFS_DEFAULT_ENABLE is not set
+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_MPI3MR=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_UFS_HPB=y
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_HYPERV_STORAGE=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_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_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_HAVE_PATA_PLATFORM=y
+CONFIG_ATA=y
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_ZPODD is not set
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_BRCM=m
+CONFIG_AHCI_IMX=m
+CONFIG_AHCI_CEVA=m
+CONFIG_AHCI_MTK=m
+CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_AHCI_TEGRA=m
+CONFIG_AHCI_XGENE=m
+CONFIG_AHCI_QORIQ=m
+CONFIG_SATA_AHCI_SEATTLE=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+CONFIG_SATA_DWC_OLD_DMA=y
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IMX=m
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+# CONFIG_PATA_OF_PLATFORM is not set
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_PATA_ACPI is not set
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_EBS=m
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_MHI_NET=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+CONFIG_ATM_ENI_TUNE_BURST=y
+CONFIG_ATM_ENI_BURST_TX_16W=y
+CONFIG_ATM_ENI_BURST_TX_8W=y
+CONFIG_ATM_ENI_BURST_TX_4W=y
+CONFIG_ATM_ENI_BURST_TX_2W=y
+CONFIG_ATM_ENI_BURST_RX_16W=y
+CONFIG_ATM_ENI_BURST_RX_8W=y
+CONFIG_ATM_ENI_BURST_RX_4W=y
+CONFIG_ATM_ENI_BURST_RX_2W=y
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+# CONFIG_CAIF_DRIVERS is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+CONFIG_NET_DSA_BCM_SF2=m
+CONFIG_NET_DSA_LOOP=m
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_MSCC_FELIX=m
+CONFIG_NET_DSA_MSCC_SEVILLE=m
+# CONFIG_NET_DSA_AR9331 is not set
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+CONFIG_NET_DSA_SJA1105_TAS=y
+CONFIG_NET_DSA_SJA1105_VL=y
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+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_ACTIONS=y
+CONFIG_OWL_EMAC=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_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCM4908_ENET=m
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_BGMAC=m
+CONFIG_BGMAC_PLATFORM=m
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+CONFIG_CHELSIO_IPSEC_INLINE=m
+CONFIG_CHELSIO_TLS_DEVICE=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_GEMINI_ETHERNET=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=m
+CONFIG_FSL_FMAN=m
+CONFIG_DPAA_ERRATUM_A050385=y
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
+CONFIG_GIANFAR=m
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_SWITCH=m
+CONFIG_FSL_ENETC=m
+CONFIG_FSL_ENETC_VF=m
+CONFIG_FSL_ENETC_IERB=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_NET_VENDOR_MICROSOFT=y
+CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_LITEX_LITEETH=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_MVNETA=m
+CONFIG_MVPP2=m
+CONFIG_MVPP2_PTP=y
+# CONFIG_PXA168_ETH is not set
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_OCTEONTX2_MBOX=m
+CONFIG_OCTEONTX2_AF=m
+# CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
+CONFIG_OCTEONTX2_PF=m
+CONFIG_OCTEONTX2_VF=m
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MEDIATEK=y
+CONFIG_NET_MEDIATEK_SOC=m
+CONFIG_NET_MEDIATEK_STAR_EMAC=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+CONFIG_MLX5_FPGA=y
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CLS_ACT=y
+CONFIG_MLX5_TC_CT=y
+CONFIG_MLX5_TC_SAMPLE=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_MLX5_SF=y
+CONFIG_MLX5_SF_MANAGER=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_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_MLXBF_GIGE=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_SPARX5_SWITCH=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+CONFIG_NFP_APP_FLOWER=y
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_IONIC=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCA7000=m
+CONFIG_QCA7000_SPI=m
+CONFIG_QCA7000_UART=m
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_SNI_NETSEC=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_DWC_QOS_ETH=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MEDIATEK=m
+CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SOCFPGA=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
+CONFIG_DWMAC_IMX8=m
+CONFIG_DWMAC_INTEL_PLAT=m
+CONFIG_DWMAC_VISCONTI=m
+CONFIG_DWMAC_LOONGSON=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_EMACLITE=m
+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_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_QCOM_IPA=m
+# CONFIG_NET_SB1000 is not set
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+CONFIG_MESON_GXL_PHY=m
+CONFIG_ADIN_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=y
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_OF_MDIO=y
+CONFIG_ACPI_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_SUN4I=m
+CONFIG_MDIO_XGENE=y
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BCM_IPROC is not set
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_IPQ4019=m
+CONFIG_MDIO_IPQ8064=m
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_MESON_G12A=m
+CONFIG_MDIO_BUS_MUX_BCM_IPROC=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HWRNG=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+# CONFIG_WIL6210_DEBUGFS is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_AHB=y
+CONFIG_ATH10K_SDIO=m
+CONFIG_ATH10K_USB=m
+CONFIG_ATH10K_SNOC=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_AHB=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K_DEBUGFS=y
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_ATH11K_SPECTRAL=y
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+CONFIG_IPW2100_DEBUG=y
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+CONFIG_IPW2200_DEBUG=y
+CONFIG_LIBIPW=m
+CONFIG_LIBIPW_DEBUG=y
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# CONFIG_IWLEGACY_DEBUGFS is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+
+#
+# Debugging Options
+#
+CONFIG_IWLWIFI_DEBUG=y
+CONFIG_IWLWIFI_DEBUGFS=y
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_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_MT76_CONNAC_LIB=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_MT7921E=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+# CONFIG_CW1200_WLAN_SPI is not set
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+# CONFIG_WILINK_PLATFORM_DATA is not set
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_AT86RF230 is not set
+# CONFIG_IEEE802154_MRF24J40 is not set
+# CONFIG_IEEE802154_CC2520 is not set
+# CONFIG_IEEE802154_ATUSB is not set
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+CONFIG_IEEE802154_CA8210_DEBUGFS=y
+CONFIG_IEEE802154_MCR20A=m
+CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+CONFIG_WWAN_HWSIM=m
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+# end of Wireless WAN
+
+CONFIG_VMXNET3=m
+# CONFIG_FUJITSU_ES is not set
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
+CONFIG_KEYBOARD_IMX=m
+CONFIG_KEYBOARD_IMX_SC_KEY=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_KEYBOARD_OPENCORES=m
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_SUN4I_LRADC=m
+CONFIG_KEYBOARD_IQS62X=m
+# CONFIG_KEYBOARD_OMAP4 is not set
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_CAP11XX=m
+# CONFIG_KEYBOARD_BCM is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_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_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_ILITEK=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_MSG2638=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
+CONFIG_TOUCHSCREEN_SUN4I=m
+CONFIG_TOUCHSCREEN_SUR40=m
+# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+# CONFIG_INPUT_AD714X_SPI is not set
+CONFIG_INPUT_ATC260X_ONKEY=m
+CONFIG_INPUT_ATMEL_CAPTOUCH=m
+CONFIG_INPUT_BMA150=m
+# CONFIG_INPUT_E3X0_BUTTON is not set
+CONFIG_INPUT_PM8941_PWRKEY=m
+CONFIG_INPUT_PM8XXX_VIBRATOR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
+CONFIG_INPUT_MMA8450=m
+# CONFIG_INPUT_GPIO_BEEPER is not set
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_CPCAP_PWRBUTTON=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_RK805_PWRKEY=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_DA7280_HAPTICS=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_INPUT_SC27XX_VIBRA=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F3A=y
+CONFIG_RMI4_F54=y
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_PARKBD=m
+# CONFIG_SERIO_AMBAKMI is not set
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_SERIO_ARC_PS2 is not set
+CONFIG_SERIO_APBPS2=m
+CONFIG_HYPERV_KEYBOARD=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_8250_BCM7271=m
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
+# CONFIG_SERIAL_KGDB_NMI is not set
+CONFIG_SERIAL_MESON=y
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_UARTS_4=y
+CONFIG_SERIAL_SAMSUNG_UARTS=4
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_TEGRA_TCU=m
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_EARLYCON=y
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_QCOM_GENI=y
+CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
+# CONFIG_SERIAL_SIFIVE is not set
+# CONFIG_SERIAL_QE is not set
+# CONFIG_SERIAL_SCCNXP is not set
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_BCM63XX=y
+CONFIG_SERIAL_BCM63XX_CONSOLE=y
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+CONFIG_SERIAL_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_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+# CONFIG_HVC_DCC is not set
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+# CONFIG_TTY_PRINTK is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+CONFIG_IPMI_PANIC_EVENT=y
+# CONFIG_IPMI_PANIC_STRING is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_IPMB_DEVICE_INTERFACE=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_IPROC_RNG200=m
+CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_HISI=m
+CONFIG_HW_RANDOM_XGENE=m
+CONFIG_HW_RANDOM_MESON=m
+CONFIG_HW_RANDOM_CAVIUM=m
+CONFIG_HW_RANDOM_MTK=m
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=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_DEVPORT=y
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_TIS_SYNQUACER=m
+CONFIG_TCG_TIS_I2C_CR50=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_XILLYBUS_CLASS=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYBUS_OF=m
+CONFIG_XILLYUSB=m
+CONFIG_RANDOM_TRUST_CPU=y
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
+
+#
+# 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_ALTERA=m
+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_HISI=m
+CONFIG_I2C_IMX=m
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_MLXBF=m
+CONFIG_I2C_MESON=m
+CONFIG_I2C_MT65XX=m
+CONFIG_I2C_MV64XXX=m
+# CONFIG_I2C_NOMADIK is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_OWL=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PXA=m
+# CONFIG_I2C_PXA_SLAVE is not set
+CONFIG_I2C_QCOM_CCI=m
+CONFIG_I2C_QCOM_GENI=m
+CONFIG_I2C_QUP=m
+CONFIG_I2C_RK3X=m
+# CONFIG_I2C_SIMTEC is not set
+CONFIG_I2C_SPRD=y
+CONFIG_I2C_SYNQUACER=m
+CONFIG_I2C_TEGRA=m
+CONFIG_I2C_TEGRA_BPMP=m
+# CONFIG_I2C_VERSATILE is not set
+CONFIG_I2C_THUNDERX=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_XLP9XX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_CP2615=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_VIRTIO=m
+# end of I2C Hardware Bus support
+
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_I2C_SLAVE_TESTUNIT=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+CONFIG_MIPI_I3C_HCI=m
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_ALTERA_CORE=m
+CONFIG_SPI_ALTERA_DFL=m
+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_KUNPENG=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_ROCKCHIP_SFC=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_TEGRA210_QUAD=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_HISI3670=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_OPTIONAL=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_KVM=m
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_OCP=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_AMD=m
+CONFIG_PINCTRL_BM1880=y
+CONFIG_PINCTRL_MCP23S08_I2C=m
+CONFIG_PINCTRL_MCP23S08_SPI=m
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
+CONFIG_PINCTRL_MAX77620=m
+CONFIG_PINCTRL_ZYNQMP=m
+CONFIG_PINCTRL_RK805=m
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_MICROCHIP_SGPIO=y
+CONFIG_PINCTRL_KEEMBAY=m
+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_IMX8ULP=y
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_AP806=y
+CONFIG_PINCTRL_ARMADA_CP110=y
+CONFIG_PINCTRL_ARMADA_37XX=y
+CONFIG_PINCTRL_MSM=y
+# CONFIG_PINCTRL_APQ8064 is not set
+# CONFIG_PINCTRL_APQ8084 is not set
+# CONFIG_PINCTRL_IPQ4019 is not set
+# CONFIG_PINCTRL_IPQ8064 is not set
+# CONFIG_PINCTRL_IPQ8074 is not set
+CONFIG_PINCTRL_IPQ6018=m
+CONFIG_PINCTRL_MSM8226=m
+# CONFIG_PINCTRL_MSM8660 is not set
+# CONFIG_PINCTRL_MSM8960 is not set
+# CONFIG_PINCTRL_MDM9607 is not set
+# CONFIG_PINCTRL_MDM9615 is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
+CONFIG_PINCTRL_MSM8916=m
+CONFIG_PINCTRL_MSM8953=m
+CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8994 is not set
+# CONFIG_PINCTRL_MSM8996 is not set
+CONFIG_PINCTRL_MSM8998=m
+# CONFIG_PINCTRL_QCS404 is not set
+CONFIG_PINCTRL_QDF2XXX=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
+CONFIG_PINCTRL_SC7180=m
+CONFIG_PINCTRL_SC7280=m
+CONFIG_PINCTRL_SC8180X=m
+# CONFIG_PINCTRL_SDM660 is not set
+CONFIG_PINCTRL_SDM845=m
+CONFIG_PINCTRL_SDX55=m
+CONFIG_PINCTRL_SM6115=m
+CONFIG_PINCTRL_SM6125=m
+CONFIG_PINCTRL_SM8150=m
+CONFIG_PINCTRL_SM8250=m
+CONFIG_PINCTRL_SM8350=m
+CONFIG_PINCTRL_LPASS_LPI=m
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_PINCTRL_SAMSUNG=y
+CONFIG_PINCTRL_EXYNOS=y
+CONFIG_PINCTRL_EXYNOS_ARM64=y
+CONFIG_PINCTRL_SPRD=y
+CONFIG_PINCTRL_SPRD_SC9860=y
+CONFIG_PINCTRL_SUNXI=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+CONFIG_PINCTRL_SUN8I_H3_R=y
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
+CONFIG_PINCTRL_SUN50I_A64=y
+CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_A100=y
+CONFIG_PINCTRL_SUN50I_A100_R=y
+CONFIG_PINCTRL_SUN50I_H5=y
+CONFIG_PINCTRL_SUN50I_H6=y
+CONFIG_PINCTRL_SUN50I_H6_R=y
+CONFIG_PINCTRL_SUN50I_H616=y
+CONFIG_PINCTRL_SUN50I_H616_R=y
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA210=y
+CONFIG_PINCTRL_TEGRA194=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
+
+#
+# MediaTek pinctrl drivers
+#
+CONFIG_EINT_MTK=y
+CONFIG_PINCTRL_MTK=y
+CONFIG_PINCTRL_MTK_V2=y
+CONFIG_PINCTRL_MTK_MOORE=y
+CONFIG_PINCTRL_MTK_PARIS=y
+CONFIG_PINCTRL_MT2712=y
+CONFIG_PINCTRL_MT6765=y
+CONFIG_PINCTRL_MT6779=m
+CONFIG_PINCTRL_MT6797=y
+CONFIG_PINCTRL_MT7622=y
+CONFIG_PINCTRL_MT8167=y
+CONFIG_PINCTRL_MT8173=y
+CONFIG_PINCTRL_MT8183=y
+CONFIG_PINCTRL_MT8192=y
+# CONFIG_PINCTRL_MT8195 is not set
+CONFIG_PINCTRL_MT8365=y
+CONFIG_PINCTRL_MT8516=y
+# end of MediaTek pinctrl drivers
+
+CONFIG_PINCTRL_MESON=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_PINCTRL_MESON_GXL=y
+CONFIG_PINCTRL_MESON8_PMX=y
+CONFIG_PINCTRL_MESON_AXG=y
+CONFIG_PINCTRL_MESON_AXG_PMX=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_PINCTRL_MESON_A1=y
+CONFIG_PINCTRL_LOCHNAGAR=m
+CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_CS47L15=y
+CONFIG_PINCTRL_CS47L35=y
+CONFIG_PINCTRL_CS47L85=y
+CONFIG_PINCTRL_CS47L90=y
+CONFIG_PINCTRL_CS47L92=y
+CONFIG_PINCTRL_VISCONTI=y
+CONFIG_PINCTRL_TMPV7700=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_REGMAP=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_74XX_MMIO=m
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_RASPBERRYPI_EXP=m
+CONFIG_GPIO_BCM_XGS_IPROC=m
+CONFIG_GPIO_BRCMSTB=m
+CONFIG_GPIO_CADENCE=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EIC_SPRD=m
+# CONFIG_GPIO_EXAR is not set
+CONFIG_GPIO_FTGPIO010=y
+CONFIG_GPIO_GENERIC_PLATFORM=y
+CONFIG_GPIO_GRGPIO=m
+CONFIG_GPIO_HISI=m
+# CONFIG_GPIO_HLWD is not set
+# CONFIG_GPIO_LOGICVC is not set
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MPC8XXX=y
+CONFIG_GPIO_MVEBU=y
+CONFIG_GPIO_MXC=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_PMIC_EIC_SPRD=m
+CONFIG_GPIO_ROCKCHIP=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_VISCONTI=m
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_XGENE_SB=m
+CONFIG_GPIO_XILINX=m
+CONFIG_GPIO_XLP=m
+CONFIG_GPIO_ZYNQ=m
+# 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_ALTERA_A10SR=m
+CONFIG_GPIO_BD70528=m
+CONFIG_GPIO_BD71815=m
+CONFIG_GPIO_BD71828=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_LP87565=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
+CONFIG_GPIO_SL28CPLD=m
+CONFIG_GPIO_TQMX86=m
+# CONFIG_GPIO_WM8994 is not set
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_MLXBF=m
+CONFIG_GPIO_MLXBF2=m
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
+# CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+CONFIG_GPIO_MAX3191X=m
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+CONFIG_GPIO_MOXTET=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+CONFIG_GPIO_VIRTIO=m
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_MXC=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+# CONFIG_W1_MASTER_SGI is not set
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_ATC260X=m
+CONFIG_POWER_RESET_BRCMSTB=y
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_HISI=y
+CONFIG_POWER_RESET_LINKSTATION=m
+CONFIG_POWER_RESET_MSM=y
+CONFIG_POWER_RESET_QCOM_PON=m
+CONFIG_POWER_RESET_OCELOT_RESET=y
+CONFIG_POWER_RESET_LTC2952=y
+CONFIG_POWER_RESET_REGULATOR=y
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_REBOOT_MODE=m
+CONFIG_SYSCON_REBOOT_MODE=m
+CONFIG_POWER_RESET_SC27XX=m
+CONFIG_NVMEM_REBOOT_MODE=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_TEST_POWER is not set
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_CPCAP=m
+CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_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_LTC4162L=m
+CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
+CONFIG_CHARGER_MP2629=m
+CONFIG_CHARGER_QCOM_SMBB=m
+# CONFIG_CHARGER_BQ2415X is not set
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_BQ256XX=m
+CONFIG_CHARGER_SMB347=m
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
+CONFIG_CHARGER_SC2731=m
+CONFIG_FUEL_GAUGE_SC27XX=m
+CONFIG_CHARGER_UCS1002=m
+CONFIG_CHARGER_BD99954=m
+CONFIG_BATTERY_SURFACE=m
+CONFIG_CHARGER_SURFACE=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_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_ARM_SCMI=m
+CONFIG_SENSORS_ARM_SCPI=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_SPARX5=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_GSC=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+# CONFIG_SENSORS_IIO_HWMON is not set
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LOCHNAGAR=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC2992=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+# CONFIG_SENSORS_MAX1111 is not set
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+# CONFIG_SENSORS_MAX197 is not set
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_TPS23861=m
+# CONFIG_SENSORS_MENF21BMC_HWMON is not set
+CONFIG_SENSORS_MR75203=m
+# CONFIG_SENSORS_ADCXX is not set
+CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1266=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_BEL_PFE=m
+CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_FSP_3Y=m
+# CONFIG_SENSORS_IBM_CFFPS is not set
+CONFIG_SENSORS_DPS920AB=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR36021=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_MAX15301=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_MP2888=m
+CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_PIM4328=m
+CONFIG_SENSORS_PM6764TR=m
+CONFIG_SENSORS_PXE1610=m
+CONFIG_SENSORS_Q54SJ108A2=m
+CONFIG_SENSORS_STPDDC60=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE122=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+CONFIG_SENSORS_SL28CPLD=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHT4x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VEXPRESS=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# ACPI drivers
+#
+# CONFIG_SENSORS_ACPI_POWER is not set
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_FREQ_THERMAL=y
+# CONFIG_CPU_IDLE_THERMAL is not set
+CONFIG_DEVFREQ_THERMAL=y
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
+CONFIG_HISI_THERMAL=m
+CONFIG_IMX_THERMAL=m
+CONFIG_IMX_SC_THERMAL=m
+CONFIG_IMX8MM_THERMAL=m
+CONFIG_MAX77620_THERMAL=m
+CONFIG_QORIQ_THERMAL=m
+CONFIG_SUN8I_THERMAL=m
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_ARMADA_THERMAL=m
+CONFIG_MTK_THERMAL=m
+CONFIG_AMLOGIC_THERMAL=m
+
+#
+# Broadcom thermal drivers
+#
+CONFIG_BCM2711_THERMAL=m
+CONFIG_BCM2835_THERMAL=m
+CONFIG_BRCMSTB_THERMAL=m
+CONFIG_BCM_NS_THERMAL=m
+CONFIG_BCM_SR_THERMAL=m
+# end of Broadcom thermal drivers
+
+#
+# Samsung thermal drivers
+#
+CONFIG_EXYNOS_THERMAL=m
+# end of Samsung thermal drivers
+
+#
+# NVIDIA Tegra thermal drivers
+#
+CONFIG_TEGRA_SOCTHERM=m
+CONFIG_TEGRA_BPMP_THERMAL=m
+# end of NVIDIA Tegra thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+
+#
+# Qualcomm thermal drivers
+#
+CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_SPMI_ADC_TM5=m
+# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
+CONFIG_QCOM_LMH=m
+# end of Qualcomm thermal drivers
+
+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
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT 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_BD957XMUF_WATCHDOG=m
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_MENF21BMC_WATCHDOG is not set
+CONFIG_WDAT_WDT=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_MLX_WDT=m
+CONFIG_SL28CPLD_WATCHDOG=m
+# CONFIG_ARM_SP805_WATCHDOG is not set
+CONFIG_ARM_SBSA_WATCHDOG=m
+CONFIG_ARMADA_37XX_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_S3C2410_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
+# CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_MAX77620_WATCHDOG=m
+CONFIG_IMX2_WDT=m
+CONFIG_IMX_SC_WDT=m
+CONFIG_IMX7ULP_WDT=m
+CONFIG_TEGRA_WATCHDOG=m
+# CONFIG_QCOM_WDT is not set
+CONFIG_MESON_GXBB_WATCHDOG=m
+CONFIG_MESON_WATCHDOG=m
+CONFIG_MEDIATEK_WATCHDOG=m
+CONFIG_ARM_SMC_WATCHDOG=m
+CONFIG_STPMIC1_WATCHDOG=m
+CONFIG_RTD119X_WATCHDOG=y
+CONFIG_SPRD_WATCHDOG=m
+CONFIG_PM8916_WATCHDOG=m
+CONFIG_VISCONTI_WATCHDOG=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_KEMPLD_WDT=m
+CONFIG_BCM2835_WDT=m
+CONFIG_BCM7038_WDT=m
+CONFIG_MEN_A21_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_KEEMBAY_WATCHDOG=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_A10SR=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_HI6421_SPMI=m
+CONFIG_MFD_HI655X_PMIC=m
+CONFIG_HTC_PASIC3=m
+# CONFIG_HTC_I2CPLD is not set
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_INTEL_PMT=m
+CONFIG_MFD_IQS62X=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+CONFIG_MFD_KEMPLD=m
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=m
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6360 is not set
+# CONFIG_MFD_MT6397 is not set
+CONFIG_MFD_MENF21BMC=m
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_CPCAP=m
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_NTXEC=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_RT4831=m
+# CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_RK808=m
+# CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+CONFIG_MFD_SIMPLE_MFD_I2C=m
+CONFIG_MFD_SL28CPLD=m
+# CONFIG_MFD_SM501 is not set
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_SC27XX_PMIC=m
+# CONFIG_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_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_ROHM_BD957XMUF=m
+CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
+CONFIG_MFD_ATC260X=m
+CONFIG_MFD_ATC260X_I2C=m
+CONFIG_MFD_KHADAS_MCU=m
+CONFIG_MFD_QCOM_PM8008=m
+CONFIG_MFD_VEXPRESS_SYSREG=y
+# CONFIG_RAVE_SP_CORE is not set
+CONFIG_MFD_INTEL_M10_BMC=m
+CONFIG_MFD_RSMU_I2C=m
+CONFIG_MFD_RSMU_SPI=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_REGULATOR_88PG86X=m
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_ARM_SCMI=m
+CONFIG_REGULATOR_ATC260X=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD71815=m
+CONFIG_REGULATOR_BD71828=m
+CONFIG_REGULATOR_BD718XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_BD957XMUF=m
+CONFIG_REGULATOR_CPCAP=m
+CONFIG_REGULATOR_CROS_EC=m
+CONFIG_REGULATOR_DA9121=m
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_FAN53880=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_HI6421V530=m
+CONFIG_REGULATOR_HI655X=m
+CONFIG_REGULATOR_HI6421V600=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_MAX8893=m
+# 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_MT6315=m
+CONFIG_REGULATOR_MT6380=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PF8X00=m
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_RPMH=m
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_ROHM=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=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_MESON_TX=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_TOY=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
+CONFIG_MEDIA_CEC_RC=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CROS_EC=m
+CONFIG_CEC_MESON_AO=m
+CONFIG_CEC_MESON_G12A_AO=m
+CONFIG_CEC_SAMSUNG_S5P=m
+CONFIG_CEC_TEGRA=m
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_JPEG_HELPER=m
+CONFIG_V4L2_H264=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
+
+#
+# Please notice that the enabled Media controller Request API is EXPERIMENTAL
+#
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+# CONFIG_I2C_SI470X is not set
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+CONFIG_VIDEO_ASPEED=m
+CONFIG_VIDEO_MUX=m
+CONFIG_VIDEO_QCOM_CAMSS=m
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
+CONFIG_VIDEO_EXYNOS4_IS_COMMON=m
+CONFIG_VIDEO_S5P_FIMC=m
+CONFIG_VIDEO_S5P_MIPI_CSIS=m
+CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
+CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y
+CONFIG_VIDEO_XILINX=m
+CONFIG_VIDEO_XILINX_CSI2RXSS=m
+CONFIG_VIDEO_XILINX_TPG=m
+CONFIG_VIDEO_XILINX_VTC=m
+CONFIG_VIDEO_SUN4I_CSI=m
+CONFIG_VIDEO_SUN6I_CSI=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_ALLEGRO_DVT=m
+CONFIG_VIDEO_CODA=m
+CONFIG_VIDEO_IMX_PXP=m
+CONFIG_VIDEO_IMX8_JPEG=m
+CONFIG_VIDEO_MEDIATEK_JPEG=m
+CONFIG_VIDEO_MEDIATEK_VPU=m
+CONFIG_VIDEO_MEDIATEK_MDP=m
+CONFIG_VIDEO_MEDIATEK_VCODEC=m
+CONFIG_VIDEO_MEDIATEK_VCODEC_VPU=y
+CONFIG_VIDEO_MEDIATEK_VCODEC_SCP=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_MESON_GE2D=m
+CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
+CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+CONFIG_VIDEO_ROCKCHIP_RGA=m
+CONFIG_VIDEO_QCOM_VENUS=m
+CONFIG_VIDEO_SUN8I_DEINTERLACE=m
+CONFIG_VIDEO_SUN8I_ROTATE=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIMC=m
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VIM2M=m
+CONFIG_VIDEO_VICODEC=m
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV748X=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+CONFIG_VIDEO_MAX9286=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_AD9389B=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_ST_MIPID02=m
+# end of Miscellaneous helper chips
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_CCS_PLL=m
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_IMX208=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX219=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX290=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX334=m
+CONFIG_VIDEO_IMX335=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_IMX412=m
+CONFIG_VIDEO_OV02A10=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV2740=m
+CONFIG_VIDEO_OV5640=m
+CONFIG_VIDEO_OV5645=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV5648=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5675=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9282=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV9734=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5K6AA=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_S5K4ECGX=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_CCS=m
+CONFIG_VIDEO_ET8EK8=m
+CONFIG_VIDEO_S5C73M3=m
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9768=m
+CONFIG_VIDEO_DW9807_VCM=m
+# end of Lens drivers
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+# end of Flash devices
+
+#
+# SPI helper chips
+#
+CONFIG_VIDEO_GS1662=m
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+CONFIG_DVB_MN88443X=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_BUS=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_CEC=y
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+CONFIG_DRM_HDLCD=m
+# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
+CONFIG_DRM_MALI_DISPLAY=m
+CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+# CONFIG_DRM_AMD_DC_HDCP is not set
+CONFIG_DRM_AMD_DC_SI=y
+# CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
+
+CONFIG_HSA_AMD=y
+CONFIG_HSA_AMD_SVM=y
+CONFIG_DRM_NOUVEAU=m
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
+CONFIG_NOUVEAU_PLATFORM_DRIVER=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_SVM=y
+CONFIG_DRM_KMB_DISPLAY=m
+# CONFIG_DRM_VGEM is not set
+CONFIG_DRM_VKMS=m
+# CONFIG_DRM_EXYNOS is not set
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_CDN_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_INNO_HDMI=y
+CONFIG_ROCKCHIP_LVDS=y
+CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_RK3066_HDMI=y
+CONFIG_DRM_VMWGFX=m
+# CONFIG_DRM_VMWGFX_FBCON is not set
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_RCAR_DW_HDMI=m
+CONFIG_DRM_RCAR_LVDS=m
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+# CONFIG_DRM_MSM_GPU_SUDO is not set
+CONFIG_DRM_MSM_HDMI_HDCP=y
+CONFIG_DRM_MSM_DP=y
+CONFIG_DRM_MSM_DSI=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_10NM_PHY=y
+CONFIG_DRM_MSM_DSI_7NM_PHY=y
+CONFIG_DRM_TEGRA=m
+# CONFIG_DRM_TEGRA_DEBUG is not set
+# CONFIG_DRM_TEGRA_STAGING is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_ABT_Y030XX067A=m
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
+CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
+CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+CONFIG_DRM_PANEL_DSI_CM=m
+CONFIG_DRM_PANEL_LVDS=m
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_ELIDA_KD35T133=m
+CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
+CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
+CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
+CONFIG_DRM_PANEL_KHADAS_TS050=m
+CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W=m
+CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
+CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_LG_LB035Q02=m
+CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_NEC_NL8048HL11=m
+CONFIG_DRM_PANEL_NOVATEK_NT35510=m
+CONFIG_DRM_PANEL_NOVATEK_NT36672A=m
+CONFIG_DRM_PANEL_NOVATEK_NT39016=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
+CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
+CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
+CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
+CONFIG_DRM_PANEL_SAMSUNG_DB7430=m
+CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63M0=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_SPI=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_DSI=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
+CONFIG_DRM_PANEL_SAMSUNG_SOFEF00=m
+CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
+CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
+CONFIG_DRM_PANEL_SITRONIX_ST7701=m
+CONFIG_DRM_PANEL_SITRONIX_ST7703=m
+CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
+CONFIG_DRM_PANEL_SONY_ACX424AKP=m
+CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+CONFIG_DRM_PANEL_TDO_TL070WSH30=m
+CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
+CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
+CONFIG_DRM_PANEL_TPO_TPG110=m
+CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_RM69299=m
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_CDNS_DSI=m
+CONFIG_DRM_CHIPONE_ICN6211=m
+CONFIG_DRM_CHRONTEL_CH7033=m
+CONFIG_DRM_CROS_EC_ANX7688=m
+CONFIG_DRM_DISPLAY_CONNECTOR=m
+CONFIG_DRM_LONTIUM_LT8912B=m
+CONFIG_DRM_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=m
+CONFIG_DRM_ITE_IT66121=m
+CONFIG_DRM_LVDS_CODEC=m
+CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
+CONFIG_DRM_NWL_MIPI_DSI=m
+CONFIG_DRM_NXP_PTN3460=m
+CONFIG_DRM_PARADE_PS8622=m
+CONFIG_DRM_PARADE_PS8640=m
+CONFIG_DRM_SIL_SII8620=m
+CONFIG_DRM_SII902X=m
+CONFIG_DRM_SII9234=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
+CONFIG_DRM_THINE_THC63LVD1024=m
+CONFIG_DRM_TOSHIBA_TC358762=m
+CONFIG_DRM_TOSHIBA_TC358764=m
+CONFIG_DRM_TOSHIBA_TC358767=m
+CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=m
+CONFIG_DRM_TI_TFP410=m
+CONFIG_DRM_TI_SN65DSI83=m
+CONFIG_DRM_TI_SN65DSI86=m
+CONFIG_DRM_TI_TPD12S015=m
+CONFIG_DRM_ANALOGIX_ANX6345=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
+CONFIG_DRM_ANALOGIX_ANX7625=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+CONFIG_DRM_CDNS_MHDP8546=m
+CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_DW_MIPI_DSI=m
+# end of Display Interface Bridges
+
+CONFIG_DRM_IMX_DCSS=m
+CONFIG_DRM_VC4=m
+CONFIG_DRM_VC4_HDMI_CEC=y
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+CONFIG_DRM_HISI_HIBMC=m
+CONFIG_DRM_HISI_KIRIN=m
+CONFIG_DRM_MEDIATEK=m
+CONFIG_DRM_MEDIATEK_HDMI=m
+# CONFIG_DRM_MXSFB is not set
+CONFIG_DRM_MESON=m
+CONFIG_DRM_MESON_DW_HDMI=m
+# CONFIG_DRM_ARCPGU is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_TINYDRM_HX8357D=m
+CONFIG_TINYDRM_ILI9225=m
+CONFIG_TINYDRM_ILI9341=m
+CONFIG_TINYDRM_ILI9486=m
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+CONFIG_TINYDRM_ST7735R=m
+CONFIG_DRM_PL111=m
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_TIDSS=m
+CONFIG_DRM_ZYNQMP_DPSUB=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_HYPERV=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_ARMCLCD is not set
+CONFIG_FB_IMX=m
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_UVESA=m
+CONFIG_FB_EFI=y
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+CONFIG_FB_I740=m
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+CONFIG_FB_SMSCUFX=m
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+CONFIG_FB_XILINX=m
+CONFIG_FB_VIRTUAL=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_MX3=y
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+CONFIG_BACKLIGHT_LED=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
+# CONFIG_SND_CTL_VALIDATION is not set
+# CONFIG_SND_JACK_INJECTION_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+# CONFIG_SND_AZT3328 is not set
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+# CONFIG_SND_ICE1712 is not set
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+# CONFIG_SND_MAESTRO3 is not set
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_ALIGNED_MMIO=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_PREALLOC_SIZE=1024
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SND_BCM2835_SOC_I2S=m
+CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DESIGNWARE_PCM=y
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_MQS=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_EASRC=m
+CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_AUD2HTX=m
+CONFIG_SND_SOC_FSL_RPMSG=m
+CONFIG_SND_SOC_IMX_PCM_DMA=m
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_IMX_SOC=m
+
+#
+# SoC Audio support for Freescale i.MX boards:
+#
+CONFIG_SND_SOC_IMX_ES8328=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_IMX_AUDMIX=m
+CONFIG_SND_SOC_IMX_HDMI=m
+CONFIG_SND_SOC_IMX_RPMSG=m
+CONFIG_SND_SOC_IMX_CARD=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+CONFIG_SND_KIRKWOOD_SOC=m
+CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
+# CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_INTEL_KEEMBAY is not set
+CONFIG_SND_SOC_MEDIATEK=m
+# CONFIG_SND_SOC_MT2701 is not set
+CONFIG_SND_SOC_MT6797=m
+CONFIG_SND_SOC_MT6797_MT6351=m
+# CONFIG_SND_SOC_MT8173 is not set
+CONFIG_SND_SOC_MT8183=m
+CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
+CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_MT8192=m
+CONFIG_SND_SOC_MT8192_MT6359_RT1015_RT5682=m
+CONFIG_SND_SOC_MT8195=m
+CONFIG_SND_SOC_MT8195_MT6359_RT1019_RT5682=m
+
+#
+# ASoC support for Amlogic platforms
+#
+CONFIG_SND_MESON_AIU=m
+CONFIG_SND_MESON_AXG_FIFO=m
+CONFIG_SND_MESON_AXG_FRDDR=m
+CONFIG_SND_MESON_AXG_TODDR=m
+CONFIG_SND_MESON_AXG_TDM_FORMATTER=m
+CONFIG_SND_MESON_AXG_TDM_INTERFACE=m
+CONFIG_SND_MESON_AXG_TDMIN=m
+CONFIG_SND_MESON_AXG_TDMOUT=m
+CONFIG_SND_MESON_AXG_SOUND_CARD=m
+CONFIG_SND_MESON_AXG_SPDIFOUT=m
+CONFIG_SND_MESON_AXG_SPDIFIN=m
+CONFIG_SND_MESON_AXG_PDM=m
+CONFIG_SND_MESON_CARD_UTILS=m
+CONFIG_SND_MESON_CODEC_GLUE=m
+CONFIG_SND_MESON_GX_SOUND_CARD=m
+CONFIG_SND_MESON_G12A_TOACODEC=m
+CONFIG_SND_MESON_G12A_TOHDMITX=m
+CONFIG_SND_SOC_MESON_T9015=m
+# end of ASoC support for Amlogic platforms
+
+CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_LPASS_CPU=m
+CONFIG_SND_SOC_LPASS_HDMI=m
+CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_LPASS_IPQ806X=m
+CONFIG_SND_SOC_LPASS_APQ8016=m
+CONFIG_SND_SOC_LPASS_SC7180=m
+CONFIG_SND_SOC_STORM=m
+CONFIG_SND_SOC_APQ8016_SBC=m
+CONFIG_SND_SOC_QCOM_COMMON=m
+CONFIG_SND_SOC_QDSP6_COMMON=m
+CONFIG_SND_SOC_QDSP6_CORE=m
+CONFIG_SND_SOC_QDSP6_AFE=m
+CONFIG_SND_SOC_QDSP6_AFE_DAI=m
+CONFIG_SND_SOC_QDSP6_AFE_CLOCKS=m
+CONFIG_SND_SOC_QDSP6_ADM=m
+CONFIG_SND_SOC_QDSP6_ROUTING=m
+CONFIG_SND_SOC_QDSP6_ASM=m
+CONFIG_SND_SOC_QDSP6_ASM_DAI=m
+CONFIG_SND_SOC_QDSP6=m
+CONFIG_SND_SOC_MSM8996=m
+CONFIG_SND_SOC_SDM845=m
+CONFIG_SND_SOC_SM8250=m
+CONFIG_SND_SOC_SC7180=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_PDM=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
+CONFIG_SND_SOC_RK3399_GRU_SOUND=m
+CONFIG_SND_SOC_SAMSUNG=m
+CONFIG_SND_SAMSUNG_PCM=m
+CONFIG_SND_SAMSUNG_SPDIF=m
+CONFIG_SND_SAMSUNG_I2S=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
+CONFIG_SND_SOC_SMDK_WM8994_PCM=m
+CONFIG_SND_SOC_SNOW=m
+# CONFIG_SND_SOC_ODROID is not set
+# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994=m
+CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OF=m
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_IMX_OF=m
+CONFIG_SND_SOC_SOF_IMX_COMMON=m
+CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y
+CONFIG_SND_SOC_SOF_IMX8=m
+CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=y
+CONFIG_SND_SOC_SOF_IMX8M=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+CONFIG_SND_SOC_SPRD=m
+CONFIG_SND_SOC_SPRD_MCDT=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN8I_CODEC=m
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
+CONFIG_SND_SUN50I_CODEC_ANALOG=m
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
+CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
+# end of Allwinner SoC Audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
+CONFIG_SND_SOC_XILINX_SPDIF=m
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CPCAP=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4234=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_ICS43432=m
+# CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_LOCHNAGAR_SC=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98095=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
+CONFIG_SND_SOC_MAX98390=m
+CONFIG_SND_SOC_MAX9860=m
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+CONFIG_SND_SOC_PCM5102A=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RK817=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308_SDW=m
+CONFIG_SND_SOC_RT1316_SDW=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT711_SDCA_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
+CONFIG_SND_SOC_RT715_SDCA_SDW=m
+CONFIG_SND_SOC_SDW_MOCKUP=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIMPLE_MUX=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2518=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS2562=m
+CONFIG_SND_SOC_TAS2764=m
+CONFIG_SND_SOC_TAS2770=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TFA989X=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+CONFIG_SND_SOC_TLV320ADCX140=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WCD_MBHC=m
+CONFIG_SND_SOC_WCD938X=m
+CONFIG_SND_SOC_WCD938X_SDW=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WM8994=m
+CONFIG_SND_SOC_WSA881X=m
+CONFIG_SND_SOC_ZL38060=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_MT6359=m
+CONFIG_SND_SOC_MT6359_ACCDET=m
+CONFIG_SND_SOC_MT6660=m
+CONFIG_SND_SOC_NAU8315=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=m
+CONFIG_SND_SOC_LPASS_RX_MACRO=m
+CONFIG_SND_SOC_LPASS_TX_MACRO=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_AUDIO_GRAPH_CARD=m
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=y
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+# CONFIG_HID_CMEDIA is not set
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_VIVALDI=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID_ACPI=m
+CONFIG_I2C_HID_OF=m
+CONFIG_I2C_HID_OF_GOODIX=m
+# end of I2C HID support
+
+CONFIG_I2C_HID_CORE=m
+
+#
+# Surface System Aggregator Module HID support
+#
+CONFIG_SURFACE_HID=m
+CONFIG_SURFACE_KBD=m
+# end of Surface System Aggregator Module HID support
+
+CONFIG_SURFACE_HID_CORE=m
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_OTG=y
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_OTG_FSM=m
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_HISTB=m
+CONFIG_USB_XHCI_MTK=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_XHCI_TEGRA=m
+CONFIG_USB_EHCI_BRCMSTB=m
+CONFIG_USB_BRCMSTB=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_USB_EHCI_EXYNOS=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNS3_IMX=m
+CONFIG_USB_CDNSP_PCI=m
+# CONFIG_USB_CDNSP_GADGET is not set
+# CONFIG_USB_CDNSP_HOST is not set
+CONFIG_USB_MTU3=m
+CONFIG_USB_MTU3_HOST=y
+# CONFIG_USB_MTU3_GADGET is not set
+# CONFIG_USB_MTU3_DUAL_ROLE is not set
+# CONFIG_USB_MTU3_DEBUG is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_HOST=y
+# CONFIG_USB_MUSB_GADGET is not set
+# CONFIG_USB_MUSB_DUAL_ROLE is not set
+
+#
+# Platform Glue Layer
+#
+CONFIG_USB_MUSB_SUNXI=m
+CONFIG_USB_MUSB_MEDIATEK=m
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_MESON_G12A=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC3_QCOM=m
+CONFIG_USB_DWC3_IMX8MP=m
+CONFIG_USB_DWC3_XILINX=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PERIPHERAL is not set
+CONFIG_USB_DWC2_DUAL_ROLE=y
+CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_UDC is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_IMX=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_CHIPIDEA_TEGRA=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1760_HOST_ROLE=y
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+# CONFIG_USB_ISP1760_DUAL_ROLE is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_TEST is not set
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_LINK_LAYER_TEST=m
+# CONFIG_USB_CHAOSKEY is not set
+CONFIG_BRCM_USB_PINMAP=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_MXS_PHY=m
+CONFIG_USB_TEGRA_PHY=m
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_U_SERIAL_CONSOLE=y
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+CONFIG_USB_SNP_CORE=m
+CONFIG_USB_SNP_UDC_PLAT=m
+# CONFIG_USB_M66592 is not set
+CONFIG_USB_BDC_UDC=m
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+CONFIG_USB_GADGET_XILINX=m
+CONFIG_USB_MAX3420_UDC=m
+CONFIG_USB_TEGRA_XUDC=m
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_F_TCM=y
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_USB_RAW_GADGET=m
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_TCPCI_MAXIM=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+CONFIG_TYPEC_QCOM_PMIC=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_PI3USB30532=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=m
+CONFIG_PWRSEQ_EMMC=m
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_QCOM_DML=y
+CONFIG_MMC_STM32_SDMMC=y
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+# CONFIG_MMC_SDHCI_OF_ASPEED is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
+CONFIG_MMC_SDHCI_OF_DWCMSHC=m
+CONFIG_MMC_SDHCI_OF_SPARX5=m
+CONFIG_MMC_SDHCI_CADENCE=m
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_MMC_SDHCI_S3C=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MMC_SDHCI_S3C_DMA=y
+CONFIG_MMC_SDHCI_F_SDH30=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
+CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MESON_MX_SDIO is not set
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_SDHCI_MSM=m
+# CONFIG_MMC_MXC is not set
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_SDHCI_SPRD=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_CAVIUM_THUNDERX=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_PLTFM=m
+CONFIG_MMC_DW_BLUEFIELD=m
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_MMC_DW_HI3798CV200=m
+CONFIG_MMC_DW_K3=m
+CONFIG_MMC_DW_PCI=m
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_BCM2835=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_BRCMSTB=m
+CONFIG_MMC_SDHCI_XENON=m
+# CONFIG_MMC_SDHCI_OMAP is not set
+CONFIG_MMC_SDHCI_AM654=m
+CONFIG_MMC_OWL=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_AN30259A=m
+CONFIG_LEDS_AW2013=m
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+CONFIG_LEDS_CPCAP=m
+CONFIG_LEDS_CR0014114=m
+CONFIG_LEDS_EL15203000=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3692X=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8860=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA955X_GPIO=y
+CONFIG_LEDS_PCA963X=m
+# CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_REGULATOR is not set
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_TCA6507=m
+# CONFIG_LEDS_TLC591XX is not set
+CONFIG_LEDS_MAX77650=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+CONFIG_LEDS_IS31FL319X=m
+CONFIG_LEDS_IS31FL32XX=m
+CONFIG_LEDS_SC27XX_BLTC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_SPI_BYTE=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM3697=m
+CONFIG_LEDS_LM36274=m
+
+#
+# Flash and Torch LED drivers
+#
+# CONFIG_LEDS_AAT1290 is not set
+CONFIG_LEDS_AS3645A=m
+# CONFIG_LEDS_KTD2692 is not set
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_RT4505=m
+CONFIG_LEDS_RT8515=m
+CONFIG_LEDS_SGM3140=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
+CONFIG_INFINIBAND_HNS=m
+CONFIG_INFINIBAND_HNS_HIP06=y
+CONFIG_INFINIBAND_HNS_HIP08=y
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_DEBUG=y
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_AL_MC=m
+CONFIG_EDAC_LAYERSCAPE=m
+CONFIG_EDAC_THUNDERX=m
+CONFIG_EDAC_ALTERA=y
+CONFIG_EDAC_ALTERA_SDRAM=y
+CONFIG_EDAC_ALTERA_OCRAM=y
+CONFIG_EDAC_ALTERA_ETHERNET=y
+CONFIG_EDAC_ALTERA_NAND=y
+CONFIG_EDAC_ALTERA_USB=y
+CONFIG_EDAC_ALTERA_QSPI=y
+CONFIG_EDAC_ALTERA_SDMMC=y
+CONFIG_EDAC_SYNOPSYS=m
+CONFIG_EDAC_XGENE=m
+CONFIG_EDAC_QCOM=m
+CONFIG_EDAC_BLUEFIELD=m
+CONFIG_EDAC_DMC520=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AC100=m
+CONFIG_RTC_DRV_BRCMSTB=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1307_CENTURY=y
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+# CONFIG_RTC_DRV_HYM8563 is not set
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX77686=m
+CONFIG_RTC_DRV_RK808=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_ISL12022 is not set
+CONFIG_RTC_DRV_ISL12026=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BD70528=m
+# CONFIG_RTC_DRV_BQ32K is not set
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+CONFIG_RTC_DRV_RV8803=y
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+CONFIG_RTC_DRV_MAX6916=m
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+CONFIG_RTC_DRV_EFI=y
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_DRV_SC27XX=m
+CONFIG_RTC_DRV_ZYNQMP=y
+CONFIG_RTC_DRV_CROS_EC=m
+CONFIG_RTC_DRV_NTXEC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_IMXDI=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
+CONFIG_RTC_DRV_MESON_VRTC=m
+CONFIG_HAVE_S3C_RTC=y
+CONFIG_RTC_DRV_S3C=m
+CONFIG_RTC_DRV_PL030=y
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_RTC_DRV_CADENCE=m
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PM8XXX=m
+CONFIG_RTC_DRV_TEGRA=m
+CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
+# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_IMX_SC=y
+CONFIG_RTC_DRV_MT2712=y
+CONFIG_RTC_DRV_MT7622=m
+CONFIG_RTC_DRV_XGENE=y
+CONFIG_RTC_DRV_R7301=m
+CONFIG_RTC_DRV_CPCAP=m
+CONFIG_RTC_DRV_RTD119X=y
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_GOLDFISH=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_ACPI=y
+CONFIG_DMA_OF=y
+CONFIG_ALTERA_MSGDMA=m
+# CONFIG_AMBA_PL08X is not set
+CONFIG_AXI_DMAC=m
+CONFIG_BCM_SBA_RAID=m
+CONFIG_DMA_BCM2835=m
+CONFIG_DMA_SUN6I=m
+CONFIG_DW_AXI_DMAC=m
+CONFIG_FSL_EDMA=m
+CONFIG_FSL_QDMA=m
+CONFIG_HISI_DMA=m
+CONFIG_IMX_DMA=m
+CONFIG_IMX_SDMA=m
+# CONFIG_INTEL_IDMA64 is not set
+CONFIG_K3_DMA=m
+CONFIG_MV_XOR=y
+CONFIG_MV_XOR_V2=y
+CONFIG_MXS_DMA=y
+CONFIG_MX3_IPU=y
+CONFIG_MX3_IPU_IRQS=4
+CONFIG_OWL_DMA=m
+CONFIG_PL330_DMA=m
+CONFIG_PLX_DMA=m
+CONFIG_SPRD_DMA=m
+# CONFIG_TEGRA20_APB_DMA is not set
+CONFIG_TEGRA210_ADMA=y
+CONFIG_XGENE_DMA=m
+CONFIG_XILINX_DMA=m
+CONFIG_XILINX_ZYNQMP_DMA=m
+CONFIG_XILINX_ZYNQMP_DPDMA=m
+CONFIG_MTK_HSDMA=m
+CONFIG_MTK_CQDMA=m
+CONFIG_MTK_UART_APDMA=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_GPI_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+# CONFIG_DW_DMAC is not set
+CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+# CONFIG_SF_PDMA is not set
+CONFIG_FSL_DPAA2_QDMA=m
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+CONFIG_SW_SYNC=y
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_HT16K33=m
+CONFIG_LCD2S=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_UIO_PRUSS is not set
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_UIO_DFL=m
+CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+# CONFIG_VFIO_PLATFORM is not set
+CONFIG_VFIO_MDEV=m
+CONFIG_VFIO_FSL_MC=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI_LIB=y
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+CONFIG_VDPA_SIM=m
+CONFIG_VDPA_SIM_NET=m
+CONFIG_VDPA_SIM_BLOCK=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA=y
+CONFIG_MLX5_VDPA_NET=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+# CONFIG_GREYBUS is not set
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+# CONFIG_COMEDI_MISC_DRIVERS is not set
+# CONFIG_COMEDI_ISA_DRIVERS is not set
+# CONFIG_COMEDI_PCI_DRIVERS is not set
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+# CONFIG_COMEDI_TESTS is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# CONFIG_AD7280 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+# CONFIG_ADE7854 is not set
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+CONFIG_MFD_NVEC=m
+CONFIG_KEYBOARD_NVEC=m
+CONFIG_SERIO_NVEC_PS2=m
+CONFIG_NVEC_POWER=m
+CONFIG_NVEC_PAZ00=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_VIDEO_HANTRO=m
+CONFIG_VIDEO_HANTRO_IMX8M=y
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
+CONFIG_VIDEO_IMX_MEDIA=m
+
+#
+# i.MX5/6/7/8 Media Sub devices
+#
+CONFIG_VIDEO_IMX7_CSI=m
+# end of i.MX5/6/7/8 Media Sub devices
+
+CONFIG_VIDEO_MESON_VDEC=m
+CONFIG_VIDEO_ROCKCHIP_VDEC=m
+CONFIG_VIDEO_SUNXI=y
+CONFIG_VIDEO_SUNXI_CEDRUS=m
+CONFIG_TEGRA_VDE=m
+# CONFIG_VIDEO_ZORAN is not set
+CONFIG_VIDEO_TEGRA=m
+CONFIG_VIDEO_TEGRA_TPG=y
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
+
+#
+# Android
+#
+# end of Android
+
+# CONFIG_STAGING_BOARD is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SEPS525=m
+CONFIG_FB_TFT_SH1106=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_KS7010=m
+CONFIG_BCM_VIDEOCORE=m
+CONFIG_BCM2835_VCHIQ=m
+CONFIG_VCHIQ_CDEV=y
+CONFIG_SND_BCM2835=m
+CONFIG_VIDEO_BCM2835=m
+CONFIG_BCM2835_VCHIQ_MMAL=m
+CONFIG_PI433=m
+CONFIG_XIL_AXIS_FIFO=m
+CONFIG_FIELDBUS_DEV=m
+CONFIG_HMS_ANYBUSS_BUS=m
+CONFIG_ARCX_ANYBUS_CONTROLLER=m
+CONFIG_HMS_PROFINET=m
+CONFIG_QLGE=m
+CONFIG_WFX=m
+# CONFIG_GOLDFISH is not set
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_RPMSG=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_VBC=m
+# CONFIG_CROS_EC_DEBUGFS is not set
+CONFIG_CROS_EC_SENSORHUB=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_CROS_USBPD_NOTIFY=m
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_MLXBF_TMFIFO=m
+CONFIG_MLXBF_BOOTCTL=m
+CONFIG_MLXBF_PMC=m
+CONFIG_SURFACE_PLATFORMS=y
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+# CONFIG_SURFACE_ACPI_NOTIFY is not set
+# CONFIG_SURFACE_AGGREGATOR_CDEV is not set
+CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
+CONFIG_SURFACE_DTX=m
+CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_HOTPLUG=m
+CONFIG_SURFACE_PLATFORM_PROFILE=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_AGGREGATOR=m
+CONFIG_SURFACE_AGGREGATOR_BUS=y
+# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Clock driver for ARM Reference designs
+#
+CONFIG_ICST=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
+# end of Clock driver for ARM Reference designs
+
+CONFIG_LMK04832=m
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_HI655X=m
+CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SCPI=m
+CONFIG_COMMON_CLK_SI5341=m
+# CONFIG_COMMON_CLK_SI5351 is not set
+CONFIG_COMMON_CLK_SI514=m
+CONFIG_COMMON_CLK_SI544=m
+# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_BM1880=y
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CDCE925=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_COMMON_CLK_FSL_FLEXSPI=m
+CONFIG_COMMON_CLK_FSL_SAI=y
+CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_CLK_QORIQ=y
+CONFIG_CLK_LS1028A_PLLDIG=m
+CONFIG_COMMON_CLK_XGENE=y
+CONFIG_COMMON_CLK_LOCHNAGAR=m
+CONFIG_COMMON_CLK_PWM=m
+CONFIG_COMMON_CLK_VC5=m
+CONFIG_COMMON_CLK_BD718XX=m
+CONFIG_COMMON_CLK_FIXED_MMIO=y
+CONFIG_CLK_ACTIONS=y
+# CONFIG_CLK_OWL_S500 is not set
+CONFIG_CLK_OWL_S700=y
+CONFIG_CLK_OWL_S900=y
+CONFIG_CLK_BCM2711_DVP=m
+CONFIG_CLK_BCM2835=y
+CONFIG_COMMON_CLK_IPROC=y
+CONFIG_CLK_BCM_NS2=y
+CONFIG_CLK_BCM_SR=y
+CONFIG_CLK_RASPBERRYPI=m
+# CONFIG_COMMON_CLK_HI3516CV300 is not set
+CONFIG_COMMON_CLK_HI3519=m
+CONFIG_COMMON_CLK_HI3559A=y
+CONFIG_COMMON_CLK_HI3660=y
+CONFIG_COMMON_CLK_HI3670=y
+CONFIG_COMMON_CLK_HI3798CV200=m
+CONFIG_COMMON_CLK_HI6220=y
+CONFIG_RESET_HISI=y
+CONFIG_STUB_CLK_HI6220=y
+CONFIG_STUB_CLK_HI3660=y
+CONFIG_MXC_CLK=y
+CONFIG_MXC_CLK_SCU=y
+CONFIG_CLK_IMX8MM=y
+CONFIG_CLK_IMX8MN=y
+CONFIG_CLK_IMX8MP=y
+CONFIG_CLK_IMX8MQ=y
+CONFIG_CLK_IMX8QXP=y
+
+#
+# Clock driver for MediaTek SoC
+#
+CONFIG_COMMON_CLK_MEDIATEK=y
+CONFIG_COMMON_CLK_MT2712=y
+CONFIG_COMMON_CLK_MT2712_BDPSYS=y
+CONFIG_COMMON_CLK_MT2712_IMGSYS=y
+CONFIG_COMMON_CLK_MT2712_JPGDECSYS=y
+CONFIG_COMMON_CLK_MT2712_MFGCFG=y
+CONFIG_COMMON_CLK_MT2712_MMSYS=y
+CONFIG_COMMON_CLK_MT2712_VDECSYS=y
+CONFIG_COMMON_CLK_MT2712_VENCSYS=y
+CONFIG_COMMON_CLK_MT6765=y
+CONFIG_COMMON_CLK_MT6765_AUDIOSYS=y
+CONFIG_COMMON_CLK_MT6765_CAMSYS=y
+CONFIG_COMMON_CLK_MT6765_GCESYS=y
+CONFIG_COMMON_CLK_MT6765_MMSYS=y
+CONFIG_COMMON_CLK_MT6765_IMGSYS=y
+CONFIG_COMMON_CLK_MT6765_VCODECSYS=y
+CONFIG_COMMON_CLK_MT6765_MFGSYS=y
+CONFIG_COMMON_CLK_MT6765_MIPI0ASYS=y
+CONFIG_COMMON_CLK_MT6765_MIPI0BSYS=y
+CONFIG_COMMON_CLK_MT6765_MIPI1ASYS=y
+CONFIG_COMMON_CLK_MT6765_MIPI1BSYS=y
+CONFIG_COMMON_CLK_MT6765_MIPI2ASYS=y
+CONFIG_COMMON_CLK_MT6765_MIPI2BSYS=y
+CONFIG_COMMON_CLK_MT6779=y
+CONFIG_COMMON_CLK_MT6779_MMSYS=y
+CONFIG_COMMON_CLK_MT6779_IMGSYS=y
+CONFIG_COMMON_CLK_MT6779_IPESYS=y
+CONFIG_COMMON_CLK_MT6779_CAMSYS=y
+CONFIG_COMMON_CLK_MT6779_VDECSYS=y
+CONFIG_COMMON_CLK_MT6779_VENCSYS=y
+CONFIG_COMMON_CLK_MT6779_MFGCFG=y
+CONFIG_COMMON_CLK_MT6779_AUDSYS=y
+CONFIG_COMMON_CLK_MT6797=y
+CONFIG_COMMON_CLK_MT6797_MMSYS=y
+CONFIG_COMMON_CLK_MT6797_IMGSYS=y
+CONFIG_COMMON_CLK_MT6797_VDECSYS=y
+CONFIG_COMMON_CLK_MT6797_VENCSYS=y
+CONFIG_COMMON_CLK_MT7622=y
+CONFIG_COMMON_CLK_MT7622_ETHSYS=y
+CONFIG_COMMON_CLK_MT7622_HIFSYS=y
+CONFIG_COMMON_CLK_MT7622_AUDSYS=y
+CONFIG_COMMON_CLK_MT8167=y
+CONFIG_COMMON_CLK_MT8167_AUDSYS=y
+CONFIG_COMMON_CLK_MT8167_IMGSYS=y
+CONFIG_COMMON_CLK_MT8167_MFGCFG=y
+CONFIG_COMMON_CLK_MT8167_MMSYS=y
+CONFIG_COMMON_CLK_MT8167_VDECSYS=y
+CONFIG_COMMON_CLK_MT8173=y
+CONFIG_COMMON_CLK_MT8173_MMSYS=y
+CONFIG_COMMON_CLK_MT8183=y
+CONFIG_COMMON_CLK_MT8183_AUDIOSYS=y
+CONFIG_COMMON_CLK_MT8183_CAMSYS=y
+CONFIG_COMMON_CLK_MT8183_IMGSYS=y
+CONFIG_COMMON_CLK_MT8183_IPU_CORE0=y
+CONFIG_COMMON_CLK_MT8183_IPU_CORE1=y
+CONFIG_COMMON_CLK_MT8183_IPU_ADL=y
+CONFIG_COMMON_CLK_MT8183_IPU_CONN=y
+CONFIG_COMMON_CLK_MT8183_MFGCFG=y
+CONFIG_COMMON_CLK_MT8183_MMSYS=y
+CONFIG_COMMON_CLK_MT8183_VDECSYS=y
+CONFIG_COMMON_CLK_MT8183_VENCSYS=y
+CONFIG_COMMON_CLK_MT8192=y
+CONFIG_COMMON_CLK_MT8192_AUDSYS=y
+CONFIG_COMMON_CLK_MT8192_CAMSYS=y
+CONFIG_COMMON_CLK_MT8192_IMGSYS=y
+CONFIG_COMMON_CLK_MT8192_IMP_IIC_WRAP=y
+CONFIG_COMMON_CLK_MT8192_IPESYS=y
+CONFIG_COMMON_CLK_MT8192_MDPSYS=y
+CONFIG_COMMON_CLK_MT8192_MFGCFG=y
+CONFIG_COMMON_CLK_MT8192_MMSYS=y
+CONFIG_COMMON_CLK_MT8192_MSDC=y
+CONFIG_COMMON_CLK_MT8192_SCP_ADSP=y
+CONFIG_COMMON_CLK_MT8192_VDECSYS=y
+CONFIG_COMMON_CLK_MT8192_VENCSYS=y
+CONFIG_COMMON_CLK_MT8516=y
+CONFIG_COMMON_CLK_MT8516_AUDSYS=y
+# end of Clock driver for MediaTek SoC
+
+#
+# Clock support for Amlogic platforms
+#
+CONFIG_COMMON_CLK_MESON_REGMAP=y
+CONFIG_COMMON_CLK_MESON_DUALDIV=y
+CONFIG_COMMON_CLK_MESON_MPLL=y
+CONFIG_COMMON_CLK_MESON_PHASE=m
+CONFIG_COMMON_CLK_MESON_PLL=y
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
+CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
+CONFIG_COMMON_CLK_MESON_AO_CLKC=y
+CONFIG_COMMON_CLK_MESON_EE_CLKC=y
+CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y
+CONFIG_COMMON_CLK_GXBB=y
+CONFIG_COMMON_CLK_AXG=y
+CONFIG_COMMON_CLK_AXG_AUDIO=m
+CONFIG_COMMON_CLK_G12A=y
+# end of Clock support for Amlogic platforms
+
+CONFIG_ARMADA_AP_CP_HELPER=y
+CONFIG_ARMADA_37XX_CLK=y
+CONFIG_ARMADA_AP806_SYSCON=y
+CONFIG_ARMADA_AP_CPU_CLK=y
+CONFIG_ARMADA_CP110_SYSCON=y
+CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_RPMCC=y
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_QCOM_A53PLL=m
+CONFIG_QCOM_A7PLL=m
+CONFIG_QCOM_CLK_APCS_MSM8916=m
+CONFIG_QCOM_CLK_APCC_MSM8996=m
+CONFIG_QCOM_CLK_APCS_SDX55=m
+CONFIG_QCOM_CLK_RPM=m
+CONFIG_QCOM_CLK_SMD_RPM=m
+CONFIG_QCOM_CLK_RPMH=m
+# CONFIG_APQ_GCC_8084 is not set
+# CONFIG_APQ_MMCC_8084 is not set
+CONFIG_IPQ_APSS_PLL=m
+CONFIG_IPQ_APSS_6018=m
+# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_6018=m
+# CONFIG_IPQ_GCC_806X is not set
+# CONFIG_IPQ_LCC_806X is not set
+# CONFIG_IPQ_GCC_8074 is not set
+# CONFIG_MSM_GCC_8660 is not set
+CONFIG_MSM_GCC_8916=m
+CONFIG_MSM_GCC_8939=m
+# CONFIG_MSM_GCC_8960 is not set
+# CONFIG_MSM_LCC_8960 is not set
+CONFIG_MDM_GCC_9607=m
+# CONFIG_MDM_GCC_9615 is not set
+# CONFIG_MDM_LCC_9615 is not set
+# CONFIG_MSM_MMCC_8960 is not set
+# CONFIG_MSM_GCC_8953 is not set
+# CONFIG_MSM_GCC_8974 is not set
+# CONFIG_MSM_MMCC_8974 is not set
+# CONFIG_MSM_MMCC_8994 is not set
+# CONFIG_MSM_GCC_8994 is not set
+# CONFIG_MSM_GCC_8996 is not set
+# CONFIG_MSM_MMCC_8996 is not set
+CONFIG_MSM_GCC_8998=m
+CONFIG_MSM_GPUCC_8998=m
+CONFIG_MSM_MMCC_8998=m
+CONFIG_QCS_GCC_404=m
+CONFIG_SC_CAMCC_7180=m
+CONFIG_SC_DISPCC_7180=m
+CONFIG_SC_DISPCC_7280=m
+CONFIG_SC_GCC_7180=m
+CONFIG_SC_GCC_7280=m
+CONFIG_SC_GCC_8180X=m
+CONFIG_SC_LPASS_CORECC_7180=m
+CONFIG_SC_GPUCC_7180=m
+CONFIG_SC_GPUCC_7280=m
+CONFIG_SC_MSS_7180=m
+CONFIG_SC_VIDEOCC_7180=m
+CONFIG_SC_VIDEOCC_7280=m
+CONFIG_SDM_CAMCC_845=m
+CONFIG_SDM_GCC_660=m
+CONFIG_SDM_MMCC_660=m
+CONFIG_SDM_GPUCC_660=m
+CONFIG_QCS_TURING_404=m
+CONFIG_QCS_Q6SSTOP_404=m
+CONFIG_SDM_GCC_845=m
+CONFIG_SDM_GPUCC_845=m
+CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SDM_DISPCC_845=m
+CONFIG_SDM_LPASSCC_845=m
+CONFIG_SDX_GCC_55=m
+CONFIG_SM_CAMCC_8250=m
+CONFIG_SM_DISPCC_8250=m
+CONFIG_SM_GCC_6115=m
+CONFIG_SM_GCC_6125=m
+CONFIG_SM_GCC_6350=m
+CONFIG_SM_GCC_8150=m
+CONFIG_SM_GCC_8250=m
+CONFIG_SM_GCC_8350=m
+CONFIG_SM_GPUCC_8150=m
+CONFIG_SM_GPUCC_8250=m
+CONFIG_SM_VIDEOCC_8150=m
+CONFIG_SM_VIDEOCC_8250=m
+CONFIG_SPMI_PMIC_CLKDIV=m
+CONFIG_QCOM_HFPLL=m
+# CONFIG_KPSS_XCC is not set
+CONFIG_CLK_GFM_LPASS_SM8250=m
+CONFIG_COMMON_CLK_ROCKCHIP=y
+CONFIG_CLK_PX30=y
+CONFIG_CLK_RK3308=y
+CONFIG_CLK_RK3328=y
+CONFIG_CLK_RK3368=y
+CONFIG_CLK_RK3399=y
+CONFIG_CLK_RK3568=y
+CONFIG_COMMON_CLK_SAMSUNG=y
+CONFIG_EXYNOS_ARM64_COMMON_CLK=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_EXYNOS_CLKOUT=m
+CONFIG_CLK_INTEL_SOCFPGA=y
+CONFIG_CLK_INTEL_SOCFPGA64=y
+CONFIG_SPRD_COMMON_CLK=m
+CONFIG_SPRD_SC9860_CLK=m
+CONFIG_SPRD_SC9863A_CLK=m
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN50I_A64_CCU=y
+CONFIG_SUN50I_A100_CCU=y
+CONFIG_SUN50I_A100_R_CCU=y
+CONFIG_SUN50I_H6_CCU=y
+CONFIG_SUN50I_H616_CCU=y
+CONFIG_SUN50I_H6_R_CCU=y
+# CONFIG_SUN8I_A83T_CCU is not set
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
+CONFIG_SUN8I_R_CCU=y
+CONFIG_CLK_TEGRA_BPMP=y
+CONFIG_TEGRA_CLK_DFLL=y
+CONFIG_XILINX_VCU=m
+CONFIG_COMMON_CLK_ZYNQMP=y
+CONFIG_HWSPINLOCK=y
+CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK_SPRD=m
+CONFIG_HWSPINLOCK_SUN6I=m
+
+#
+# Clock Source drivers
+#
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_ACPI=y
+CONFIG_TIMER_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
+CONFIG_ROCKCHIP_TIMER=y
+CONFIG_OWL_TIMER=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_TEGRA_TIMER=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
+CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_HISILICON_ERRATUM_161010101=y
+CONFIG_ARM64_ERRATUM_858921=y
+CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
+CONFIG_ARM_TIMER_SP804=y
+CONFIG_MTK_TIMER=y
+CONFIG_SPRD_TIMER=y
+CONFIG_TIMER_IMX_SYS_CTR=y
+# CONFIG_MICROCHIP_PIT64B is not set
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU is not set
+CONFIG_ARM_MHU_V2=m
+CONFIG_IMX_MBOX=m
+CONFIG_PLATFORM_MHU=m
+# CONFIG_PL320_MBOX is not set
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
+CONFIG_ROCKCHIP_MBOX=y
+CONFIG_PCC=y
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_BCM2835_MBOX=y
+CONFIG_HI3660_MBOX=m
+CONFIG_HI6220_MBOX=m
+# CONFIG_MAILBOX_TEST is not set
+CONFIG_QCOM_APCS_IPC=m
+CONFIG_TEGRA_HSP_MBOX=y
+CONFIG_XGENE_SLIMPRO_MBOX=m
+CONFIG_BCM_PDC_MBOX=m
+CONFIG_BCM_FLEXRM_MBOX=m
+CONFIG_MTK_CMDQ_MBOX=m
+CONFIG_ZYNQMP_IPI_MBOX=y
+CONFIG_SUN6I_MSGBOX=m
+CONFIG_SPRD_MBOX=m
+CONFIG_QCOM_IPCC=y
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOASID=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
+CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y
+CONFIG_OF_IOMMU=y
+CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA_LIB=y
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_SUN50I_IOMMU=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_EXYNOS_IOMMU=y
+# CONFIG_EXYNOS_IOMMU_DEBUG is not set
+CONFIG_APPLE_DART=m
+CONFIG_ARM_SMMU=y
+# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
+# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set
+CONFIG_ARM_SMMU_QCOM=y
+CONFIG_ARM_SMMU_V3=y
+CONFIG_ARM_SMMU_V3_SVA=y
+CONFIG_MTK_IOMMU=y
+CONFIG_QCOM_IOMMU=y
+CONFIG_VIRTIO_IOMMU=y
+CONFIG_SPRD_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=y
+CONFIG_REMOTEPROC_CDEV=y
+CONFIG_IMX_REMOTEPROC=m
+CONFIG_MTK_SCP=m
+CONFIG_QCOM_PIL_INFO=m
+CONFIG_QCOM_RPROC_COMMON=m
+CONFIG_QCOM_Q6V5_COMMON=m
+CONFIG_QCOM_Q6V5_ADSP=m
+CONFIG_QCOM_Q6V5_MSS=m
+CONFIG_QCOM_Q6V5_PAS=m
+CONFIG_QCOM_Q6V5_WCSS=m
+CONFIG_QCOM_SYSMON=m
+# CONFIG_QCOM_WCNSS_PIL is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_NS=m
+CONFIG_RPMSG_MTK_SCP=m
+CONFIG_RPMSG_QCOM_GLINK=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
+CONFIG_RPMSG_QCOM_GLINK_SMEM=m
+CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+CONFIG_SOUNDWIRE=y
+
+#
+# SoundWire Devices
+#
+# CONFIG_SOUNDWIRE_INTEL is not set
+CONFIG_SOUNDWIRE_QCOM=m
+
+#
+# SOC (System On Chip) specific Drivers
+#
+CONFIG_OWL_PM_DOMAINS_HELPER=y
+CONFIG_OWL_PM_DOMAINS=y
+
+#
+# Amlogic SoC drivers
+#
+CONFIG_MESON_CANVAS=m
+CONFIG_MESON_CLK_MEASURE=y
+CONFIG_MESON_GX_SOCINFO=y
+CONFIG_MESON_GX_PM_DOMAINS=y
+CONFIG_MESON_EE_PM_DOMAINS=y
+CONFIG_MESON_SECURE_PM_DOMAINS=y
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+CONFIG_BCM2835_POWER=y
+CONFIG_RASPBERRYPI_POWER=y
+CONFIG_SOC_BRCMSTB=y
+CONFIG_BCM_PMB=y
+CONFIG_BRCMSTB_PM=y
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+CONFIG_FSL_DPAA=y
+# CONFIG_FSL_DPAA_CHECKING is not set
+# CONFIG_FSL_BMAN_TEST is not set
+# CONFIG_FSL_QMAN_TEST is not set
+CONFIG_QUICC_ENGINE=y
+CONFIG_FSL_GUTS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_DPAA2_CONSOLE=m
+CONFIG_FSL_RCPM=y
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
+CONFIG_SOC_IMX8M=y
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# MediaTek SoC drivers
+#
+CONFIG_MTK_CMDQ=m
+CONFIG_MTK_DEVAPC=m
+CONFIG_MTK_INFRACFG=y
+CONFIG_MTK_PMIC_WRAP=m
+CONFIG_MTK_SCPSYS=y
+CONFIG_MTK_SCPSYS_PM_DOMAINS=y
+CONFIG_MTK_MMSYS=y
+# end of MediaTek SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_AOSS_QMP=m
+CONFIG_QCOM_COMMAND_DB=y
+CONFIG_QCOM_CPR=m
+CONFIG_QCOM_GENI_SE=y
+CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_LLCC=m
+CONFIG_QCOM_KRYO_L2_ACCESSORS=y
+CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_OCMEM=m
+CONFIG_QCOM_PDR_HELPERS=m
+CONFIG_QCOM_QMI_HELPERS=m
+CONFIG_QCOM_RMTFS_MEM=m
+CONFIG_QCOM_RPMH=y
+CONFIG_QCOM_RPMHPD=y
+CONFIG_QCOM_RPMPD=m
+CONFIG_QCOM_SMEM=m
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_SMEM_STATE=y
+CONFIG_QCOM_SMP2P=m
+CONFIG_QCOM_SMSM=m
+CONFIG_QCOM_SOCINFO=m
+CONFIG_QCOM_WCNSS_CTRL=m
+CONFIG_QCOM_APR=m
+# end of Qualcomm SoC drivers
+
+CONFIG_ROCKCHIP_GRF=y
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SOC_SAMSUNG=y
+CONFIG_EXYNOS_CHIPID=y
+CONFIG_EXYNOS_PMU=y
+CONFIG_EXYNOS_PM_DOMAINS=y
+CONFIG_SUNXI_MBUS=y
+CONFIG_SUNXI_SRAM=y
+CONFIG_ARCH_TEGRA_132_SOC=y
+CONFIG_ARCH_TEGRA_210_SOC=y
+CONFIG_ARCH_TEGRA_186_SOC=y
+CONFIG_ARCH_TEGRA_194_SOC=y
+CONFIG_ARCH_TEGRA_234_SOC=y
+CONFIG_SOC_TEGRA_FUSE=y
+CONFIG_SOC_TEGRA_FLOWCTRL=y
+CONFIG_SOC_TEGRA_PMC=y
+CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
+CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+CONFIG_ZYNQMP_POWER=y
+CONFIG_ZYNQMP_PM_DOMAINS=y
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_DEVFREQ_GOV_PASSIVE=y
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
+CONFIG_ARM_IMX_BUS_DEVFREQ=m
+CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y
+CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_QCOM_SPMI_MISC=m
+# CONFIG_EXTCON_RT8973A is not set
+CONFIG_EXTCON_SM5502=m
+# CONFIG_EXTCON_USB_GPIO is not set
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_ARM_PL172_MPMC=m
+CONFIG_BRCMSTB_DPFE=y
+CONFIG_FPGA_DFL_EMIF=m
+CONFIG_FSL_IFC=y
+CONFIG_MTK_SMI=y
+CONFIG_TEGRA_MC=y
+CONFIG_TEGRA210_EMC_TABLE=y
+CONFIG_TEGRA210_EMC=m
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA220=m
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD06=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_FXLS8962AF=m
+CONFIG_FXLS8962AF_I2C=m
+CONFIG_FXLS8962AF_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+# CONFIG_MMA8452 is not set
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+# CONFIG_SCA3000 is not set
+CONFIG_SCA3300=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7091R5=m
+CONFIG_AD7124=m
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
+CONFIG_AD7292=m
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+CONFIG_AD7949=m
+# CONFIG_AD799X is not set
+CONFIG_AD9467=m
+CONFIG_ADI_AXI_ADC=m
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_BCM_IPROC_ADC=m
+# CONFIG_BERLIN2_ADC is not set
+# CONFIG_CC10001_ADC is not set
+CONFIG_CPCAP_ADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_ENVELOPE_DETECTOR=m
+# CONFIG_EXYNOS_ADC is not set
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+# CONFIG_IMX7D_ADC is not set
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2496=m
+CONFIG_LTC2497=m
+# CONFIG_MAX1027 is not set
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
+CONFIG_MAX1241=m
+# CONFIG_MAX1363 is not set
+CONFIG_MAX9611=m
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+CONFIG_MCP3911=m
+CONFIG_MEDIATEK_MT6577_AUXADC=m
+CONFIG_MESON_SARADC=m
+CONFIG_MP2629_ADC=m
+# CONFIG_NAU7802 is not set
+CONFIG_QCOM_VADC_COMMON=m
+# CONFIG_QCOM_SPMI_IADC is not set
+# CONFIG_QCOM_SPMI_VADC is not set
+CONFIG_QCOM_SPMI_ADC5=m
+# CONFIG_ROCKCHIP_SARADC is not set
+CONFIG_SC27XX_ADC=m
+CONFIG_SD_ADC_MODULATOR=m
+CONFIG_SUN4I_GPADC=m
+# CONFIG_TI_ADC081C is not set
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=m
+# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC161S626=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
+# CONFIG_TI_ADS8688 is not set
+CONFIG_TI_ADS124S08=m
+CONFIG_TI_ADS131E08=m
+# CONFIG_TI_AM335X_ADC is not set
+CONFIG_TI_TLC4541=m
+CONFIG_TI_TSC2046=m
+# CONFIG_VF610_ADC is not set
+# CONFIG_VIPERBOARD_ADC is not set
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+CONFIG_HMC425=m
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_ATLAS_EZO_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SENSIRION_SGP40 is not set
+CONFIG_SPS30=m
+CONFIG_SPS30_I2C=m
+CONFIG_SPS30_SERIAL=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# IIO SCMI Sensors
+#
+CONFIG_IIO_SCMI=m
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+# CONFIG_AD5755 is not set
+CONFIG_AD5758=m
+CONFIG_AD5761=m
+# CONFIG_AD5764 is not set
+# CONFIG_AD5766 is not set
+CONFIG_AD5770R=m
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+CONFIG_AD8801=m
+CONFIG_DPOT_DAC=m
+CONFIG_DS4424=m
+CONFIG_LTC1660=m
+CONFIG_LTC2632=m
+CONFIG_M62332=m
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+# CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+CONFIG_ADF4371=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+CONFIG_ADXRS290=m
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+# CONFIG_DHT11 is not set
+CONFIG_HDC100X=m
+CONFIG_HDC2010=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+CONFIG_ADIS16460=m
+CONFIG_ADIS16475=m
+# CONFIG_ADIS16480 is not set
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_FXOS8700=m
+CONFIG_FXOS8700_I2C=m
+CONFIG_FXOS8700_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
+CONFIG_IIO_ST_LSM9DS0=m
+CONFIG_IIO_ST_LSM9DS0_I2C=m
+CONFIG_IIO_ST_LSM9DS0_SPI=m
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+# CONFIG_ACPI_ALS is not set
+# CONFIG_ADJD_S311 is not set
+CONFIG_ADUX1020=m
+CONFIG_AL3010=m
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+CONFIG_APDS9960=m
+CONFIG_AS73211=m
+# CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
+# CONFIG_CM32181 is not set
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM3605=m
+# CONFIG_CM36651 is not set
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+CONFIG_GP2AP002=m
+# CONFIG_GP2AP020A00F is not set
+CONFIG_IQS621_ALS=m
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+# CONFIG_SENSORS_LM3533 is not set
+# CONFIG_LTR501 is not set
+CONFIG_LV0104CS=m
+# CONFIG_MAX44000 is not set
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+CONFIG_SI1145=m
+# CONFIG_STK3310 is not set
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+CONFIG_TSL2591=m
+CONFIG_TSL2772=m
+# CONFIG_TSL4531 is not set
+CONFIG_US5182D=m
+# CONFIG_VCNL4000 is not set
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+# CONFIG_VEML6070 is not set
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8974=m
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_MMC35240 is not set
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+# CONFIG_YAMAHA_YAS530 is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+CONFIG_IIO_MUX=m
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+CONFIG_IQS624_POS=m
+# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+CONFIG_AD5272=m
+# CONFIG_DS1803 is not set
+CONFIG_MAX5432=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+# CONFIG_MCP4131 is not set
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DLHL60D=m
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_HP03 is not set
+CONFIG_ICP10100=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_CROS_EC_MKBP_PROXIMITY=m
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_PING=m
+CONFIG_RFD77402=m
+CONFIG_SRF04=m
+CONFIG_SX9310=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VCNL3020=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_IQS620AT_TEMP=m
+CONFIG_LTC2983=m
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
+# CONFIG_MLX90614 is not set
+CONFIG_MLX90632=m
+# CONFIG_TMP006 is not set
+CONFIG_TMP007=m
+CONFIG_TMP117=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+CONFIG_NTB=y
+CONFIG_NTB_MSI=y
+CONFIG_NTB_IDT=m
+# CONFIG_NTB_EPF is not set
+CONFIG_NTB_SWITCHTEC=m
+# CONFIG_NTB_PINGPONG is not set
+# CONFIG_NTB_TOOL is not set
+CONFIG_NTB_PERF=m
+# CONFIG_NTB_MSI_TEST is not set
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_ATMEL_TCB=m
+CONFIG_PWM_BCM_IPROC=m
+CONFIG_PWM_BCM2835=m
+CONFIG_PWM_BERLIN=m
+CONFIG_PWM_BRCMSTB=m
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_DWC=m
+# CONFIG_PWM_FSL_FTM is not set
+CONFIG_PWM_HIBVT=m
+# CONFIG_PWM_IMX1 is not set
+# CONFIG_PWM_IMX27 is not set
+CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_IQS620A=m
+CONFIG_PWM_KEEMBAY=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_MESON=m
+CONFIG_PWM_MTK_DISP=m
+CONFIG_PWM_MEDIATEK=m
+CONFIG_PWM_NTXEC=m
+# CONFIG_PWM_PCA9685 is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SAMSUNG=m
+CONFIG_PWM_SL28CPLD=m
+CONFIG_PWM_SPRD=m
+CONFIG_PWM_SUN4I=m
+CONFIG_PWM_TEGRA=m
+CONFIG_PWM_VISCONTI=m
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_PM=y
+CONFIG_ARM_GIC_MAX_NR=1
+CONFIG_ARM_GIC_V2M=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARM_GIC_V3_ITS_FSL_MC=y
+CONFIG_ALPINE_MSI=y
+CONFIG_AL_FIC=y
+CONFIG_BCM7038_L1_IRQ=y
+CONFIG_BRCMSTB_L2_IRQ=y
+CONFIG_DW_APB_ICTL=y
+CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_MADERA_IRQ=m
+# CONFIG_XILINX_INTC is not set
+CONFIG_IMX_GPCV2=y
+CONFIG_MVEBU_GICP=y
+CONFIG_MVEBU_ICU=y
+CONFIG_MVEBU_ODMI=y
+CONFIG_MVEBU_PIC=y
+CONFIG_MVEBU_SEI=y
+CONFIG_LS_EXTIRQ=y
+CONFIG_LS_SCFG_MSI=y
+CONFIG_PARTITION_PERCPU=y
+CONFIG_QCOM_IRQ_COMBINER=y
+CONFIG_MESON_IRQ_GPIO=y
+CONFIG_QCOM_PDC=y
+CONFIG_IMX_IRQSTEER=y
+CONFIG_IMX_INTMUX=y
+CONFIG_MST_IRQ=y
+CONFIG_APPLE_AIC=y
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_A10SR is not set
+CONFIG_RESET_BERLIN=y
+CONFIG_RESET_BRCMSTB=m
+CONFIG_RESET_BRCMSTB_RESCAL=y
+CONFIG_RESET_IMX7=y
+CONFIG_RESET_MCHP_SPARX5=y
+CONFIG_RESET_MESON=y
+CONFIG_RESET_MESON_AUDIO_ARB=m
+CONFIG_RESET_QCOM_AOSS=y
+CONFIG_RESET_QCOM_PDC=m
+CONFIG_RESET_RASPBERRYPI=m
+CONFIG_RESET_SCMI=m
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SUNXI=y
+CONFIG_RESET_TI_SYSCON=m
+CONFIG_COMMON_RESET_HI3660=m
+CONFIG_COMMON_RESET_HI6220=m
+CONFIG_RESET_TEGRA_BPMP=y
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_PHY_XGENE=m
+CONFIG_PHY_CAN_TRANSCEIVER=m
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN6I_MIPI_DPHY=m
+CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_SUN50I_USB3=m
+CONFIG_PHY_MESON8B_USB2=m
+CONFIG_PHY_MESON_GXL_USB2=m
+CONFIG_PHY_MESON_G12A_USB2=m
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
+CONFIG_PHY_MESON_AXG_PCIE=m
+CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=m
+CONFIG_PHY_MESON_AXG_MIPI_DPHY=m
+CONFIG_PHY_BCM_SR_USB=m
+CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_BCM_NS_USB2=m
+CONFIG_PHY_BCM_NS_USB3=m
+CONFIG_PHY_NS2_PCIE=m
+CONFIG_PHY_NS2_USB_DRD=m
+CONFIG_PHY_BRCM_SATA=m
+CONFIG_PHY_BRCM_USB=m
+CONFIG_PHY_BCM_SR_PCIE=m
+CONFIG_PHY_CADENCE_TORRENT=m
+CONFIG_PHY_CADENCE_DPHY=m
+CONFIG_PHY_CADENCE_SIERRA=m
+CONFIG_PHY_CADENCE_SALVO=m
+CONFIG_PHY_FSL_IMX8MQ_USB=m
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_PHY_HI6220_USB=m
+CONFIG_PHY_HI3660_USB=m
+CONFIG_PHY_HI3670_USB=m
+CONFIG_PHY_HISTB_COMBPHY=m
+CONFIG_PHY_HISI_INNO_USB2=m
+CONFIG_PHY_BERLIN_SATA=m
+CONFIG_PHY_BERLIN_USB=m
+CONFIG_PHY_MVEBU_A3700_COMPHY=m
+CONFIG_PHY_MVEBU_A3700_UTMI=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_UTMI=m
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_UFS=m
+CONFIG_PHY_MTK_XSPHY=m
+CONFIG_PHY_MTK_HDMI=m
+CONFIG_PHY_MTK_MIPI_DSI=m
+CONFIG_PHY_SPARX5_SERDES=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_MAPPHONE_MDM6600=m
+CONFIG_PHY_OCELOT_SERDES=m
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ4019_USB=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_PHY_QCOM_PCIE2=m
+CONFIG_PHY_QCOM_QMP=m
+CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_QCOM_USB_HS_28NM=m
+CONFIG_PHY_QCOM_USB_SS=m
+CONFIG_PHY_QCOM_IPQ806X_USB=m
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
+CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_TYPEC=m
+CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_PCIE=y
+CONFIG_PHY_SAMSUNG_UFS=m
+# CONFIG_PHY_SAMSUNG_USB2 is not set
+# CONFIG_PHY_EXYNOS5_USBDRD is not set
+CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_PHY_TEGRA194_P2U=m
+# CONFIG_PHY_TUSB1210 is not set
+CONFIG_PHY_INTEL_KEEMBAY_EMMC=m
+CONFIG_PHY_INTEL_KEEMBAY_USB=m
+CONFIG_PHY_XILINX_ZYNQMP=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_IDLE_INJECT=y
+# CONFIG_DTPM is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+CONFIG_ARM_CCI_PMU=y
+CONFIG_ARM_CCI400_PMU=y
+CONFIG_ARM_CCI5xx_PMU=y
+CONFIG_ARM_CCN=y
+CONFIG_ARM_CMN=m
+CONFIG_ARM_PMU=y
+CONFIG_ARM_PMU_ACPI=y
+CONFIG_ARM_SMMU_V3_PMU=m
+CONFIG_ARM_DSU_PMU=m
+CONFIG_FSL_IMX8_DDR_PMU=m
+CONFIG_QCOM_L2_PMU=y
+CONFIG_QCOM_L3_PMU=y
+CONFIG_THUNDERX2_PMU=m
+CONFIG_XGENE_PMU=y
+CONFIG_ARM_SPE_PMU=m
+CONFIG_ARM_DMC620_PMU=m
+CONFIG_HISI_PMU=y
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=m
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_OF_PMEM=m
+CONFIG_NVDIMM_KEYS=y
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_HMEM_DEVICES=y
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_NVMEM_IMX_IIM=m
+CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_IMX_OCOTP_SCU=m
+CONFIG_MTK_EFUSE=m
+CONFIG_QCOM_QFPROM=m
+CONFIG_NVMEM_SPMI_SDAM=m
+CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_ROCKCHIP_OTP=m
+CONFIG_NVMEM_BCM_OCOTP=m
+CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_MESON_EFUSE=m
+# CONFIG_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
+CONFIG_SC27XX_EFUSE=m
+CONFIG_NVMEM_ZYNQMP=y
+CONFIG_SPRD_EFUSE=m
+# CONFIG_NVMEM_RMEM is not set
+
+#
+# HW tracing support
+#
+CONFIG_STM=y
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+# CONFIG_STM_DUMMY is not set
+CONFIG_STM_SOURCE_CONSOLE=y
+# CONFIG_STM_SOURCE_HEARTBEAT is not set
+CONFIG_STM_SOURCE_FTRACE=m
+# CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_SOCFPGA=m
+CONFIG_FPGA_MGR_SOCFPGA_A10=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_STRATIX10_SOC=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_SOCFPGA_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_OF_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+# CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000 is not set
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_FPGA_MGR_ZYNQMP_FPGA=m
+CONFIG_FPGA_MGR_VERSAL_FPGA=m
+# CONFIG_FSI is not set
+CONFIG_TEE=m
+
+#
+# TEE drivers
+#
+# CONFIG_OPTEE is not set
+# end of TEE drivers
+
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+CONFIG_MUX_ADGS1408=m
+CONFIG_MUX_GPIO=m
+CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+CONFIG_INTERCONNECT=y
+CONFIG_INTERCONNECT_IMX=m
+CONFIG_INTERCONNECT_IMX8MM=m
+CONFIG_INTERCONNECT_IMX8MN=m
+CONFIG_INTERCONNECT_IMX8MQ=m
+# CONFIG_INTERCONNECT_QCOM is not set
+CONFIG_INTERCONNECT_SAMSUNG=y
+CONFIG_INTERCONNECT_EXYNOS=m
+# CONFIG_COUNTER is not set
+# CONFIG_MOST is not set
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+# CONFIG_F2FS_FS_COMPRESSION is not set
+CONFIG_F2FS_IOSTAT=y
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION_ALGS=y
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
+# CONFIG_FS_VERITY is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_DAX=y
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+CONFIG_NETFS_STATS=y
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+# CONFIG_NTFS3_64BIT_CLUSTER is not set
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=m
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+# CONFIG_ADFS_FS is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_UBIFS_FS is not set
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+CONFIG_CRAMFS_MTD=y
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+CONFIG_HPFS_FS=m
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+CONFIG_PSTORE_LZ4HC_COMPRESS=m
+# CONFIG_PSTORE_842_COMPRESS is not set
+CONFIG_PSTORE_ZSTD_COMPRESS=y
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_ZIP=y
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
+CONFIG_CODA_FS=m
+# CONFIG_AFS_FS is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=y
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
+# CONFIG_EVM is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2S=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_ALLWINNER=y
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
+# CONFIG_CRYPTO_DEV_SUN4I_SS_DEBUG is not set
+CONFIG_CRYPTO_DEV_SUN8I_CE=m
+# CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
+CONFIG_CRYPTO_DEV_SUN8I_CE_HASH=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS=m
+# CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set
+CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS_HASH=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
+CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
+CONFIG_CRYPTO_DEV_S5P=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
+CONFIG_CRYPTO_DEV_MXS_DCP=m
+CONFIG_CRYPTO_DEV_CPT=m
+CONFIG_CAVIUM_CPT=m
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_MARVELL=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_CRYPTO_DEV_OCTEONTX_CPT=m
+# CONFIG_CRYPTO_DEV_OCTEONTX2_CPT is not set
+CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
+CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
+CONFIG_CRYPTO_DEV_QCE_SHA=y
+CONFIG_CRYPTO_DEV_QCE_AEAD=y
+CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_SKCIPHER is not set
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set
+CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
+CONFIG_CRYPTO_DEV_ROCKCHIP=m
+CONFIG_CRYPTO_DEV_ZYNQMP_AES=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_BCM_SPU=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_CCREE=m
+CONFIG_CRYPTO_DEV_HISI_SEC=m
+CONFIG_CRYPTO_DEV_HISI_SEC2=m
+CONFIG_CRYPTO_DEV_HISI_QM=m
+CONFIG_CRYPTO_DEV_HISI_ZIP=m
+CONFIG_CRYPTO_DEV_HISI_HPRE=m
+CONFIG_CRYPTO_DEV_HISI_TRNG=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4=m
+CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4_ECB=y
+CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4_CTS=y
+# CONFIG_CRYPTO_DEV_KEEMBAY_OCS_HCU is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+# CONFIG_PRIME_NUMBERS is not set
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_STMP_DEVICE=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+CONFIG_INDIRECT_PIO=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=y
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
+CONFIG_AUDIT_COMPAT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=y
+CONFIG_842_DECOMPRESS=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_RESTRICTED_POOL is not set
+CONFIG_DMA_NONCOHERENT_MMAP=y
+CONFIG_DMA_COHERENT_POOL=y
+CONFIG_DMA_REMAP=y
+CONFIG_DMA_DIRECT_REMAP=y
+CONFIG_DMA_CMA=y
+CONFIG_DMA_PERNUMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=0
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+# CONFIG_FONT_6x8 is not set
+CONFIG_SG_SPLIT=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_STACKDEPOT=y
+CONFIG_STACK_HASH_ORDER=20
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# end of Library routines
+
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_PLDMFW=y
+CONFIG_ASN1_ENCODER=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_COMPRESSED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_DEBUG_INFO_BTF_MODULES=y
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_FRAME_WARN=2048
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+CONFIG_DEBUG_SECTION_MISMATCH=y
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_HONOUR_BLOCKLIST=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+# end of Generic Kernel Debugging Instruments
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_PAGE_OWNER=y
+CONFIG_PAGE_POISONING=y
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_ARCH_HAS_DEBUG_WX=y
+CONFIG_DEBUG_WX=y
+CONFIG_GENERIC_PTDUMP=y
+CONFIG_PTDUMP_CORE=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
+CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# end of Debug kernel data structures
+
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
+CONFIG_RCU_TORTURE_TEST=m
+CONFIG_RCU_REF_SCALE_TEST=m
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_TRACE=y
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_LATENCYTOP=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_BOOTTIME_TRACING=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_STACK_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_HWLAT_TRACER=y
+CONFIG_OSNOISE_TRACER=y
+CONFIG_TIMERLAT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
+CONFIG_TRACING_MAP=y
+CONFIG_SYNTH_EVENTS=y
+CONFIG_HIST_TRIGGERS=y
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+# CONFIG_KPROBE_EVENT_GEN_TEST is not set
+# CONFIG_HIST_TRIGGERS_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# arm64 Debugging
+#
+CONFIG_PID_IN_CONTEXTIDR=y
+# CONFIG_DEBUG_EFI is not set
+CONFIG_ARM64_RELOC_TEST=m
+CONFIG_CORESIGHT=y
+CONFIG_CORESIGHT_LINKS_AND_SINKS=y
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
+CONFIG_CORESIGHT_CATU=y
+CONFIG_CORESIGHT_SINK_TPIU=y
+CONFIG_CORESIGHT_SINK_ETBV10=y
+CONFIG_CORESIGHT_SOURCE_ETM4X=y
+# CONFIG_ETM4X_IMPDEF_FEATURE is not set
+CONFIG_CORESIGHT_STM=y
+CONFIG_CORESIGHT_CPU_DEBUG=m
+CONFIG_CORESIGHT_CTI=y
+# CONFIG_CORESIGHT_CTI_INTEGRATION_REGS is not set
+CONFIG_CORESIGHT_TRBE=m
+# end of arm64 Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_STRING_SELFTEST is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_SCANF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_PARMAN is not set
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_BITOPS is not set
+# CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_HMM is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# CONFIG_HYPERV_TESTING is not set
+# end of Kernel Testing and Coverage
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
new file mode 100644
index 000000000000..7128001d7d1d
--- /dev/null
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -0,0 +1,10253 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 5.15.0 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=100201
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23501
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23501
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=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_WERROR is not set
+CONFIG_LOCALVERSION="_1"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_ZSTD=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_ZSTD is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_SIM=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_MSI_IOMMU=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_JIT is not set
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+# end of BPF subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_SCHED_CORE=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_SCHED_AVG_IRQ=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+# CONFIG_PRINTK_INDEX is not set
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=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_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_X86_32=y
+CONFIG_FORCE_DYNAMIC_FTRACE=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_NR_GPIO=512
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_32_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=3
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
+CONFIG_X86_CPU_RESCTRL=y
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=y
+# CONFIG_IOSF_MBI_DEBUG is not set
+# CONFIG_X86_32_IRIS is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+# CONFIG_XEN is not set
+CONFIG_KVM_GUEST=y
+CONFIG_ARCH_CPUIDLE_HALTPOLL=y
+# CONFIG_PVH is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_M486SX is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=6
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_IA32_FEAT_CTL=y
+CONFIG_X86_VMX_FEATURE_NAMES=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=8
+CONFIG_NR_CPUS_DEFAULT=8
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCELOG_LEGACY is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=m
+CONFIG_PERF_EVENTS_INTEL_CSTATE=m
+CONFIG_PERF_EVENTS_AMD_POWER=m
+CONFIG_PERF_EVENTS_AMD_UNCORE=m
+# end of Performance monitoring
+
+# CONFIG_X86_LEGACY_VM86 is not set
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX32=y
+CONFIG_X86_IOPL_IOPERM=y
+# CONFIG_TOSHIBA is not set
+CONFIG_I8K=m
+# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_X86_PAE=y
+# CONFIG_X86_CPA_STATISTICS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+# CONFIG_X86_PMEM_LEGACY is not set
+# CONFIG_HIGHPTE is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_X86_UMIP=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+# CONFIG_KEXEC_JUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+# end of Processor type and features
+
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON_SIGNAL=38
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+# CONFIG_ACPI_TAD is not set
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_PLATFORM_PROFILE=m
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_DPTF=y
+CONFIG_DPTF_POWER=m
+CONFIG_DPTF_PCH_FIVR=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_CONFIGFS=m
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_TPS68470_PMIC_OPREGION=y
+CONFIG_ACPI_VIOT=y
+CONFIG_X86_PM_TIMER=y
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+# CONFIG_X86_POWERNOW_K6 is not set
+# CONFIG_X86_POWERNOW_K7 is not set
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+# CONFIG_X86_GX_SUSPMOD is not set
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_SPEEDSTEP_ICH is not set
+# CONFIG_X86_SPEEDSTEP_SMI is not set
+CONFIG_X86_P4_CLOCKMOD=m
+# CONFIG_X86_CPUFREQ_NFORCE2 is not set
+# CONFIG_X86_LONGRUN is not set
+# CONFIG_X86_LONGHAUL is not set
+# CONFIG_X86_E_POWERSAVER is not set
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+CONFIG_CPU_IDLE_GOV_HALTPOLL=y
+CONFIG_HALTPOLL_CPUIDLE=y
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
+# CONFIG_SCx200 is not set
+# CONFIG_ALIX is not set
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
+CONFIG_AMD_NB=y
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_COMPAT_32=y
+# end of Binary Emulations
+
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+CONFIG_HAVE_KVM_PM_NOTIFIER=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_WERROR=y
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+# CONFIG_KVM_XEN is not set
+# CONFIG_KVM_MMU_AUDIT is not set
+CONFIG_AS_AVX512=y
+CONFIG_AS_SHA1_NI=y
+CONFIG_AS_SHA256_NI=y
+CONFIG_AS_TPAUSE=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_GENERIC_ENTRY=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+# CONFIG_STATIC_CALL_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_HAVE_STATIC_CALL=y
+CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SPLIT_ARG64=y
+CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_GZIP is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_DEV_BSG_COMMON=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_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_FC_APPID is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_HMM_MIRROR=y
+CONFIG_VMAP_PFN=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+CONFIG_GUP_GET_PTE_LOW_HIGH=y
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_KMAP_LOCAL=y
+CONFIG_SECRETMEM=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_DBGFS=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
+# CONFIG_TLS_TOE is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XFRM_ESPINTCP=y
+CONFIG_SMC=m
+CONFIG_SMC_DIAG=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+# CONFIG_NET_FOU_IP_TUNNELS is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+CONFIG_INET_ESPINTCP=y
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=y
+CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_ESPINTCP=y
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
+CONFIG_IPV6_RPL_LWTUNNEL=y
+CONFIG_IPV6_IOAM6_LWTUNNEL=y
+# CONFIG_NETLABEL is not set
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+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_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+# CONFIG_IP6_NF_SECURITY is not set
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+# CONFIG_NF_TABLES_BRIDGE is not set
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+# CONFIG_RDS_RDMA is not set
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+# CONFIG_BRIDGE_CFM is not set
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=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_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+# CONFIG_6LOWPAN is not set
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BATMAN_V=y
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=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_STREAM_PARSER=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+# CONFIG_CAN_J1939 is not set
+CONFIG_CAN_ISOTP=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+# CONFIG_CAN_JANZ_ICAN3 is not set
+# CONFIG_CAN_KVASER_PCIEFD is not set
+# CONFIG_PCH_CAN is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PCI=m
+# CONFIG_CAN_M_CAN_PLATFORM is not set
+# CONFIG_CAN_M_CAN_TCAN4X5X is not set
+# CONFIG_CAN_PEAK_PCIEFD is not set
+# CONFIG_CAN_SJA1000 is not set
+CONFIG_CAN_SOFTING=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_LEDS=y
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+# CONFIG_BT_HCIUART_MRVL is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_IPV6 is not set
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_MCTP=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_RDMA is not set
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_VIRTUAL_NCI=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_S3FWRN82_UART=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+# CONFIG_EISA is not set
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+# CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_LABEL=y
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_COMPAQ is not set
+# CONFIG_HOTPLUG_PCI_IBM is not set
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+#
+# PCI controller drivers
+#
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+
+#
+# Mobiveil PCIe Core Support
+#
+# end of Mobiveil PCIe Core Support
+
+#
+# Cadence PCIe controllers support
+#
+# end of Cadence PCIe controllers support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=m
+CONFIG_CXL_MEM=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_ACPI=m
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA is not set
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_RAPIDIO=m
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_CACHE=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
+CONFIG_REGMAP_SOUNDWIRE_MBQ=m
+CONFIG_REGMAP_I3C=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
+CONFIG_SYSFB=y
+CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=y
+CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
+CONFIG_EFI_TEST=m
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_EFI_RCI2_TABLE is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_EFI_EMBEDDED_FIRMWARE=y
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_MCHP23K256 is not set
+CONFIG_MTD_MCHP48L640=m
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_PHRAM=m
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+# CONFIG_MTD_ONENAND is not set
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_CS553X=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_ARASAN=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+# CONFIG_MTD_SPI_NOR is not set
+# CONFIG_MTD_UBI is not set
+# CONFIG_MTD_HYPERBUS is not set
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_CDROM=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+# CONFIG_IBM_ASM is not set
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_PCH_PHUB=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
+CONFIG_MISC_RTSX=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_INTEL_MEI_TXE=m
+CONFIG_INTEL_MEI_HDCP=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_ECHO=m
+CONFIG_BCM_VK=m
+# CONFIG_BCM_VK_TTY is not set
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+# CONFIG_SCSI_NSP32 is not set
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+# CONFIG_PATA_CS5535 is not set
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_UNSTRIPED is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+# CONFIG_DM_WRITECACHE is not set
+CONFIG_DM_ERA=m
+# CONFIG_DM_CLONE is not set
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_ZONED is not set
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LAN is not set
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_TAP=m
+CONFIG_TUN_VNET_CROSS_LE=y
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_VSOCKMON is not set
+CONFIG_MHI_NET=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+# CONFIG_CAIF_DRIVERS is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+# CONFIG_NET_DSA_BCM_SF2 is not set
+# CONFIG_NET_DSA_LOOP is not set
+# CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK is not set
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+# CONFIG_NET_DSA_MSCC_SEVILLE is not set
+CONFIG_NET_DSA_AR9331=m
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_QCA8K=m
+# CONFIG_NET_DSA_REALTEK_SMI is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=y
+CONFIG_AMD_XGBE=m
+# CONFIG_AMD_XGBE_DCB is not set
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+# CONFIG_AQTION is not set
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+# CONFIG_CHELSIO_T4_DCB is not set
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_CHELSIO_TLS_DEVICE=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+# CONFIG_PCMCIA_XIRCOM is not set
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=y
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+# CONFIG_IXGBE_DCB is not set
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+# CONFIG_ICE is not set
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+# CONFIG_SKGE_GENESIS is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CLS_ACT=y
+CONFIG_MLX5_TC_SAMPLE=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+# CONFIG_MLX5_TLS is not set
+CONFIG_MLX5_SW_STEERING=y
+# CONFIG_MLX5_SF is not set
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+# CONFIG_LAN743X is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_PCH_GBE is not set
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_INTEL=m
+CONFIG_DWMAC_LOONGSON=m
+CONFIG_STMMAC_PCI=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_EMACLITE=m
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+# CONFIG_SFP is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=y
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+# CONFIG_CORTINA_PHY is not set
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+# CONFIG_MARVELL_10G_PHY is not set
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+# CONFIG_MICROCHIP_T1_PHY is not set
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+# CONFIG_DP83TC811_PHY is not set
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_ACPI_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_MVUSB is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+
+#
+# MDIO Multiplexers
+#
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HWRNG=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+CONFIG_IWLWIFI_BCAST_FILTERING=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615_COMMON=m
+CONFIG_MT7615E=m
+CONFIG_MT7663_USB_SDIO_COMMON=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921E=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+# CONFIG_WILC1000_SPI is not set
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+# CONFIG_IEEE802154_CC2520 is not set
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+# CONFIG_IEEE802154_CA8210 is not set
+# CONFIG_IEEE802154_MCR20A is not set
+CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+CONFIG_WWAN_HWSIM=m
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+CONFIG_IOSM=m
+# end of Wireless WAN
+
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_IQS62X is not set
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=m
+# CONFIG_KEYBOARD_MTK_PMIC is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+# CONFIG_JOYSTICK_PXRC is not set
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+# CONFIG_TABLET_SERIAL_WACOM4 is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMA140=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_ILITEK=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_MSG2638=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+# CONFIG_TOUCHSCREEN_WM831X is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_GPIO_BEEPER is not set
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+# CONFIG_INPUT_WISTRON_BTNS is not set
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA7280_HAPTICS is not set
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
+# CONFIG_INPUT_WM831X_ON is not set
+# CONFIG_INPUT_PCAP is not set
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_16550A_VARIANTS=y
+CONFIG_SERIAL_8250_FINTEK=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_LANTIQ=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+# CONFIG_SERIAL_SC16IS7XX is not set
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_BCM63XX=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=m
+# CONFIG_SERIAL_MEN_Z135 is not set
+# CONFIG_SERIAL_SPRD is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_SERIAL_DEV_BUS=m
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+# CONFIG_SONYPI is not set
+CONFIG_MWAVE=m
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_NSC_GPIO is not set
+CONFIG_DEVMEM=y
+CONFIG_NVRAM=m
+CONFIG_DEVPORT=y
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_TIS_I2C_CR50=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_CRB=m
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_TELCLOCK=m
+CONFIG_XILLYBUS_CLASS=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYUSB=m
+# CONFIG_RANDOM_TRUST_CPU is not set
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+# CONFIG_I2C_MUX_LTC4306 is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=m
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_CP2615=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_CROS_EC_TUNNEL=m
+# CONFIG_SCx200_ACB is not set
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_I2C_SLAVE_TESTUNIT=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+CONFIG_MIPI_I3C_HCI=m
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_ALTERA_CORE=m
+CONFIG_SPI_ALTERA_DFL=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_DMA=y
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_NXP_FLEXSPI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_LANTIQ_SSC=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_TOPCLIFF_PCH=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_XILINX=m
+CONFIG_SPI_ZYNQMP_GQSPI=m
+CONFIG_SPI_AMD=m
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_LOOPBACK_TEST=m
+CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
+CONFIG_SPMI=m
+CONFIG_SPMI_HISI3670=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+CONFIG_PPS_CLIENT_KTIMER=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_VMW=m
+CONFIG_PTP_1588_CLOCK_OCP=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_DA9062=m
+# CONFIG_PINCTRL_MCP23S08 is not set
+# CONFIG_PINCTRL_SX150X is not set
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_LYNXPOINT=m
+CONFIG_PINCTRL_INTEL=y
+CONFIG_PINCTRL_ALDERLAKE=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_ELKHARTLAKE=m
+CONFIG_PINCTRL_EMMITSBURG=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_JASPERLAKE=m
+CONFIG_PINCTRL_LAKEFIELD=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_CS47L35=y
+CONFIG_PINCTRL_CS47L85=y
+CONFIG_PINCTRL_CS47L90=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+# CONFIG_GPIO_WINBOND is not set
+# CONFIG_GPIO_WS16C48 is not set
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_TIMBERDALE=y
+CONFIG_GPIO_TPS65086=m
+# CONFIG_GPIO_TPS65912 is not set
+CONFIG_GPIO_TPS68470=y
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_UCB1400=m
+# CONFIG_GPIO_WM831X is not set
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_PCI_IDIO_16=m
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+CONFIG_GPIO_VIRTIO=m
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_W1_MASTER_SGI=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+# CONFIG_W1_SLAVE_DS2406 is not set
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+# CONFIG_W1_SLAVE_DS2438 is not set
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+# CONFIG_POWER_RESET is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+# CONFIG_WM831X_BACKUP is not set
+# CONFIG_WM831X_POWER is not set
+CONFIG_TEST_POWER=m
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_LTC4162L=m
+CONFIG_CHARGER_MP2629=m
+CONFIG_CHARGER_MT6360=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_BQ256XX=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+# CONFIG_BATTERY_GOLDFISH is not set
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
+CONFIG_CHARGER_BD99954=m
+CONFIG_BATTERY_SURFACE=m
+CONFIG_CHARGER_SURFACE=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+# CONFIG_SENSORS_ASPEED is not set
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+# CONFIG_SENSORS_POWR1220 is not set
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC2992=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_TPS23861=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_MR75203=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1266=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_BEL_PFE=m
+CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_FSP_3Y=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_DPS920AB=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+# CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR36021=m
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+# CONFIG_SENSORS_LTC2978_REGULATOR is not set
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX15301=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_MP2888=m
+CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_PIM4328=m
+CONFIG_SENSORS_PM6764TR=m
+# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_Q54SJ108A2=m
+CONFIG_SENSORS_STPDDC60=m
+# CONFIG_SENSORS_TPS40422 is not set
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE122=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHT4x=m
+# CONFIG_SENSORS_SHTC1 is not set
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+# CONFIG_SENSORS_TMP103 is not set
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+# CONFIG_SENSORS_W83773G is not set
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+# CONFIG_SENSORS_WM831X is not set
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_DEVFREQ_THERMAL=y
+# CONFIG_THERMAL_EMULATION is not set
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+# CONFIG_INTEL_SOC_DTS_THERMAL is not set
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT3406_THERMAL=m
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_INTEL_TCC_COOLING=m
+CONFIG_INTEL_MENLOW=m
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+# CONFIG_MENZ069_WATCHDOG is not set
+CONFIG_WDAT_WDT=m
+# CONFIG_WM831X_WATCHDOG is not set
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+# CONFIG_EBC_C384_WDT is not set
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+# CONFIG_SBC7240_WDT is not set
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_MEN_A21_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+CONFIG_MFD_CS47L35=y
+CONFIG_MFD_CS47L85=y
+CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
+# CONFIG_PMIC_DA903X is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+CONFIG_MFD_DA9062=m
+# CONFIG_MFD_DA9063 is not set
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MP2629=m
+CONFIG_HTC_PASIC3=m
+# CONFIG_HTC_I2CPLD is not set
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_INTEL_SOC_PMIC_BXTWC is not set
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_MRFLD=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_PMC_BXT=m
+CONFIG_MFD_INTEL_PMT=m
+CONFIG_MFD_IQS62X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77693 is not set
+CONFIG_MFD_MAX77843=y
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+CONFIG_MFD_MT6360=m
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT4831=m
+CONFIG_MFD_RT5033=m
+# CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+# CONFIG_MFD_TPS65090 is not set
+CONFIG_MFD_TI_LP873X=m
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+CONFIG_MFD_TPS65912=y
+# CONFIG_MFD_TPS65912_I2C is not set
+CONFIG_MFD_TPS65912_SPI=y
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=m
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
+CONFIG_MFD_WM8998=y
+# CONFIG_MFD_WM8400 is not set
+CONFIG_MFD_WM831X=y
+# CONFIG_MFD_WM831X_I2C is not set
+CONFIG_MFD_WM831X_SPI=y
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_ATC260X_I2C is not set
+# CONFIG_RAVE_SP_CORE is not set
+CONFIG_MFD_INTEL_M10_BMC=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+# CONFIG_REGULATOR_88PG86X is not set
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
+# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+# CONFIG_REGULATOR_BD9571MWV is not set
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9210=m
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+# CONFIG_REGULATOR_LTC3589 is not set
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8893=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MAX77826=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6315=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6358=m
+CONFIG_REGULATOR_MT6359=m
+CONFIG_REGULATOR_MT6360=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_TPS6524X=m
+# CONFIG_REGULATOR_TPS65912 is not set
+# CONFIG_REGULATOR_WM831X is not set
+CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+# CONFIG_IR_IMON_DECODER is not set
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+# CONFIG_IR_IMON_RAW is not set
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+# CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
+CONFIG_IR_TOY=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_MEDIA_CEC_RC=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CROS_EC=m
+CONFIG_CEC_SECO=m
+CONFIG_CEC_SECO_RC=y
+CONFIG_USB_PULSE8_CEC=m
+# CONFIG_USB_RAINSHADOW_CEC is not set
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+# CONFIG_USB_GSPCA_DTCS033 is not set
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+# CONFIG_VIDEO_AU0828_RC is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+# CONFIG_VIDEO_SOLO6X10 is not set
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+# CONFIG_VIDEO_IPU3_CIO2 is not set
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_VIA_CAMERA=m
+# CONFIG_VIDEO_CADENCE is not set
+CONFIG_VIDEO_ASPEED=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+# CONFIG_DVB_FIREDTV is not set
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
+CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of Miscellaneous helper chips
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_IMX208=m
+# CONFIG_VIDEO_IMX214 is not set
+CONFIG_VIDEO_IMX219=m
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_OV02A10 is not set
+CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV2740 is not set
+# CONFIG_VIDEO_OV5647 is not set
+CONFIG_VIDEO_OV5648=m
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+CONFIG_VIDEO_OV5675=m
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+CONFIG_VIDEO_OV8865=m
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV9734 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+CONFIG_VIDEO_DW9768=m
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+# CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+# CONFIG_AGP_NVIDIA is not set
+CONFIG_AGP_SIS=m
+# CONFIG_AGP_SWORKS is not set
+CONFIG_AGP_VIA=m
+# CONFIG_AGP_EFFICEON is not set
+CONFIG_INTEL_GTT=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_CEC=y
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN=y
+# CONFIG_DRM_AMD_DC_HDCP is not set
+CONFIG_DRM_AMD_DC_SI=y
+CONFIG_DRM_AMD_SECURE_DISPLAY=y
+# end of Display Engine Configuration
+
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
+CONFIG_DRM_I915_FENCE_TIMEOUT=10000
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
+CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
+CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
+CONFIG_DRM_I915_STOP_TIMEOUT=100
+CONFIG_DRM_I915_TIMESLICE_DURATION=1
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VKMS=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+# CONFIG_DRM_VMWGFX_MKSSTATS is not set
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_TINYDRM_HX8357D=m
+# CONFIG_TINYDRM_ILI9225 is not set
+# CONFIG_TINYDRM_ILI9341 is not set
+# CONFIG_TINYDRM_ILI9486 is not set
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+# CONFIG_TINYDRM_ST7735R is not set
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_HYPERV=m
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_VIA is not set
+# CONFIG_DRM_SAVAGE is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+CONFIG_FB_OPENCORES=m
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SSD1307=m
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+# CONFIG_LCD_OTM3225A is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+CONFIG_BACKLIGHT_SAHARA=m
+# CONFIG_BACKLIGHT_WM831X is not set
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+# CONFIG_SND_ES1968_RADIO is not set
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+# CONFIG_SND_SIS7019 is not set
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=0
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+# CONFIG_SND_ISIGHT is not set
+# CONFIG_SND_FIREWORKS is not set
+# CONFIG_SND_BEBOB is not set
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREFACE is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_SND_SOC_AMD_ACP=m
+# CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
+CONFIG_SND_SOC_AMD_RENOIR=m
+CONFIG_SND_SOC_AMD_RENOIR_MACH=m
+CONFIG_SND_SOC_AMD_ACP5x=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_RPMSG=m
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
+# CONFIG_SND_I2S_HI6210_I2S is not set
+CONFIG_SND_SOC_IMG=y
+CONFIG_SND_SOC_IMG_I2S_IN=m
+CONFIG_SND_SOC_IMG_I2S_OUT=m
+CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
+CONFIG_SND_SOC_IMG_SPDIF_IN=m
+CONFIG_SND_SOC_IMG_SPDIF_OUT=m
+CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+# CONFIG_SND_SOC_INTEL_CML_H is not set
+# CONFIG_SND_SOC_INTEL_CML_LP is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+# CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH is not set
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI_DEV=m
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_ACPI_DEV=m
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_INTEL_APL=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_INTEL_CNL=m
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_ICL=m
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_JASPERLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_TGL=m
+CONFIG_SND_SOC_SOF_TIGERLAKE=m
+CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
+CONFIG_SND_SOC_SOF_ALDERLAKE=m
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
+CONFIG_SND_SOC_XILINX_SPDIF=m
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_ARIZONA=m
+CONFIG_SND_SOC_WM_ADSP=m
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=m
+CONFIG_SND_SOC_ADAU1701=m
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+# CONFIG_SND_SOC_AK4458 is not set
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+# CONFIG_SND_SOC_AK5558 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_BD28623 is not set
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+# CONFIG_SND_SOC_CS35L35 is not set
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+# CONFIG_SND_SOC_CS42L56 is not set
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4234=m
+# CONFIG_SND_SOC_CS4265 is not set
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
+# CONFIG_SND_SOC_DA7213 is not set
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_HDAC_HDMI=m
+CONFIG_SND_SOC_HDAC_HDA=m
+CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+# CONFIG_SND_SOC_MAX9867 is not set
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
+CONFIG_SND_SOC_MAX98390=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+# CONFIG_SND_SOC_PCM1789_I2C is not set
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM5102A=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT1011=m
+CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
+CONFIG_SND_SOC_RT1308_SDW=m
+CONFIG_SND_SOC_RT1316_SDW=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT711_SDCA_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
+CONFIG_SND_SOC_RT715_SDCA_SDW=m
+CONFIG_SND_SOC_SDW_MOCKUP=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
+CONFIG_SND_SOC_SPDIF=m
+# CONFIG_SND_SOC_SSM2305 is not set
+CONFIG_SND_SOC_SSM2518=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+# CONFIG_SND_SOC_STA350 is not set
+CONFIG_SND_SOC_STI_SAS=m
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
+# CONFIG_SND_SOC_TAS2770 is not set
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TFA989X=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+CONFIG_SND_SOC_TLV320ADCX140=m
+CONFIG_SND_SOC_TS3A227E=m
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WCD_MBHC=m
+CONFIG_SND_SOC_WCD938X=m
+CONFIG_SND_SOC_WCD938X_SDW=m
+CONFIG_SND_SOC_WM5102=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+# CONFIG_SND_SOC_WM8782 is not set
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WSA881X=m
+CONFIG_SND_SOC_ZL38060=m
+# CONFIG_SND_SOC_MAX9759 is not set
+# CONFIG_SND_SOC_MT6351 is not set
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_MT6660=m
+CONFIG_SND_SOC_NAU8315=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+# CONFIG_SND_SOC_NAU8824 is not set
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=m
+CONFIG_SND_SOC_LPASS_RX_MACRO=m
+CONFIG_SND_SOC_LPASS_TX_MACRO=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+# CONFIG_HID_ELAN is not set
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+# CONFIG_HOLTEK_FF is not set
+# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_VIVALDI=m
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
+# CONFIG_HID_JABRA is not set
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NTI is not set
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID_ACPI=m
+# end of I2C HID support
+
+CONFIG_I2C_HID_CORE=m
+
+#
+# Surface System Aggregator Module HID support
+#
+CONFIG_SURFACE_HID=m
+CONFIG_SURFACE_KBD=m
+# end of Surface System Aggregator Module HID support
+
+CONFIG_SURFACE_HID_CORE=m
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNSP_PCI=m
+# CONFIG_USB_CDNSP_GADGET is not set
+# CONFIG_USB_CDNSP_HOST is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_UDC is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_U_SERIAL_CONSOLE=y
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+CONFIG_USB_M66592=m
+CONFIG_USB_BDC_UDC=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+# CONFIG_USB_NET2272_DMA is not set
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_MAX3420_UDC=m
+CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+# CONFIG_USB_CONFIGFS_SERIAL is not set
+# CONFIG_USB_CONFIGFS_ACM is not set
+# CONFIG_USB_CONFIGFS_OBEX is not set
+# CONFIG_USB_CONFIGFS_NCM is not set
+# CONFIG_USB_CONFIGFS_ECM is not set
+# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
+# CONFIG_USB_CONFIGFS_RNDIS is not set
+# CONFIG_USB_CONFIGFS_EEM is not set
+# CONFIG_USB_CONFIGFS_PHONET is not set
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+# CONFIG_USB_CONFIGFS_F_FS is not set
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+# CONFIG_USB_CONFIGFS_F_MIDI is not set
+# CONFIG_USB_CONFIGFS_F_HID is not set
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_F_TCM=y
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+# CONFIG_USB_FUNCTIONFS_ETH is not set
+# CONFIG_USB_FUNCTIONFS_RNDIS is not set
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+# CONFIG_USB_RAW_GADGET is not set
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+# CONFIG_TYPEC_TCPM is not set
+# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# CONFIG_TYPEC_MUX_INTEL_PMC is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+# CONFIG_USB_ROLES_INTEL_XHCI is not set
+CONFIG_MMC=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+# CONFIG_MMC_HSQ is not set
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+# CONFIG_MMC_SDHCI_XENON is not set
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+# CONFIG_LEDS_MT6323 is not set
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+# CONFIG_LEDS_WM831X_STATUS is not set
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+# CONFIG_LEDS_MLXCPLD is not set
+# CONFIG_LEDS_MLXREG is not set
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+# CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_TPS6105X=m
+
+#
+# Flash and Torch LED drivers
+#
+CONFIG_LEDS_AS3645A=m
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_RT8515 is not set
+CONFIG_LEDS_SGM3140=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+# CONFIG_EDAC_GHES is not set
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD76X is not set
+# CONFIG_EDAC_E7XXX is not set
+CONFIG_EDAC_E752X=m
+# CONFIG_EDAC_I82875P is not set
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+# CONFIG_EDAC_IE31200 is not set
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+# CONFIG_EDAC_I82860 is not set
+# CONFIG_EDAC_R82600 is not set
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1374=m
+# CONFIG_RTC_DRV_DS1374_WDT is not set
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_PCF50633=m
+# CONFIG_RTC_DRV_CROS_EC is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_FTRTC010 is not set
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+# CONFIG_RTC_DRV_GOLDFISH is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_PCH_DMA=m
+CONFIG_PLX_DMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_HSU_DMA=m
+# CONFIG_SF_PDMA is not set
+# CONFIG_INTEL_LDMA is not set
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+# CONFIG_HD44780 is not set
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_LCD2S=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_UIO_DFL=m
+CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VFIO_PCI_IGD=y
+CONFIG_VFIO_MDEV=m
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+# CONFIG_VDPA is not set
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+CONFIG_GREYBUS=m
+CONFIG_GREYBUS_ES2=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_SSV_DNP=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+# CONFIG_COMEDI_TESTS is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+CONFIG_AD7280=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_INTEL_ATOMISP=y
+# CONFIG_VIDEO_ZORAN is not set
+CONFIG_VIDEO_IPU3_IMGU=m
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
+
+#
+# Android
+#
+# end of Android
+
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+CONFIG_GS_FPGABOOT=m
+# CONFIG_UNISYSSPAR is not set
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SEPS525=m
+CONFIG_FB_TFT_SH1106=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+# CONFIG_MOST_COMPONENTS is not set
+CONFIG_KS7010=m
+CONFIG_GREYBUS_AUDIO=m
+CONFIG_GREYBUS_AUDIO_APB_CODEC=m
+CONFIG_GREYBUS_BOOTROM=m
+CONFIG_GREYBUS_FIRMWARE=m
+CONFIG_GREYBUS_HID=m
+CONFIG_GREYBUS_LIGHT=m
+CONFIG_GREYBUS_LOG=m
+CONFIG_GREYBUS_LOOPBACK=m
+CONFIG_GREYBUS_POWER=m
+CONFIG_GREYBUS_RAW=m
+CONFIG_GREYBUS_VIBRATOR=m
+CONFIG_GREYBUS_BRIDGED_PHY=m
+CONFIG_GREYBUS_GPIO=m
+CONFIG_GREYBUS_I2C=m
+CONFIG_GREYBUS_PWM=m
+CONFIG_GREYBUS_SDIO=m
+CONFIG_GREYBUS_SPI=m
+CONFIG_GREYBUS_UART=m
+CONFIG_GREYBUS_USB=m
+CONFIG_PI433=m
+# CONFIG_FIELDBUS_DEV is not set
+CONFIG_QLGE=m
+CONFIG_WFX=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_HUAWEI_WMI=m
+CONFIG_MXM_WMI=m
+CONFIG_PEAQ_WMI=m
+# CONFIG_XIAOMI_WMI is not set
+CONFIG_GIGABYTE_WMI=m
+CONFIG_ACERHDF=m
+# CONFIG_ACER_WIRELESS is not set
+CONFIG_ACER_WMI=m
+CONFIG_AMD_PMC=m
+CONFIG_ADV_SWBUTTON=m
+CONFIG_APPLE_GMUX=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_MERAKI_MX100=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
+CONFIG_AMILO_RFKILL=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_HP_ACCEL=m
+CONFIG_WIRELESS_HOTKEY=m
+CONFIG_HP_WMI=m
+CONFIG_TC1100_WMI=m
+CONFIG_IBM_RTL=m
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_THINKPAD_LMI=m
+CONFIG_X86_PLATFORM_DRIVERS_INTEL=y
+CONFIG_INTEL_ATOMISP2_PDX86=y
+CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_SAR_INT1092=m
+CONFIG_INTEL_SKL_INT3472=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_INTEL_PMT_CLASS=m
+CONFIG_INTEL_PMT_TELEMETRY=m
+CONFIG_INTEL_PMT_CRASHLOG=m
+CONFIG_INTEL_WMI=y
+CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_INT0002_VGPIO is not set
+CONFIG_INTEL_OAKTRAIL=m
+# CONFIG_INTEL_CHTDC_TI_PWRBTN is not set
+CONFIG_INTEL_MRFLD_PWRBTN=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_MSI_WMI=m
+CONFIG_PCENGINES_APU2=m
+CONFIG_SAMSUNG_LAPTOP=m
+# CONFIG_SAMSUNG_Q10 is not set
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+# CONFIG_ACPI_CMPC is not set
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_LG_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_SYSTEM76_ACPI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_I2C_MULTI_INSTANTIATE=m
+# CONFIG_MLX_PLATFORM is not set
+CONFIG_TOUCHSCREEN_DMI=y
+CONFIG_FW_ATTR_CLASS=m
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_SCU_IPC=y
+CONFIG_INTEL_SCU=y
+CONFIG_INTEL_SCU_PCI=y
+CONFIG_INTEL_SCU_PLATFORM=m
+CONFIG_INTEL_SCU_IPC_UTIL=m
+CONFIG_PMC_ATOM=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+# CONFIG_CHROMEOS_TBMC is not set
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SENSORHUB=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_CROS_USBPD_NOTIFY=m
+# CONFIG_WILCO_EC is not set
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_SURFACE_PLATFORMS=y
+CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_POWER_OPREGION is not set
+CONFIG_SURFACE_ACPI_NOTIFY=m
+CONFIG_SURFACE_AGGREGATOR_CDEV=m
+CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
+CONFIG_SURFACE_DTX=m
+CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_HOTPLUG=m
+CONFIG_SURFACE_PLATFORM_PROFILE=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_AGGREGATOR=m
+CONFIG_SURFACE_AGGREGATOR_BUS=y
+# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_WM831X=m
+
+#
+# Clock driver for ARM Reference designs
+#
+CONFIG_ICST=y
+# CONFIG_CLK_SP810 is not set
+# end of Clock driver for ARM Reference designs
+
+CONFIG_LMK04832=m
+# CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
+CONFIG_COMMON_CLK_SI5351=m
+# CONFIG_COMMON_CLK_SI544 is not set
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_COMMON_CLK_PWM=m
+# CONFIG_XILINX_VCU is not set
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+# CONFIG_PCC is not set
+CONFIG_ALTERA_MBOX=m
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOASID=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_DMA=y
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+CONFIG_HYPERV_IOMMU=y
+CONFIG_VIRTIO_IOMMU=m
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_NS=m
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+CONFIG_SOUNDWIRE=m
+
+#
+# SoundWire Devices
+#
+CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_INTEL=m
+CONFIG_SOUNDWIRE_QCOM=m
+CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_MRFLD=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_FPGA_DFL_EMIF=m
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA220=m
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_FXLS8962AF=m
+CONFIG_FXLS8962AF_I2C=m
+CONFIG_FXLS8962AF_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+# CONFIG_KXCJK1013 is not set
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+# CONFIG_MMA8452 is not set
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_SCA3300=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7091R5=m
+CONFIG_AD7124=m
+CONFIG_AD7192=m
+CONFIG_AD7266=m
+CONFIG_AD7291=m
+CONFIG_AD7292=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+# CONFIG_AXP20X_ADC is not set
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+CONFIG_INTEL_MRFLD_ADC=m
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2496=m
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+CONFIG_MAX11100=m
+# CONFIG_MAX1118 is not set
+CONFIG_MAX1241=m
+CONFIG_MAX1363=m
+# CONFIG_MAX9611 is not set
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+CONFIG_MEDIATEK_MT6360_ADC=m
+CONFIG_MEN_Z188_ADC=m
+CONFIG_MP2629_ADC=m
+CONFIG_NAU7802=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+# CONFIG_TI_ADC084S021 is not set
+CONFIG_TI_ADC12138=m
+# CONFIG_TI_ADC108S102 is not set
+CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS131E08=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_TLC4541=m
+CONFIG_TI_TSC2046=m
+CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+CONFIG_HMC425=m
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_ATLAS_EZO_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SENSIRION_SGP40=m
+CONFIG_SPS30=m
+CONFIG_SPS30_I2C=m
+CONFIG_SPS30_SERIAL=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+CONFIG_AD5755=m
+# CONFIG_AD5758 is not set
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5766=m
+CONFIG_AD5770R=m
+CONFIG_AD5791=m
+CONFIG_AD7303=m
+CONFIG_AD8801=m
+CONFIG_DS4424=m
+CONFIG_LTC1660=m
+# CONFIG_LTC2632 is not set
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MCP4725=m
+# CONFIG_MCP4922 is not set
+CONFIG_TI_DAC082S085=m
+# CONFIG_TI_DAC5571 is not set
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS290=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HDC2010=m
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+# CONFIG_ADIS16460 is not set
+CONFIG_ADIS16475=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_FXOS8700=m
+CONFIG_FXOS8700_I2C=m
+CONFIG_FXOS8700_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
+CONFIG_IIO_ST_LSM9DS0=m
+CONFIG_IIO_ST_LSM9DS0_I2C=m
+CONFIG_IIO_ST_LSM9DS0_SPI=m
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_ADUX1020=m
+CONFIG_AL3010=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_AS73211=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+# CONFIG_IIO_CROS_EC_LIGHT_PROX is not set
+# CONFIG_GP2AP002 is not set
+CONFIG_GP2AP020A00F=m
+# CONFIG_IQS621_ALS is not set
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+# CONFIG_LV0104CS is not set
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+# CONFIG_SI1133 is not set
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2591=m
+# CONFIG_TSL2772 is not set
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+CONFIG_VEML6070=m
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+# CONFIG_AK09911 is not set
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+CONFIG_YAMAHA_YAS530=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+CONFIG_IQS624_POS=m
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+# CONFIG_AD5272 is not set
+CONFIG_DS1803=m
+CONFIG_MAX5432=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+# CONFIG_MCP4018 is not set
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DLHL60D=m
+# CONFIG_DPS310 is not set
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+# CONFIG_ICP10100 is not set
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+# CONFIG_T5403 is not set
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_CROS_EC_MKBP_PROXIMITY=m
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_PING=m
+CONFIG_RFD77402=m
+# CONFIG_SRF04 is not set
+CONFIG_SX9310=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VCNL3020=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_IQS620AT_TEMP is not set
+CONFIG_LTC2983=m
+CONFIG_MAXIM_THERMOCOUPLE=m
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TMP117=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
+# CONFIG_NTB_IDT is not set
+CONFIG_NTB_EPF=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_DWC=m
+CONFIG_PWM_IQS620A=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+
+#
+# IRQ chip support
+#
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_TI_SYSCON is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_USB_LGM_PHY=m
+CONFIG_PHY_CAN_TRANSCEIVER=m
+# CONFIG_BCM_KONA_USB2_PHY is not set
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+# CONFIG_PHY_CPCAP_USB is not set
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_TUSB1210=m
+CONFIG_PHY_INTEL_LGM_EMMC=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
+CONFIG_INTEL_RAPL=m
+CONFIG_IDLE_INJECT=y
+# CONFIG_DTPM is not set
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+# CONFIG_LIBNVDIMM is not set
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_NVMEM_SPMI_SDAM=m
+CONFIG_NVMEM_RMEM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+# CONFIG_STM_SOURCE_FTRACE is not set
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+# CONFIG_INTEL_TH_ACPI is not set
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+# CONFIG_ALTERA_PR_IP_CORE is not set
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+# CONFIG_FPGA_MGR_XILINX_SPI is not set
+# CONFIG_FPGA_MGR_MACHXO2_SPI is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_TEE=m
+
+#
+# TEE drivers
+#
+# end of TEE drivers
+
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+# CONFIG_MUX_ADG792A is not set
+# CONFIG_MUX_ADGS1408 is not set
+# CONFIG_MUX_GPIO is not set
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+CONFIG_INTERCONNECT=y
+# CONFIG_COUNTER is not set
+CONFIG_MOST=m
+CONFIG_MOST_USB_HDM=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_SND=m
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
+CONFIG_F2FS_FS_ZSTD=y
+CONFIG_F2FS_IOSTAT=y
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_DAX=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION_ALGS=m
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
+# CONFIG_FS_VERITY is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+# CONFIG_NETFS_STATS is not set
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_PROC_CPU_RESCTRL=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+CONFIG_HPFS_FS=m
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=y
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+CONFIG_PSTORE_ZSTD_COMPRESS=y
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_VBOXSF_FS=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+# CONFIG_SECURITY_INFINIBAND is not set
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+CONFIG_INTEL_TXT=y
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CFB is not set
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2S=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_SERPENT_SSE2_586=y
+# CONFIG_CRYPTO_SM4 is not set
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_586=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
+CONFIG_CRYPTO_DEV_QAT=m
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+# CONFIG_PRIME_NUMBERS is not set
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_32=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+# CONFIG_FONT_6x8 is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# end of Library routines
+
+CONFIG_ASN1_ENCODER=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_COMPRESSED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_DEBUG_INFO_BTF_MODULES=y
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+# end of Generic Kernel Debugging Instruments
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_ARCH_HAS_DEBUG_WX=y
+CONFIG_DEBUG_WX=y
+CONFIG_GENERIC_PTDUMP=y
+CONFIG_PTDUMP_CORE=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_VM is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_KMAP_LOCAL is not set
+CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+CONFIG_WW_MUTEX_SELFTEST=m
+# CONFIG_SCF_TORTURE_TEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+CONFIG_DEBUG_SG=y
+CONFIG_DEBUG_NOTIFIERS=y
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# end of Debug kernel data structures
+
+CONFIG_DEBUG_CREDENTIALS=y
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_REF_SCALE_TEST=m
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_FUNCTION_PROFILER=y
+# CONFIG_STACK_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_HWLAT_TRACER=y
+CONFIG_OSNOISE_TRACER=y
+CONFIG_TIMERLAT_TRACER=y
+CONFIG_MMIOTRACE=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
+CONFIG_TRACING_MAP=y
+CONFIG_SYNTH_EVENTS=y
+CONFIG_HIST_TRIGGERS=y
+CONFIG_TRACE_EVENT_INJECT=y
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_MMIOTRACE_TEST is not set
+CONFIG_PREEMPTIRQ_DELAY_TEST=m
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+CONFIG_KPROBE_EVENT_GEN_TEST=m
+# CONFIG_HIST_TRIGGERS_DEBUG is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_SAMPLES is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# x86 Debugging
+#
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+CONFIG_PUNIT_ATOM_DEBUG=m
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_UNWINDER_GUESS is not set
+# end of x86 Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_LKDTM=m
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_TEST_HEXDUMP=m
+# CONFIG_STRING_SELFTEST is not set
+CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
+CONFIG_TEST_KSTRTOX=m
+CONFIG_TEST_PRINTF=m
+CONFIG_TEST_SCANF=m
+CONFIG_TEST_BITMAP=m
+CONFIG_TEST_UUID=m
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+CONFIG_TEST_HASH=m
+# CONFIG_TEST_IDA is not set
+CONFIG_TEST_PARMAN=m
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_BITOPS is not set
+# CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_TEST_FPU=m
+CONFIG_TEST_CLOCKSOURCE_WATCHDOG=m
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# CONFIG_HYPERV_TESTING is not set
+# end of Kernel Testing and Coverage
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/mv-debug b/srcpkgs/linux5.15/files/mv-debug
new file mode 100755
index 000000000000..8898c928d119
--- /dev/null
+++ b/srcpkgs/linux5.15/files/mv-debug
@@ -0,0 +1,7 @@
+#!/bin/sh
+mod=$1
+mkdir -p usr/lib/debug/${mod%/*}
+$OBJCOPY --only-keep-debug --compress-debug-sections $mod usr/lib/debug/$mod
+$OBJCOPY --add-gnu-debuglink=${DESTDIR}/usr/lib/debug/$mod $mod
+/usr/bin/$STRIP --strip-debug $mod
+gzip -9 $mod
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
new file mode 100644
index 000000000000..dd2bd2da0a8e
--- /dev/null
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -0,0 +1,8320 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/powerpc 5.15.0 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=100201
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23501
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23501
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=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_WERROR is not set
+CONFIG_LOCALVERSION="_1"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_XZ=y
+# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_XZ=y
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_IRQ_DOMAIN_NOMAP=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+CONFIG_BPF_LSM=y
+# end of BPF subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+# CONFIG_PRINTK_INDEX is not set
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_RDMA=y
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CPUSETS is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
+# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_SYSCTL=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_EXPERT=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_PPC32=y
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_PPC_BOOK3S_32=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+CONFIG_PPC_BOOK3S_603=y
+CONFIG_PPC_BOOK3S_604=y
+CONFIG_GENERIC_CPU=y
+# CONFIG_E300C2_CPU is not set
+# CONFIG_E300C3_CPU is not set
+# CONFIG_G4_CPU is not set
+CONFIG_PPC_BOOK3S=y
+CONFIG_PPC_FPU_REGS=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
+CONFIG_PPC_HAVE_PMU_SUPPORT=y
+CONFIG_PMU_SYSFS=y
+CONFIG_PPC_PERF_CTRS=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2048
+# end of Processor support
+
+CONFIG_VDSO32=y
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_32BIT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_BITS_MIN=11
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_NR_IRQS=512
+CONFIG_NMI_IPI=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_UDBG_16550=y
+CONFIG_GENERIC_TBSYNC=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_PPC_MSI_BITMAP=y
+
+#
+# Platform support
+#
+# CONFIG_SCOM_DEBUGFS is not set
+CONFIG_PPC_CHRP=y
+# CONFIG_PPC_MPC512x is not set
+CONFIG_PPC_MPC52xx=y
+# CONFIG_PPC_MPC5200_SIMPLE is not set
+CONFIG_PPC_EFIKA=y
+# CONFIG_PPC_LITE5200 is not set
+# CONFIG_PPC_MEDIA5200 is not set
+CONFIG_PPC_MPC5200_BUGFIX=y
+# CONFIG_PPC_MPC5200_LPBFIFO is not set
+CONFIG_PPC_PMAC=y
+CONFIG_PPC_PMAC32_PSURGE=y
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+CONFIG_KVM_GUEST=y
+CONFIG_EPAPR_PARAVIRT=y
+CONFIG_PPC_NATIVE=y
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+# CONFIG_UDBG_RTAS_CONSOLE is not set
+CONFIG_PPC_SMP_MUXED_IPI=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_MSGR is not set
+CONFIG_PPC_I8259=y
+CONFIG_PPC_RTAS=y
+CONFIG_RTAS_ERROR_LOGGING=y
+CONFIG_PPC_RTAS_DAEMON=y
+CONFIG_RTAS_PROC=y
+CONFIG_PPC_MPC106=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+# CONFIG_CPUFREQ_DT is not set
+CONFIG_CPU_FREQ_PMAC=y
+# end of CPU Frequency scaling
+
+#
+# CPUIdle driver
+#
+
+#
+# CPU Idle
+#
+# CONFIG_CPU_IDLE is not set
+# end of CPU Idle
+# end of CPUIdle driver
+
+CONFIG_TAU=y
+# CONFIG_TAU_INT is not set
+# CONFIG_TAU_AVERAGE is not set
+CONFIG_QE_GPIO=y
+# CONFIG_GEN_RTC is not set
+# end of Platform support
+
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_PPC_QUEUED_SPINLOCKS is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_PPC_4K_PAGES=y
+CONFIG_PPC_PAGE_SHIFT=12
+CONFIG_THREAD_SHIFT=13
+CONFIG_DATA_SHIFT=12
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_CMDLINE=""
+CONFIG_EXTRA_TARGETS=""
+CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_APM_EMULATION=m
+CONFIG_PM_CLK=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_ENERGY_MODEL=y
+CONFIG_PPC_RTAS_FILTER=y
+# end of Kernel options
+
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+# CONFIG_ISA is not set
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_FSL_LBC is not set
+CONFIG_FSL_GTM=y
+# end of Bus options
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xb0000000
+# end of Advanced setup
+
+CONFIG_PPC_LIB_RHEAP=y
+CONFIG_VIRTUALIZATION=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_GATHER_PAGE_SIZE=y
+CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_LTO_NONE=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS=11
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_HAVE_ARCH_NVRAM_OPS=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_GZIP is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_DEV_BSG_COMMON=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=m
+CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_FC_APPID is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+CONFIG_BLK_SED_OPAL=y
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_FLATMEM=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_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_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_CLEANCACHE is not set
+CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+# CONFIG_ZSMALLOC is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_PAGE_IDLE_FLAG=y
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ZONE_DMA=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_KMAP_LOCAL=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_DBGFS=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XFRM_ESPINTCP=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+CONFIG_INET_ESPINTCP=y
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_ESPINTCP=y
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
+CONFIG_IPV6_RPL_LWTUNNEL=y
+CONFIG_IPV6_IOAM6_LWTUNNEL=y
+# CONFIG_NETLABEL is not set
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=m
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+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_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+# CONFIG_IP6_NF_MATCH_SRH is not set
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+# end of DECnet: Netfilter Configuration
+
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
+CONFIG_NFT_BRIDGE_REJECT=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+# CONFIG_BRIDGE_CFM is not set
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_DECNET=m
+CONFIG_DECNET_ROUTER=y
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+# CONFIG_HSR is not set
+# CONFIG_NET_SWITCHDEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=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_STREAM_PARSER=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+# CONFIG_CAN_J1939 is not set
+# CONFIG_CAN_ISOTP is not set
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+# CONFIG_CAN_FLEXCAN is not set
+# CONFIG_CAN_GRCAN is not set
+# CONFIG_CAN_KVASER_PCIEFD is not set
+# CONFIG_CAN_C_CAN is not set
+# CONFIG_CAN_CC770 is not set
+# CONFIG_CAN_IFI_CANFD is not set
+# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_MSCAN is not set
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_PCMCIA=m
+# CONFIG_CAN_F81601 is not set
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
+# CONFIG_CAN_SJA1000_PLATFORM is not set
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+# CONFIG_CAN_MCP251X is not set
+# CONFIG_CAN_MCP251XFD is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_LEDS is not set
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+# CONFIG_BT_HCIUART_INTEL is not set
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=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_MCTP=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+# CONFIG_CAIF_USB is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+# CONFIG_NFC_NCI is not set
+# CONFIG_NFC_HCI is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+# CONFIG_NFC_TRF7970A is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+# CONFIG_NFC_PN533_I2C is not set
+CONFIG_NFC_PN532_UART=m
+# CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=m
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_PCI=y
+CONFIG_FORCE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_MSI_ARCH_FALLBACKS=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# PCI controller drivers
+#
+# CONFIG_PCI_FTPCI100 is not set
+# CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCIE_XILINX is not set
+# CONFIG_PCIE_MICROCHIP_HOST is not set
+
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+
+#
+# Mobiveil PCIe Core Support
+#
+# end of Mobiveil PCIe Core Support
+
+#
+# Cadence PCIe controllers support
+#
+CONFIG_PCIE_CADENCE=y
+CONFIG_PCIE_CADENCE_HOST=y
+# CONFIG_PCIE_CADENCE_PLAT_HOST is not set
+CONFIG_PCI_J721E=y
+CONFIG_PCI_J721E_HOST=y
+# end of Cadence PCIe controllers support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=m
+CONFIG_CXL_MEM=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_RAPIDIO is not set
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_CACHE=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# CONFIG_MOXTET is not set
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+# CONFIG_MTD is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_RESERVED_MEM=y
+# CONFIG_OF_OVERLAY is not set
+CONFIG_OF_DMA_DEFAULT_COHERENT=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_AX88796 is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_MAC_FLOPPY=y
+CONFIG_CDROM=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_RSXX is not set
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
+# CONFIG_NVME_TARGET_LOOP is not set
+CONFIG_NVME_TARGET_FC=m
+# CONFIG_NVME_TARGET_FCLOOP is not set
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_DUMMY_IRQ is not set
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
+CONFIG_MISC_RTSX=m
+CONFIG_HISI_HIKEY_USB=m
+CONFIG_C2PORT=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_IDT_89HPESX is not set
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# end of Texas Instruments shared transport line discipline
+
+# CONFIG_SENSORS_LIS3_SPI is not set
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+# CONFIG_ECHO is not set
+CONFIG_BCM_VK=m
+# CONFIG_BCM_VK_TTY is not set
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+CONFIG_AIC79XX_DEBUG_ENABLE=y
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+# CONFIG_MEGARAID_LEGACY is not set
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_SCSI_MYRB=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
+CONFIG_SCSI_IPS=m
+# CONFIG_SCSI_INITIO is not set
+CONFIG_SCSI_INIA100=m
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_NSP32=m
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_MESH=m
+CONFIG_SCSI_MESH_SYNC_RATE=5
+CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
+CONFIG_SCSI_MAC53C94=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_FDOMAIN is not set
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_AHCI_CEVA is not set
+# CONFIG_AHCI_QORIQ is not set
+# CONFIG_SATA_INIC162X is not set
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+# CONFIG_SATA_DWC is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MACIO=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_MPC52xx=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+# CONFIG_PATA_SERVERWORKS is not set
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+# CONFIG_PATA_TRIFLEX is not set
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+CONFIG_PATA_NS87410=m
+# CONFIG_PATA_OPTI is not set
+CONFIG_PATA_PCMCIA=m
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+# CONFIG_MD_CLUSTER is not set
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+# CONFIG_DM_CLONE is not set
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_ADB=y
+CONFIG_ADB_CUDA=y
+CONFIG_ADB_PMU=y
+CONFIG_ADB_PMU_LED=y
+# CONFIG_ADB_PMU_LED_DISK is not set
+CONFIG_PMAC_APM_EMU=m
+CONFIG_PMAC_MEDIABAY=y
+CONFIG_PMAC_BACKLIGHT=y
+# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
+CONFIG_ADB_MACIO=y
+CONFIG_INPUT_ADBHID=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_THERM_WINDTUNNEL=m
+CONFIG_THERM_ADT746X=m
+CONFIG_WINDFARM=m
+CONFIG_ANSLCD=m
+CONFIG_PMAC_RACKMETER=m
+CONFIG_SENSORS_AMS=m
+CONFIG_SENSORS_AMS_PMU=y
+CONFIG_SENSORS_AMS_I2C=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_MHI_NET=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+# CONFIG_ARCNET_COM90xx is not set
+CONFIG_ARCNET_COM90xxIO=m
+# CONFIG_ARCNET_RIM_I is not set
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+CONFIG_ATM_ZATM_DEBUG=y
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+# CONFIG_CAIF_DRIVERS is not set
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+# CONFIG_SLICOSS is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_APPLE=y
+CONFIG_MACE=m
+# CONFIG_MACE_AAUI_PORT is not set
+CONFIG_BMAC=m
+CONFIG_NET_VENDOR_AQUANTIA=y
+# CONFIG_AQTION is not set
+# CONFIG_NET_VENDOR_ARC is not set
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+# CONFIG_BCMGENET is not set
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+# CONFIG_MACB is not set
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_GEMINI_ETHERNET is not set
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+# CONFIG_DE4X5 is not set
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+CONFIG_SUNDANCE_MMIO=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC_MPC52xx=m
+CONFIG_FEC_MPC52xx_MDIO=y
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+# CONFIG_UCC_GETH is not set
+# CONFIG_GIANFAR is not set
+CONFIG_FSL_ENETC=m
+CONFIG_FSL_ENETC_VF=m
+CONFIG_FSL_ENETC_IERB=m
+CONFIG_FSL_ENETC_MDIO=m
+CONFIG_FSL_ENETC_PTP_CLOCK=m
+# CONFIG_FSL_ENETC_QOS is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+# CONFIG_FM10K is not set
+CONFIG_IGC=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_LITEX_LITEETH=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MV643XX_ETH=m
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+CONFIG_MLX5_FPGA=y
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_CORE_EN_DCB=y
+CONFIG_MLX5_CORE_IPOIB=y
+# CONFIG_MLX5_FPGA_IPSEC is not set
+# CONFIG_MLX5_IPSEC is not set
+# CONFIG_MLX5_SF is not set
+# CONFIG_MLXSW_CORE is not set
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCX24J600 is not set
+CONFIG_LAN743X=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+# CONFIG_FORCEDETH is not set
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCA7000_UART is not set
+# CONFIG_QCOM_EMAC is not set
+# CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+# CONFIG_SMSC911X is not set
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+# CONFIG_STMMAC_ETH is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_AXI_EMAC is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+# CONFIG_ROADRUNNER is not set
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=m
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=m
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+# CONFIG_BCM7XXX_PHY is not set
+CONFIG_BCM84881_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+# CONFIG_INTEL_XWAY_PHY is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+# CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_BUS=m
+CONFIG_FWNODE_MDIO=m
+CONFIG_OF_MDIO=m
+CONFIG_MDIO_DEVRES=m
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_IPQ4019=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+# CONFIG_ATH9K_HWRNG is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+# CONFIG_WCN36XX is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+# CONFIG_PCI_ATMEL is not set
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+# CONFIG_BRCMFMAC_SDIO is not set
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+# CONFIG_IPW2100 is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_APPLE_AIRPORT=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+# CONFIG_MWIFIEX_USB is not set
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615_COMMON=m
+CONFIG_MT7615E=m
+CONFIG_MT7663_USB_SDIO_COMMON=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921E=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+# CONFIG_WLAN_VENDOR_TI is not set
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+# CONFIG_HDLC_X25 is not set
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_FSL_UCC_HDLC=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+# CONFIG_IEEE802154_CA8210 is not set
+# CONFIG_IEEE802154_MCR20A is not set
+CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+CONFIG_WWAN_HWSIM=m
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+# end of Wireless WAN
+
+# CONFIG_VMXNET3 is not set
+CONFIG_USB4_NET=m
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+# CONFIG_MISDN_NETJET is not set
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_APMPOWER is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+CONFIG_KEYBOARD_ADP5588=m
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=m
+CONFIG_KEYBOARD_QT1050=m
+# CONFIG_KEYBOARD_QT1070 is not set
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+# CONFIG_KEYBOARD_LM8333 is not set
+CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_CAP11XX is not set
+# CONFIG_KEYBOARD_BCM is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
+# CONFIG_MOUSE_SERIAL is not set
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+# CONFIG_JOYSTICK_AS5011 is not set
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADC is not set
+# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_BU21029 is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
+CONFIG_TOUCHSCREEN_CY8CTMA140=m
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+# CONFIG_TOUCHSCREEN_EXC3000 is not set
+CONFIG_TOUCHSCREEN_FUJITSU=m
+# CONFIG_TOUCHSCREEN_GOODIX is not set
+# CONFIG_TOUCHSCREEN_HIDEEP is not set
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+CONFIG_TOUCHSCREEN_ILITEK=m
+# CONFIG_TOUCHSCREEN_S6SY761 is not set
+CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
+# CONFIG_TOUCHSCREEN_ELAN is not set
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
+CONFIG_TOUCHSCREEN_MCS5000=m
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
+CONFIG_TOUCHSCREEN_MSG2638=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 is not set
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+# CONFIG_TOUCHSCREEN_TSC2004 is not set
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_RM_TS is not set
+# CONFIG_TOUCHSCREEN_SILEAD is not set
+# CONFIG_TOUCHSCREEN_SIS_I2C is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_SUR40=m
+# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
+# CONFIG_TOUCHSCREEN_SX8654 is not set
+CONFIG_TOUCHSCREEN_TPS6507X=m
+# CONFIG_TOUCHSCREEN_ZET6223 is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
+# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ATC260X_ONKEY is not set
+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_GPIO_VIBRA is not set
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_KXTJ9 is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA7280_HAPTICS is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_IMS_PCU is not set
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+CONFIG_INPUT_STPMIC1_ONKEY=m
+CONFIG_RMI4_CORE=m
+# CONFIG_RMI4_I2C is not set
+# CONFIG_RMI4_SPI is not set
+# CONFIG_RMI4_SMB is not set
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=m
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=m
+CONFIG_SERIO_SERPORT=m
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=m
+CONFIG_SERIO_RAW=m
+# CONFIG_SERIO_XILINX_XPS_PS2 is not set
+CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_GPIO_PS2 is not set
+# CONFIG_USERIO is not set
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_FSL=y
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_OF_PLATFORM=m
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_PMACZILOG=y
+# CONFIG_SERIAL_PMACZILOG_TTYS is not set
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y
+CONFIG_SERIAL_MPC52xx=y
+CONFIG_SERIAL_MPC52xx_CONSOLE=y
+CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
+CONFIG_SERIAL_QE=m
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+CONFIG_SERIAL_BCM63XX=m
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_FSL_LINFLEXUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# CONFIG_SERIAL_SPRD is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_RTAS=y
+# CONFIG_HVC_UDBG is not set
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
+CONFIG_DEVMEM=y
+CONFIG_NVRAM=y
+CONFIG_DEVPORT=y
+# CONFIG_TCG_TPM is not set
+CONFIG_XILLYBUS_CLASS=m
+# CONFIG_XILLYBUS is not set
+CONFIG_XILLYUSB=m
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_GPMUX is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+CONFIG_I2C_ISCH=m
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# Mac SMBus host controller drivers
+#
+CONFIG_I2C_HYDRA=m
+CONFIG_I2C_POWERMAC=y
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_MPC=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_RK3X is not set
+CONFIG_I2C_SIMTEC=m
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_CP2615=m
+# CONFIG_I2C_PARPORT is not set
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+# CONFIG_MIPI_I3C_HCI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_NXP_FLEXSPI=m
+# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_MPC52xx is not set
+CONFIG_SPI_MPC52xx_PSC=m
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_ROCKCHIP is not set
+# CONFIG_SPI_SC18IS602 is not set
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+CONFIG_SPI_AMD=m
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=y
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+# CONFIG_SPMI is not set
+# CONFIG_HSI is not set
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+# CONFIG_PPS_CLIENT_GPIO is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK_OPTIONAL=m
+CONFIG_PTP_1588_CLOCK_QORIQ=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+# CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+# end of PTP clock support
+
+# CONFIG_PINCTRL is not set
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=m
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_CADENCE is not set
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_FTGPIO010 is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_GRGPIO is not set
+CONFIG_GPIO_HLWD=m
+# CONFIG_GPIO_MB86S7X is not set
+CONFIG_GPIO_MPC5200=y
+# CONFIG_GPIO_SIFIVE is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GPIO_AMD_FCH is not set
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_GW_PLD is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+CONFIG_GPIO_PCA9570=m
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+# CONFIG_GPIO_MAX77650 is not set
+# CONFIG_GPIO_TQMX86 is not set
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+# CONFIG_GPIO_PCI_IDIO_16 is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+# CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_MAX3191X is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+# CONFIG_GPIO_VIPERBOARD is not set
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_VIRTIO=m
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_GPIO is not set
+CONFIG_W1_MASTER_SGI=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+# CONFIG_POWER_RESET is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+# CONFIG_PDA_POWER is not set
+CONFIG_APM_POWER=m
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_CHARGER_ADP5061 is not set
+# CONFIG_BATTERY_CW2015 is not set
+CONFIG_BATTERY_DS2760=m
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+CONFIG_BATTERY_PMU=m
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_CHARGER_SBS is not set
+# CONFIG_MANAGER_SBS is not set
+CONFIG_BATTERY_BQ27XXX=m
+# CONFIG_BATTERY_BQ27XXX_I2C is not set
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1721X is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+CONFIG_CHARGER_MANAGER=m
+# CONFIG_CHARGER_LT3651 is not set
+CONFIG_CHARGER_LTC4162L=m
+# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_MAX77650=m
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+CONFIG_CHARGER_BQ2515X=m
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_BQ25980 is not set
+CONFIG_CHARGER_BQ256XX=m
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
+# CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_UCS1002 is not set
+# CONFIG_CHARGER_BD99954 is not set
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+# CONFIG_SENSORS_G762 is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_HIH6130 is not set
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+# CONFIG_SENSORS_IIO_HWMON is not set
+CONFIG_SENSORS_JC42=m
+# CONFIG_SENSORS_POWR1220 is not set
+CONFIG_SENSORS_LINEAGE=m
+# CONFIG_SENSORS_LTC2945 is not set
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+# CONFIG_SENSORS_LTC2990 is not set
+CONFIG_SENSORS_LTC2992=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+# CONFIG_SENSORS_LTC4222 is not set
+CONFIG_SENSORS_LTC4245=m
+# CONFIG_SENSORS_LTC4260 is not set
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX31722 is not set
+# CONFIG_SENSORS_MAX31730 is not set
+# CONFIG_SENSORS_MAX6621 is not set
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MAX31790 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
+CONFIG_SENSORS_TPS23861=m
+# CONFIG_SENSORS_MR75203 is not set
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+# CONFIG_SENSORS_LM95234 is not set
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_PCF8591=m
+# CONFIG_PMBUS is not set
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+# CONFIG_SENSORS_SHT15 is not set
+CONFIG_SENSORS_SHT21=m
+# CONFIG_SENSORS_SHT3x is not set
+CONFIG_SENSORS_SHT4x=m
+# CONFIG_SENSORS_SHTC1 is not set
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M192=m
+# CONFIG_SENSORS_STTS751 is not set
+CONFIG_SENSORS_SMM665=m
+# CONFIG_SENSORS_ADC128D818 is not set
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_TC74 is not set
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_FREQ_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
+# CONFIG_GENERIC_ADC_THERMAL is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT 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 is not set
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_STPMIC1_WATCHDOG=m
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_MPC5200_WDT is not set
+# CONFIG_MEN_A21_WDT is not set
+CONFIG_WATCHDOG_RTAS=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_BD9571MWV is not set
+# CONFIG_MFD_AXP20X_I2C is not set
+# CONFIG_MFD_MADERA is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_GATEWORKS_GSC is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+CONFIG_MFD_MP2629=m
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_LPC_ICH is not set
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_INTEL_PMT is not set
+# CONFIG_MFD_IQS62X is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77650=m
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6360 is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_NTXEC=m
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_MFD_RDC321X is not set
+CONFIG_MFD_RT4831=m
+# CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RK808 is not set
+# CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TI_LP87565 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+CONFIG_MFD_TQMX86=m
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
+# CONFIG_MFD_ROHM_BD71828 is not set
+# CONFIG_MFD_ROHM_BD957XMUF is not set
+CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
+CONFIG_MFD_ATC260X=m
+CONFIG_MFD_ATC260X_I2C=m
+CONFIG_MFD_QCOM_PM8008=m
+# CONFIG_RAVE_SP_CORE is not set
+# CONFIG_MFD_INTEL_M10_BMC is not set
+CONFIG_MFD_RSMU_I2C=m
+CONFIG_MFD_RSMU_SPI=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_88PG86X is not set
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ATC260X is not set
+# CONFIG_REGULATOR_DA9121 is not set
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_FAN53880 is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77650 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+CONFIG_REGULATOR_MAX8893=m
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MCP16502 is not set
+# CONFIG_REGULATOR_MP5416 is not set
+# CONFIG_REGULATOR_MP8859 is not set
+# CONFIG_REGULATOR_MP886X is not set
+# CONFIG_REGULATOR_MPQ7920 is not set
+# CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_PCA9450 is not set
+# CONFIG_REGULATOR_PF8X00 is not set
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+# CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT4831 is not set
+# CONFIG_REGULATOR_RT6160 is not set
+# CONFIG_REGULATOR_RT6245 is not set
+CONFIG_REGULATOR_RTQ2134=m
+# CONFIG_REGULATOR_RTMV20 is not set
+CONFIG_REGULATOR_RTQ6752=m
+# CONFIG_REGULATOR_SLG51000 is not set
+# CONFIG_REGULATOR_STPMIC1 is not set
+# CONFIG_REGULATOR_SY8106A is not set
+# CONFIG_REGULATOR_SY8824X is not set
+# CONFIG_REGULATOR_SY8827N is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VCTRL is not set
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+# CONFIG_IR_HIX5HD2 is not set
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_REDRAT3=m
+# CONFIG_IR_SPI is not set
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+# CONFIG_IR_GPIO_CIR is not set
+# CONFIG_IR_GPIO_TX is not set
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
+CONFIG_IR_TOY=m
+CONFIG_CEC_CORE=m
+# CONFIG_MEDIA_CEC_RC is not set
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
+
+#
+# Please notice that the enabled Media controller Request API is EXPERIMENTAL
+#
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=16
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+# CONFIG_VIDEO_TM6000 is not set
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+# CONFIG_VIDEO_CX25821 is not set
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+# CONFIG_VIDEO_SAA7134_GO7007 is not set
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+# CONFIG_I2C_SI470X is not set
+# CONFIG_RADIO_SI4713 is not set
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+# CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_SAA7706H is not set
+# CONFIG_RADIO_TEF6862 is not set
+# CONFIG_RADIO_WL1273 is not set
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+# CONFIG_VIDEO_CADENCE is not set
+CONFIG_VIDEO_ASPEED=m
+CONFIG_VIDEO_MUX=m
+CONFIG_VIDEO_XILINX=m
+CONFIG_VIDEO_XILINX_CSI2RXSS=m
+CONFIG_VIDEO_XILINX_TPG=m
+CONFIG_VIDEO_XILINX_VTC=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+# CONFIG_SDR_PLATFORM_DRIVERS is not set
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIMC=m
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+# CONFIG_VIDEO_VIM2M is not set
+# CONFIG_VIDEO_VICODEC is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+# CONFIG_VIDEO_ADV7183 is not set
+CONFIG_VIDEO_ADV748X=m
+CONFIG_VIDEO_ADV7604=m
+# CONFIG_VIDEO_ADV7604_CEC is not set
+CONFIG_VIDEO_ADV7842=m
+# CONFIG_VIDEO_ADV7842_CEC is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+# CONFIG_VIDEO_TC358743_CEC is not set
+# CONFIG_VIDEO_TVP514X is not set
+CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+CONFIG_VIDEO_MAX9286=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+# CONFIG_SDR_MAX2175 is not set
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of Miscellaneous helper chips
+
+#
+# Camera sensor devices
+#
+# CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_IMX208 is not set
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX219 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX319 is not set
+CONFIG_VIDEO_IMX334=m
+CONFIG_VIDEO_IMX335=m
+# CONFIG_VIDEO_IMX355 is not set
+CONFIG_VIDEO_IMX412=m
+# CONFIG_VIDEO_OV02A10 is not set
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+CONFIG_VIDEO_OV5648=m
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9282=m
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+CONFIG_VIDEO_DW9768=m
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+# CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_AGP=y
+CONFIG_AGP_UNINORTH=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_DP_AUX_BUS=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_AMDGPU is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_UDL=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_RCAR_DW_HDMI is not set
+# CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_ABT_Y030XX067A=m
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
+CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
+CONFIG_DRM_PANEL_NOVATEK_NT39016=m
+# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
+CONFIG_DRM_PANEL_SAMSUNG_DB7430=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
+# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
+CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
+CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHIPONE_ICN6211 is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
+CONFIG_DRM_DISPLAY_CONNECTOR=m
+# CONFIG_DRM_LONTIUM_LT8912B is not set
+# CONFIG_DRM_LONTIUM_LT9611 is not set
+# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_ITE_IT66121 is not set
+# CONFIG_DRM_LVDS_CODEC is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_PARADE_PS8640 is not set
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
+CONFIG_DRM_SIMPLE_BRIDGE=m
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358762 is not set
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TOSHIBA_TC358768 is not set
+# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TI_TFP410 is not set
+# CONFIG_DRM_TI_SN65DSI83 is not set
+# CONFIG_DRM_TI_SN65DSI86 is not set
+# CONFIG_DRM_TI_TPD12S015 is not set
+# CONFIG_DRM_ANALOGIX_ANX6345 is not set
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_ANALOGIX_ANX7625 is not set
+# CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_CDNS_MHDP8546 is not set
+# end of Display Interface Bridges
+
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+# CONFIG_DRM_MXSFB is not set
+# CONFIG_DRM_ARCPGU is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_TINYDRM_HX8357D=m
+CONFIG_TINYDRM_ILI9225=m
+CONFIG_TINYDRM_ILI9341=m
+CONFIG_TINYDRM_ILI9486=m
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+CONFIG_TINYDRM_ST7735R=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+# CONFIG_DRM_SIS is not set
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=y
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_MACMODES=y
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_OF=y
+CONFIG_FB_CONTROL=y
+CONFIG_FB_PLATINUM=y
+CONFIG_FB_VALKYRIE=y
+CONFIG_FB_CT65550=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_IMSTT=y
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_OPENCORES is not set
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+CONFIG_FB_MATROX=y
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=y
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=y
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=y
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=y
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+# CONFIG_FB_CARMINE is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+# CONFIG_FB_MB862XX_LIME is not set
+CONFIG_FB_MB862XX_I2C=y
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+CONFIG_BACKLIGHT_LED=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_MTS64=m
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+# CONFIG_SND_AW2 is not set
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+# CONFIG_SND_ES1968_INPUT is not set
+# CONFIG_SND_ES1968_RADIO is not set
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_MAESTRO3_INPUT is not set
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_PREALLOC_SIZE=2048
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_PPC=y
+CONFIG_SND_POWERMAC=m
+CONFIG_SND_POWERMAC_AUTO_DRC=y
+CONFIG_SND_AOA=m
+CONFIG_SND_AOA_FABRIC_LAYOUT=m
+CONFIG_SND_AOA_ONYX=m
+CONFIG_SND_AOA_TAS=m
+CONFIG_SND_AOA_TOONIE=m
+CONFIG_SND_AOA_SOUNDBUS=m
+CONFIG_SND_AOA_SOUNDBUS_I2S=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+CONFIG_SND_SYNTH_EMUX=m
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+# CONFIG_HID_CP2112 is not set
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+# CONFIG_HID_GFRM is not set
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_VIVALDI=m
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID_OF=m
+CONFIG_I2C_HID_OF_GOODIX=m
+# end of I2C HID support
+
+CONFIG_I2C_HID_CORE=m
+# end of HID support
+
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_LED_TRIG=y
+# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_CONN_GPIO is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+# CONFIG_XPS_USB_HCD_XILINX is not set
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_FHCI_HCD=m
+# CONFIG_FHCI_DEBUG is not set
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=15
+CONFIG_USBIP_VHCI_NR_HCS=8
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_HOST=y
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_ISP1760 is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+# CONFIG_USB_HUB_USB251XB is not set
+# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+# end of USB Physical Layer drivers
+
+# CONFIG_USB_GADGET is not set
+# CONFIG_TYPEC is not set
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=m
+CONFIG_PWRSEQ_EMMC=m
+# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=256
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+# CONFIG_MMC_SDHCI_PLTFM is not set
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_MTK is not set
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+# CONFIG_LEDS_CLASS_MULTICOLOR is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_AW2013 is not set
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_CR0014114 is not set
+# CONFIG_LEDS_EL15203000 is not set
+# CONFIG_LEDS_LM3530 is not set
+CONFIG_LEDS_LM3532=m
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_LP3944=m
+# CONFIG_LEDS_LP3952 is not set
+# CONFIG_LEDS_LP50XX is not set
+CONFIG_LEDS_LP55XX_COMMON=m
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP8860 is not set
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_TLC591XX is not set
+CONFIG_LEDS_MAX77650=m
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
+# CONFIG_LEDS_IS31FL32XX is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_MLXREG is not set
+# CONFIG_LEDS_USER is not set
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
+
+#
+# Flash and Torch LED drivers
+#
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+CONFIG_RTC_DRV_ABEOZ9=m
+# CONFIG_RTC_DRV_ABX80X is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+# CONFIG_RTC_DRV_NTXEC is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_GENERIC=y
+CONFIG_RTC_DRV_CADENCE=m
+# CONFIG_RTC_DRV_FTRTC010 is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
+# CONFIG_RTC_DRV_R7301 is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_RTC_DRV_GOLDFISH=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_OF=y
+# CONFIG_ALTERA_MSGDMA is not set
+# CONFIG_DW_AXI_DMAC is not set
+# CONFIG_FSL_EDMA is not set
+# CONFIG_INTEL_IDMA64 is not set
+# CONFIG_PLX_DMA is not set
+# CONFIG_XILINX_ZYNQMP_DPDMA is not set
+CONFIG_PPC_BESTCOMM=m
+CONFIG_PPC_BESTCOMM_ATA=m
+CONFIG_PPC_BESTCOMM_FEC=m
+# CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_HIDMA is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
+# CONFIG_SF_PDMA is not set
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_PANEL is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_UIO_PRUSS is not set
+CONFIG_UIO_MF624=m
+# CONFIG_VFIO is not set
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+# CONFIG_VDPA is not set
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# end of Microsoft Hyper-V guest support
+
+# CONFIG_GREYBUS is not set
+# CONFIG_COMEDI is not set
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL8723BS is not set
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+# CONFIG_RTS5208 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# CONFIG_AD7280 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+# CONFIG_ADE7854 is not set
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+# CONFIG_FB_SM750 is not set
+# CONFIG_STAGING_MEDIA is not set
+
+#
+# Android
+#
+# end of Android
+
+# CONFIG_STAGING_BOARD is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+# CONFIG_FB_TFT is not set
+# CONFIG_KS7010 is not set
+# CONFIG_PI433 is not set
+# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_FIELDBUS_DEV is not set
+CONFIG_QLGE=m
+CONFIG_WFX=m
+# CONFIG_GOLDFISH is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Clock driver for ARM Reference designs
+#
+# CONFIG_ICST is not set
+# CONFIG_CLK_SP810 is not set
+# end of Clock driver for ARM Reference designs
+
+CONFIG_LMK04832=m
+# CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
+CONFIG_COMMON_CLK_AXI_CLKGEN=m
+# CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# CONFIG_XILINX_VCU is not set
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_MICROCHIP_PIT64B is not set
+# end of Clock Source drivers
+
+# CONFIG_MAILBOX is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+# CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+CONFIG_QUICC_ENGINE=y
+CONFIG_UCC_SLOW=y
+CONFIG_UCC_FAST=y
+CONFIG_UCC=y
+CONFIG_QE_TDM=y
+CONFIG_QE_USB=y
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_CONFIGFS is not set
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_DEVICE is not set
+# CONFIG_IIO_SW_TRIGGER is not set
+# CONFIG_IIO_TRIGGERED_EVENT is not set
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+# CONFIG_BMA400 is not set
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_BMI088_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+# CONFIG_FXLS8962AF_I2C is not set
+# CONFIG_FXLS8962AF_SPI is not set
+CONFIG_HID_SENSOR_ACCEL_3D=m
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCA3300 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+# CONFIG_AD7091R5 is not set
+CONFIG_AD7124=m
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
+CONFIG_AD7292=m
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+# CONFIG_AD7766 is not set
+CONFIG_AD7768_1=m
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+CONFIG_AD7949=m
+# CONFIG_AD799X is not set
+# CONFIG_ADI_AXI_ADC is not set
+CONFIG_CC10001_ADC=m
+# CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2496 is not set
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+# CONFIG_MAX1241 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+CONFIG_MCP3911=m
+# CONFIG_MP2629_ADC is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_SD_ADC_MODULATOR is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7950 is not set
+CONFIG_TI_ADS8344=m
+# CONFIG_TI_ADS8688 is not set
+CONFIG_TI_ADS124S08=m
+CONFIG_TI_ADS131E08=m
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_TI_TSC2046 is not set
+# CONFIG_VF610_ADC is not set
+CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+# CONFIG_HMC425 is not set
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_ATLAS_EZO_SENSOR is not set
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SENSIRION_SGP40=m
+CONFIG_SPS30=m
+CONFIG_SPS30_I2C=m
+CONFIG_SPS30_SERIAL=m
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+CONFIG_AD5446=m
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+CONFIG_AD5766=m
+# CONFIG_AD5770R is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+CONFIG_LTC1660=m
+# CONFIG_LTC2632 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+CONFIG_TI_DAC7311=m
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS290 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
+# CONFIG_HDC2010 is not set
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16460 is not set
+# CONFIG_ADIS16475 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+# CONFIG_FXOS8700_I2C is not set
+# CONFIG_FXOS8700_SPI is not set
+# CONFIG_KMX61 is not set
+# CONFIG_INV_ICM42600_I2C is not set
+# CONFIG_INV_ICM42600_SPI is not set
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# CONFIG_IIO_ST_LSM9DS0 is not set
+# end of Inertial measurement units
+
+#
+# Light sensors
+#
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADUX1020 is not set
+# CONFIG_AL3010 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
+# CONFIG_AS73211 is not set
+# CONFIG_BH1750 is not set
+CONFIG_BH1780=m
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP002 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+# CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2591 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+# CONFIG_AK8974 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+CONFIG_YAMAHA_YAS530=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# CONFIG_IIO_MUX is not set
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
+CONFIG_MAX5432=m
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+CONFIG_MCP41010=m
+# CONFIG_TPL0102 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
+# CONFIG_DLHL60D is not set
+# CONFIG_DPS310 is not set
+CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_HP03 is not set
+# CONFIG_ICP10100 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+CONFIG_MB1232=m
+# CONFIG_PING is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+# CONFIG_SX9310 is not set
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
+# CONFIG_VCNL3020 is not set
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_LTC2983=m
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TMP117 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+# CONFIG_AL_FIC is not set
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+# CONFIG_RESET_CONTROLLER is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_PHY_CAN_TRANSCEIVER=m
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_CADENCE_TORRENT is not set
+CONFIG_PHY_CADENCE_DPHY=m
+# CONFIG_PHY_CADENCE_SALVO is not set
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_CPCAP_USB is not set
+# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# end of PHY Subsystem
+
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_DAX=y
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_NVMEM_RMEM=m
+
+#
+# HW tracing support
+#
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
+# CONFIG_FPGA is not set
+# CONFIG_FSI is not set
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+CONFIG_MUX_ADGS1408=m
+# CONFIG_MUX_GPIO is not set
+# CONFIG_MUX_MMIO is not set
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+CONFIG_INTERCONNECT=y
+# CONFIG_COUNTER is not set
+# CONFIG_MOST is not set
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
+CONFIG_F2FS_FS_ZSTD=y
+CONFIG_F2FS_IOSTAT=y
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_DAX=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION_ALGS=m
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
+# CONFIG_FS_VERITY is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+# CONFIG_NETFS_STATS is not set
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+CONFIG_HPFS_FS=m
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+CONFIG_PSTORE_LZ4HC_COMPRESS=m
+# CONFIG_PSTORE_842_COMPRESS is not set
+CONFIG_PSTORE_ZSTD_COMPRESS=y
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+# CONFIG_EROFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CFB is not set
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+# CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2S=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MD5_PPC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_PPC=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+# CONFIG_CRYPTO_SM4 is not set
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+# CONFIG_PACKING is not set
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+CONFIG_XZ_DEC_POWERPC=y
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_DMA_DECLARE_COHERENT=y
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+# end of Library routines
+
+CONFIG_PLDMFW=y
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_COMPRESSED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+# end of Generic Kernel Debugging Instruments
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+# CONFIG_DEBUG_PAGE_REF is not set
+CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_KMAP_LOCAL is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# end of Debug kernel data structures
+
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_REF_SCALE_TEST=m
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_STACK_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+# CONFIG_OSNOISE_TRACER is not set
+# CONFIG_TIMERLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
+# CONFIG_SYNTH_EVENTS is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+CONFIG_KPROBE_EVENT_GEN_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# powerpc Debugging
+#
+CONFIG_PPC_DISABLE_WERROR=y
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
+# CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+CONFIG_XMON=y
+# CONFIG_XMON_DEFAULT is not set
+CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
+CONFIG_DEBUGGER=y
+# CONFIG_BDI_SWITCH is not set
+CONFIG_BOOTX_TEXT=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+# end of powerpc Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_STRING_SELFTEST is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_SCANF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_BITOPS is not set
+# CONFIG_TEST_VMALLOC is not set
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+# CONFIG_TEST_BLACKHOLE_DEV is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# end of Kernel Testing and Coverage
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
new file mode 100644
index 000000000000..7527759d59df
--- /dev/null
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -0,0 +1,10346 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/powerpc 5.15.0 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=100201
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23501
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23501
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=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_WERROR is not set
+CONFIG_LOCALVERSION="_1"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_XZ is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_IRQ_EDGE_EOI_HANDLER=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_SIM=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_IRQ_DOMAIN_NOMAP=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+CONFIG_BPF_LSM=y
+# end of BPF subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_SCHED_CORE=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_SCHED_AVG_IRQ=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+# CONFIG_PRINTK_INDEX is not set
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_CC_HAS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_RDMA=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
+# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_SYSCTL=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_EXPERT=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_PPC64=y
+
+#
+# Processor support
+#
+CONFIG_PPC_BOOK3S_64=y
+# CONFIG_PPC_BOOK3E_64 is not set
+CONFIG_GENERIC_CPU=y
+# CONFIG_CELL_CPU is not set
+# CONFIG_POWER5_CPU is not set
+# CONFIG_POWER6_CPU is not set
+# CONFIG_POWER7_CPU is not set
+# CONFIG_POWER8_CPU is not set
+# CONFIG_POWER9_CPU is not set
+CONFIG_PPC_BOOK3S=y
+CONFIG_PPC_FPU_REGS=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_VSX=y
+CONFIG_PPC_RADIX_MMU=y
+CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
+CONFIG_PPC_PKEY=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_PPC_HAVE_PMU_SUPPORT=y
+CONFIG_PMU_SYSFS=y
+CONFIG_PPC_PERF_CTRS=y
+CONFIG_FORCE_SMP=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2048
+CONFIG_PPC_DOORBELL=y
+# end of Processor support
+
+CONFIG_VDSO32=y
+CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_CPU_LITTLE_ENDIAN is not set
+CONFIG_64BIT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_NR_IRQS=512
+CONFIG_NMI_IPI=y
+CONFIG_PPC_WATCHDOG=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_PPC=y
+CONFIG_PPC_BARRIER_NOSPEC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_UDBG_16550=y
+CONFIG_GENERIC_TBSYNC=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_EPAPR_BOOT=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_NONZERO_CPU=y
+CONFIG_PPC_DCR_MMIO=y
+CONFIG_PPC_DCR=y
+CONFIG_PPC_OF_PLATFORM_PCI=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_PPC_DAWR=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_PPC_MSI_BITMAP=y
+CONFIG_PPC_XICS=y
+CONFIG_PPC_ICP_NATIVE=y
+CONFIG_PPC_ICP_HV=y
+CONFIG_PPC_ICS_RTAS=y
+CONFIG_PPC_XIVE=y
+CONFIG_PPC_XIVE_NATIVE=y
+CONFIG_PPC_XIVE_SPAPR=y
+
+#
+# Platform support
+#
+CONFIG_PPC_POWERNV=y
+CONFIG_OPAL_PRD=m
+CONFIG_PPC_MEMTRACE=y
+CONFIG_SCOM_DEBUGFS=y
+CONFIG_PPC_PSERIES=y
+CONFIG_PPC_SPLPAR=y
+CONFIG_DTL=y
+CONFIG_PSERIES_ENERGY=m
+CONFIG_SCANLOG=m
+CONFIG_IO_EVENT_IRQ=y
+CONFIG_LPARCFG=y
+CONFIG_PPC_SMLPAR=y
+CONFIG_CMM=m
+CONFIG_HV_PERF_CTRS=y
+CONFIG_IBMVIO=y
+CONFIG_IBMEBUS=y
+CONFIG_PAPR_SCM=m
+CONFIG_PPC_SVM=y
+CONFIG_PPC_PMAC=y
+CONFIG_PPC_PMAC64=y
+CONFIG_PPC_MAPLE=y
+CONFIG_PPC_PASEMI=y
+
+#
+# PA Semi PWRficient options
+#
+# CONFIG_PPC_PASEMI_NEMO is not set
+# CONFIG_PPC_PASEMI_IOMMU is not set
+CONFIG_PPC_PASEMI_MDIO=m
+# end of PA Semi PWRficient options
+
+CONFIG_PPC_PS3=y
+
+#
+# PS3 Platform Options
+#
+CONFIG_PS3_ADVANCED=y
+CONFIG_PS3_HTAB_SIZE=20
+# CONFIG_PS3_DYNAMIC_DMA is not set
+CONFIG_PS3_VUART=y
+CONFIG_PS3_PS3AV=y
+CONFIG_PS3_SYS_MANAGER=y
+# CONFIG_PS3_VERBOSE_RESULT is not set
+# CONFIG_PS3_REPOSITORY_WRITE is not set
+CONFIG_PS3_STORAGE=m
+CONFIG_PS3_DISK=m
+CONFIG_PS3_ROM=m
+CONFIG_PS3_FLASH=m
+CONFIG_PS3_LPM=m
+# CONFIG_PS3GELIC_UDBG is not set
+# end of PS3 Platform Options
+
+CONFIG_PPC_CELL=y
+CONFIG_PPC_CELL_COMMON=y
+CONFIG_PPC_CELL_NATIVE=y
+CONFIG_PPC_IBM_CELL_BLADE=y
+CONFIG_AXON_MSI=y
+
+#
+# Cell Broadband Engine options
+#
+CONFIG_SPU_FS=m
+CONFIG_SPU_BASE=y
+CONFIG_CBE_RAS=y
+CONFIG_PPC_IBM_CELL_RESETBUTTON=y
+CONFIG_PPC_IBM_CELL_POWERBUTTON=m
+CONFIG_CBE_THERM=m
+CONFIG_PPC_PMI=y
+CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
+# end of Cell Broadband Engine options
+
+CONFIG_PPC_VAS=y
+CONFIG_KVM_GUEST=y
+CONFIG_EPAPR_PARAVIRT=y
+CONFIG_PPC_NATIVE=y
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+CONFIG_PPC_DT_CPU_FTRS=y
+CONFIG_UDBG_RTAS_CONSOLE=y
+CONFIG_PPC_SMP_MUXED_IPI=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_MSGR is not set
+CONFIG_PPC_I8259=y
+CONFIG_U3_DART=y
+CONFIG_PPC_RTAS=y
+CONFIG_RTAS_ERROR_LOGGING=y
+CONFIG_PPC_RTAS_DAEMON=y
+CONFIG_RTAS_PROC=y
+CONFIG_RTAS_FLASH=m
+CONFIG_MMIO_NVRAM=y
+CONFIG_MPIC_U3_HT_IRQS=y
+CONFIG_MPIC_BROKEN_REGREAD=y
+CONFIG_EEH=y
+CONFIG_PPC_970_NAP=y
+CONFIG_PPC_P7_NAP=y
+CONFIG_PPC_BOOK3S_IDLE=y
+CONFIG_PPC_INDIRECT_PIO=y
+CONFIG_PPC_INDIRECT_MMIO=y
+CONFIG_PPC_IO_WORKAROUNDS=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_CPU_FREQ_CBE=m
+CONFIG_CPU_FREQ_CBE_PMI=y
+CONFIG_CPU_FREQ_MAPLE=y
+CONFIG_CPU_FREQ_PMAC64=y
+CONFIG_PPC_PASEMI_CPUFREQ=y
+CONFIG_POWERNV_CPUFREQ=y
+# end of CPU Frequency scaling
+
+#
+# CPUIdle driver
+#
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
+
+#
+# POWERPC CPU Idle Drivers
+#
+CONFIG_PSERIES_CPUIDLE=y
+CONFIG_POWERNV_CPUIDLE=y
+# end of POWERPC CPU Idle Drivers
+# end of CPU Idle
+# end of CPUIdle driver
+
+CONFIG_QE_GPIO=y
+# CONFIG_GEN_RTC is not set
+# end of Platform support
+
+#
+# Kernel options
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_PPC_UV=y
+# CONFIG_LD_HEAD_STUB_CATCH is not set
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_PPC_QUEUED_SPINLOCKS is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
+CONFIG_RELOCATABLE=y
+# CONFIG_RELOCATABLE_TEST is not set
+CONFIG_CRASH_DUMP=y
+CONFIG_FA_DUMP=y
+# CONFIG_OPAL_CORE is not set
+CONFIG_IRQ_ALL_CPUS=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=8
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_MEMORYLESS_NODES=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC_PAGE_SHIFT=12
+CONFIG_THREAD_SHIFT=14
+CONFIG_DATA_SHIFT=12
+CONFIG_FORCE_MAX_ZONEORDER=13
+# CONFIG_PPC_PROT_SAO_LPAR is not set
+CONFIG_PPC_COPRO_BASE=y
+CONFIG_SCHED_SMT=y
+CONFIG_PPC_DENORMALISATION=y
+CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+CONFIG_EXTRA_TARGETS=""
+CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP_SMP_NONZERO_CPU=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_PPC_MEM_KEYS=y
+CONFIG_PPC_RTAS_FILTER=y
+# end of Kernel options
+
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_FSL_LBC=y
+CONFIG_FSL_GTM=y
+# end of Bus options
+
+CONFIG_NONSTATIC_KERNEL=y
+CONFIG_PAGE_OFFSET=0xc000000000000000
+CONFIG_KERNEL_START=0xc000000000000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_ARCH_RANDOM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_KVM_BOOK3S_HANDLER=y
+CONFIG_KVM_BOOK3S_64_HANDLER=y
+CONFIG_KVM_BOOK3S_PR_POSSIBLE=y
+CONFIG_KVM_BOOK3S_HV_POSSIBLE=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
+# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
+CONFIG_KVM_XICS=y
+CONFIG_KVM_XIVE=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_KEXEC_ELF=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_NMI_WATCHDOG=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_GATHER_PAGE_SIZE=y
+CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_LTO_NONE=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_HAVE_ARCH_NVRAM_OPS=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+CONFIG_MODULE_REL_CRCS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_GZIP is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_DEV_BSG_COMMON=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_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_FC_APPID is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+CONFIG_BLK_SED_OPAL=y
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+# CONFIG_OSF_PARTITION is not set
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_HAS_MMIOWB=y
+CONFIG_MMIOWB=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_NUMA_KEEP_MEMINFO=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SYSFS=y
+CONFIG_CMA_AREAS=7
+# CONFIG_MEM_SOFT_DIRTY is not set
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
+CONFIG_DEVICE_PRIVATE=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_HUGEPD=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_DBGFS=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XFRM_ESPINTCP=y
+CONFIG_SMC=m
+CONFIG_SMC_DIAG=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+# CONFIG_NET_FOU_IP_TUNNELS is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+CONFIG_INET_ESPINTCP=y
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=y
+CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_ESPINTCP=y
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
+CONFIG_IPV6_RPL_LWTUNNEL=y
+CONFIG_IPV6_IOAM6_LWTUNNEL=y
+# CONFIG_NETLABEL is not set
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+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_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XTABLES_COMPAT=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+# CONFIG_IP_VS_MH is not set
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+# CONFIG_IP6_NF_SECURITY is not set
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
+CONFIG_NFT_BRIDGE_REJECT=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+# CONFIG_RDS_RDMA is not set
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+# CONFIG_BRIDGE_CFM is not set
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=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_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+# CONFIG_6LOWPAN_GHC_EXT_HDR_HOP is not set
+# CONFIG_6LOWPAN_GHC_UDP is not set
+# CONFIG_6LOWPAN_GHC_ICMPV6 is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_DEST is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE is not set
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+# CONFIG_IEEE802154_6LOWPAN is not set
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BATMAN_V=y
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=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_STREAM_PARSER=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+# CONFIG_CAN_J1939 is not set
+# CONFIG_CAN_ISOTP is not set
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_FLEXCAN=m
+CONFIG_CAN_GRCAN=m
+# CONFIG_CAN_JANZ_ICAN3 is not set
+# CONFIG_CAN_KVASER_PCIEFD is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PCI=m
+# CONFIG_CAN_M_CAN_PLATFORM is not set
+# CONFIG_CAN_M_CAN_TCAN4X5X is not set
+CONFIG_CAN_MSCAN=m
+# CONFIG_CAN_PEAK_PCIEFD is not set
+# CONFIG_CAN_SJA1000 is not set
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_NOKIA is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+# CONFIG_BT_HCIUART_MRVL is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_MCTP=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_RDMA is not set
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_VIRTUAL_NCI=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_S3FWRN82_UART=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_PCI=y
+CONFIG_FORCE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_MSI_ARCH_FALLBACKS=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_ECAM=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_PCI_P2PDMA is not set
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_CPCI=y
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+CONFIG_HOTPLUG_PCI_POWERNV=m
+CONFIG_HOTPLUG_PCI_RPA=m
+CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
+
+#
+# PCI controller drivers
+#
+CONFIG_PCI_FTPCI100=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_XILINX=y
+# CONFIG_PCIE_MICROCHIP_HOST is not set
+
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCIE_DW_PLAT_EP is not set
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+
+#
+# Mobiveil PCIe Core Support
+#
+# end of Mobiveil PCIe Core Support
+
+#
+# Cadence PCIe controllers support
+#
+CONFIG_PCIE_CADENCE=y
+CONFIG_PCIE_CADENCE_HOST=y
+CONFIG_PCIE_CADENCE_EP=y
+CONFIG_PCIE_CADENCE_PLAT=y
+CONFIG_PCIE_CADENCE_PLAT_HOST=y
+CONFIG_PCIE_CADENCE_PLAT_EP=y
+CONFIG_PCI_J721E=y
+CONFIG_PCI_J721E_HOST=y
+CONFIG_PCI_J721E_EP=y
+# end of Cadence PCIe controllers support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_EPF_TEST is not set
+CONFIG_PCI_EPF_NTB=m
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=m
+CONFIG_CXL_MEM=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_PMEM=m
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+# CONFIG_ELECTRA_CF is not set
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_RAPIDIO=m
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_CACHE=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_I3C=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# CONFIG_MOXTET is not set
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
+CONFIG_MTD_PCI=m
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_MCHP23K256=m
+CONFIG_MTD_MCHP48L640=m
+CONFIG_MTD_SST25L=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+CONFIG_MTD_POWERNV_FLASH=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_DENALI_DT=m
+CONFIG_MTD_NAND_CAFE=m
+# CONFIG_MTD_NAND_PASEMI is not set
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+# CONFIG_MTD_NAND_CADENCE is not set
+CONFIG_MTD_NAND_ARASAN=m
+CONFIG_MTD_NAND_INTEL_LGM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_HYPERBUS is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
+CONFIG_OF_DMA_DEFAULT_COHERENT=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_PC_PCMCIA is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_CDROM=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBMVMC=m
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HI6421V600_IRQ=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
+CONFIG_MISC_RTSX=m
+# CONFIG_HISI_HIKEY_USB is not set
+CONFIG_C2PORT=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_SPI=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+CONFIG_ECHO=m
+CONFIG_CXL_BASE=y
+CONFIG_CXL=m
+CONFIG_OCXL_BASE=y
+CONFIG_OCXL=m
+CONFIG_BCM_VK=m
+# CONFIG_BCM_VK_TTY is not set
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_CXLFLASH=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFS_DWC_TC_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
+CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_MYRB=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IBMVSCSIS=m
+CONFIG_SCSI_IBMVFC=m
+CONFIG_SCSI_IBMVFC_TRACE=y
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_FDOMAIN is not set
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_ATA_NONSTANDARD=y
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_CEVA=m
+CONFIG_AHCI_QORIQ=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MACIO=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_EBS=m
+CONFIG_DM_ERA=m
+# CONFIG_DM_CLONE is not set
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_ADB_PMU=y
+CONFIG_ADB_PMU_LED=y
+CONFIG_ADB_PMU_LED_DISK=y
+CONFIG_PMAC_SMU=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_WINDFARM=m
+CONFIG_WINDFARM_PM81=m
+CONFIG_WINDFARM_PM72=m
+CONFIG_WINDFARM_RM31=m
+CONFIG_WINDFARM_PM91=m
+CONFIG_WINDFARM_PM112=m
+CONFIG_WINDFARM_PM121=m
+CONFIG_PMAC_RACKMETER=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_VSOCKMON is not set
+CONFIG_MHI_NET=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+# CONFIG_CAIF_DRIVERS is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+# CONFIG_NET_DSA_BCM_SF2 is not set
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
+CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+# CONFIG_NET_DSA_MSCC_FELIX is not set
+# CONFIG_NET_DSA_MSCC_SEVILLE is not set
+CONFIG_NET_DSA_AR9331=m
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_QCA8K=m
+# CONFIG_NET_DSA_REALTEK_SMI is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=y
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=y
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+# CONFIG_CHELSIO_T4_DCB is not set
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_GEMINI_ETHERNET=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+CONFIG_SUNDANCE_MMIO=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
+CONFIG_GIANFAR=m
+CONFIG_FSL_DPAA2_SWITCH=m
+CONFIG_FSL_ENETC=m
+CONFIG_FSL_ENETC_VF=m
+CONFIG_FSL_ENETC_IERB=m
+CONFIG_FSL_ENETC_MDIO=m
+CONFIG_FSL_ENETC_PTP_CLOCK=m
+# CONFIG_FSL_ENETC_QOS is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_IBMVETH=m
+CONFIG_IBM_EMAC=m
+CONFIG_IBM_EMAC_RXB=128
+CONFIG_IBM_EMAC_TXB=64
+CONFIG_IBM_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
+# CONFIG_IBM_EMAC_DEBUG is not set
+CONFIG_IBM_EMAC_ZMII=y
+CONFIG_IBM_EMAC_RGMII=y
+CONFIG_IBM_EMAC_TAH=y
+CONFIG_IBM_EMAC_EMAC4=y
+CONFIG_EHEA=m
+CONFIG_IBMVNIC=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_LITEX_LITEETH=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CLS_ACT=y
+CONFIG_MLX5_TC_SAMPLE=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_SW_STEERING=y
+# CONFIG_MLX5_SF is not set
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+# CONFIG_MSCC_OCELOT_SWITCH is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PASEMI=y
+CONFIG_PASEMI_MAC=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_IONIC=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCA7000=m
+CONFIG_QCA7000_SPI=m
+CONFIG_QCA7000_UART=m
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_INTEL_PLAT=m
+CONFIG_DWMAC_LOONGSON=m
+CONFIG_STMMAC_PCI=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_TOSHIBA=y
+# CONFIG_GELIC_NET is not set
+# CONFIG_SPIDER_NET is not set
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_EMACLITE=m
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+# CONFIG_BCM84881_PHY is not set
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_OF_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_IPQ4019=m
+# CONFIG_MDIO_IPQ8064 is not set
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HWRNG=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_AHB=y
+# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_DEBUGFS is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+# CONFIG_PCMCIA_ATMEL is not set
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+CONFIG_IWLWIFI_BCAST_FILTERING=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEBUGFS is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_APPLE_AIRPORT=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615_COMMON=m
+CONFIG_MT7615E=m
+CONFIG_MT7663_USB_SDIO_COMMON=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921E=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+# CONFIG_WILC1000_SPI is not set
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+# CONFIG_IEEE802154_CC2520 is not set
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
+# CONFIG_IEEE802154_MCR20A is not set
+CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+CONFIG_WWAN_HWSIM=m
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+# end of Wireless WAN
+
+# CONFIG_VMXNET3 is not set
+CONFIG_USB4_NET=m
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+# CONFIG_KEYBOARD_ADP5520 is not set
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_STMPE=m
+# CONFIG_KEYBOARD_IQS62X is not set
+CONFIG_KEYBOARD_OMAP4=m
+CONFIG_KEYBOARD_TC3589X=m
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+# CONFIG_KEYBOARD_TWL4030 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CAP11XX=m
+CONFIG_KEYBOARD_BCM=m
+# CONFIG_KEYBOARD_MTK_PMIC is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_88PM860X is not set
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_AR1021_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
+CONFIG_TOUCHSCREEN_CY8CTMA140=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_ILITEK=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_MSG2638=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+# CONFIG_TOUCHSCREEN_WM831X is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_88PM860X_ONKEY is not set
+# CONFIG_INPUT_88PM80X_ONKEY is not set
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_ATC260X_ONKEY=m
+CONFIG_INPUT_ATMEL_CAPTOUCH=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+# CONFIG_INPUT_MAX8925_ONKEY is not set
+# CONFIG_INPUT_MAX8997_HAPTIC is not set
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_CPCAP_PWRBUTTON=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+# CONFIG_INPUT_TWL4030_PWRBUTTON is not set
+# CONFIG_INPUT_TWL4030_VIBRA is not set
+# CONFIG_INPUT_TWL6040_VIBRA is not set
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_RK805_PWRKEY=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+CONFIG_INPUT_DA7280_HAPTICS=m
+CONFIG_INPUT_DA9052_ONKEY=m
+# CONFIG_INPUT_DA9055_ONKEY is not set
+CONFIG_INPUT_DA9063_ONKEY=m
+# CONFIG_INPUT_WM831X_ON is not set
+# CONFIG_INPUT_PCAP is not set
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_XILINX_XPS_PS2=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+CONFIG_SERIAL_8250_FINTEK=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_EXAR=m
+# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_ASPEED_VUART=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_OF_PLATFORM=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_PMACZILOG=m
+CONFIG_SERIAL_PMACZILOG_TTYS=y
+CONFIG_SERIAL_ICOM=m
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
+CONFIG_SERIAL_QE=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+# CONFIG_SERIAL_SC16IS7XX is not set
+CONFIG_SERIAL_BCM63XX=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+# CONFIG_SERIAL_FSL_LINFLEXUART is not set
+CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
+# CONFIG_SERIAL_MEN_Z135 is not set
+CONFIG_SERIAL_SPRD=m
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=m
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVC_OLD_HVSI=y
+CONFIG_HVC_OPAL=y
+CONFIG_HVC_RTAS=y
+# CONFIG_HVC_UDBG is not set
+CONFIG_HVCS=m
+CONFIG_SERIAL_DEV_BUS=m
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IBM_BSR=m
+CONFIG_POWERNV_OP_PANEL=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_POWERNV=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_PASEMI=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_PSERIES=m
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
+CONFIG_DEVMEM=y
+CONFIG_NVRAM=y
+CONFIG_DEVPORT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_TIS_I2C_CR50=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_IBMVTPM=m
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_XILLYBUS_CLASS=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYBUS_OF=m
+CONFIG_XILLYUSB=m
+# CONFIG_RANDOM_TRUST_CPU is not set
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_GPMUX=m
+# CONFIG_I2C_MUX_LTC4306 is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_DEMUX_PINCTRL=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+CONFIG_I2C_ISCH=m
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# Mac SMBus host controller drivers
+#
+CONFIG_I2C_POWERMAC=y
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=m
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_MPC=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PASEMI=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_RK3X=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_CP2615=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_OPAL=y
+CONFIG_I2C_FSI=m
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+# CONFIG_MIPI_I3C_HCI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_ALTERA_CORE=m
+CONFIG_SPI_ALTERA_DFL=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_DMA=y
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_FSI=m
+CONFIG_SPI_NXP_FLEXSPI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_FSL_LIB=y
+CONFIG_SPI_FSL_SPI=y
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_XILINX=m
+CONFIG_SPI_ZYNQMP_GQSPI=m
+CONFIG_SPI_AMD=m
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_LOOPBACK_TEST=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_TIME=m
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_DYNAMIC=y
+CONFIG_SPMI=m
+CONFIG_SPMI_HISI3670=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+CONFIG_PPS_CLIENT_KTIMER=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_PTP_1588_CLOCK_QORIQ=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_OCP=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_DA9062=m
+CONFIG_PINCTRL_MCP23S08_I2C=m
+CONFIG_PINCTRL_MCP23S08_SPI=m
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
+CONFIG_PINCTRL_MAX77620=m
+CONFIG_PINCTRL_PALMAS=m
+CONFIG_PINCTRL_RK805=m
+# CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_CS47L35=y
+CONFIG_PINCTRL_CS47L85=y
+CONFIG_PINCTRL_CS47L90=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_74XX_MMIO=m
+CONFIG_GPIO_ALTERA=m
+CONFIG_GPIO_CADENCE=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_FTGPIO010=y
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_GRGPIO=m
+CONFIG_GPIO_HLWD=m
+CONFIG_GPIO_LOGICVC=m
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_SAMA5D2_PIOBU=m
+# CONFIG_GPIO_SIFIVE is not set
+CONFIG_GPIO_SYSCON=m
+CONFIG_GPIO_XILINX=y
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_ADNP=m
+CONFIG_GPIO_GW_PLD=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_LP87565=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_RC5T583=y
+CONFIG_GPIO_STMPE=y
+CONFIG_GPIO_TC3589X=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS65218=m
+CONFIG_GPIO_TPS6586X=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TPS65912=m
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_TWL4030=m
+CONFIG_GPIO_TWL6040=m
+CONFIG_GPIO_UCB1400=m
+CONFIG_GPIO_WM831X=m
+CONFIG_GPIO_WM8350=m
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_74X164=m
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+CONFIG_GPIO_VIRTIO=m
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_W1_MASTER_SGI=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
+CONFIG_POWER_RESET_ATC260X=m
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_LTC2952=y
+# CONFIG_POWER_RESET_MT6323 is not set
+# CONFIG_POWER_RESET_REGULATOR is not set
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_TPS65086=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_REBOOT_MODE=m
+CONFIG_SYSCON_REBOOT_MODE=m
+# CONFIG_NVMEM_REBOOT_MODE is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+# CONFIG_MAX8925_POWER is not set
+# CONFIG_WM831X_BACKUP is not set
+# CONFIG_WM831X_POWER is not set
+# CONFIG_WM8350_POWER is not set
+CONFIG_TEST_POWER=m
+# CONFIG_BATTERY_88PM860X is not set
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_ACT8945A=m
+CONFIG_BATTERY_CPCAP=m
+CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_DA9030 is not set
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+# CONFIG_CHARGER_AXP20X is not set
+# CONFIG_BATTERY_AXP20X is not set
+CONFIG_AXP20X_POWER=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+# CONFIG_CHARGER_TWL4030 is not set
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_LTC4162L=m
+# CONFIG_CHARGER_MAX14577 is not set
+CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
+# CONFIG_CHARGER_MAX77693 is not set
+# CONFIG_CHARGER_MAX8997 is not set
+# CONFIG_CHARGER_MAX8998 is not set
+CONFIG_CHARGER_MP2629=m
+CONFIG_CHARGER_MT6360=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_BQ256XX=m
+CONFIG_CHARGER_SMB347=m
+# CONFIG_CHARGER_TPS65090 is not set
+CONFIG_BATTERY_GAUGE_LTC2941=m
+# CONFIG_BATTERY_GOLDFISH is not set
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_UCS1002=m
+CONFIG_CHARGER_BD99954=m
+CONFIG_RN5T618_POWER=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DA9052_ADC=m
+# CONFIG_SENSORS_DA9055 is not set
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_GSC=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IBMPOWERNV=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC2992=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_TPS23861=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_MR75203=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1266=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_BEL_PFE=m
+CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_FSP_3Y=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_DPS920AB=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+# CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR36021=m
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+# CONFIG_SENSORS_LTC2978 is not set
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX15301=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_MP2888=m
+CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_PIM4328=m
+CONFIG_SENSORS_PM6764TR=m
+# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_Q54SJ108A2=m
+CONFIG_SENSORS_STPDDC60=m
+# CONFIG_SENSORS_TPS40422 is not set
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE122=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHT4x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_WM831X=m
+# CONFIG_SENSORS_WM8350 is not set
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_FREQ_THERMAL=y
+# CONFIG_CPU_IDLE_THERMAL is not set
+CONFIG_DEVFREQ_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=m
+CONFIG_MAX77620_THERMAL=m
+CONFIG_DA9062_THERMAL=m
+# CONFIG_TI_SOC_THERMAL is not set
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_BD957XMUF_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+# CONFIG_DA9055_WATCHDOG is not set
+# CONFIG_DA9063_WATCHDOG is not set
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_GPIO_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+# CONFIG_MENZ069_WATCHDOG is not set
+CONFIG_WM831X_WATCHDOG=m
+# CONFIG_WM8350_WATCHDOG is not set
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_RN5T618_WATCHDOG=m
+# CONFIG_TWL4030_WATCHDOG is not set
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_MAX77620_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_STPMIC1_WATCHDOG=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_KEMPLD_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_WATCHDOG_RTAS=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_ACT8945A=m
+CONFIG_MFD_AS3711=y
+CONFIG_MFD_AS3722=y
+CONFIG_PMIC_ADP5520=y
+CONFIG_MFD_AAT2870_CORE=y
+CONFIG_MFD_ATMEL_FLEXCOM=m
+CONFIG_MFD_ATMEL_HLCDC=m
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+CONFIG_MFD_CS47L35=y
+CONFIG_MFD_CS47L85=y
+CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
+CONFIG_PMIC_DA903X=y
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=m
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_GATEWORKS_GSC=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MP2629=m
+CONFIG_MFD_HI6421_PMIC=m
+CONFIG_MFD_HI6421_SPMI=m
+CONFIG_HTC_PASIC3=m
+CONFIG_HTC_I2CPLD=y
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_INTEL_PMT=m
+CONFIG_MFD_IQS62X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+CONFIG_MFD_88PM800=m
+CONFIG_MFD_88PM805=m
+CONFIG_MFD_88PM860X=y
+CONFIG_MFD_MAX14577=m
+CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=m
+CONFIG_MFD_MAX77686=y
+CONFIG_MFD_MAX77693=m
+CONFIG_MFD_MAX77843=y
+CONFIG_MFD_MAX8907=m
+CONFIG_MFD_MAX8925=y
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_MAX8998=y
+CONFIG_MFD_MT6360=m
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_CPCAP=m
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_NTXEC=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT4831=m
+CONFIG_MFD_RT5033=m
+CONFIG_MFD_RC5T583=y
+CONFIG_MFD_RK808=m
+CONFIG_MFD_RN5T618=m
+# CONFIG_MFD_SEC_CORE is not set
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_STMPE=y
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
+CONFIG_STMPE_I2C=y
+CONFIG_STMPE_SPI=y
+# end of STMicroelectronics STMPE Interface Drivers
+
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_MFD_LP8788=y
+CONFIG_MFD_TI_LMU=m
+CONFIG_MFD_PALMAS=y
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+CONFIG_MFD_TPS65090=y
+# CONFIG_MFD_TPS65217 is not set
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TI_LP87565=m
+CONFIG_MFD_TPS65218=m
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
+CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_TPS80031=y
+CONFIG_TWL4030_CORE=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TC3589X=y
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+# CONFIG_MFD_LOCHNAGAR is not set
+CONFIG_MFD_ARIZONA=m
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+CONFIG_MFD_WM8998=y
+CONFIG_MFD_WM8400=y
+CONFIG_MFD_WM831X=y
+CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_WM831X_SPI=y
+CONFIG_MFD_WM8350=y
+CONFIG_MFD_WM8350_I2C=y
+CONFIG_MFD_WM8994=m
+# CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
+# CONFIG_MFD_ROHM_BD71828 is not set
+CONFIG_MFD_ROHM_BD957XMUF=m
+CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
+CONFIG_MFD_ATC260X=m
+CONFIG_MFD_ATC260X_I2C=m
+CONFIG_MFD_QCOM_PM8008=m
+# CONFIG_RAVE_SP_CORE is not set
+CONFIG_MFD_INTEL_M10_BMC=m
+CONFIG_MFD_RSMU_I2C=m
+CONFIG_MFD_RSMU_SPI=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_88PG86X=m
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_88PM8607=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_ACT8945A=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_ATC260X=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_BD957XMUF=m
+CONFIG_REGULATOR_CPCAP=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9063=m
+CONFIG_REGULATOR_DA9121=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_FAN53880=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_HI6421V530=m
+CONFIG_REGULATOR_HI6421V600=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP873X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LP87565=m
+CONFIG_REGULATOR_LP8788=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX14577=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX77620=m
+CONFIG_REGULATOR_MAX77650=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8893=m
+CONFIG_REGULATOR_MAX8907=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX8998=m
+CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MAX77802=m
+CONFIG_REGULATOR_MAX77826=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MCP16502=m
+CONFIG_REGULATOR_MP5416=m
+CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MP886X=m
+CONFIG_REGULATOR_MPQ7920=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6315=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6358=m
+CONFIG_REGULATOR_MT6359=m
+CONFIG_REGULATOR_MT6360=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PF8X00=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RN5T618=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_STPMIC1=m
+CONFIG_REGULATOR_SY8106A=m
+CONFIG_REGULATOR_SY8824X=m
+CONFIG_REGULATOR_SY8827N=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS65218=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS80031=m
+CONFIG_REGULATOR_TWL4030=m
+CONFIG_REGULATOR_VCTRL=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_HIX5HD2=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_SPI=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
+CONFIG_IR_PWM_TX=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+# CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
+CONFIG_IR_TOY=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_MEDIA_CEC_RC=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_USB_PULSE8_CEC=m
+# CONFIG_USB_RAINSHADOW_CEC is not set
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+# CONFIG_USB_GSPCA_DTCS033 is not set
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+# CONFIG_VIDEO_AU0828_RC is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+# CONFIG_VIDEO_SOLO6X10 is not set
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+# CONFIG_VIDEO_CADENCE is not set
+CONFIG_VIDEO_ASPEED=m
+CONFIG_VIDEO_MUX=m
+CONFIG_VIDEO_XILINX=m
+CONFIG_VIDEO_XILINX_CSI2RXSS=m
+CONFIG_VIDEO_XILINX_TPG=m
+CONFIG_VIDEO_XILINX_VTC=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+# CONFIG_DVB_FIREDTV is not set
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
+CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+CONFIG_VIDEO_MAX9286=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of Miscellaneous helper chips
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_IMX208=m
+# CONFIG_VIDEO_IMX214 is not set
+CONFIG_VIDEO_IMX219=m
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX319 is not set
+CONFIG_VIDEO_IMX334=m
+CONFIG_VIDEO_IMX335=m
+# CONFIG_VIDEO_IMX355 is not set
+CONFIG_VIDEO_IMX412=m
+# CONFIG_VIDEO_OV02A10 is not set
+CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+CONFIG_VIDEO_OV5648=m
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+CONFIG_VIDEO_OV5675=m
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9282=m
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+CONFIG_VIDEO_DW9768=m
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+# CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_UNINORTH=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_BUS=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_CEC=y
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# CONFIG_DRM_KOMEDA is not set
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN=y
+# CONFIG_DRM_AMD_DC_HDCP is not set
+CONFIG_DRM_AMD_DC_SI=y
+CONFIG_DRM_AMD_SECURE_DISPLAY=y
+# end of Display Engine Configuration
+
+CONFIG_HSA_AMD=y
+CONFIG_HSA_AMD_SVM=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_NOUVEAU_SVM is not set
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VKMS=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_RCAR_DW_HDMI=m
+# CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_ABT_Y030XX067A=m
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
+CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
+CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+CONFIG_DRM_PANEL_DSI_CM=m
+CONFIG_DRM_PANEL_LVDS=m
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_ELIDA_KD35T133=m
+CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
+# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
+CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
+CONFIG_DRM_PANEL_KHADAS_TS050=m
+CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W=m
+CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
+CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_LG_LB035Q02=m
+CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_NEC_NL8048HL11=m
+CONFIG_DRM_PANEL_NOVATEK_NT35510=m
+CONFIG_DRM_PANEL_NOVATEK_NT36672A=m
+CONFIG_DRM_PANEL_NOVATEK_NT39016=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
+CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
+CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
+CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
+CONFIG_DRM_PANEL_SAMSUNG_DB7430=m
+CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
+CONFIG_DRM_PANEL_SAMSUNG_SOFEF00=m
+CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
+CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
+CONFIG_DRM_PANEL_SITRONIX_ST7701=m
+CONFIG_DRM_PANEL_SITRONIX_ST7703=m
+CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
+CONFIG_DRM_PANEL_SONY_ACX424AKP=m
+CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+CONFIG_DRM_PANEL_TDO_TL070WSH30=m
+CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
+CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
+CONFIG_DRM_PANEL_TPO_TPG110=m
+CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_RM69299=m
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_CDNS_DSI=m
+CONFIG_DRM_CHIPONE_ICN6211=m
+CONFIG_DRM_CHRONTEL_CH7033=m
+CONFIG_DRM_DISPLAY_CONNECTOR=m
+CONFIG_DRM_LONTIUM_LT8912B=m
+CONFIG_DRM_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=m
+CONFIG_DRM_ITE_IT66121=m
+CONFIG_DRM_LVDS_CODEC=m
+CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
+CONFIG_DRM_NWL_MIPI_DSI=m
+CONFIG_DRM_NXP_PTN3460=m
+CONFIG_DRM_PARADE_PS8622=m
+CONFIG_DRM_PARADE_PS8640=m
+CONFIG_DRM_SIL_SII8620=m
+CONFIG_DRM_SII902X=m
+CONFIG_DRM_SII9234=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
+CONFIG_DRM_THINE_THC63LVD1024=m
+CONFIG_DRM_TOSHIBA_TC358762=m
+CONFIG_DRM_TOSHIBA_TC358764=m
+CONFIG_DRM_TOSHIBA_TC358767=m
+CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=m
+CONFIG_DRM_TI_TFP410=m
+CONFIG_DRM_TI_SN65DSI83=m
+CONFIG_DRM_TI_SN65DSI86=m
+CONFIG_DRM_TI_TPD12S015=m
+CONFIG_DRM_ANALOGIX_ANX6345=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
+CONFIG_DRM_ANALOGIX_ANX7625=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+CONFIG_DRM_CDNS_MHDP8546=m
+CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+CONFIG_DRM_MXS=y
+CONFIG_DRM_MXSFB=m
+CONFIG_DRM_ARCPGU=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_TINYDRM_HX8357D=m
+# CONFIG_TINYDRM_ILI9225 is not set
+# CONFIG_TINYDRM_ILI9341 is not set
+# CONFIG_TINYDRM_ILI9486 is not set
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+# CONFIG_TINYDRM_ST7735R is not set
+CONFIG_DRM_GUD=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_MACMODES=y
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_OF=y
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+# CONFIG_FB_I740 is not set
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_SM501 is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+CONFIG_FB_PS3=m
+CONFIG_FB_PS3_DEFAULT_SIZE_M=9
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+# CONFIG_FB_MB862XX_LIME is not set
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_SIMPLE=m
+CONFIG_FB_SSD1307=m
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+# CONFIG_LCD_OTM3225A is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_DA903X is not set
+CONFIG_BACKLIGHT_DA9052=m
+# CONFIG_BACKLIGHT_MAX8925 is not set
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+# CONFIG_BACKLIGHT_WM831X is not set
+# CONFIG_BACKLIGHT_ADP5520 is not set
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+# CONFIG_BACKLIGHT_88PM860X is not set
+CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_AAT2870 is not set
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+# CONFIG_BACKLIGHT_LP8788 is not set
+# CONFIG_BACKLIGHT_PANDORA is not set
+CONFIG_BACKLIGHT_SKY81452=m
+# CONFIG_BACKLIGHT_AS3711 is not set
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+CONFIG_BACKLIGHT_LED=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_PPC=y
+CONFIG_SND_POWERMAC=m
+CONFIG_SND_POWERMAC_AUTO_DRC=y
+CONFIG_SND_PS3=m
+CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
+CONFIG_SND_AOA=m
+CONFIG_SND_AOA_FABRIC_LAYOUT=m
+CONFIG_SND_AOA_ONYX=m
+CONFIG_SND_AOA_TAS=m
+CONFIG_SND_AOA_TOONIE=m
+CONFIG_SND_AOA_SOUNDBUS=m
+CONFIG_SND_AOA_SOUNDBUS_I2S=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_SOC_MIKROE_PROTO=m
+CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_MQS=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_EASRC=m
+CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_RPMSG=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+CONFIG_SND_SOC_IMG=y
+CONFIG_SND_SOC_IMG_I2S_IN=m
+CONFIG_SND_SOC_IMG_I2S_OUT=m
+CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
+CONFIG_SND_SOC_IMG_SPDIF_IN=m
+CONFIG_SND_SOC_IMG_SPDIF_OUT=m
+CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_OF=m
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+CONFIG_SND_SOC_SOF=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
+CONFIG_SND_SOC_XILINX_SPDIF=m
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CPCAP=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4234=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98390=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM5102A=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RK817=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2518=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS2562=m
+CONFIG_SND_SOC_TAS2764=m
+CONFIG_SND_SOC_TAS2770=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TFA989X=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+CONFIG_SND_SOC_TLV320ADCX140=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_ZL38060=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_MT6660=m
+CONFIG_SND_SOC_NAU8315=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=m
+CONFIG_SND_SOC_LPASS_RX_MACRO=m
+CONFIG_SND_SOC_LPASS_TX_MACRO=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_AUDIO_GRAPH_CARD=m
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_VIVALDI=m
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID_OF=m
+CONFIG_I2C_HID_OF_GOODIX=m
+# end of I2C HID support
+
+CONFIG_I2C_HID_CORE=m
+# end of HID support
+
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_FHCI_HCD=m
+# CONFIG_FHCI_DEBUG is not set
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_UDC is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_IMX=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_CHIPIDEA_TEGRA=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_U_SERIAL_CONSOLE=y
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+CONFIG_USB_SNP_UDC_PLAT=m
+CONFIG_USB_M66592=m
+CONFIG_USB_BDC_UDC=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+# CONFIG_USB_NET2272_DMA is not set
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_GADGET_XILINX=m
+CONFIG_USB_MAX3420_UDC=m
+CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+# CONFIG_USB_CONFIGFS_SERIAL is not set
+# CONFIG_USB_CONFIGFS_ACM is not set
+# CONFIG_USB_CONFIGFS_OBEX is not set
+# CONFIG_USB_CONFIGFS_NCM is not set
+# CONFIG_USB_CONFIGFS_ECM is not set
+# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
+# CONFIG_USB_CONFIGFS_RNDIS is not set
+# CONFIG_USB_CONFIGFS_EEM is not set
+# CONFIG_USB_CONFIGFS_PHONET is not set
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+# CONFIG_USB_CONFIGFS_F_FS is not set
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+# CONFIG_USB_CONFIGFS_F_MIDI is not set
+# CONFIG_USB_CONFIGFS_F_HID is not set
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_F_TCM=y
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+# CONFIG_USB_FUNCTIONFS_ETH is not set
+# CONFIG_USB_FUNCTIONFS_RNDIS is not set
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+# CONFIG_USB_RAW_GADGET is not set
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+# CONFIG_TYPEC_TCPM is not set
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=m
+CONFIG_PWRSEQ_EMMC=m
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_MMC_SDHCI_OF_ASPEED=m
+CONFIG_MMC_SDHCI_OF_AT91=m
+CONFIG_MMC_SDHCI_OF_ESDHC=m
+CONFIG_MMC_SDHCI_OF_HLWD=m
+CONFIG_MMC_SDHCI_OF_DWCMSHC=m
+CONFIG_MMC_SDHCI_CADENCE=m
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_SDHCI_MILBEAUT=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+# CONFIG_MMC_SDRICOH_CS is not set
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+# CONFIG_MMC_SDHCI_XENON is not set
+CONFIG_MMC_SDHCI_OMAP=m
+CONFIG_MMC_SDHCI_AM654=m
+CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_88PM860X is not set
+CONFIG_LEDS_AN30259A=m
+CONFIG_LEDS_AW2013=m
+CONFIG_LEDS_BCM6328=m
+CONFIG_LEDS_BCM6358=m
+CONFIG_LEDS_CPCAP=m
+CONFIG_LEDS_CR0014114=m
+CONFIG_LEDS_EL15203000=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3692X=m
+# CONFIG_LEDS_MT6323 is not set
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+# CONFIG_LEDS_LP8788 is not set
+CONFIG_LEDS_LP8860=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+# CONFIG_LEDS_WM831X_STATUS is not set
+# CONFIG_LEDS_WM8350 is not set
+# CONFIG_LEDS_DA903X is not set
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_LT3593=m
+# CONFIG_LEDS_ADP5520 is not set
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX77650=m
+# CONFIG_LEDS_MAX8997 is not set
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+CONFIG_LEDS_IS31FL319X=m
+CONFIG_LEDS_IS31FL32XX=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_POWERNV=m
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_TPS6105X=m
+
+#
+# Flash and Torch LED drivers
+#
+CONFIG_LEDS_AAT1290=m
+CONFIG_LEDS_AS3645A=m
+CONFIG_LEDS_KTD2692=m
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_MAX77693 is not set
+CONFIG_LEDS_RT4505=m
+# CONFIG_LEDS_RT8515 is not set
+CONFIG_LEDS_SGM3140=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_PASEMI=m
+# CONFIG_EDAC_CELL is not set
+# CONFIG_EDAC_AMD8131 is not set
+# CONFIG_EDAC_AMD8111 is not set
+CONFIG_EDAC_CPC925=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_88PM860X=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AS3722=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1307_CENTURY=y
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_LP8788=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX8907=m
+CONFIG_RTC_DRV_MAX8925=m
+CONFIG_RTC_DRV_MAX8998=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_MAX77686=m
+CONFIG_RTC_DRV_RK808=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_ISL12026=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_TWL4030=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_RTC_DRV_TPS6586X=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_TPS80031=m
+CONFIG_RTC_DRV_RC5T583=m
+CONFIG_RTC_DRV_RC5T619=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_OPAL=y
+CONFIG_RTC_DRV_ZYNQMP=m
+CONFIG_RTC_DRV_NTXEC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_GENERIC=y
+CONFIG_RTC_DRV_CADENCE=m
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PS3=m
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+CONFIG_RTC_DRV_R7301=m
+CONFIG_RTC_DRV_CPCAP=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_GOLDFISH=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_OF=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_DW_AXI_DMAC=m
+CONFIG_FSL_EDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_PLX_DMA=m
+CONFIG_XILINX_ZYNQMP_DPDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
+# CONFIG_SF_PDMA is not set
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+CONFIG_DMATEST=m
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
+CONFIG_LCD2S=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_FSL_ELBC_GPCM=m
+# CONFIG_UIO_FSL_ELBC_GPCM_NETX5152 is not set
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_DFL=m
+CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_SPAPR_TCE=m
+CONFIG_VFIO_SPAPR_EEH=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_MDEV=m
+CONFIG_IRQ_BYPASS_MANAGER=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VDPA=m
+# CONFIG_VIRTIO_PMEM is not set
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+# CONFIG_VDPA_SIM is not set
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA=y
+CONFIG_MLX5_VDPA_NET=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# end of Microsoft Hyper-V guest support
+
+CONFIG_GREYBUS=m
+CONFIG_GREYBUS_ES2=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+# CONFIG_COMEDI_TESTS is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+CONFIG_AD7280=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+CONFIG_STAGING_MEDIA=y
+# CONFIG_VIDEO_ZORAN is not set
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
+
+#
+# Android
+#
+# end of Android
+
+# CONFIG_STAGING_BOARD is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+CONFIG_GS_FPGABOOT=m
+# CONFIG_UNISYSSPAR is not set
+CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SEPS525=m
+# CONFIG_FB_TFT_SH1106 is not set
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+# CONFIG_MOST_COMPONENTS is not set
+CONFIG_KS7010=m
+CONFIG_GREYBUS_AUDIO=m
+CONFIG_GREYBUS_AUDIO_APB_CODEC=m
+CONFIG_GREYBUS_BOOTROM=m
+CONFIG_GREYBUS_FIRMWARE=m
+CONFIG_GREYBUS_HID=m
+CONFIG_GREYBUS_LIGHT=m
+CONFIG_GREYBUS_LOG=m
+CONFIG_GREYBUS_LOOPBACK=m
+CONFIG_GREYBUS_POWER=m
+CONFIG_GREYBUS_RAW=m
+CONFIG_GREYBUS_VIBRATOR=m
+CONFIG_GREYBUS_BRIDGED_PHY=m
+CONFIG_GREYBUS_GPIO=m
+CONFIG_GREYBUS_I2C=m
+CONFIG_GREYBUS_PWM=m
+CONFIG_GREYBUS_SDIO=m
+CONFIG_GREYBUS_SPI=m
+CONFIG_GREYBUS_UART=m
+CONFIG_GREYBUS_USB=m
+CONFIG_PI433=m
+CONFIG_XIL_AXIS_FIFO=m
+# CONFIG_FIELDBUS_DEV is not set
+CONFIG_QLGE=m
+CONFIG_WFX=m
+# CONFIG_GOLDFISH is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_WM831X=m
+
+#
+# Clock driver for ARM Reference designs
+#
+CONFIG_ICST=y
+# CONFIG_CLK_SP810 is not set
+# end of Clock driver for ARM Reference designs
+
+CONFIG_LMK04832=m
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_SI5341=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI514=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_SI570=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CDCE925=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_COMMON_CLK_PWM=m
+CONFIG_COMMON_CLK_VC5=m
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+CONFIG_XILINX_VCU=m
+CONFIG_HWSPINLOCK=y
+
+#
+# Clock Source drivers
+#
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_MICROCHIP_PIT64B is not set
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PLATFORM_MHU=m
+CONFIG_ALTERA_MBOX=m
+CONFIG_MAILBOX_TEST=m
+CONFIG_IOMMU_IOVA=m
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+CONFIG_SPAPR_TCE_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_NS=m
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+CONFIG_QUICC_ENGINE=y
+CONFIG_UCC_SLOW=y
+CONFIG_UCC=y
+CONFIG_QE_USB=y
+CONFIG_FSL_GUTS=y
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+# CONFIG_EXTCON_FSA9480 is not set
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77693=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_MAX8997=m
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_FPGA_DFL_EMIF=m
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA220=m
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD06=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_FXLS8962AF=m
+CONFIG_FXLS8962AF_I2C=m
+CONFIG_FXLS8962AF_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_SCA3300=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7091R5=m
+CONFIG_AD7124=m
+CONFIG_AD7192=m
+CONFIG_AD7266=m
+CONFIG_AD7291=m
+CONFIG_AD7292=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+CONFIG_AD9467=m
+CONFIG_ADI_AXI_ADC=m
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_CPCAP_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_ENVELOPE_DETECTOR=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+# CONFIG_LP8788_ADC is not set
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2496=m
+CONFIG_LTC2497=m
+CONFIG_MAX1027=m
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
+CONFIG_MAX1241=m
+CONFIG_MAX1363=m
+CONFIG_MAX9611=m
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+CONFIG_MEDIATEK_MT6360_ADC=m
+CONFIG_MEN_Z188_ADC=m
+CONFIG_MP2629_ADC=m
+CONFIG_NAU7802=m
+# CONFIG_PALMAS_GPADC is not set
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_RN5T618_ADC=m
+CONFIG_SD_ADC_MODULATOR=m
+CONFIG_STMPE_ADC=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=m
+CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
+CONFIG_TI_ADS8688=m
+CONFIG_TI_ADS124S08=m
+CONFIG_TI_ADS131E08=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_TLC4541=m
+CONFIG_TI_TSC2046=m
+# CONFIG_TWL4030_MADC is not set
+# CONFIG_TWL6030_GPADC is not set
+CONFIG_VF610_ADC=m
+CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+CONFIG_HMC425=m
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_ATLAS_EZO_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SENSIRION_SGP40=m
+CONFIG_SPS30=m
+CONFIG_SPS30_I2C=m
+CONFIG_SPS30_SERIAL=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+CONFIG_AD5755=m
+# CONFIG_AD5758 is not set
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5766=m
+CONFIG_AD5770R=m
+CONFIG_AD5791=m
+CONFIG_AD7303=m
+CONFIG_AD8801=m
+CONFIG_DPOT_DAC=m
+CONFIG_DS4424=m
+CONFIG_LTC1660=m
+CONFIG_LTC2632=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MAX5821=m
+CONFIG_MCP4725=m
+CONFIG_MCP4922=m
+CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+CONFIG_VF610_DAC=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS290=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HDC2010=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+# CONFIG_ADIS16460 is not set
+CONFIG_ADIS16475=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_FXOS8700=m
+CONFIG_FXOS8700_I2C=m
+CONFIG_FXOS8700_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
+CONFIG_IIO_ST_LSM9DS0=m
+CONFIG_IIO_ST_LSM9DS0_I2C=m
+CONFIG_IIO_ST_LSM9DS0_SPI=m
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ADJD_S311=m
+CONFIG_ADUX1020=m
+CONFIG_AL3010=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_AS73211=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM3605=m
+CONFIG_CM36651=m
+CONFIG_GP2AP002=m
+CONFIG_GP2AP020A00F=m
+CONFIG_IQS621_ALS=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LV0104CS=m
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2591=m
+CONFIG_TSL2772=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+CONFIG_VEML6070=m
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8974=m
+CONFIG_AK8975=m
+# CONFIG_AK09911 is not set
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+CONFIG_YAMAHA_YAS530=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+CONFIG_IIO_MUX=m
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+CONFIG_IQS624_POS=m
+# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+CONFIG_AD5272=m
+CONFIG_DS1803=m
+CONFIG_MAX5432=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_DLHL60D=m
+# CONFIG_DPS310 is not set
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+CONFIG_ICP10100=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+# CONFIG_T5403 is not set
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_PING=m
+CONFIG_RFD77402=m
+# CONFIG_SRF04 is not set
+CONFIG_SX9310=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VCNL3020=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_IQS620AT_TEMP=m
+CONFIG_LTC2983=m
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MLX90614=m
+CONFIG_MLX90632=m
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TMP117=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
+CONFIG_NTB_IDT=m
+CONFIG_NTB_EPF=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_ATMEL_TCB=m
+CONFIG_PWM_DWC=m
+CONFIG_PWM_FSL_FTM=m
+CONFIG_PWM_IQS620A=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_NTXEC=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_STMPE=y
+# CONFIG_PWM_TWL is not set
+# CONFIG_PWM_TWL_LED is not set
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+# CONFIG_AL_FIC is not set
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_TI_SYSCON is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_PHY_CAN_TRANSCEIVER=m
+CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_CADENCE_TORRENT=m
+CONFIG_PHY_CADENCE_DPHY=m
+CONFIG_PHY_CADENCE_SIERRA=m
+CONFIG_PHY_CADENCE_SALVO=m
+CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+# CONFIG_PHY_CPCAP_USB is not set
+CONFIG_PHY_MAPPHONE_MDM6600=m
+CONFIG_PHY_OCELOT_SERDES=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_IDLE_INJECT=y
+# CONFIG_DTPM is not set
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_OF_PMEM=m
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_RMEM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_OF_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_FSI=m
+# CONFIG_FSI_NEW_DEV_NODE is not set
+CONFIG_FSI_MASTER_GPIO=m
+CONFIG_FSI_MASTER_HUB=m
+CONFIG_FSI_MASTER_ASPEED=m
+CONFIG_FSI_SCOM=m
+CONFIG_FSI_SBEFIFO=m
+CONFIG_FSI_OCC=m
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
+CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+CONFIG_INTERCONNECT=y
+# CONFIG_COUNTER is not set
+CONFIG_MOST=m
+CONFIG_MOST_USB_HDM=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_SND=m
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
+CONFIG_F2FS_FS_ZSTD=y
+CONFIG_F2FS_IOSTAT=y
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION_ALGS=m
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
+# CONFIG_FS_VERITY is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_DAX=y
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+CONFIG_OVERLAY_FS_XINO_AUTO=y
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+# CONFIG_NETFS_STATS is not set
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+# CONFIG_NTFS3_64BIT_CLUSTER is not set
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_UBIFS_FS is not set
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+CONFIG_HPFS_FS=m
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+CONFIG_PSTORE_LZ4HC_COMPRESS=m
+# CONFIG_PSTORE_842_COMPRESS is not set
+CONFIG_PSTORE_ZSTD_COMPRESS=y
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_VPMSUM=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2S=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
+CONFIG_CRYPTO_VPMSUM_TESTER=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MD5_PPC=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_PPC=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=y
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+CONFIG_CRYPTO_DEV_VMX=y
+CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_CCREE=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_BYPASS=y
+CONFIG_ARCH_HAS_DMA_MAP_DIRECT=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_RESTRICTED_POOL is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+# CONFIG_FONT_6x8 is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_COPY_MC=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# end of Library routines
+
+CONFIG_PLDMFW=y
+CONFIG_ASN1_ENCODER=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_COMPRESSED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_FRAME_WARN=2048
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+# end of Generic Kernel Debugging Instruments
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+# CONFIG_DEBUG_PAGE_REF is not set
+CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+CONFIG_WW_MUTEX_SELFTEST=m
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_NOTIFIERS=y
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# end of Debug kernel data structures
+
+CONFIG_DEBUG_CREDENTIALS=y
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_REF_SCALE_TEST=m
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_OSNOISE_TRACER=y
+CONFIG_TIMERLAT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+# CONFIG_TRACER_SNAPSHOT is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
+# CONFIG_SYNTH_EVENTS is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+CONFIG_PREEMPTIRQ_DELAY_TEST=m
+CONFIG_KPROBE_EVENT_GEN_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# powerpc Debugging
+#
+# CONFIG_PPC_DISABLE_WERROR is not set
+CONFIG_PPC_WERROR=y
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_HCALL_STATS is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_JUMP_LABEL_FEATURE_CHECKS is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set
+# CONFIG_PPC_RFI_SRR_DEBUG is not set
+CONFIG_XMON=y
+# CONFIG_XMON_DEFAULT is not set
+CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
+CONFIG_DEBUGGER=y
+CONFIG_BOOTX_TEXT=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+# CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
+# end of powerpc Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_LKDTM=m
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_STRING_SELFTEST is not set
+CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
+CONFIG_TEST_KSTRTOX=m
+CONFIG_TEST_PRINTF=m
+CONFIG_TEST_SCANF=m
+CONFIG_TEST_BITMAP=m
+CONFIG_TEST_UUID=m
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+CONFIG_TEST_HASH=m
+# CONFIG_TEST_IDA is not set
+CONFIG_TEST_PARMAN=m
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_BITOPS is not set
+# CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_HMM is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# end of Kernel Testing and Coverage
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
new file mode 100644
index 000000000000..6255c189c287
--- /dev/null
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -0,0 +1,10072 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/powerpc 5.15.0 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=100201
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23501
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23501
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=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_WERROR is not set
+CONFIG_LOCALVERSION="_1"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_XZ is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_SIM=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_IRQ_DOMAIN_NOMAP=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
+CONFIG_BPF_LSM=y
+# end of BPF subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_SCHED_CORE=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_SCHED_AVG_IRQ=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+# CONFIG_PSI is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+# CONFIG_PRINTK_INDEX is not set
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_CC_HAS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_RDMA=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
+# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_SYSCTL=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_EXPERT=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_PPC64=y
+
+#
+# Processor support
+#
+CONFIG_PPC_BOOK3S_64=y
+# CONFIG_PPC_BOOK3E_64 is not set
+CONFIG_GENERIC_CPU=y
+# CONFIG_POWER7_CPU is not set
+# CONFIG_POWER8_CPU is not set
+# CONFIG_POWER9_CPU is not set
+CONFIG_PPC_BOOK3S=y
+CONFIG_PPC_FPU_REGS=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_VSX=y
+CONFIG_PPC_RADIX_MMU=y
+CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
+CONFIG_PPC_PKEY=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_PPC_HAVE_PMU_SUPPORT=y
+CONFIG_PMU_SYSFS=y
+CONFIG_PPC_PERF_CTRS=y
+CONFIG_FORCE_SMP=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2048
+CONFIG_PPC_DOORBELL=y
+# end of Processor support
+
+CONFIG_VDSO32=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_PPC64_BOOT_WRAPPER=y
+CONFIG_64BIT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_NR_IRQS=512
+CONFIG_NMI_IPI=y
+CONFIG_PPC_WATCHDOG=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_PPC=y
+CONFIG_PPC_BARRIER_NOSPEC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_UDBG_16550=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_EPAPR_BOOT=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_NONZERO_CPU=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_PPC_DAWR=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_PPC_MSI_BITMAP=y
+CONFIG_PPC_XICS=y
+CONFIG_PPC_ICP_NATIVE=y
+CONFIG_PPC_ICP_HV=y
+CONFIG_PPC_ICS_RTAS=y
+CONFIG_PPC_XIVE=y
+CONFIG_PPC_XIVE_NATIVE=y
+CONFIG_PPC_XIVE_SPAPR=y
+
+#
+# Platform support
+#
+CONFIG_PPC_POWERNV=y
+CONFIG_OPAL_PRD=m
+CONFIG_PPC_MEMTRACE=y
+CONFIG_SCOM_DEBUGFS=y
+CONFIG_PPC_PSERIES=y
+CONFIG_PPC_SPLPAR=y
+CONFIG_DTL=y
+CONFIG_PSERIES_ENERGY=m
+CONFIG_SCANLOG=m
+CONFIG_IO_EVENT_IRQ=y
+CONFIG_LPARCFG=y
+CONFIG_PPC_SMLPAR=y
+CONFIG_CMM=m
+CONFIG_HV_PERF_CTRS=y
+CONFIG_IBMVIO=y
+CONFIG_PAPR_SCM=m
+CONFIG_PPC_SVM=y
+CONFIG_PPC_VAS=y
+CONFIG_KVM_GUEST=y
+CONFIG_EPAPR_PARAVIRT=y
+CONFIG_PPC_NATIVE=y
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+CONFIG_PPC_DT_CPU_FTRS=y
+# CONFIG_UDBG_RTAS_CONSOLE is not set
+CONFIG_PPC_SMP_MUXED_IPI=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_MSGR is not set
+CONFIG_PPC_I8259=y
+CONFIG_PPC_RTAS=y
+CONFIG_RTAS_ERROR_LOGGING=y
+CONFIG_PPC_RTAS_DAEMON=y
+CONFIG_RTAS_PROC=y
+CONFIG_RTAS_FLASH=m
+CONFIG_EEH=y
+CONFIG_PPC_P7_NAP=y
+CONFIG_PPC_BOOK3S_IDLE=y
+CONFIG_PPC_INDIRECT_PIO=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_POWERNV_CPUFREQ=y
+# end of CPU Frequency scaling
+
+#
+# CPUIdle driver
+#
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
+
+#
+# POWERPC CPU Idle Drivers
+#
+CONFIG_PSERIES_CPUIDLE=y
+CONFIG_POWERNV_CPUIDLE=y
+# end of POWERPC CPU Idle Drivers
+# end of CPU Idle
+# end of CPUIdle driver
+
+# CONFIG_GEN_RTC is not set
+# end of Platform support
+
+#
+# Kernel options
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_PPC_UV=y
+# CONFIG_LD_HEAD_STUB_CATCH is not set
+CONFIG_MPROFILE_KERNEL=y
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_PPC_QUEUED_SPINLOCKS is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
+CONFIG_RELOCATABLE=y
+# CONFIG_RELOCATABLE_TEST is not set
+CONFIG_CRASH_DUMP=y
+CONFIG_FA_DUMP=y
+# CONFIG_OPAL_CORE is not set
+CONFIG_IRQ_ALL_CPUS=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=8
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_MEMORYLESS_NODES=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC_PAGE_SHIFT=12
+CONFIG_THREAD_SHIFT=14
+CONFIG_DATA_SHIFT=12
+CONFIG_FORCE_MAX_ZONEORDER=13
+# CONFIG_PPC_PROT_SAO_LPAR is not set
+CONFIG_PPC_COPRO_BASE=y
+CONFIG_SCHED_SMT=y
+CONFIG_PPC_DENORMALISATION=y
+CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+CONFIG_EXTRA_TARGETS=""
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP_SMP_NONZERO_CPU=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_PPC_MEM_KEYS=y
+CONFIG_PPC_RTAS_FILTER=y
+# end of Kernel options
+
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_FSL_LBC=y
+# end of Bus options
+
+CONFIG_NONSTATIC_KERNEL=y
+CONFIG_PAGE_OFFSET=0xc000000000000000
+CONFIG_KERNEL_START=0xc000000000000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_ARCH_RANDOM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_KVM_BOOK3S_HANDLER=y
+CONFIG_KVM_BOOK3S_64_HANDLER=y
+CONFIG_KVM_BOOK3S_PR_POSSIBLE=y
+CONFIG_KVM_BOOK3S_HV_POSSIBLE=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
+# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
+CONFIG_KVM_XICS=y
+CONFIG_KVM_XIVE=y
+CONFIG_HAVE_LIVEPATCH=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_KEXEC_ELF=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_NMI_WATCHDOG=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_GATHER_PAGE_SIZE=y
+CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_LTO_NONE=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_HAVE_ARCH_NVRAM_OPS=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+CONFIG_MODULE_REL_CRCS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_GZIP is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_DEV_BSG_COMMON=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_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_FC_APPID is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+CONFIG_BLK_SED_OPAL=y
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+# CONFIG_OSF_PARTITION is not set
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_HAS_MMIOWB=y
+CONFIG_MMIOWB=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_NUMA_KEEP_MEMINFO=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SYSFS=y
+CONFIG_CMA_AREAS=7
+# CONFIG_MEM_SOFT_DIRTY is not set
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
+CONFIG_DEVICE_PRIVATE=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_HUGEPD=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_DBGFS=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XFRM_ESPINTCP=y
+CONFIG_SMC=m
+CONFIG_SMC_DIAG=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+# CONFIG_NET_FOU_IP_TUNNELS is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+CONFIG_INET_ESPINTCP=y
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=y
+CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_ESPINTCP=y
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
+CONFIG_IPV6_RPL_LWTUNNEL=y
+CONFIG_IPV6_IOAM6_LWTUNNEL=y
+# CONFIG_NETLABEL is not set
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+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_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XTABLES_COMPAT=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+# CONFIG_IP_VS_MH is not set
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+# CONFIG_IP6_NF_SECURITY is not set
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
+CONFIG_NFT_BRIDGE_REJECT=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+# CONFIG_RDS_RDMA is not set
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+# CONFIG_BRIDGE_CFM is not set
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=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_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+# CONFIG_6LOWPAN_GHC_EXT_HDR_HOP is not set
+# CONFIG_6LOWPAN_GHC_UDP is not set
+# CONFIG_6LOWPAN_GHC_ICMPV6 is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_DEST is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE is not set
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+# CONFIG_IEEE802154_6LOWPAN is not set
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BATMAN_V=y
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=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_STREAM_PARSER=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+# CONFIG_CAN_J1939 is not set
+# CONFIG_CAN_ISOTP is not set
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_FLEXCAN=m
+CONFIG_CAN_GRCAN=m
+# CONFIG_CAN_JANZ_ICAN3 is not set
+# CONFIG_CAN_KVASER_PCIEFD is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PCI=m
+# CONFIG_CAN_M_CAN_PLATFORM is not set
+# CONFIG_CAN_M_CAN_TCAN4X5X is not set
+CONFIG_CAN_MSCAN=m
+# CONFIG_CAN_PEAK_PCIEFD is not set
+# CONFIG_CAN_SJA1000 is not set
+CONFIG_CAN_SOFTING=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_NOKIA is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+# CONFIG_BT_HCIUART_MRVL is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_MCTP=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_RDMA is not set
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_VIRTUAL_NCI=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_S3FWRN82_UART=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_PCI=y
+CONFIG_FORCE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_MSI_ARCH_FALLBACKS=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_ECAM=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_PCI_P2PDMA is not set
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_CPCI=y
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+CONFIG_HOTPLUG_PCI_POWERNV=m
+CONFIG_HOTPLUG_PCI_RPA=m
+CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
+
+#
+# PCI controller drivers
+#
+CONFIG_PCI_FTPCI100=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_XILINX=y
+# CONFIG_PCIE_MICROCHIP_HOST is not set
+
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCIE_DW_PLAT_EP is not set
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+
+#
+# Mobiveil PCIe Core Support
+#
+# end of Mobiveil PCIe Core Support
+
+#
+# Cadence PCIe controllers support
+#
+CONFIG_PCIE_CADENCE=y
+CONFIG_PCIE_CADENCE_HOST=y
+CONFIG_PCIE_CADENCE_EP=y
+CONFIG_PCIE_CADENCE_PLAT=y
+CONFIG_PCIE_CADENCE_PLAT_HOST=y
+CONFIG_PCIE_CADENCE_PLAT_EP=y
+CONFIG_PCI_J721E=y
+CONFIG_PCI_J721E_HOST=y
+CONFIG_PCI_J721E_EP=y
+# end of Cadence PCIe controllers support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_EPF_TEST is not set
+CONFIG_PCI_EPF_NTB=m
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=m
+CONFIG_CXL_MEM=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_PMEM=m
+# CONFIG_PCCARD is not set
+CONFIG_RAPIDIO=m
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_CACHE=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_I3C=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_MOXTET=m
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_FIRMWARE_MEMMAP=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_OF is not set
+# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
+CONFIG_MTD_PCI=m
+# CONFIG_MTD_INTEL_VR_NOR is not set
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_MCHP23K256=m
+CONFIG_MTD_MCHP48L640=m
+CONFIG_MTD_SST25L=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+CONFIG_MTD_POWERNV_FLASH=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_DENALI_DT=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+# CONFIG_MTD_NAND_CADENCE is not set
+CONFIG_MTD_NAND_ARASAN=m
+CONFIG_MTD_NAND_INTEL_LGM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_HYPERBUS is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
+CONFIG_OF_DMA_DEFAULT_COHERENT=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_CDROM=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBMVMC=m
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HI6421V600_IRQ=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
+CONFIG_MISC_RTSX=m
+# CONFIG_HISI_HIKEY_USB is not set
+CONFIG_C2PORT=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_SPI=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+CONFIG_ECHO=m
+CONFIG_CXL_BASE=y
+CONFIG_CXL=m
+CONFIG_OCXL_BASE=y
+CONFIG_OCXL=m
+CONFIG_BCM_VK=m
+# CONFIG_BCM_VK_TTY is not set
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_CXLFLASH=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFS_DWC_TC_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
+CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IBMVSCSIS=m
+CONFIG_SCSI_IBMVFC=m
+CONFIG_SCSI_IBMVFC_TRACE=y
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_CEVA=m
+CONFIG_AHCI_QORIQ=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_UNSTRIPED is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+# CONFIG_DM_WRITECACHE is not set
+CONFIG_DM_EBS=m
+CONFIG_DM_ERA=m
+# CONFIG_DM_CLONE is not set
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_WINDFARM=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_VSOCKMON is not set
+CONFIG_MHI_NET=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+# CONFIG_CAIF_DRIVERS is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+# CONFIG_NET_DSA_BCM_SF2 is not set
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+# CONFIG_NET_DSA_MSCC_SEVILLE is not set
+CONFIG_NET_DSA_AR9331=m
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_QCA8K=m
+# CONFIG_NET_DSA_REALTEK_SMI is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=y
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+# CONFIG_CHELSIO_T4_DCB is not set
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_GEMINI_ETHERNET=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_IBMVETH=m
+CONFIG_IBMVNIC=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+# CONFIG_IXGBE_DCB is not set
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_LITEX_LITEETH=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+# CONFIG_SKGE_GENESIS is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CLS_ACT=y
+CONFIG_MLX5_TC_SAMPLE=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_SW_STEERING=y
+# CONFIG_MLX5_SF is not set
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+# CONFIG_MSCC_OCELOT_SWITCH is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_IONIC=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCA7000=m
+CONFIG_QCA7000_SPI=m
+CONFIG_QCA7000_UART=m
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_INTEL_PLAT=m
+CONFIG_DWMAC_LOONGSON=m
+CONFIG_STMMAC_PCI=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_EMACLITE=m
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=y
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_OF_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
+# CONFIG_MDIO_MVUSB is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_IPQ4019=m
+# CONFIG_MDIO_IPQ8064 is not set
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HWRNG=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_AHB=y
+# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_DEBUGFS is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+CONFIG_IWLWIFI_BCAST_FILTERING=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEBUGFS is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+# CONFIG_MT76x2E is not set
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615_COMMON=m
+CONFIG_MT7615E=m
+CONFIG_MT7663_USB_SDIO_COMMON=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921E=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+# CONFIG_WILC1000_SPI is not set
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+# CONFIG_IEEE802154_CC2520 is not set
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
+# CONFIG_IEEE802154_MCR20A is not set
+CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+CONFIG_WWAN_HWSIM=m
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+# end of Wireless WAN
+
+# CONFIG_VMXNET3 is not set
+CONFIG_USB4_NET=m
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+# CONFIG_KEYBOARD_ADP5520 is not set
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_STMPE=m
+# CONFIG_KEYBOARD_IQS62X is not set
+CONFIG_KEYBOARD_OMAP4=m
+CONFIG_KEYBOARD_TC3589X=m
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+# CONFIG_KEYBOARD_TWL4030 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CAP11XX=m
+CONFIG_KEYBOARD_BCM=m
+# CONFIG_KEYBOARD_MTK_PMIC is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+# CONFIG_JOYSTICK_PXRC is not set
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+# CONFIG_TABLET_SERIAL_WACOM4 is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_88PM860X is not set
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_AR1021_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
+CONFIG_TOUCHSCREEN_CY8CTMA140=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_ILITEK=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_MSG2638=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+# CONFIG_TOUCHSCREEN_WM831X is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_88PM860X_ONKEY is not set
+# CONFIG_INPUT_88PM80X_ONKEY is not set
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_ATC260X_ONKEY=m
+CONFIG_INPUT_ATMEL_CAPTOUCH=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+# CONFIG_INPUT_MAX8925_ONKEY is not set
+# CONFIG_INPUT_MAX8997_HAPTIC is not set
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_CPCAP_PWRBUTTON=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+# CONFIG_INPUT_TWL4030_PWRBUTTON is not set
+# CONFIG_INPUT_TWL4030_VIBRA is not set
+# CONFIG_INPUT_TWL6040_VIBRA is not set
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_RK805_PWRKEY=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA7280_HAPTICS is not set
+CONFIG_INPUT_DA9052_ONKEY=m
+# CONFIG_INPUT_DA9055_ONKEY is not set
+CONFIG_INPUT_DA9063_ONKEY=m
+# CONFIG_INPUT_WM831X_ON is not set
+# CONFIG_INPUT_PCAP is not set
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_XILINX_XPS_PS2=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+CONFIG_SERIAL_8250_FINTEK=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_ASPEED_VUART=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_ICOM=m
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+# CONFIG_SERIAL_SC16IS7XX is not set
+CONFIG_SERIAL_BCM63XX=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=m
+CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
+# CONFIG_SERIAL_MEN_Z135 is not set
+CONFIG_SERIAL_SPRD=m
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVC_OLD_HVSI=y
+CONFIG_HVC_OPAL=y
+CONFIG_HVC_RTAS=y
+# CONFIG_HVC_UDBG is not set
+CONFIG_HVCS=m
+CONFIG_SERIAL_DEV_BUS=m
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IBM_BSR=m
+CONFIG_POWERNV_OP_PANEL=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_POWERNV=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_PSERIES=m
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+CONFIG_DEVMEM=y
+CONFIG_NVRAM=y
+CONFIG_DEVPORT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_TIS_I2C_CR50=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_IBMVTPM=m
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_XILLYBUS_CLASS=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYBUS_OF=m
+CONFIG_XILLYUSB=m
+# CONFIG_RANDOM_TRUST_CPU is not set
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_GPMUX=m
+# CONFIG_I2C_MUX_LTC4306 is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_DEMUX_PINCTRL=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+CONFIG_I2C_NVIDIA_GPU=m
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=m
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_MPC=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_RK3X=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_CP2615=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_OPAL=y
+CONFIG_I2C_FSI=m
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+CONFIG_MIPI_I3C_HCI=m
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_ALTERA_CORE=m
+CONFIG_SPI_ALTERA_DFL=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_DMA=y
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_FSI=m
+CONFIG_SPI_NXP_FLEXSPI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_FSL_LIB=y
+CONFIG_SPI_FSL_SPI=y
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_ROCKCHIP is not set
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_XCOMM=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_ZYNQMP_GQSPI=m
+CONFIG_SPI_AMD=m
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_LOOPBACK_TEST=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_TIME=m
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_DYNAMIC=y
+CONFIG_SPMI=m
+CONFIG_SPMI_HISI3670=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+CONFIG_PPS_CLIENT_KTIMER=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_OCP=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_DA9062=m
+CONFIG_PINCTRL_MCP23S08_I2C=m
+CONFIG_PINCTRL_MCP23S08_SPI=m
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
+CONFIG_PINCTRL_MAX77620=m
+CONFIG_PINCTRL_PALMAS=m
+CONFIG_PINCTRL_RK805=m
+# CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_CS47L35=y
+CONFIG_PINCTRL_CS47L85=y
+CONFIG_PINCTRL_CS47L90=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_74XX_MMIO=m
+CONFIG_GPIO_ALTERA=m
+CONFIG_GPIO_CADENCE=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_FTGPIO010=y
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_GRGPIO=m
+CONFIG_GPIO_HLWD=m
+CONFIG_GPIO_LOGICVC=m
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_SAMA5D2_PIOBU=m
+# CONFIG_GPIO_SIFIVE is not set
+CONFIG_GPIO_SYSCON=m
+CONFIG_GPIO_XILINX=y
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_ADNP=m
+CONFIG_GPIO_GW_PLD=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_LP87565=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_RC5T583=y
+CONFIG_GPIO_STMPE=y
+CONFIG_GPIO_TC3589X=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS65218=m
+CONFIG_GPIO_TPS6586X=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TPS65912=m
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_TWL4030=m
+CONFIG_GPIO_TWL6040=m
+CONFIG_GPIO_UCB1400=m
+CONFIG_GPIO_WM831X=m
+CONFIG_GPIO_WM8350=m
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_74X164=m
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+CONFIG_GPIO_MOXTET=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+CONFIG_GPIO_VIRTIO=m
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_W1_MASTER_SGI=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+# CONFIG_POWER_RESET is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+# CONFIG_MAX8925_POWER is not set
+# CONFIG_WM831X_BACKUP is not set
+# CONFIG_WM831X_POWER is not set
+# CONFIG_WM8350_POWER is not set
+CONFIG_TEST_POWER=m
+# CONFIG_BATTERY_88PM860X is not set
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_ACT8945A=m
+CONFIG_BATTERY_CPCAP=m
+CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_DA9030 is not set
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+# CONFIG_CHARGER_AXP20X is not set
+# CONFIG_BATTERY_AXP20X is not set
+CONFIG_AXP20X_POWER=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+# CONFIG_CHARGER_TWL4030 is not set
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_LTC4162L=m
+# CONFIG_CHARGER_MAX14577 is not set
+CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
+# CONFIG_CHARGER_MAX77693 is not set
+# CONFIG_CHARGER_MAX8997 is not set
+# CONFIG_CHARGER_MAX8998 is not set
+CONFIG_CHARGER_MP2629=m
+CONFIG_CHARGER_MT6360=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_BQ256XX=m
+CONFIG_CHARGER_SMB347=m
+# CONFIG_CHARGER_TPS65090 is not set
+CONFIG_BATTERY_GAUGE_LTC2941=m
+# CONFIG_BATTERY_GOLDFISH is not set
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_UCS1002=m
+CONFIG_CHARGER_BD99954=m
+CONFIG_RN5T618_POWER=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DA9052_ADC=m
+# CONFIG_SENSORS_DA9055 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_GSC=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IBMPOWERNV=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC2992=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_TPS23861=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_MR75203=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1266=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_BEL_PFE=m
+CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_FSP_3Y=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_DPS920AB=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+# CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR36021=m
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+# CONFIG_SENSORS_LTC2978 is not set
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX15301=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_MP2888=m
+CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_PIM4328=m
+CONFIG_SENSORS_PM6764TR=m
+# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_Q54SJ108A2=m
+CONFIG_SENSORS_STPDDC60=m
+# CONFIG_SENSORS_TPS40422 is not set
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE122=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHT4x=m
+CONFIG_SENSORS_SHTC1=m
+# CONFIG_SENSORS_SIS5595 is not set
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_WM831X=m
+# CONFIG_SENSORS_WM8350 is not set
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_FREQ_THERMAL=y
+# CONFIG_CPU_IDLE_THERMAL is not set
+CONFIG_DEVFREQ_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=m
+CONFIG_MAX77620_THERMAL=m
+CONFIG_DA9062_THERMAL=m
+# CONFIG_TI_SOC_THERMAL is not set
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_BD957XMUF_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+# CONFIG_DA9055_WATCHDOG is not set
+# CONFIG_DA9063_WATCHDOG is not set
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_GPIO_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+# CONFIG_MENZ069_WATCHDOG is not set
+CONFIG_WM831X_WATCHDOG=m
+# CONFIG_WM8350_WATCHDOG is not set
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_RN5T618_WATCHDOG=m
+# CONFIG_TWL4030_WATCHDOG is not set
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_MAX77620_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_STPMIC1_WATCHDOG=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_KEMPLD_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_WATCHDOG_RTAS=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_ACT8945A=m
+CONFIG_MFD_AS3711=y
+CONFIG_MFD_AS3722=y
+CONFIG_PMIC_ADP5520=y
+CONFIG_MFD_AAT2870_CORE=y
+CONFIG_MFD_ATMEL_FLEXCOM=m
+CONFIG_MFD_ATMEL_HLCDC=m
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+CONFIG_MFD_CS47L35=y
+CONFIG_MFD_CS47L85=y
+CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
+CONFIG_PMIC_DA903X=y
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=m
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_GATEWORKS_GSC=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MP2629=m
+CONFIG_MFD_HI6421_PMIC=m
+CONFIG_MFD_HI6421_SPMI=m
+CONFIG_HTC_PASIC3=m
+CONFIG_HTC_I2CPLD=y
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_INTEL_PMT is not set
+CONFIG_MFD_IQS62X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+CONFIG_MFD_88PM800=m
+CONFIG_MFD_88PM805=m
+CONFIG_MFD_88PM860X=y
+CONFIG_MFD_MAX14577=m
+CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=m
+CONFIG_MFD_MAX77686=y
+CONFIG_MFD_MAX77693=m
+CONFIG_MFD_MAX77843=y
+CONFIG_MFD_MAX8907=m
+CONFIG_MFD_MAX8925=y
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_MAX8998=y
+CONFIG_MFD_MT6360=m
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_CPCAP=m
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_NTXEC=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT4831=m
+CONFIG_MFD_RT5033=m
+CONFIG_MFD_RC5T583=y
+CONFIG_MFD_RK808=m
+CONFIG_MFD_RN5T618=m
+# CONFIG_MFD_SEC_CORE is not set
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_STMPE=y
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
+CONFIG_STMPE_I2C=y
+CONFIG_STMPE_SPI=y
+# end of STMicroelectronics STMPE Interface Drivers
+
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_MFD_LP8788=y
+CONFIG_MFD_TI_LMU=m
+CONFIG_MFD_PALMAS=y
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+CONFIG_MFD_TPS65090=y
+# CONFIG_MFD_TPS65217 is not set
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TI_LP87565=m
+CONFIG_MFD_TPS65218=m
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
+CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_TPS80031=y
+CONFIG_TWL4030_CORE=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TC3589X=y
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+# CONFIG_MFD_LOCHNAGAR is not set
+CONFIG_MFD_ARIZONA=m
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+CONFIG_MFD_WM8998=y
+CONFIG_MFD_WM8400=y
+CONFIG_MFD_WM831X=y
+CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_WM831X_SPI=y
+CONFIG_MFD_WM8350=y
+CONFIG_MFD_WM8350_I2C=y
+CONFIG_MFD_WM8994=m
+# CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
+# CONFIG_MFD_ROHM_BD71828 is not set
+CONFIG_MFD_ROHM_BD957XMUF=m
+CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
+CONFIG_MFD_ATC260X=m
+CONFIG_MFD_ATC260X_I2C=m
+CONFIG_MFD_QCOM_PM8008=m
+# CONFIG_RAVE_SP_CORE is not set
+# CONFIG_MFD_INTEL_M10_BMC is not set
+CONFIG_MFD_RSMU_I2C=m
+CONFIG_MFD_RSMU_SPI=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_88PG86X=m
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_88PM8607=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_ACT8945A=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_ATC260X=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_BD957XMUF=m
+CONFIG_REGULATOR_CPCAP=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9063=m
+CONFIG_REGULATOR_DA9121=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_FAN53880=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_HI6421V530=m
+CONFIG_REGULATOR_HI6421V600=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP873X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LP87565=m
+CONFIG_REGULATOR_LP8788=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX14577=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX77620=m
+CONFIG_REGULATOR_MAX77650=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8893=m
+CONFIG_REGULATOR_MAX8907=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX8998=m
+CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MAX77802=m
+CONFIG_REGULATOR_MAX77826=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MCP16502=m
+CONFIG_REGULATOR_MP5416=m
+CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MP886X=m
+CONFIG_REGULATOR_MPQ7920=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6315=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6358=m
+CONFIG_REGULATOR_MT6359=m
+CONFIG_REGULATOR_MT6360=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PF8X00=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RN5T618=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_STPMIC1=m
+CONFIG_REGULATOR_SY8106A=m
+CONFIG_REGULATOR_SY8824X=m
+CONFIG_REGULATOR_SY8827N=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS65218=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS80031=m
+CONFIG_REGULATOR_TWL4030=m
+CONFIG_REGULATOR_VCTRL=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_HIX5HD2=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_SPI=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
+CONFIG_IR_PWM_TX=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+# CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
+CONFIG_IR_TOY=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_MEDIA_CEC_RC=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_USB_PULSE8_CEC=m
+# CONFIG_USB_RAINSHADOW_CEC is not set
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+# CONFIG_USB_GSPCA_DTCS033 is not set
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+# CONFIG_VIDEO_AU0828_RC is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+# CONFIG_VIDEO_SOLO6X10 is not set
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+# CONFIG_VIDEO_CADENCE is not set
+CONFIG_VIDEO_ASPEED=m
+CONFIG_VIDEO_MUX=m
+CONFIG_VIDEO_XILINX=m
+CONFIG_VIDEO_XILINX_CSI2RXSS=m
+CONFIG_VIDEO_XILINX_TPG=m
+CONFIG_VIDEO_XILINX_VTC=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+# CONFIG_DVB_FIREDTV is not set
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
+CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+CONFIG_VIDEO_MAX9286=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of Miscellaneous helper chips
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_IMX208=m
+# CONFIG_VIDEO_IMX214 is not set
+CONFIG_VIDEO_IMX219=m
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX319 is not set
+CONFIG_VIDEO_IMX334=m
+CONFIG_VIDEO_IMX335=m
+# CONFIG_VIDEO_IMX355 is not set
+CONFIG_VIDEO_IMX412=m
+# CONFIG_VIDEO_OV02A10 is not set
+CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+CONFIG_VIDEO_OV5648=m
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+CONFIG_VIDEO_OV5675=m
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9282=m
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+CONFIG_VIDEO_DW9768=m
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+# CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_BUS=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_CEC=y
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# CONFIG_DRM_KOMEDA is not set
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN=y
+# CONFIG_DRM_AMD_DC_HDCP is not set
+CONFIG_DRM_AMD_DC_SI=y
+CONFIG_DRM_AMD_SECURE_DISPLAY=y
+# end of Display Engine Configuration
+
+CONFIG_HSA_AMD=y
+CONFIG_HSA_AMD_SVM=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_NOUVEAU_SVM is not set
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VKMS=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_RCAR_DW_HDMI=m
+# CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_ABT_Y030XX067A=m
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m
+CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
+CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+CONFIG_DRM_PANEL_DSI_CM=m
+CONFIG_DRM_PANEL_LVDS=m
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_ELIDA_KD35T133=m
+CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
+# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
+CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
+CONFIG_DRM_PANEL_KHADAS_TS050=m
+CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W=m
+CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
+CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_LG_LB035Q02=m
+CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_NEC_NL8048HL11=m
+CONFIG_DRM_PANEL_NOVATEK_NT35510=m
+CONFIG_DRM_PANEL_NOVATEK_NT36672A=m
+CONFIG_DRM_PANEL_NOVATEK_NT39016=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
+CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
+CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
+CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
+CONFIG_DRM_PANEL_SAMSUNG_DB7430=m
+CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
+CONFIG_DRM_PANEL_SAMSUNG_SOFEF00=m
+CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
+CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
+CONFIG_DRM_PANEL_SITRONIX_ST7701=m
+CONFIG_DRM_PANEL_SITRONIX_ST7703=m
+CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
+CONFIG_DRM_PANEL_SONY_ACX424AKP=m
+CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+CONFIG_DRM_PANEL_TDO_TL070WSH30=m
+CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
+CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
+CONFIG_DRM_PANEL_TPO_TPG110=m
+CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_RM69299=m
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_CDNS_DSI=m
+CONFIG_DRM_CHIPONE_ICN6211=m
+CONFIG_DRM_CHRONTEL_CH7033=m
+CONFIG_DRM_DISPLAY_CONNECTOR=m
+CONFIG_DRM_LONTIUM_LT8912B=m
+CONFIG_DRM_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=m
+CONFIG_DRM_ITE_IT66121=m
+CONFIG_DRM_LVDS_CODEC=m
+CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
+CONFIG_DRM_NWL_MIPI_DSI=m
+CONFIG_DRM_NXP_PTN3460=m
+CONFIG_DRM_PARADE_PS8622=m
+CONFIG_DRM_PARADE_PS8640=m
+CONFIG_DRM_SIL_SII8620=m
+CONFIG_DRM_SII902X=m
+CONFIG_DRM_SII9234=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
+CONFIG_DRM_THINE_THC63LVD1024=m
+CONFIG_DRM_TOSHIBA_TC358762=m
+CONFIG_DRM_TOSHIBA_TC358764=m
+CONFIG_DRM_TOSHIBA_TC358767=m
+CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=m
+CONFIG_DRM_TI_TFP410=m
+CONFIG_DRM_TI_SN65DSI83=m
+CONFIG_DRM_TI_SN65DSI86=m
+CONFIG_DRM_TI_TPD12S015=m
+CONFIG_DRM_ANALOGIX_ANX6345=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
+CONFIG_DRM_ANALOGIX_ANX7625=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+CONFIG_DRM_CDNS_MHDP8546=m
+CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+# CONFIG_DRM_MXSFB is not set
+CONFIG_DRM_ARCPGU=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_TINYDRM_HX8357D=m
+# CONFIG_TINYDRM_ILI9225 is not set
+# CONFIG_TINYDRM_ILI9341 is not set
+# CONFIG_TINYDRM_ILI9486 is not set
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+# CONFIG_TINYDRM_ST7735R is not set
+CONFIG_DRM_GUD=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_MACMODES=y
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_OF=y
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_OPENCORES=m
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+CONFIG_FB_SIMPLE=m
+CONFIG_FB_SSD1307=m
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+# CONFIG_LCD_OTM3225A is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_DA903X is not set
+CONFIG_BACKLIGHT_DA9052=m
+# CONFIG_BACKLIGHT_MAX8925 is not set
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+# CONFIG_BACKLIGHT_WM831X is not set
+# CONFIG_BACKLIGHT_ADP5520 is not set
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+# CONFIG_BACKLIGHT_88PM860X is not set
+CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_AAT2870 is not set
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+# CONFIG_BACKLIGHT_LP8788 is not set
+# CONFIG_BACKLIGHT_PANDORA is not set
+CONFIG_BACKLIGHT_SKY81452=m
+# CONFIG_BACKLIGHT_AS3711 is not set
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+CONFIG_BACKLIGHT_LED=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_PPC=y
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_SOC_MIKROE_PROTO=m
+CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_MQS=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_EASRC=m
+CONFIG_SND_SOC_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_RPMSG=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+CONFIG_SND_SOC_IMG=y
+CONFIG_SND_SOC_IMG_I2S_IN=m
+CONFIG_SND_SOC_IMG_I2S_OUT=m
+CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
+CONFIG_SND_SOC_IMG_SPDIF_IN=m
+CONFIG_SND_SOC_IMG_SPDIF_OUT=m
+CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_OF=m
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+CONFIG_SND_SOC_SOF=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
+CONFIG_SND_SOC_XILINX_SPDIF=m
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CPCAP=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4234=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98390=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM5102A=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RK817=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2518=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS2562=m
+CONFIG_SND_SOC_TAS2764=m
+CONFIG_SND_SOC_TAS2770=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TFA989X=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+CONFIG_SND_SOC_TLV320ADCX140=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_ZL38060=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_MT6660=m
+# CONFIG_SND_SOC_NAU8315 is not set
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=m
+CONFIG_SND_SOC_LPASS_RX_MACRO=m
+CONFIG_SND_SOC_LPASS_TX_MACRO=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_AUDIO_GRAPH_CARD=m
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+# CONFIG_HOLTEK_FF is not set
+CONFIG_HID_VIVALDI=m
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
+# CONFIG_HID_JABRA is not set
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NTI is not set
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID_OF=m
+CONFIG_I2C_HID_OF_GOODIX=m
+# end of I2C HID support
+
+CONFIG_I2C_HID_CORE=m
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_UDC is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_IMX=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_CHIPIDEA_TEGRA=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_U_SERIAL_CONSOLE=y
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+CONFIG_USB_SNP_UDC_PLAT=m
+CONFIG_USB_M66592=m
+CONFIG_USB_BDC_UDC=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+# CONFIG_USB_NET2272_DMA is not set
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_GADGET_XILINX=m
+CONFIG_USB_MAX3420_UDC=m
+CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+# CONFIG_USB_CONFIGFS_SERIAL is not set
+# CONFIG_USB_CONFIGFS_ACM is not set
+# CONFIG_USB_CONFIGFS_OBEX is not set
+# CONFIG_USB_CONFIGFS_NCM is not set
+# CONFIG_USB_CONFIGFS_ECM is not set
+# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
+# CONFIG_USB_CONFIGFS_RNDIS is not set
+# CONFIG_USB_CONFIGFS_EEM is not set
+# CONFIG_USB_CONFIGFS_PHONET is not set
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+# CONFIG_USB_CONFIGFS_F_FS is not set
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+# CONFIG_USB_CONFIGFS_F_MIDI is not set
+# CONFIG_USB_CONFIGFS_F_HID is not set
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_F_TCM=y
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+# CONFIG_USB_FUNCTIONFS_ETH is not set
+# CONFIG_USB_FUNCTIONFS_RNDIS is not set
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+# CONFIG_USB_RAW_GADGET is not set
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+# CONFIG_TYPEC_TCPM is not set
+# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=m
+CONFIG_PWRSEQ_EMMC=m
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_MMC_SDHCI_OF_ASPEED=m
+CONFIG_MMC_SDHCI_OF_AT91=m
+CONFIG_MMC_SDHCI_OF_ESDHC=m
+CONFIG_MMC_SDHCI_OF_HLWD=m
+CONFIG_MMC_SDHCI_OF_DWCMSHC=m
+CONFIG_MMC_SDHCI_CADENCE=m
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_SDHCI_MILBEAUT=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+# CONFIG_MMC_SDHCI_XENON is not set
+CONFIG_MMC_SDHCI_OMAP=m
+CONFIG_MMC_SDHCI_AM654=m
+CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_88PM860X is not set
+CONFIG_LEDS_AN30259A=m
+CONFIG_LEDS_AW2013=m
+CONFIG_LEDS_BCM6328=m
+CONFIG_LEDS_BCM6358=m
+CONFIG_LEDS_CPCAP=m
+CONFIG_LEDS_CR0014114=m
+CONFIG_LEDS_EL15203000=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3692X=m
+# CONFIG_LEDS_MT6323 is not set
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+# CONFIG_LEDS_LP8788 is not set
+CONFIG_LEDS_LP8860=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+# CONFIG_LEDS_WM831X_STATUS is not set
+# CONFIG_LEDS_WM8350 is not set
+# CONFIG_LEDS_DA903X is not set
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_LT3593=m
+# CONFIG_LEDS_ADP5520 is not set
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX77650=m
+# CONFIG_LEDS_MAX8997 is not set
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+CONFIG_LEDS_IS31FL319X=m
+CONFIG_LEDS_IS31FL32XX=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_POWERNV=m
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_TPS6105X=m
+
+#
+# Flash and Torch LED drivers
+#
+CONFIG_LEDS_AAT1290=m
+CONFIG_LEDS_AS3645A=m
+CONFIG_LEDS_KTD2692=m
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_MAX77693 is not set
+CONFIG_LEDS_RT4505=m
+# CONFIG_LEDS_RT8515 is not set
+CONFIG_LEDS_SGM3140=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_CPC925=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_88PM860X=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AS3722=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1307_CENTURY=y
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_LP8788=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX8907=m
+CONFIG_RTC_DRV_MAX8925=m
+CONFIG_RTC_DRV_MAX8998=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_MAX77686=m
+CONFIG_RTC_DRV_RK808=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_ISL12026=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_TWL4030=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_RTC_DRV_TPS6586X=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_TPS80031=m
+CONFIG_RTC_DRV_RC5T583=m
+CONFIG_RTC_DRV_RC5T619=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_OPAL=y
+CONFIG_RTC_DRV_ZYNQMP=m
+CONFIG_RTC_DRV_NTXEC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_GENERIC=y
+CONFIG_RTC_DRV_CADENCE=m
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+CONFIG_RTC_DRV_R7301=m
+CONFIG_RTC_DRV_CPCAP=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_GOLDFISH=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_OF=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_DW_AXI_DMAC=m
+CONFIG_FSL_EDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_PLX_DMA=m
+CONFIG_XILINX_ZYNQMP_DPDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
+# CONFIG_SF_PDMA is not set
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
+CONFIG_LCD2S=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_FSL_ELBC_GPCM=m
+# CONFIG_UIO_FSL_ELBC_GPCM_NETX5152 is not set
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_DFL=m
+CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_SPAPR_TCE=m
+CONFIG_VFIO_SPAPR_EEH=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_MDEV=m
+CONFIG_IRQ_BYPASS_MANAGER=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VDPA=m
+# CONFIG_VIRTIO_PMEM is not set
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+# CONFIG_VDPA_SIM is not set
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA=y
+CONFIG_MLX5_VDPA_NET=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# end of Microsoft Hyper-V guest support
+
+CONFIG_GREYBUS=m
+CONFIG_GREYBUS_ES2=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+# CONFIG_COMEDI_TESTS is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+CONFIG_AD7280=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+CONFIG_STAGING_MEDIA=y
+# CONFIG_VIDEO_ZORAN is not set
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
+
+#
+# Android
+#
+# end of Android
+
+# CONFIG_STAGING_BOARD is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+CONFIG_GS_FPGABOOT=m
+# CONFIG_UNISYSSPAR is not set
+CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SEPS525=m
+# CONFIG_FB_TFT_SH1106 is not set
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+# CONFIG_MOST_COMPONENTS is not set
+CONFIG_KS7010=m
+CONFIG_GREYBUS_AUDIO=m
+CONFIG_GREYBUS_AUDIO_APB_CODEC=m
+CONFIG_GREYBUS_BOOTROM=m
+CONFIG_GREYBUS_FIRMWARE=m
+CONFIG_GREYBUS_HID=m
+CONFIG_GREYBUS_LIGHT=m
+CONFIG_GREYBUS_LOG=m
+CONFIG_GREYBUS_LOOPBACK=m
+CONFIG_GREYBUS_POWER=m
+CONFIG_GREYBUS_RAW=m
+CONFIG_GREYBUS_VIBRATOR=m
+CONFIG_GREYBUS_BRIDGED_PHY=m
+CONFIG_GREYBUS_GPIO=m
+CONFIG_GREYBUS_I2C=m
+CONFIG_GREYBUS_PWM=m
+CONFIG_GREYBUS_SDIO=m
+CONFIG_GREYBUS_SPI=m
+CONFIG_GREYBUS_UART=m
+CONFIG_GREYBUS_USB=m
+CONFIG_PI433=m
+CONFIG_XIL_AXIS_FIFO=m
+# CONFIG_FIELDBUS_DEV is not set
+CONFIG_QLGE=m
+CONFIG_WFX=m
+# CONFIG_GOLDFISH is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_WM831X=m
+
+#
+# Clock driver for ARM Reference designs
+#
+CONFIG_ICST=y
+# CONFIG_CLK_SP810 is not set
+# end of Clock driver for ARM Reference designs
+
+CONFIG_LMK04832=m
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_SI5341=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI514=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_SI570=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CDCE925=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_COMMON_CLK_PWM=m
+CONFIG_COMMON_CLK_VC5=m
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+CONFIG_XILINX_VCU=m
+CONFIG_HWSPINLOCK=y
+
+#
+# Clock Source drivers
+#
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_MICROCHIP_PIT64B is not set
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PLATFORM_MHU=m
+CONFIG_ALTERA_MBOX=m
+CONFIG_MAILBOX_TEST=m
+CONFIG_IOMMU_IOVA=m
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+CONFIG_SPAPR_TCE_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_NS=m
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# CONFIG_QUICC_ENGINE is not set
+CONFIG_FSL_GUTS=y
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+# CONFIG_EXTCON_FSA9480 is not set
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77693=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_MAX8997=m
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_FPGA_DFL_EMIF=m
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA220=m
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD06=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_FXLS8962AF=m
+CONFIG_FXLS8962AF_I2C=m
+CONFIG_FXLS8962AF_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_SCA3300=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7091R5=m
+CONFIG_AD7124=m
+CONFIG_AD7192=m
+CONFIG_AD7266=m
+CONFIG_AD7291=m
+CONFIG_AD7292=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+CONFIG_AD9467=m
+CONFIG_ADI_AXI_ADC=m
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_CPCAP_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_ENVELOPE_DETECTOR=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+# CONFIG_LP8788_ADC is not set
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2496=m
+CONFIG_LTC2497=m
+CONFIG_MAX1027=m
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
+CONFIG_MAX1241=m
+CONFIG_MAX1363=m
+CONFIG_MAX9611=m
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+CONFIG_MEDIATEK_MT6360_ADC=m
+CONFIG_MEN_Z188_ADC=m
+CONFIG_MP2629_ADC=m
+CONFIG_NAU7802=m
+# CONFIG_PALMAS_GPADC is not set
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_RN5T618_ADC=m
+CONFIG_SD_ADC_MODULATOR=m
+CONFIG_STMPE_ADC=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=m
+CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
+CONFIG_TI_ADS8688=m
+CONFIG_TI_ADS124S08=m
+CONFIG_TI_ADS131E08=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_TLC4541=m
+CONFIG_TI_TSC2046=m
+# CONFIG_TWL4030_MADC is not set
+# CONFIG_TWL6030_GPADC is not set
+CONFIG_VF610_ADC=m
+CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+CONFIG_HMC425=m
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_ATLAS_EZO_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SENSIRION_SGP40=m
+CONFIG_SPS30=m
+CONFIG_SPS30_I2C=m
+CONFIG_SPS30_SERIAL=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+CONFIG_AD5755=m
+# CONFIG_AD5758 is not set
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5766=m
+CONFIG_AD5770R=m
+CONFIG_AD5791=m
+CONFIG_AD7303=m
+CONFIG_AD8801=m
+CONFIG_DPOT_DAC=m
+CONFIG_DS4424=m
+CONFIG_LTC1660=m
+CONFIG_LTC2632=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MAX5821=m
+CONFIG_MCP4725=m
+CONFIG_MCP4922=m
+CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+CONFIG_VF610_DAC=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS290=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HDC2010=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+CONFIG_ADIS16460=m
+CONFIG_ADIS16475=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_FXOS8700=m
+CONFIG_FXOS8700_I2C=m
+CONFIG_FXOS8700_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
+CONFIG_IIO_ST_LSM9DS0=m
+CONFIG_IIO_ST_LSM9DS0_I2C=m
+CONFIG_IIO_ST_LSM9DS0_SPI=m
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ADJD_S311=m
+CONFIG_ADUX1020=m
+CONFIG_AL3010=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_AS73211=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM3605=m
+CONFIG_CM36651=m
+CONFIG_GP2AP002=m
+CONFIG_GP2AP020A00F=m
+CONFIG_IQS621_ALS=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LV0104CS=m
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2591=m
+CONFIG_TSL2772=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+CONFIG_VEML6070=m
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8974=m
+CONFIG_AK8975=m
+# CONFIG_AK09911 is not set
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+CONFIG_YAMAHA_YAS530=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+CONFIG_IIO_MUX=m
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+CONFIG_IQS624_POS=m
+# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+CONFIG_AD5272=m
+CONFIG_DS1803=m
+CONFIG_MAX5432=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_DLHL60D=m
+# CONFIG_DPS310 is not set
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+CONFIG_ICP10100=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+# CONFIG_T5403 is not set
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_PING=m
+CONFIG_RFD77402=m
+# CONFIG_SRF04 is not set
+CONFIG_SX9310=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VCNL3020=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_IQS620AT_TEMP=m
+CONFIG_LTC2983=m
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MLX90614=m
+CONFIG_MLX90632=m
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TMP117=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
+CONFIG_NTB_IDT=m
+CONFIG_NTB_EPF=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_ATMEL_TCB=m
+CONFIG_PWM_DWC=m
+CONFIG_PWM_FSL_FTM=m
+CONFIG_PWM_IQS620A=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_NTXEC=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_STMPE=y
+# CONFIG_PWM_TWL is not set
+# CONFIG_PWM_TWL_LED is not set
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+# CONFIG_AL_FIC is not set
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_TI_SYSCON is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_PHY_CAN_TRANSCEIVER=m
+# CONFIG_BCM_KONA_USB2_PHY is not set
+CONFIG_PHY_CADENCE_TORRENT=m
+CONFIG_PHY_CADENCE_DPHY=m
+CONFIG_PHY_CADENCE_SIERRA=m
+CONFIG_PHY_CADENCE_SALVO=m
+CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+# CONFIG_PHY_CPCAP_USB is not set
+CONFIG_PHY_MAPPHONE_MDM6600=m
+CONFIG_PHY_OCELOT_SERDES=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_IDLE_INJECT=y
+# CONFIG_DTPM is not set
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_OF_PMEM=m
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_NVMEM_RMEM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_OF_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_FSI=m
+# CONFIG_FSI_NEW_DEV_NODE is not set
+CONFIG_FSI_MASTER_GPIO=m
+CONFIG_FSI_MASTER_HUB=m
+CONFIG_FSI_MASTER_ASPEED=m
+CONFIG_FSI_SCOM=m
+CONFIG_FSI_SBEFIFO=m
+CONFIG_FSI_OCC=m
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
+CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+CONFIG_INTERCONNECT=y
+# CONFIG_COUNTER is not set
+CONFIG_MOST=m
+CONFIG_MOST_USB_HDM=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_SND=m
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
+CONFIG_F2FS_FS_ZSTD=y
+CONFIG_F2FS_IOSTAT=y
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION_ALGS=m
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
+# CONFIG_FS_VERITY is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_DAX=y
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+CONFIG_OVERLAY_FS_XINO_AUTO=y
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+# CONFIG_NETFS_STATS is not set
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+# CONFIG_NTFS3_64BIT_CLUSTER is not set
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_UBIFS_FS is not set
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+CONFIG_HPFS_FS=m
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+CONFIG_PSTORE_LZ4HC_COMPRESS=m
+# CONFIG_PSTORE_842_COMPRESS is not set
+CONFIG_PSTORE_ZSTD_COMPRESS=y
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
+CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_VPMSUM=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2S=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
+CONFIG_CRYPTO_VPMSUM_TESTER=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MD5_PPC=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_PPC=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+CONFIG_CRYPTO_DEV_VMX=y
+CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_CCREE=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_BYPASS=y
+CONFIG_ARCH_HAS_DMA_MAP_DIRECT=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_RESTRICTED_POOL is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+# CONFIG_FONT_6x8 is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_COPY_MC=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# end of Library routines
+
+CONFIG_PLDMFW=y
+CONFIG_ASN1_ENCODER=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_COMPRESSED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_FRAME_WARN=2048
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+# end of Generic Kernel Debugging Instruments
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+# CONFIG_DEBUG_PAGE_REF is not set
+CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+CONFIG_WW_MUTEX_SELFTEST=m
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_NOTIFIERS=y
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# end of Debug kernel data structures
+
+CONFIG_DEBUG_CREDENTIALS=y
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_REF_SCALE_TEST=m
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_OSNOISE_TRACER=y
+CONFIG_TIMERLAT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+# CONFIG_TRACER_SNAPSHOT is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
+# CONFIG_SYNTH_EVENTS is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+CONFIG_PREEMPTIRQ_DELAY_TEST=m
+CONFIG_KPROBE_EVENT_GEN_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# powerpc Debugging
+#
+# CONFIG_PPC_DISABLE_WERROR is not set
+CONFIG_PPC_WERROR=y
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_HCALL_STATS is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_JUMP_LABEL_FEATURE_CHECKS is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set
+# CONFIG_PPC_RFI_SRR_DEBUG is not set
+CONFIG_XMON=y
+# CONFIG_XMON_DEFAULT is not set
+CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
+CONFIG_DEBUGGER=y
+CONFIG_BOOTX_TEXT=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+# CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
+# end of powerpc Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_LKDTM=m
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_STRING_SELFTEST is not set
+CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
+CONFIG_TEST_KSTRTOX=m
+CONFIG_TEST_PRINTF=m
+CONFIG_TEST_SCANF=m
+CONFIG_TEST_BITMAP=m
+CONFIG_TEST_UUID=m
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+CONFIG_TEST_HASH=m
+# CONFIG_TEST_IDA is not set
+CONFIG_TEST_PARMAN=m
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_BITOPS is not set
+# CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_HMM is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# end of Kernel Testing and Coverage
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
new file mode 100644
index 000000000000..3f0a39a87787
--- /dev/null
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -0,0 +1,10479 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 5.15.0 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=100201
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23501
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23501
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=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_WERROR is not set
+CONFIG_LOCALVERSION="_1"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_ZSTD=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_ZSTD is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_SIM=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_MSI_IOMMU=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+CONFIG_USERMODE_DRIVER=y
+CONFIG_BPF_PRELOAD=y
+CONFIG_BPF_PRELOAD_UMD=m
+CONFIG_BPF_LSM=y
+# end of BPF subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_SCHED_CORE=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_SCHED_AVG_IRQ=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+# CONFIG_PRINTK_INDEX is not set
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CC_HAS_INT128=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
+CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=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_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_NR_GPIO=1024
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
+CONFIG_X86_CPU_RESCTRL=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=y
+# CONFIG_IOSF_MBI_DEBUG is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_XXL=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_512GB=y
+CONFIG_XEN_PV_SMP=y
+CONFIG_XEN_PV_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_XEN_DOM0=y
+CONFIG_KVM_GUEST=y
+CONFIG_ARCH_CPUIDLE_HALTPOLL=y
+CONFIG_PVH=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_JAILHOUSE_GUEST is not set
+# CONFIG_ACRN_GUEST is not set
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_IA32_FEAT_CTL=y
+CONFIG_X86_VMX_FEATURE_NAMES=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=512
+CONFIG_NR_CPUS_DEFAULT=64
+CONFIG_NR_CPUS=256
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCELOG_LEGACY is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=m
+CONFIG_PERF_EVENTS_INTEL_CSTATE=m
+CONFIG_PERF_EVENTS_AMD_POWER=m
+CONFIG_PERF_EVENTS_AMD_UNCORE=m
+# end of Performance monitoring
+
+# CONFIG_X86_16BIT is not set
+CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_X86_IOPL_IOPERM=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_X86_5LEVEL is not set
+CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_X86_CPA_STATISTICS is not set
+# CONFIG_AMD_MEM_ENCRYPT is not set
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_X86_UMIP=y
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+# CONFIG_X86_SGX is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+# CONFIG_KEXEC_FILE is not set
+CONFIG_CRASH_DUMP=y
+# CONFIG_KEXEC_JUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_DYNAMIC_MEMORY_LAYOUT=y
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+# CONFIG_LEGACY_VSYSCALL_XONLY is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_HAVE_LIVEPATCH=y
+# end of Processor type and features
+
+CONFIG_ARCH_HAS_ADD_PAGES=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_FPDT=y
+CONFIG_ACPI_LPIT=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON_SIGNAL=38
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_PLATFORM_PROFILE=m
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_HMAT=y
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_DPTF=y
+CONFIG_DPTF_POWER=m
+CONFIG_DPTF_PCH_FIVR=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_ADXL=y
+CONFIG_ACPI_CONFIGFS=m
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_TPS68470_PMIC_OPREGION=y
+CONFIG_ACPI_VIOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_PRMT=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+CONFIG_CPU_IDLE_GOV_HALTPOLL=y
+CONFIG_HALTPOLL_CPUIDLE=y
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_MMCONF_FAM10H=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_IA32_EMULATION=y
+# CONFIG_X86_X32 is not set
+CONFIG_COMPAT_32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+CONFIG_HAVE_KVM_PM_NOTIFIER=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_WERROR=y
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_AMD_SEV=y
+# CONFIG_KVM_XEN is not set
+# CONFIG_KVM_MMU_AUDIT is not set
+CONFIG_AS_AVX512=y
+CONFIG_AS_SHA1_NI=y
+CONFIG_AS_SHA256_NI=y
+CONFIG_AS_TPAUSE=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_GENERIC_ENTRY=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+# CONFIG_STATIC_CALL_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_STACK_VALIDATION=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_HAVE_STATIC_CALL=y
+CONFIG_HAVE_STATIC_CALL_INLINE=y
+CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_HAS_ELFCORE_COMPAT=y
+CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_GZIP is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_DEV_BSG_COMMON=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_WBT=y
+CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_FC_APPID is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
+CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_NUMA_KEEP_MEMINFO=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_MHP_MEMMAP_ON_MEMORY=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+# CONFIG_HWPOISON_INJECT is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_THP_SWAP=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+# CONFIG_MEM_SOFT_DIRTY is not set
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_PAGE_IDLE_FLAG=y
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
+# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_VMAP_PFN=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_SECRETMEM=y
+
+#
+# Data Access Monitoring
+#
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_DBGFS=y
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_WANT_COMPAT_NETLINK_MESSAGES=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
+# CONFIG_TLS_TOE is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_USER_COMPAT=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XFRM_ESPINTCP=y
+CONFIG_SMC=m
+CONFIG_SMC_DIAG=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+# CONFIG_NET_FOU_IP_TUNNELS is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+CONFIG_INET_ESPINTCP=y
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=y
+CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_ESPINTCP=y
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
+CONFIG_IPV6_RPL_LWTUNNEL=y
+CONFIG_IPV6_IOAM6_LWTUNNEL=y
+# CONFIG_NETLABEL is not set
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_MPTCP_IPV6=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+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_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XTABLES_COMPAT=y
+
+#
+# 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
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+# CONFIG_IP6_NF_SECURITY is not set
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
+CONFIG_NFT_BRIDGE_REJECT=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+# CONFIG_RDS_RDMA is not set
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+# CONFIG_BRIDGE_CFM is not set
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+# CONFIG_NET_DSA_TAG_HELLCREEK is not set
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=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_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+# CONFIG_6LOWPAN is not set
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BATMAN_V=y
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=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_STREAM_PARSER=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+# CONFIG_CAN_J1939 is not set
+CONFIG_CAN_ISOTP=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+# CONFIG_CAN_JANZ_ICAN3 is not set
+# CONFIG_CAN_KVASER_PCIEFD is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+# CONFIG_CAN_M_CAN_PCI is not set
+# CONFIG_CAN_M_CAN_PLATFORM is not set
+# CONFIG_CAN_M_CAN_TCAN4X5X is not set
+# CONFIG_CAN_PEAK_PCIEFD is not set
+# CONFIG_CAN_SJA1000 is not set
+CONFIG_CAN_SOFTING=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_LEDS=y
+CONFIG_BT_MSFTEXT=y
+CONFIG_BT_AOSPEXT=y
+CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+# CONFIG_BT_HCIUART_MRVL is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_IPV6 is not set
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_MCTP=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_XEN is not set
+# CONFIG_NET_9P_RDMA is not set
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_VIRTUAL_NCI=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_S3FWRN82_UART=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+# CONFIG_EISA is not set
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+# CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+#
+# PCI controller drivers
+#
+CONFIG_VMD=m
+CONFIG_PCI_HYPERV_INTERFACE=m
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+
+#
+# Mobiveil PCIe Core Support
+#
+# end of Mobiveil PCIe Core Support
+
+#
+# Cadence PCIe controllers support
+#
+# end of Cadence PCIe controllers support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+# CONFIG_CXL_BUS is not set
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA is not set
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_RAPIDIO=m
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_CACHE=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
+CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
+CONFIG_REGMAP_SOUNDWIRE_MBQ=m
+CONFIG_REGMAP_I3C=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+# CONFIG_MHI_BUS_PCI_GENERIC is not set
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+CONFIG_SYSFB=y
+CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_SOFT_RESERVE=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=m
+CONFIG_EFI_TEST=m
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_EFI_RCI2_TABLE is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_EFI_EMBEDDED_FIRMWARE=y
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_MCHP23K256 is not set
+CONFIG_MTD_MCHP48L640=m
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_PHRAM=m
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+# CONFIG_MTD_ONENAND is not set
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_ARASAN=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_SPI_NAND=m
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+# CONFIG_MTD_SPI_NOR is not set
+# CONFIG_MTD_UBI is not set
+# CONFIG_MTD_HYPERBUS is not set
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_CDROM=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+# CONFIG_IBM_ASM is not set
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
+CONFIG_MISC_RTSX=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_INTEL_MEI_TXE=m
+CONFIG_INTEL_MEI_HDCP=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+CONFIG_ECHO=m
+# CONFIG_BCM_VK is not set
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFS_DWC_TC_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
+CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_CRYPTO=y
+CONFIG_SCSI_UFS_HPB=y
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_UNSTRIPED is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+# CONFIG_DM_WRITECACHE is not set
+CONFIG_DM_EBS=m
+CONFIG_DM_ERA=m
+# CONFIG_DM_CLONE is not set
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+# CONFIG_DM_MULTIPATH_IOA is not set
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LAN is not set
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_TAP=m
+CONFIG_TUN_VNET_CROSS_LE=y
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_VSOCKMON is not set
+# CONFIG_MHI_NET is not set
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+# CONFIG_CAIF_DRIVERS is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+# CONFIG_NET_DSA_BCM_SF2 is not set
+# CONFIG_NET_DSA_LOOP is not set
+# CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK is not set
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_MSCC_SEVILLE=m
+CONFIG_NET_DSA_AR9331=m
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
+# CONFIG_NET_DSA_XRS700X_I2C is not set
+# CONFIG_NET_DSA_XRS700X_MDIO is not set
+CONFIG_NET_DSA_QCA8K=m
+# CONFIG_NET_DSA_REALTEK_SMI is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=y
+CONFIG_AMD_XGBE=m
+CONFIG_AMD_XGBE_DCB=y
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+# CONFIG_CHELSIO_T4_DCB is not set
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_CHELSIO_TLS_DEVICE=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+# CONFIG_PCMCIA_XIRCOM is not set
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=y
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+# CONFIG_IXGBE_DCB is not set
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_MICROSOFT_MANA=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+# CONFIG_SKGE_GENESIS is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CLS_ACT=y
+CONFIG_MLX5_TC_SAMPLE=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+# CONFIG_MLX5_TLS is not set
+CONFIG_MLX5_SW_STEERING=y
+# CONFIG_MLX5_SF is not set
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+# CONFIG_IONIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_INTEL=m
+CONFIG_DWMAC_LOONGSON=m
+CONFIG_STMMAC_PCI=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+# CONFIG_SFP is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=y
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+# CONFIG_MICROCHIP_T1_PHY is not set
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+# CONFIG_DP83TC811_PHY is not set
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+
+#
+# MCTP Device Drivers
+#
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_ACPI_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_MVUSB is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+# CONFIG_USB_RTL8153_ECM is not set
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HWRNG=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+CONFIG_IWLWIFI_BCAST_FILTERING=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615_COMMON=m
+CONFIG_MT7615E=m
+CONFIG_MT7663_USB_SDIO_COMMON=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921E=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+# CONFIG_WILC1000_SPI is not set
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+# CONFIG_IEEE802154_CC2520 is not set
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+# CONFIG_IEEE802154_CA8210 is not set
+# CONFIG_IEEE802154_MCR20A is not set
+CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+CONFIG_WWAN_HWSIM=m
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+CONFIG_IOSM=m
+# end of Wireless WAN
+
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_IQS62X is not set
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=m
+# CONFIG_KEYBOARD_MTK_PMIC is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+# CONFIG_JOYSTICK_PXRC is not set
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+# CONFIG_TABLET_SERIAL_WACOM4 is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMA140=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_ILITEK=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_MSG2638=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+# CONFIG_TOUCHSCREEN_WM831X is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_GPIO_BEEPER is not set
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA7280_HAPTICS is not set
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
+# CONFIG_INPUT_WM831X_ON is not set
+# CONFIG_INPUT_PCAP is not set
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_16550A_VARIANTS=y
+CONFIG_SERIAL_8250_FINTEK=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_LANTIQ=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=m
+# CONFIG_SERIAL_MEN_Z135 is not set
+# CONFIG_SERIAL_SPRD is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_SERIAL_DEV_BUS=m
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+CONFIG_MWAVE=m
+CONFIG_DEVMEM=y
+CONFIG_NVRAM=m
+CONFIG_DEVPORT=y
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_TIS_I2C_CR50=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=m
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_TELCLOCK=m
+CONFIG_XILLYBUS_CLASS=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYUSB=m
+# CONFIG_RANDOM_TRUST_CPU is not set
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+# CONFIG_I2C_MUX_LTC4306 is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=m
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+# CONFIG_I2C_DLN2 is not set
+CONFIG_I2C_CP2615=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_MLXCPLD=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_I2C_SLAVE_TESTUNIT=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SVC_I3C_MASTER=m
+# CONFIG_MIPI_I3C_HCI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_ALTERA_CORE=m
+CONFIG_SPI_ALTERA_DFL=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_DMA=y
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_NXP_FLEXSPI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_LANTIQ_SSC=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_XILINX=m
+CONFIG_SPI_ZYNQMP_GQSPI=m
+CONFIG_SPI_AMD=m
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_LOOPBACK_TEST=m
+CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
+CONFIG_SPMI=m
+CONFIG_SPMI_HISI3670=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+CONFIG_PPS_CLIENT_KTIMER=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_VMW=m
+# CONFIG_PTP_1588_CLOCK_OCP is not set
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_DA9062=m
+CONFIG_PINCTRL_MCP23S08_I2C=m
+CONFIG_PINCTRL_MCP23S08_SPI=m
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_LYNXPOINT=m
+CONFIG_PINCTRL_INTEL=y
+# CONFIG_PINCTRL_ALDERLAKE is not set
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+# CONFIG_PINCTRL_ELKHARTLAKE is not set
+CONFIG_PINCTRL_EMMITSBURG=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_JASPERLAKE=m
+# CONFIG_PINCTRL_LAKEFIELD is not set
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_CS47L35=y
+CONFIG_PINCTRL_CS47L85=y
+CONFIG_PINCTRL_CS47L90=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+# CONFIG_GPIO_WINBOND is not set
+# CONFIG_GPIO_WS16C48 is not set
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_TPS65086=m
+# CONFIG_GPIO_TPS65912 is not set
+CONFIG_GPIO_TPS68470=y
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_UCB1400=m
+# CONFIG_GPIO_WM831X is not set
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCI_IDIO_16=m
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+CONFIG_GPIO_VIRTIO=m
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_W1_MASTER_SGI=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+# CONFIG_W1_SLAVE_DS2406 is not set
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+# CONFIG_W1_SLAVE_DS2438 is not set
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+# CONFIG_POWER_RESET is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+# CONFIG_WM831X_BACKUP is not set
+# CONFIG_WM831X_POWER is not set
+CONFIG_TEST_POWER=m
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_LTC4162L=m
+CONFIG_CHARGER_MP2629=m
+CONFIG_CHARGER_MT6360=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_BQ256XX=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+# CONFIG_BATTERY_GOLDFISH is not set
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
+CONFIG_CHARGER_BD99954=m
+CONFIG_BATTERY_SURFACE=m
+CONFIG_CHARGER_SURFACE=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+# CONFIG_SENSORS_ASPEED is not set
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+# CONFIG_SENSORS_CORSAIR_PSU is not set
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+# CONFIG_SENSORS_POWR1220 is not set
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+CONFIG_SENSORS_LTC2990=m
+# CONFIG_SENSORS_LTC2992 is not set
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+# CONFIG_SENSORS_MAX127 is not set
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31730=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+# CONFIG_SENSORS_MAX6642 is not set
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_TPS23861=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_MR75203=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1266=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_BEL_PFE=m
+CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_FSP_3Y=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_DPS920AB=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+# CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR36021=m
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+# CONFIG_SENSORS_LTC2978_REGULATOR is not set
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX15301=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_MP2888=m
+CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_PIM4328=m
+# CONFIG_SENSORS_PM6764TR is not set
+# CONFIG_SENSORS_PXE1610 is not set
+# CONFIG_SENSORS_Q54SJ108A2 is not set
+CONFIG_SENSORS_STPDDC60=m
+# CONFIG_SENSORS_TPS40422 is not set
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE122=m
+CONFIG_SENSORS_ZL6100=m
+# CONFIG_SENSORS_SBTSI is not set
+CONFIG_SENSORS_SBRMI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHT4x=m
+# CONFIG_SENSORS_SHTC1 is not set
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+# CONFIG_SENSORS_TMP103 is not set
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+# CONFIG_SENSORS_W83773G is not set
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+# CONFIG_SENSORS_WM831X is not set
+CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_DEVFREQ_THERMAL=y
+# CONFIG_THERMAL_EMULATION is not set
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+# CONFIG_INTEL_SOC_DTS_THERMAL is not set
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT3406_THERMAL=m
+CONFIG_PROC_THERMAL_MMIO_RAPL=m
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_INTEL_TCC_COOLING=m
+CONFIG_INTEL_MENLOW=m
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+# CONFIG_MENZ069_WATCHDOG is not set
+CONFIG_WDAT_WDT=m
+# CONFIG_WM831X_WATCHDOG is not set
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+# CONFIG_EBC_C384_WDT is not set
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+CONFIG_MFD_CS47L35=y
+CONFIG_MFD_CS47L85=y
+CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
+# CONFIG_PMIC_DA903X is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+CONFIG_MFD_DA9062=m
+# CONFIG_MFD_DA9063 is not set
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MP2629=m
+CONFIG_HTC_PASIC3=m
+# CONFIG_HTC_I2CPLD is not set
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_INTEL_SOC_PMIC_BXTWC is not set
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_MRFLD=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_PMC_BXT=m
+# CONFIG_MFD_INTEL_PMT is not set
+CONFIG_MFD_IQS62X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77693 is not set
+CONFIG_MFD_MAX77843=y
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+CONFIG_MFD_MT6360=m
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT4831=m
+CONFIG_MFD_RT5033=m
+# CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+# CONFIG_MFD_TPS65090 is not set
+CONFIG_MFD_TI_LP873X=m
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+CONFIG_MFD_TPS65912=y
+# CONFIG_MFD_TPS65912_I2C is not set
+CONFIG_MFD_TPS65912_SPI=y
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=m
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
+CONFIG_MFD_WM8998=y
+# CONFIG_MFD_WM8400 is not set
+CONFIG_MFD_WM831X=y
+# CONFIG_MFD_WM831X_I2C is not set
+CONFIG_MFD_WM831X_SPI=y
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_ATC260X_I2C is not set
+# CONFIG_RAVE_SP_CORE is not set
+CONFIG_MFD_INTEL_M10_BMC=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+# CONFIG_REGULATOR_88PG86X is not set
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
+# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9210=m
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+# CONFIG_REGULATOR_LTC3589 is not set
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8893=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MAX77826=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6315=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6358=m
+CONFIG_REGULATOR_MT6359=m
+CONFIG_REGULATOR_MT6360=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_TPS6524X=m
+# CONFIG_REGULATOR_TPS65912 is not set
+# CONFIG_REGULATOR_WM831X is not set
+CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+# CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
+CONFIG_IR_TOY=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_MEDIA_CEC_RC=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CROS_EC=m
+CONFIG_CEC_SECO=m
+CONFIG_CEC_SECO_RC=y
+CONFIG_USB_PULSE8_CEC=m
+# CONFIG_USB_RAINSHADOW_CEC is not set
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_SUPPORT_FILTER is not set
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_TEST_SUPPORT=y
+# end of Media device types
+
+#
+# Media core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+# end of Media core support
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+# CONFIG_USB_GSPCA_DTCS033 is not set
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+# CONFIG_VIDEO_AU0828_RC is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+# CONFIG_VIDEO_SOLO6X10 is not set
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+# CONFIG_VIDEO_IPU3_CIO2 is not set
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_VIA_CAMERA=m
+# CONFIG_VIDEO_CADENCE is not set
+CONFIG_VIDEO_ASPEED=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_TEST_DRIVERS is not set
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+# CONFIG_DVB_FIREDTV is not set
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
+CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of Miscellaneous helper chips
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_IMX208=m
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX219 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_OV02A10 is not set
+CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV2740 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+CONFIG_VIDEO_OV5675=m
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV9734 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+CONFIG_VIDEO_DW9768=m
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_INTEL_GTT=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_CEC=y
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN=y
+# CONFIG_DRM_AMD_DC_HDCP is not set
+# CONFIG_DRM_AMD_DC_SI is not set
+CONFIG_DRM_AMD_SECURE_DISPLAY=y
+# end of Display Engine Configuration
+
+CONFIG_HSA_AMD=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+CONFIG_DRM_I915_GVT=y
+CONFIG_DRM_I915_GVT_KVMGT=m
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
+CONFIG_DRM_I915_FENCE_TIMEOUT=10000
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
+CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
+CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
+CONFIG_DRM_I915_STOP_TIMEOUT=100
+CONFIG_DRM_I915_TIMESLICE_DURATION=1
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VKMS=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+# CONFIG_DRM_VMWGFX_MKSSTATS is not set
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_TINYDRM_HX8357D=m
+# CONFIG_TINYDRM_ILI9225 is not set
+# CONFIG_TINYDRM_ILI9341 is not set
+# CONFIG_TINYDRM_ILI9486 is not set
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+# CONFIG_TINYDRM_ST7735R is not set
+CONFIG_DRM_XEN=y
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_HYPERV=m
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_VIA is not set
+# CONFIG_DRM_SAVAGE is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+CONFIG_FB_OPENCORES=m
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_LE80578 is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SSD1307=m
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+# CONFIG_LCD_OTM3225A is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+CONFIG_BACKLIGHT_SAHARA=m
+# CONFIG_BACKLIGHT_WM831X is not set
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+# CONFIG_SND_ES1968_RADIO is not set
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=0
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+# CONFIG_SND_ISIGHT is not set
+# CONFIG_SND_FIREWORKS is not set
+# CONFIG_SND_BEBOB is not set
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREFACE is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+# CONFIG_SND_SOC_ADI is not set
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
+CONFIG_SND_SOC_AMD_RENOIR=m
+CONFIG_SND_SOC_AMD_RENOIR_MACH=m
+CONFIG_SND_SOC_AMD_ACP5x=m
+CONFIG_SND_ATMEL_SOC=m
+# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+CONFIG_SND_SOC_FSL_MICFIL=m
+# CONFIG_SND_SOC_FSL_XCVR is not set
+CONFIG_SND_SOC_FSL_RPMSG=m
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
+# CONFIG_SND_I2S_HI6210_I2S is not set
+CONFIG_SND_SOC_IMG=y
+CONFIG_SND_SOC_IMG_I2S_IN=m
+CONFIG_SND_SOC_IMG_I2S_OUT=m
+CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
+CONFIG_SND_SOC_IMG_SPDIF_IN=m
+CONFIG_SND_SOC_IMG_SPDIF_OUT=m
+CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+# CONFIG_SND_SOC_INTEL_CML_H is not set
+# CONFIG_SND_SOC_INTEL_CML_LP is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI_DEV=m
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_ACPI_DEV=m
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_INTEL_APL=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_INTEL_CNL=m
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_ICL=m
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_JASPERLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_TGL=m
+CONFIG_SND_SOC_SOF_TIGERLAKE=m
+CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
+CONFIG_SND_SOC_SOF_ALDERLAKE=m
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
+CONFIG_SND_SOC_XILINX_SPDIF=m
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_ARIZONA=m
+CONFIG_SND_SOC_WM_ADSP=m
+CONFIG_SND_SOC_AC97_CODEC=m
+# CONFIG_SND_SOC_ADAU1372_I2C is not set
+# CONFIG_SND_SOC_ADAU1372_SPI is not set
+CONFIG_SND_SOC_ADAU1701=m
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_BD28623 is not set
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+# CONFIG_SND_SOC_CS35L35 is not set
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+# CONFIG_SND_SOC_CS42L56 is not set
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4234=m
+# CONFIG_SND_SOC_CS4265 is not set
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_HDAC_HDMI=m
+CONFIG_SND_SOC_HDAC_HDA=m
+CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
+CONFIG_SND_SOC_MAX98390=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+# CONFIG_SND_SOC_PCM5102A is not set
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT1011=m
+CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
+CONFIG_SND_SOC_RT1308_SDW=m
+CONFIG_SND_SOC_RT1316_SDW=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT711_SDCA_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
+CONFIG_SND_SOC_RT715_SDCA_SDW=m
+CONFIG_SND_SOC_SDW_MOCKUP=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
+CONFIG_SND_SOC_SPDIF=m
+# CONFIG_SND_SOC_SSM2305 is not set
+CONFIG_SND_SOC_SSM2518=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+# CONFIG_SND_SOC_STA350 is not set
+CONFIG_SND_SOC_STI_SAS=m
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
+# CONFIG_SND_SOC_TAS2770 is not set
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TFA989X=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+CONFIG_SND_SOC_TLV320ADCX140=m
+CONFIG_SND_SOC_TS3A227E=m
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WCD_MBHC=m
+CONFIG_SND_SOC_WCD938X=m
+CONFIG_SND_SOC_WCD938X_SDW=m
+CONFIG_SND_SOC_WM5102=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+# CONFIG_SND_SOC_WM8782 is not set
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WSA881X=m
+CONFIG_SND_SOC_ZL38060=m
+# CONFIG_SND_SOC_MAX9759 is not set
+# CONFIG_SND_SOC_MT6351 is not set
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_MT6660=m
+# CONFIG_SND_SOC_NAU8315 is not set
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
+# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
+# CONFIG_SND_XEN_FRONTEND is not set
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+# CONFIG_HOLTEK_FF is not set
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_VIVALDI=m
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
+# CONFIG_HID_JABRA is not set
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NTI is not set
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID_ACPI=m
+# end of I2C HID support
+
+CONFIG_I2C_HID_CORE=m
+
+#
+# Intel ISH HID support
+#
+CONFIG_INTEL_ISH_HID=m
+CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
+# end of Intel ISH HID support
+
+#
+# AMD SFH HID Support
+#
+CONFIG_AMD_SFH_HID=m
+# end of AMD SFH HID Support
+
+#
+# Surface System Aggregator Module HID support
+#
+CONFIG_SURFACE_HID=m
+CONFIG_SURFACE_KBD=m
+# end of Surface System Aggregator Module HID support
+
+CONFIG_SURFACE_HID_CORE=m
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNSP_PCI=m
+# CONFIG_USB_CDNSP_GADGET is not set
+# CONFIG_USB_CDNSP_HOST is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_UDC is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_U_SERIAL_CONSOLE=y
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+CONFIG_USB_M66592=m
+CONFIG_USB_BDC_UDC=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+# CONFIG_USB_NET2272_DMA is not set
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+# CONFIG_USB_MAX3420_UDC is not set
+CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+# CONFIG_USB_CONFIGFS_SERIAL is not set
+# CONFIG_USB_CONFIGFS_ACM is not set
+# CONFIG_USB_CONFIGFS_OBEX is not set
+# CONFIG_USB_CONFIGFS_NCM is not set
+# CONFIG_USB_CONFIGFS_ECM is not set
+# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
+# CONFIG_USB_CONFIGFS_RNDIS is not set
+# CONFIG_USB_CONFIGFS_EEM is not set
+# CONFIG_USB_CONFIGFS_PHONET is not set
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+# CONFIG_USB_CONFIGFS_F_FS is not set
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+# CONFIG_USB_CONFIGFS_F_MIDI is not set
+# CONFIG_USB_CONFIGFS_F_HID is not set
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_F_TCM=y
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+# CONFIG_USB_FUNCTIONFS_ETH is not set
+# CONFIG_USB_FUNCTIONFS_RNDIS is not set
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+# CONFIG_USB_RAW_GADGET is not set
+# end of USB Gadget precomposed configurations
+
+CONFIG_TYPEC=m
+# CONFIG_TYPEC_TCPM is not set
+# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# CONFIG_TYPEC_MUX_INTEL_PMC is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_MMC=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+# CONFIG_MMC_HSQ is not set
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+# CONFIG_MMC_SDHCI_XENON is not set
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+# CONFIG_LEDS_MT6323 is not set
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+# CONFIG_LEDS_WM831X_STATUS is not set
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+# CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_TPS6105X=m
+
+#
+# Flash and Torch LED drivers
+#
+CONFIG_LEDS_AS3645A=m
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_RT8515 is not set
+CONFIG_LEDS_SGM3140=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+# CONFIG_INFINIBAND_OPA_VNIC is not set
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+# CONFIG_EDAC_GHES is not set
+CONFIG_EDAC_AMD64=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+# CONFIG_EDAC_IE31200 is not set
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_I10NM=m
+CONFIG_EDAC_PND2=m
+# CONFIG_EDAC_IGEN6 is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1374=m
+# CONFIG_RTC_DRV_DS1374_WDT is not set
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_PCF50633=m
+# CONFIG_RTC_DRV_CROS_EC is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_FTRTC010 is not set
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+# CONFIG_RTC_DRV_GOLDFISH is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_IDXD_BUS=m
+CONFIG_INTEL_IDXD=m
+# CONFIG_INTEL_IDXD_COMPAT is not set
+# CONFIG_INTEL_IDXD_SVM is not set
+CONFIG_INTEL_IDXD_PERFMON=y
+CONFIG_INTEL_IOATDMA=m
+CONFIG_PLX_DMA=m
+CONFIG_AMD_PTDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_HSU_DMA=m
+# CONFIG_SF_PDMA is not set
+# CONFIG_INTEL_LDMA is not set
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
+# end of DMABUF options
+
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+# CONFIG_HD44780 is not set
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_IMG_ASCII_LCD=m
+# CONFIG_LCD2S is not set
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_UIO_DFL=m
+CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VFIO_PCI_IGD=y
+CONFIG_VFIO_MDEV=m
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+# CONFIG_VDPA is not set
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GNTDEV_DMABUF=y
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_XEN_GRANT_DMA_ALLOC=y
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+CONFIG_XEN_UNPOPULATED_ALLOC=y
+# end of Xen driver support
+
+CONFIG_GREYBUS=m
+CONFIG_GREYBUS_ES2=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+# CONFIG_COMEDI_TESTS is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+CONFIG_AD7280=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_INTEL_ATOMISP=y
+# CONFIG_VIDEO_ZORAN is not set
+CONFIG_VIDEO_IPU3_IMGU=m
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
+
+#
+# Android
+#
+# end of Android
+
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+CONFIG_GS_FPGABOOT=m
+# CONFIG_UNISYSSPAR is not set
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SEPS525=m
+CONFIG_FB_TFT_SH1106=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+# CONFIG_MOST_COMPONENTS is not set
+CONFIG_KS7010=m
+CONFIG_GREYBUS_AUDIO=m
+CONFIG_GREYBUS_AUDIO_APB_CODEC=m
+CONFIG_GREYBUS_BOOTROM=m
+CONFIG_GREYBUS_FIRMWARE=m
+CONFIG_GREYBUS_HID=m
+CONFIG_GREYBUS_LIGHT=m
+CONFIG_GREYBUS_LOG=m
+CONFIG_GREYBUS_LOOPBACK=m
+CONFIG_GREYBUS_POWER=m
+CONFIG_GREYBUS_RAW=m
+CONFIG_GREYBUS_VIBRATOR=m
+CONFIG_GREYBUS_BRIDGED_PHY=m
+CONFIG_GREYBUS_GPIO=m
+CONFIG_GREYBUS_I2C=m
+CONFIG_GREYBUS_PWM=m
+CONFIG_GREYBUS_SDIO=m
+CONFIG_GREYBUS_SPI=m
+CONFIG_GREYBUS_UART=m
+CONFIG_GREYBUS_USB=m
+CONFIG_PI433=m
+# CONFIG_FIELDBUS_DEV is not set
+CONFIG_QLGE=m
+CONFIG_WFX=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_HUAWEI_WMI=m
+CONFIG_MXM_WMI=m
+CONFIG_PEAQ_WMI=m
+# CONFIG_XIAOMI_WMI is not set
+CONFIG_GIGABYTE_WMI=m
+CONFIG_ACERHDF=m
+# CONFIG_ACER_WIRELESS is not set
+CONFIG_ACER_WMI=m
+# CONFIG_AMD_PMC is not set
+CONFIG_ADV_SWBUTTON=m
+CONFIG_APPLE_GMUX=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_MERAKI_MX100=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_X86_PLATFORM_DRIVERS_DELL=y
+CONFIG_ALIENWARE_WMI=m
+CONFIG_DCDBAS=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_RBU=m
+CONFIG_DELL_RBTN=m
+CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_PRIVACY=y
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_LED=m
+# CONFIG_DELL_WMI_SYSMAN is not set
+CONFIG_AMILO_RFKILL=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_HP_ACCEL=m
+CONFIG_WIRELESS_HOTKEY=m
+CONFIG_HP_WMI=m
+CONFIG_IBM_RTL=m
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_THINKPAD_LMI=m
+CONFIG_X86_PLATFORM_DRIVERS_INTEL=y
+CONFIG_INTEL_ATOMISP2_PDX86=y
+CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_SAR_INT1092=m
+CONFIG_INTEL_SKL_INT3472=m
+CONFIG_INTEL_PMC_CORE=y
+
+#
+# Intel Speed Select Technology interface support
+#
+# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
+# end of Intel Speed Select Technology interface support
+
+CONFIG_INTEL_TELEMETRY=m
+CONFIG_INTEL_WMI=y
+CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_INT0002_VGPIO is not set
+CONFIG_INTEL_OAKTRAIL=m
+# CONFIG_INTEL_CHTDC_TI_PWRBTN is not set
+CONFIG_INTEL_MRFLD_PWRBTN=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+# CONFIG_INTEL_TURBO_MAX_3 is not set
+CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_MSI_WMI=m
+CONFIG_PCENGINES_APU2=m
+CONFIG_SAMSUNG_LAPTOP=m
+# CONFIG_SAMSUNG_Q10 is not set
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+# CONFIG_ACPI_CMPC is not set
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_LG_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_SYSTEM76_ACPI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_I2C_MULTI_INSTANTIATE=m
+CONFIG_MLX_PLATFORM=m
+CONFIG_TOUCHSCREEN_DMI=y
+CONFIG_FW_ATTR_CLASS=m
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_SCU_IPC=y
+CONFIG_INTEL_SCU=y
+CONFIG_INTEL_SCU_PCI=y
+CONFIG_INTEL_SCU_PLATFORM=m
+CONFIG_INTEL_SCU_IPC_UTIL=m
+CONFIG_PMC_ATOM=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+# CONFIG_CHROMEOS_TBMC is not set
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+# CONFIG_CROS_EC_ISHTP is not set
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SENSORHUB=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_CROS_USBPD_NOTIFY=m
+# CONFIG_WILCO_EC is not set
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_SURFACE_PLATFORMS=y
+CONFIG_SURFACE3_WMI=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_ACPI_NOTIFY=m
+CONFIG_SURFACE_AGGREGATOR_CDEV=m
+CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
+CONFIG_SURFACE_DTX=m
+# CONFIG_SURFACE_GPE is not set
+CONFIG_SURFACE_HOTPLUG=m
+CONFIG_SURFACE_PLATFORM_PROFILE=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_AGGREGATOR=m
+CONFIG_SURFACE_AGGREGATOR_BUS=y
+# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_WM831X=m
+
+#
+# Clock driver for ARM Reference designs
+#
+CONFIG_ICST=y
+CONFIG_CLK_SP810=y
+# end of Clock driver for ARM Reference designs
+
+CONFIG_LMK04832=m
+# CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_COMMON_CLK_PWM=m
+# CONFIG_XILINX_VCU is not set
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+CONFIG_ALTERA_MBOX=m
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOASID=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA_LIB=y
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y
+CONFIG_VIRTIO_IOMMU=m
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_NS=m
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+CONFIG_SOUNDWIRE=m
+
+#
+# SoundWire Devices
+#
+CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_INTEL=m
+CONFIG_SOUNDWIRE_QCOM=m
+CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_MRFLD=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+# CONFIG_EXTCON_USBC_TUSB320 is not set
+CONFIG_MEMORY=y
+# CONFIG_FPGA_DFL_EMIF is not set
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA220=m
+CONFIG_BMA400=m
+CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_BMI088_ACCEL=m
+CONFIG_BMI088_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_FXLS8962AF=m
+CONFIG_FXLS8962AF_I2C=m
+CONFIG_FXLS8962AF_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+# CONFIG_MMA8452 is not set
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_SCA3300=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7091R5=m
+CONFIG_AD7124=m
+CONFIG_AD7192=m
+CONFIG_AD7266=m
+CONFIG_AD7291=m
+CONFIG_AD7292=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+# CONFIG_AXP20X_ADC is not set
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+CONFIG_INTEL_MRFLD_ADC=m
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2496=m
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+CONFIG_MAX11100=m
+# CONFIG_MAX1118 is not set
+CONFIG_MAX1241=m
+CONFIG_MAX1363=m
+# CONFIG_MAX9611 is not set
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+# CONFIG_MEDIATEK_MT6360_ADC is not set
+CONFIG_MEN_Z188_ADC=m
+CONFIG_MP2629_ADC=m
+CONFIG_NAU7802=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+# CONFIG_TI_ADC084S021 is not set
+CONFIG_TI_ADC12138=m
+# CONFIG_TI_ADC108S102 is not set
+CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS131E08=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_TLC4541=m
+CONFIG_TI_TSC2046=m
+CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+# CONFIG_HMC425 is not set
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_ATLAS_EZO_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SENSIRION_SGP40=m
+CONFIG_SPS30=m
+CONFIG_SPS30_I2C=m
+CONFIG_SPS30_SERIAL=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+CONFIG_AD5755=m
+# CONFIG_AD5758 is not set
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5766=m
+# CONFIG_AD5770R is not set
+CONFIG_AD5791=m
+CONFIG_AD7303=m
+CONFIG_AD8801=m
+CONFIG_DS4424=m
+CONFIG_LTC1660=m
+# CONFIG_LTC2632 is not set
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MCP4725=m
+# CONFIG_MCP4922 is not set
+CONFIG_TI_DAC082S085=m
+# CONFIG_TI_DAC5571 is not set
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS290=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HDC2010=m
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+# CONFIG_ADIS16460 is not set
+# CONFIG_ADIS16475 is not set
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_FXOS8700=m
+CONFIG_FXOS8700_I2C=m
+CONFIG_FXOS8700_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
+CONFIG_IIO_ST_LSM9DS0=m
+CONFIG_IIO_ST_LSM9DS0_I2C=m
+CONFIG_IIO_ST_LSM9DS0_SPI=m
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_ADUX1020=m
+# CONFIG_AL3010 is not set
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_AS73211=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+# CONFIG_IIO_CROS_EC_LIGHT_PROX is not set
+# CONFIG_GP2AP002 is not set
+CONFIG_GP2AP020A00F=m
+# CONFIG_IQS621_ALS is not set
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LV0104CS=m
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+# CONFIG_SI1133 is not set
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2591=m
+# CONFIG_TSL2772 is not set
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+CONFIG_VEML6070=m
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+# CONFIG_AK09911 is not set
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+CONFIG_YAMAHA_YAS530=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+CONFIG_IQS624_POS=m
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5110=m
+CONFIG_AD5272=m
+CONFIG_DS1803=m
+CONFIG_MAX5432=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DLHL60D=m
+# CONFIG_DPS310 is not set
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+# CONFIG_ICP10100 is not set
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+# CONFIG_T5403 is not set
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_CROS_EC_MKBP_PROXIMITY=m
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_PING=m
+CONFIG_RFD77402=m
+# CONFIG_SRF04 is not set
+# CONFIG_SX9310 is not set
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VCNL3020=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_IQS620AT_TEMP is not set
+CONFIG_LTC2983=m
+CONFIG_MAXIM_THERMOCOUPLE=m
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TMP117=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
+CONFIG_NTB_AMD=m
+# CONFIG_NTB_IDT is not set
+CONFIG_NTB_INTEL=m
+# CONFIG_NTB_EPF is not set
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_CROS_EC=m
+# CONFIG_PWM_DWC is not set
+CONFIG_PWM_IQS620A=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+
+#
+# IRQ chip support
+#
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_TI_SYSCON is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_USB_LGM_PHY=m
+CONFIG_PHY_CAN_TRANSCEIVER=m
+# CONFIG_BCM_KONA_USB2_PHY is not set
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+# CONFIG_PHY_CPCAP_USB is not set
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_TUSB1210=m
+CONFIG_PHY_INTEL_LGM_EMMC=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
+CONFIG_INTEL_RAPL=m
+CONFIG_IDLE_INJECT=y
+# CONFIG_DTPM is not set
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+# CONFIG_RAS_CEC is not set
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_HMEM_DEVICES=y
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_NVMEM_SPMI_SDAM=m
+CONFIG_NVMEM_RMEM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+# CONFIG_ALTERA_PR_IP_CORE is not set
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+# CONFIG_FPGA_MGR_XILINX_SPI is not set
+# CONFIG_FPGA_MGR_MACHXO2_SPI is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_TEE=m
+
+#
+# TEE drivers
+#
+CONFIG_AMDTEE=m
+# end of TEE drivers
+
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+# CONFIG_MUX_ADG792A is not set
+# CONFIG_MUX_ADGS1408 is not set
+# CONFIG_MUX_GPIO is not set
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_UNISYS_VISORBUS is not set
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+CONFIG_INTERCONNECT=y
+# CONFIG_COUNTER is not set
+CONFIG_MOST=m
+CONFIG_MOST_USB_HDM=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_SND=m
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
+CONFIG_F2FS_FS_ZSTD=y
+CONFIG_F2FS_IOSTAT=y
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION_ALGS=m
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
+# CONFIG_FS_VERITY is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_DAX=y
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+CONFIG_OVERLAY_FS_XINO_AUTO=y
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+# CONFIG_NETFS_STATS is not set
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_NTFS3_FS=m
+# CONFIG_NTFS3_64BIT_CLUSTER is not set
+CONFIG_NTFS3_LZX_XPRESS=y
+# CONFIG_NTFS3_FS_POSIX_ACL is not set
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_PROC_CPU_RESCTRL=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLB_PAGE_FREE_VMEMMAP=y
+# CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON is not set
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+CONFIG_HPFS_FS=m
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+CONFIG_PSTORE_LZ4HC_COMPRESS=m
+# CONFIG_PSTORE_842_COMPRESS is not set
+CONFIG_PSTORE_ZSTD_COMPRESS=y
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_VBOXSF_FS=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+# CONFIG_SECURITY_INFINIBAND is not set
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+CONFIG_INTEL_TXT=y
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_CURVE25519_X86=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2S=m
+CONFIG_CRYPTO_BLAKE2S_X86=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+# CONFIG_CRYPTO_SM4 is not set
+# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
+# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_SP_PSP=y
+# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
+CONFIG_CRYPTO_DEV_QAT=m
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+# CONFIG_CRYPTO_DEV_QAT_4XXX is not set
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+# CONFIG_PRIME_NUMBERS is not set
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+# CONFIG_FONT_6x8 is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_COPY_MC=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# end of Library routines
+
+CONFIG_PLDMFW=y
+CONFIG_ASN1_ENCODER=m
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_COMPRESSED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_DEBUG_INFO_BTF_MODULES=y
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+CONFIG_STACK_VALIDATION=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_HAVE_ARCH_KCSAN=y
+# end of Generic Kernel Debugging Instruments
+
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_ARCH_HAS_DEBUG_WX=y
+CONFIG_DEBUG_WX=y
+CONFIG_GENERIC_PTDUMP=y
+CONFIG_PTDUMP_CORE=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+CONFIG_WW_MUTEX_SELFTEST=m
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_NOTIFIERS=y
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# end of Debug kernel data structures
+
+CONFIG_DEBUG_CREDENTIALS=y
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_REF_SCALE_TEST=m
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_OBJTOOL_MCOUNT=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_FUNCTION_PROFILER=y
+# CONFIG_STACK_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_HWLAT_TRACER=y
+CONFIG_OSNOISE_TRACER=y
+CONFIG_TIMERLAT_TRACER=y
+CONFIG_MMIOTRACE=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
+CONFIG_TRACING_MAP=y
+CONFIG_SYNTH_EVENTS=y
+CONFIG_HIST_TRIGGERS=y
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_MMIOTRACE_TEST is not set
+CONFIG_PREEMPTIRQ_DELAY_TEST=m
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+CONFIG_KPROBE_EVENT_GEN_TEST=m
+# CONFIG_HIST_TRIGGERS_DEBUG is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_SAMPLES is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+
+#
+# x86 Debugging
+#
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+# CONFIG_PUNIT_ATOM_DEBUG is not set
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
+# CONFIG_UNWINDER_GUESS is not set
+# end of x86 Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_LKDTM=m
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_STRING_SELFTEST is not set
+CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
+CONFIG_TEST_KSTRTOX=m
+CONFIG_TEST_PRINTF=m
+CONFIG_TEST_SCANF=m
+CONFIG_TEST_BITMAP=m
+CONFIG_TEST_UUID=m
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+CONFIG_TEST_HASH=m
+# CONFIG_TEST_IDA is not set
+CONFIG_TEST_PARMAN=m
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_BITOPS is not set
+# CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
+CONFIG_TEST_FPU=m
+CONFIG_TEST_CLOCKSOURCE_WATCHDOG=m
+CONFIG_ARCH_USE_MEMTEST=y
+# CONFIG_MEMTEST is not set
+# CONFIG_HYPERV_TESTING is not set
+# end of Kernel Testing and Coverage
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.15/patches/fix-musl-objtool.patch b/srcpkgs/linux5.15/patches/fix-musl-objtool.patch
new file mode 100644
index 000000000000..b7d0b6a83cbc
--- /dev/null
+++ b/srcpkgs/linux5.15/patches/fix-musl-objtool.patch
@@ -0,0 +1,16 @@
+objtool is using the headers provided by kernel-libc-headers, which are kernel version 5.10, so
+they use __always_inline instead of inline, and musl doesn't define __always_inline (glibc does)
+
+diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
+index 92ce4fc..d74b931 100644
+--- a/tools/objtool/Makefile
++++ b/tools/objtool/Makefile
+@@ -30,7 +30,7 @@ INCLUDES := -I$(srctree)/tools/include \
+ 	    -I$(srctree)/tools/objtool/include \
+ 	    -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include
+ WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested-externs
+-CFLAGS   := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
++CFLAGS   := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS) -D__always_inline=inline
+ LDFLAGS  += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
+ 
+ # Allow old libelf to be used:
diff --git a/srcpkgs/linux5.15/patches/ppc-vas-on-4k.patch b/srcpkgs/linux5.15/patches/ppc-vas-on-4k.patch
new file mode 100644
index 000000000000..408b09059625
--- /dev/null
+++ b/srcpkgs/linux5.15/patches/ppc-vas-on-4k.patch
@@ -0,0 +1,13 @@
+diff --git a/arch/powerpc/platforms/book3s/Kconfig b/arch/powerpc/platforms/book3s/Kconfig
+index 34c9315..88f4f87 100644
+--- a/arch/powerpc/platforms/book3s/Kconfig
++++ b/arch/powerpc/platforms/book3s/Kconfig
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ config PPC_VAS
+ 	bool "IBM Virtual Accelerator Switchboard (VAS)"
+-	depends on (PPC_POWERNV || PPC_PSERIES) && PPC_64K_PAGES
++	depends on PPC_POWERNV || PPC_PSERIES
+ 	default y
+ 	help
+ 	  This enables support for IBM Virtual Accelerator Switchboard (VAS).
diff --git a/srcpkgs/linux5.15/patches/ppc64-be-elfv2.patch b/srcpkgs/linux5.15/patches/ppc64-be-elfv2.patch
new file mode 100644
index 000000000000..dde27580dc9b
--- /dev/null
+++ b/srcpkgs/linux5.15/patches/ppc64-be-elfv2.patch
@@ -0,0 +1,86 @@
+This makes the Linux kernel build as ELFv2 on big endian ppc64. The upstream
+doesn't seem to be interested in this but it's a small patch that is unlikely
+to break/easy to remake and in worst case can always be ditched.
+
+Using ELFv2 has some potential performance benefits and is already always used
+on little endian. It requires a relatively modern toolchain, which we already
+have.
+
+Ping q66 if it does not apply.
+
+--- a/arch/powerpc/Makefile	2020-01-05 14:40:50.395763093 +0100
++++ b/arch/powerpc/Makefile	2020-01-05 14:48:39.025251092 +0100
+@@ -92,10 +92,8 @@
+ 
+ ifdef CONFIG_PPC64
+ ifndef CONFIG_CC_IS_CLANG
+-cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mabi=elfv1)
+-cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mcall-aixdesc)
+-aflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mabi=elfv1)
+-aflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mabi=elfv2
++cflags-y    += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc))
++aflags-y    += $(call cc-option,-mabi=elfv2,$(call cc-option,-mabi=elfv1))
+ endif
+ endif
+ 
+@@ -144,14 +142,8 @@
+ 
+ CFLAGS-$(CONFIG_PPC64)	:= $(call cc-option,-mtraceback=no)
+ ifndef CONFIG_CC_IS_CLANG
+-ifdef CONFIG_CPU_LITTLE_ENDIAN
+ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc))
+-AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2)
+-else
+-CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)
+-CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcall-aixdesc)
+-AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)
+-endif
++AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2,$(call cc-option,-mabi=elfv1))
+ endif
+ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,$(call cc-option,-mminimal-toc))
+ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)
+
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -48,8 +48,8 @@ ifdef CONFIG_CPU_BIG_ENDIAN
+ BOOTCFLAGS	+= -mbig-endian
+ else
+ BOOTCFLAGS	+= -mlittle-endian
+-BOOTCFLAGS	+= $(call cc-option,-mabi=elfv2)
+ endif
++BOOTCFLAGS	+= $(call cc-option,-mabi=elfv2)
+ 
+ BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
+ 
+--- a/drivers/crypto/vmx/Makefile	2020-01-01 10:56:10.560965046 +0100
++++ b/drivers/crypto/vmx/Makefile	2020-01-01 10:57:05.189968856 +0100
+@@ -5,7 +5,7 @@
+ ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
+ override flavour := linux-ppc64le
+ else
+-override flavour := linux-ppc64
++override flavour := linux-ppc64v2
+ endif
+ 
+ quiet_cmd_perl = PERL $@
+
+--- a/drivers/crypto/vmx/ppc-xlate.pl
++++ b/drivers/crypto/vmx/ppc-xlate.pl
+@@ -40,7 +40,7 @@ my $globl = sub {
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -142,7 +142,7 @@ my $vmr = sub {
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /linux-ppc64le/);
++my $no_vrsave = ($flavour =~ /linux-ppc64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
new file mode 100644
index 000000000000..aa06fccd7097
--- /dev/null
+++ b/srcpkgs/linux5.15/template
@@ -0,0 +1,325 @@
+# Template file for 'linux5.15'
+pkgname=linux5.15
+version=5.15.1
+revision=1
+wrksrc="linux-${version%.*}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
+ https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
+checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
+ 07f435f2754bfa6a0d28720d53309bd04f339d4f3ec70db5aa5632dde2ae248c"
+skip_extraction="patch-${version}.xz"
+python_version=3
+
+# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
+archs="x86_64* i686* aarch64* ppc*"
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage cpio pahole python3"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+
+pre_patch() {
+	xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
+}
+
+do_configure() {
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (allmodconfig).
+	local arch subarch
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc; subarch=ppc;;
+		mips*) arch=mips;;
+	esac
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_cross} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_cross} oldconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+
+do_build() {
+	local arch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+		mips*) _args="uImage modules dtbs"; arch=mips;;
+	esac
+	export LDFLAGS=
+	make ARCH=$arch ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_cross} ${makejobs} ${_args}
+}
+
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+		mips*) arch=mips;;
+	esac
+
+	# Run depmod after compressing modules - makes depmod.sh a noop
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} ${_cross} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+		mips)
+			vinstall arch/mips/boot/uImage.bin 644 boot uImage-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux vdso \
+		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} ${_cross} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* m* p*";;
+		arm|arm64) _args="x86* m* p*";;
+		powerpc) _args="arm* m* x86* parisc";;
+		mips) _args="arm* x86* p*";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols and compress modules
+	msg_normal "$pkgver: extracting debug info and compressing modules, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux5.15-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux5.15-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}

From 4ce7dd5e79f8d1a21cc5571c72abb2f6abf0a980 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Sat, 6 Nov 2021 09:58:20 +0000
Subject: [PATCH 2500/4088] i3status-rust: update to 0.20.5.

---
 srcpkgs/i3status-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 35604b2a45e0..b6e8d5b7f07e 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.4
+version=0.20.5
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,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=613d5ec876c0be8371b1037ddbf777b904bd84f57334b532454e4c430bdbd48f
+checksum=0ad5067f0762daf35b92fa60e127f228d5571af80cdd9a8720b001df5d51e4fb
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From debf896a0c882c16d3860a59b2b559d72d790e31 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Sat, 6 Nov 2021 10:01:27 +0000
Subject: [PATCH 2501/4088] font-iosevka: update to 11.0.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ee14527111e0..894ad7e45211 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.3.2
+version=11.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- bde311f16f3f671de0ea9e0f33f175eeeda82ee5f05b765990a9a3fff6b0e282
- c26623065fdf9fa560c33b7d31b2ec71734fdf7300ed125366f666c42b59a259"
+ 71416d2112cf6b934c5518fbbf3ecdcc9933effcb24995030add6a3153782792
+ 453901626f47deb25e20fd77ddbe85d705e1550c5172b7878772aa9319c70306"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 9b5771b01052be26b376012a8610c1ae9017a2c1 Mon Sep 17 00:00:00 2001
From: Joakim Holm <joakimholm@protonmail.com>
Date: Mon, 13 Jul 2020 19:03:00 +0200
Subject: [PATCH 2502/4088] New package: mdr-0.2.5

Closes: #19549 [via git-merge-pr]
---
 srcpkgs/mdr/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/mdr/template

diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
new file mode 100644
index 000000000000..338651940611
--- /dev/null
+++ b/srcpkgs/mdr/template
@@ -0,0 +1,16 @@
+# Template file for 'mdr'
+pkgname=mdr
+version=0.2.5
+revision=1
+build_style=go
+go_import_path="github.com/MichaelMure/mdr"
+short_desc="MarkDown Renderer for the terminal"
+maintainer="Joakim Holm <joakimholm@protonmail.com>"
+license="MIT"
+homepage="https://github.com/MichaelMure/mdr"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum="7b8e4aa229094fbc4cb616470ab30b5665aa42d479d33407f95b45a336d2d88f"
+
+post_install() {
+	vlicense LICENSE
+}

From 0ba12e01b7ab5bb4e0856a15865403bbf0d192ea Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 6 Nov 2021 12:19:24 +0100
Subject: [PATCH 2503/4088] yq-go: update to 4.14.1.

---
 srcpkgs/yq-go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 13d483113852..1f495211bcab 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.13.4
+version=4.14.1
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=5d18ce2b2877a42a9765fceb7617f5aae3e0bc4e9f44c3048f9c9928a19bf965
+checksum=294300a8c182c3f8e1f537ad2feebb6d0651f61330f33504bdc502f48992bf84
 
 do_check() {
 	go test -v

From cde5cf8d303af78ab9011f2ed6c774d268f870ed Mon Sep 17 00:00:00 2001
From: "B. Wilson" <x@wilsonb.com>
Date: Mon, 30 Mar 2020 14:29:52 +0900
Subject: [PATCH 2504/4088] New package: hyperrogue-11.3f

Closes: #20454 [via git-merge-pr]
---
 srcpkgs/hyperrogue/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/hyperrogue/template

diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
new file mode 100644
index 000000000000..7f0b8da5750f
--- /dev/null
+++ b/srcpkgs/hyperrogue/template
@@ -0,0 +1,23 @@
+# Template file for 'hyperrogue'
+pkgname=hyperrogue
+version=11.3f
+revision=1
+build_style=gnu-configure
+hostmakedepends="autoconf automake"
+makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
+ SDL_ttf-devel zlib-devel"
+short_desc="SDL rogue-like in a non-euclidean world"
+maintainer="B. Wilson <x@wilsonb.com>"
+license="GPL-2.0-or-later, CC-BY-SA-4.0, CC-BY-SA-3.0, CC-BY-3.0, Public Domain"
+homepage="https://www.roguetemple.com/z/hyper/"
+distfiles="https://github.com/zenorogue/hyperrogue/archive/v${version}.tar.gz"
+checksum=5451b35860c940adc422d455e42d702a76eb6595450e92cb2c0e432cf77ddd9b
+nocross="Generates code from build output that must run on host"
+
+# SDL_gfx-devel headers require that SDL.h be under the header search paths,
+# which are not set correctly by upstream.
+CXXFLAGS+=" -I/usr/include/SDL"
+
+pre_configure() {
+	autoreconf -i
+}

From 9db0878ce0111af069dda5501e9b597897a85c82 Mon Sep 17 00:00:00 2001
From: Phosu Parsons <38191182+phossil@users.noreply.github.com>
Date: Tue, 15 Dec 2020 04:35:30 -0500
Subject: [PATCH 2505/4088] New package: SystemPreferences-1.2.0

Closes: #27250 [via git-merge-pr]
---
 srcpkgs/SystemPreferences/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/SystemPreferences/template

diff --git a/srcpkgs/SystemPreferences/template b/srcpkgs/SystemPreferences/template
new file mode 100644
index 000000000000..0d7881c5f447
--- /dev/null
+++ b/srcpkgs/SystemPreferences/template
@@ -0,0 +1,16 @@
+# Template file for 'SystemPreferences'
+pkgname=SystemPreferences
+version=1.2.0
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="gnustep-make gcc-objc"
+makedepends="gnustep-base-devel gnustep-gui-devel"
+depends="gnustep-base gnustep-gui gnustep-back"
+short_desc="GNUstep preferences application"
+maintainer="Phosu Parsons <founderofjp@gmail.com>"
+license="GPL-2.0-only"
+homepage="http://gnustep.org/experience/systempreferences.html"
+distfiles="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${pkgname}-${version}.tar.gz"
+checksum=690cfd28552c5883fe06a89283f44574f41d937627b41c8435743f07e360e7b9
+nocross="objc doesn't get cross build at present within gcc (see gnustep-base)"

From 4aebc5107197effdb492782912b3fb2849202ae6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:34 +0100
Subject: [PATCH 2506/4088] akonadi-calendar: update to 21.08.3.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 6c7cd6d91bce..56eb4e0b852e 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=4affc8734320f6ffa68da92d54c505d0e90af55d72d1167f66397166325b8c4c
+checksum=4c0be997823732c6cb9408b85ebbfb35f4d8044e139aebe320f627f4e33ef49e
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From afa9cb9a8f3bda5e6977efafe836aa9760f7af6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:35 +0100
Subject: [PATCH 2507/4088] akonadi-contacts: update to 21.08.3.

---
 srcpkgs/akonadi-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 2f2a88df81ce..d959d7309402 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=6faff8beb673b0434c336b4f6183752337c6312fbc5cfd873b957cc04c60e2aa
+checksum=11dd2d592a6f596879f84429d360d4a2b55dd982d0a9e95aad80dc8d9ce4b5c4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From 799ee6f7e672cb4fc9ec0cf44a819dbdfc569b94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:37 +0100
Subject: [PATCH 2508/4088] akonadi-import-wizard: update to 21.08.3.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 454ef2a5e2b3..308d662c0f30 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=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=235b20605cc6e94a5207557482680e7ca54d5e71c84a9a7c4b6a5b426793eb41
+checksum=aaaaedc234e73955ed7780eba5d1df8b30ff2a0dad110900ac64baf89cc0f4ea
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b39f3280cfdb1e5828390d99d43412d326a30b74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:38 +0100
Subject: [PATCH 2509/4088] akonadi-mime: update to 21.08.3.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 70ae74251a13..78e739aa06f0 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=a31b254e82f8096274e2c32a8a0ace98881b2bc36bf7bbe294b18b44bf117b3a
+checksum=c4e0ac666a31ea925bc5e98e528b32ab273d4ba5016a0f7dd49c0392127daba5
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From b6fb05236992e5246c5cfccb370d051c7c1b107b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:40 +0100
Subject: [PATCH 2510/4088] akonadi-notes: update to 21.08.3.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 7c61c370ba0e..79c3f8450a98 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b8d20bcfdb0e2a381b3ca73cc4307754af77f96a7127a871e0146b05547a2964
+checksum=d6818c00f8fc1f693b7019d7dba8d1c764e2c0a08ed0064e4f824a4c246c333c
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 751cd8d250b1afc361e9cd2d4e488668c8fa6d3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:41 +0100
Subject: [PATCH 2511/4088] akonadi-search: update to 21.08.3.

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 5d7a5ca654a2..3050405e96f8 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=c5c22e2307fb9b9b3e4a3bda47c1a3be15bb078f7a7627f6d90cfc91707237a8
+checksum=a0d263e49296fa1f558fa350003cdd458724f93024082ad96ac97f1048686ebb
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 68b3eb9afbdf0d7b6cd3736b890a7d687ad35e45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:43 +0100
Subject: [PATCH 2512/4088] calendarsupport: update to 21.08.3.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index f3ff5065d92e..927a48fbc9b4 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=3312e1c147259822e834ae22365242d1d64dad5304dc2718eb94a4fb31c1f406
+checksum=de798aca4ce24ea0f94c4fec1554ebc835c5414cd40e2d6c1a00708d3aa22ace
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 8bd413beef8ba665f1153a00e351f5332bc2e00b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:44 +0100
Subject: [PATCH 2513/4088] grantleetheme: update to 21.08.3.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 79a4d1e9ca8a..e980554ddb2b 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=b3cd7a22090db107a18c3a7c847e8667f61e6eecb09a87236664211f844aa176
+checksum=63248c5c16d75ecb69a7b535a7695cb8f2dd13139289d406d3f5729fae148785
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 5f03eed163c9f7668dcfa5da3b78228c234d9c7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:45 +0100
Subject: [PATCH 2514/4088] kalarmcal: update to 21.08.3.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 05b3f034245a..5a2070b7c7f8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=30eec408e48cc8ef2a6d0d426cbc037bcfb657827cabf044065fd4b9d657ac75
+checksum=d3f340944fd52f79cfd683dc0c2965c472ecbb2053c042fba9b93ad82fe2f50f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e71e23a93fb6906859a0fe10f275950b58ebaf8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:47 +0100
Subject: [PATCH 2515/4088] kcalutils: update to 21.08.3.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 68aa4eb3bf94..f745d20cae8e 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=dfa9d428501f5a6584f68c10d4210b14cb275d2978cc8d097dabf56fbebe6e4f
+checksum=311be30637868b25d64efe42ac8bd67ecb77c73b7866926f70d51814fd4d4050
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 63ef80bcf91e6cfbbe5bf6b6e04da74f16bd23e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:49 +0100
Subject: [PATCH 2516/4088] kdepim-runtime: update to 21.08.3.

---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index f4df61a636af..8c553521842e 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=98ba9d5bcd53371e6a157e65f8231241fd69c20427059a2ffce00987ccf1f46f
+checksum=5dd700977f1a276ab2e92fa23778bafd61279cc0ee116b9dac8651c52f0242b4
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From c8c08c1e8a89ecaad29858353a301088fa16320b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:50 +0100
Subject: [PATCH 2517/4088] kimap: update to 21.08.3.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index eaaf28ff7f92..50a211662b2d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=5dd42c72f83949293fda98ecb9c2439d4ddd0e9c1a2ecb6af11b83893f49b461
+checksum=352a028f9f01214d6ad9742de73dcd6d3a4d61e073d7653cbb0b3e50fb9bbc87
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From c02a70cc3b99ab7c052492dcc1f3e90f15625fb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:52 +0100
Subject: [PATCH 2518/4088] kldap: update to 21.08.3.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 4a05a93ebe21..4a983026b6cf 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7c7f241675dd768e20f8cd50f74a7c40658efc555af899ee128204cc932589ed
+checksum=a1318c5f4b725b3212bae7caa3249d0896c30710ff1466d85755b3787b9961c9
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 964eb486bc3976f82a857b8b8ce5b2d2821ade21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:54 +0100
Subject: [PATCH 2519/4088] kmail: update to 21.08.3.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 5f6361a43a2c..b21cdb1c91ad 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=e724656303129f2f4dab5f820284a381cc86b6dad662d7b8be0a4adc0f095e71
+checksum=071cc189ca862c7f5462442d44df9fcafc125cfe4f9ed587490e04db8fb2710a

From 73d8d226d1a4eddabeef399ca75d9ee051f7d558 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:56 +0100
Subject: [PATCH 2520/4088] kmail-account-wizard: update to 21.08.3.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 2aa9d9e2c113..002bf4bea165 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=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=2bf9538f3768b8df62fb148fecffdc55ae764309c23a20158885d8e165ba8429
+checksum=097d3a63a6165c10f8f5738677553de5eb20a3d6e9b08283d4abc276e35cdff1

From c7ac221814284bc2dffd7a7304f0db6f0c4e1846 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:57 +0100
Subject: [PATCH 2521/4088] kmailtransport: update to 21.08.3.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 48a9db633912..4370b89a9709 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=bdaf4c209ebfad53050adf19b804dad958dceabc0ffd03585a2ff905ade2e660
+checksum=1c32f02ebc8b07f0ecd9af36111bef8e53fd62f463f5cf4ae70501b25c8dc476
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 4b8aa4541b352d5f97f2aa8f217dd3af6e136910 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:18:59 +0100
Subject: [PATCH 2522/4088] kmbox: update to 21.08.3.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae083fbf770..f27e5a5f687c 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=fec8bf59803a982589b18c866cd013506bc58ab64ae677105a0aff9499e8bb14
+checksum=32042d5d1ec3df940dbbe0c429285daafc6d00a38c88846d81a417586861b3a5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 2394f573aa1f795b50affd151840f9695e90d5de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:00 +0100
Subject: [PATCH 2523/4088] kmime: update to 21.08.3.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b65139eb9cb8..a2e8dce37750 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=e47d6ae33a81d7747a9f6ec823f777e379969c6fec03a4e2911b3f734adde0b5
+checksum=66cfc3fcdffe779ff89fa54955b8d4c2a56caaafe31656508ffe3b48b5b6afae
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 122d56de158eed7677b10706ab0a48e86ce39231 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:01 +0100
Subject: [PATCH 2524/4088] kontactinterface: update to 21.08.3.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index b642276fd04b..4434de10fbca 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=8f5f0b86745273341b9f25bb24eb7bd12fe12894dce0886b47bf940f26655b71
+checksum=52fd92c560ae1eaed5e9ce4058ade1bccae436ce38f04a682474b86699710489
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 97923f4d3d26bdcf8cdb6377f561f7ccb2f0ae6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:03 +0100
Subject: [PATCH 2525/4088] ksmtp: update to 21.08.3.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 4bfaecf07234..2d1e4be33496 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=d00faa4d3d30ccb6e3007c578681403cf7da6fbfcf691b78a25e6d8e87886d21
+checksum=a060b93620a673d05578ffd93b8faa5b003e5069723fc490e7f3b3877e003f36
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ba144054910fb0d1ebccd4bb6943aa32129aa3f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:04 +0100
Subject: [PATCH 2526/4088] ktnef: update to 21.08.3.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 3669f10d19cc..766b376c8ff9 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=17e3e588b3af2bb80f82d85f41e58ffaab9bd5174116820d957854e1d0788416
+checksum=0a6ff64449c9bc67560570572a3db21e7e699d357ee2a5351a65684812f2da6d
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ed0e479170a618b6be85df570d5b1defae5b658d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:06 +0100
Subject: [PATCH 2527/4088] libgravatar: update to 21.08.3.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 76ca55d0c5e0..36a448e6eafd 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=418358a941a6dd5549cc31a2e6e9bf9ec02ad45634d92dec3acb6601645bee10
+checksum=3d5ad62fac06275495a39e602f8a4452123e83d56f905a6bea1bf5ebf2a3225a
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9ecfa082c814a97e0940ad812240e557c08771bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:07 +0100
Subject: [PATCH 2528/4088] libkdepim: update to 21.08.3.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 33b3a53f1eec..64352de8b8d4 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=f0599557a0ca95f7998236d2e05b1321b8832aab688c4bc687ecf6f89f9b16c9
+checksum=6084b80880c4e3ba280fc23f41a9ef5dcb3d6be799519433137222d4be74e69c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From ffa7b229a720e589c1d8bc953e014d5325f81517 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:09 +0100
Subject: [PATCH 2529/4088] libkgapi: update to 21.08.3.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index eb399db07b77..1914ec96b3a9 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -11,7 +11,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=40e95815d7c84edc86748c1ea2dbcb1ca187448af2c9a76460f3e3b12352b68d
+checksum=3a27cfcb988f469aababfe6b94c72fecc3a641c37e372c00c17d955912593e80
 
 do_check() {
 	:

From 6a695e5ed83459c71bfd8b5ed81654754bb25670 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:10 +0100
Subject: [PATCH 2530/4088] libkleo: update to 21.08.3.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 304af6693e1f..31637f463c72 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=02030b82b4ab1a41489fa9ca0cb530540bad7279039fc6e07c45e984a5e8e392
+checksum=3453152fbc56ddde19295321a2d46a26fde4fccfbde47e97a42c6c1858c57e47
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2a63704ffbf9fe5e68fc891d8684e3ec21ad2275 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:12 +0100
Subject: [PATCH 2531/4088] kleopatra: update to 21.08.3.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 567cf16dc24a..06dc4eb9f04c 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c9de8fe61cbdeb61f11be221c526c445fbfeb7016632bd34fa1827ca7b07a4fa
+checksum=7169f71165acc95fc72fc4a694294bf7b9999d785c974982b092f0dcef04f6be
 
 do_check() {
 	dbus-run-session ninja -C build test

From f849cd3b4362d6ed31849a5ba41a4f7aae05dcda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:13 +0100
Subject: [PATCH 2532/4088] libksieve: update to 21.08.3.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 435aa454090a..088c5d8633ce 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=1e84e5b584613eb45aff46bdf34dc6277490a07c4b821457c71eb98a8202abcb
+checksum=8702d58742dc53da2f5627b4c8c2b89fd8876334ba87f8f631c50abcbd88d4ea
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 78d073417017ea6cca04a8bcf181278392c6de3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:15 +0100
Subject: [PATCH 2533/4088] mailcommon: update to 21.08.3.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 4029de89af1f..7ea08d0e1505 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=7f67ff6f21cf7630b40d126bb894f884c281f525db459afd35e9c4e172ff0c34
+checksum=292c2ee359f51daa1f91acacd1bf48bfe6e5bf109c0f976468c2107a11baeb6e
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 7f6041671f787e6ba90a4c05d3bd8919c70b7e0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:16 +0100
Subject: [PATCH 2534/4088] mailimporter: update to 21.08.3.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 7391d799c4b1..073b1d9867bd 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=87d38324b6af3d001006703f912a5ad74ff0a83bed79d109e421f3afe15ba06d
+checksum=4cc8bb67799e1fc208372196783fb50b371afb90ed3fb7aa93fbb0120b217503
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e69b3beb1101705b703773d6d9c1272b7bdbb3c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:19 +0100
Subject: [PATCH 2535/4088] messagelib: update to 21.08.3.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 748a742dae52..0aee864a8dad 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=19fa3efd33cd220cec416f553f944e64127e423d45404412875d9c15c98c5d3f
+checksum=e7ddd8a3ee522a49ac6dfa2dd7055f77033bb331af6cf8445a7ced395fa43561
 
 #TODO: fix build without qca-qt5
 

From 1b560df650ab332a04232ef404d8b6896c482e31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:21 +0100
Subject: [PATCH 2536/4088] pimcommon: update to 21.08.3.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 535f87a90107..ec5a27c81f35 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=8f8324fda5dbc3edf62f2e48f8b92e23a4972c447dcb199d6910f59f6f5f971c
+checksum=748c9286f95c4d602c839514f9949d7984ce9a3f7c1a040fe41973e9ae4e44c2
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6b9081ddf18cb097ff39576018f55658850495ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:22 +0100
Subject: [PATCH 2537/4088] kpimtextedit: update to 21.08.3.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 13509e35b75c..1df47e1ee70d 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f0b0c84c0154259f7eb099e69b645c3c53d8531314e44e8540b02a94d24b876c
+checksum=f0383d43f659c095739a1803b5f06144b5574ba0e810feed0baa58b929dc72a1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 0515c9e4dfccabb2882d2d2b0fb1c7d6e23bc83e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:23 +0100
Subject: [PATCH 2538/4088] kidentitymanagement: update to 21.08.3.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index c1af80922eba..07c46e34a932 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=acf09a276fa2b0e126e82bcbde3ff87e3fd4e23b5b95e6c0aaa0ea2038d05c4d
+checksum=8b519b6ba948735d07b2922e76d430817f0dd5a499cad03cee60577998e0d001
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From cb5d6131cb9462d9c57ee73832c326d570bc3b92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:25 +0100
Subject: [PATCH 2539/4088] akonadi5: update to 21.08.3.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 8de6ecc0eb61..1528453b827b 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.2
+version=21.08.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,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=4203976a5fc3f8737441bcc1a745f3f5651171a1f2572e9e5f5020057193904b
+checksum=1a6f214b08a651a006972dd78d8f2c8746f21d2f266e2ee6b140ce13ed7f14fb
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 2c4c87011cfcae35924f78b6fb7b59ccd341f380 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:27 +0100
Subject: [PATCH 2540/4088] pim-data-exporter: update to 21.08.3.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 2bcc747f8ea0..20890bff24ee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=aea82b27211049de93260bd3e3689c642b9e88dda658b27dfce4b5c9a7332952
+checksum=93536ed1775b43a281c7624df9c0b6c70ebfc81920220b4abfe6f66b209fcf50

From 0b732e8a782590ecb8526f78193e7d923cdc1bbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:52 +0100
Subject: [PATCH 2541/4088] okular: update to 21.08.3.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index a823de33185d..68fabe2aecf7 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=38ad86037dbc844ca07348d9bd353cfa77814cbae26f8273ad4fc3e500197678
+checksum=39b922d2d7c6916025bfceacf8610214cead665369285d7a6904a434fe81f001
 
 do_check() {
 	cd build

From 8aa5685adc397036cc9ab1d847d3f84af053b8a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:19:54 +0100
Subject: [PATCH 2542/4088] libkexiv25: update to 21.08.3.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index a54541a7ed7f..87935f97f770 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.2
+version=21.08.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=6adfeed75f35e956dc602d97c033e15af33241200c7c51b7fdf66693d735ea6a
+checksum=166126f6d42a390afebc8f75b719e0b64fccacab299d52a991d083fbeb68a895
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 0e456cbc325855b80038db0cb14d819ee88e6229 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:13 +0100
Subject: [PATCH 2543/4088] kde5-baseapps: update to 21.08.3.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 57ecf91968fa..cc2fc86c06d5 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=meta
 depends="

From 3ae52e8ba54038ae863355586d3571123a268a60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:24 +0100
Subject: [PATCH 2544/4088] dolphin: update to 21.08.3.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index abce1e0d005c..44c30aeb7dd9 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4256d5077cc83f8025838b59f4dafabb16ed800bcb58761f312f6a8cdcc551a1
+checksum=3b17bfd81dcb04d37810cea0d52d098ce5244289a2eb0173f575291ca97bd9a7
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From 2b822dd2cddc0b93e96ae59a335fe4090f5578d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:25 +0100
Subject: [PATCH 2545/4088] dolphin-plugins: update to 21.08.3.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index d793647a93ee..262b2e81aacc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c72a2ba9fb2199092c8806a9819b3c5706d983db7f763f1962b8933655bde808
+checksum=17686354ee0396567464902babbaf77985cec103d7cc0b0c8a25c5dffc171125

From 036375eea0af6f05811b59c52bf18c9f3f2a6e8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:27 +0100
Subject: [PATCH 2546/4088] khelpcenter: update to 21.08.3.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 35f6eea8ff61..ef98f6503cf3 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=56774ad5a77a9acae39b375e488d2853b0c4797c0fa1a5536dc67bc3ce0f7547
+checksum=d7695b36f0403ff3880055f5cc79de3de9ffc65005b8693d1486e3ee8540c5de
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 5cd2e82d178e92db478d85b5e7bcba3adba2d485 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:30 +0100
Subject: [PATCH 2547/4088] kate5: update to 21.08.3.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 0c749af46dd3..0073d6abd2ff 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.2
+version=21.08.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=d68898759dd2538051124681e5928ef5fb163ca61b6cd8f59ee056cc068ea6b2
+checksum=e23eb09a06e29c273332dedc95f79abb9d070ec749cf9de2178a0c383b07bfbd
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From b233c82443670ffcba2dee55a2a4fd372b903e76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:31 +0100
Subject: [PATCH 2548/4088] konsole: update to 21.08.3.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index c3e339655d15..e2b8b886b8cd 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=2f1284ac12c7f3c05351f0a6004f3504efb4c014ea36426ed1c017a49f7a17d2
+checksum=21f57b47cc89de69cc4184ff9dfac0fd3ced0eac42771ae7a519225dd21300f1
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From 583917c3673a8516e361b4323be2a1ddc48d74d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:33 +0100
Subject: [PATCH 2549/4088] baloo-widgets5: update to 21.08.3.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index a6ad1e90fa5b..55bf1ab825dd 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.2
+version=21.08.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=5d212156b9f39aa4111b7bb0974e1bfcacb90f30d3f9cdd308a6f700f1c668ba
+checksum=8bcd7427e7eb601c0882967f2d2898021aac64d2a881e2966917e21d85e054de
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From a0f8cb5de36e0a5d6c8a3460613f3d1434e11738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:34 +0100
Subject: [PATCH 2550/4088] kio-extras: update to 21.08.3.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 4edd1b75875b..362c315a7787 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=640092d134657feabe87cea79cd1a6caaccd09aa620089289bd461506c62651c
+checksum=42020c10ea1ff595f929d3626cab3dc4f2d41957c069eea449cb5564705aa053

From 4b31f7328dbac92d5dd1298743299f04c6d1a96e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:56 +0100
Subject: [PATCH 2551/4088] ark: update to 21.08.3.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 47019c138e7a..1d5c6e2d483f 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f941c247cd30517a7aa765ed547d98a92d588c4445a7376f99e1f903168bf43
+checksum=671858504c628991bf579b1a20edd822f6bb235b4fced618cf3906a919da3df3
 
 do_check() {
 	cd build

From 327b5f60d4700e9be18f10cd8a4704011d9488fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:57 +0100
Subject: [PATCH 2552/4088] elisa: update to 21.08.3.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 04e2cf379181..c10079aef28e 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=65ecf7e97f2755c202acc914a04d986633fc350648af44787fca2da0763b9193
+checksum=6b0717a67d4b10f21b5e0ab087d7569f996f542c8d3e050b186a4ef844997a70
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From cf4454d71e7fba11d0ea68f90074fb05a56fc634 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:20:59 +0100
Subject: [PATCH 2553/4088] kdeconnect: update to 21.08.3.

---
 srcpkgs/kdeconnect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index fc3a59ad628a..2833420344dd 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.2
+version=21.08.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -19,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=dbfd0eeef729be25b72f238a750d991db5e1fdeab386a0dea55172f00a1dbb25
+checksum=324663336db1000163eae91a63be84b6a614131ed62bd6dd6563639ecd5bdabd
 python_version=3

From 496fdf258f34ee3355bb1485c566edfe9a05fcff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:21:00 +0100
Subject: [PATCH 2554/4088] kdegraphics-thumbnailers: update to 21.08.3.

---
 srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index afdd9c1c2cc2..e4dd289d2b07 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=e2a090b49319aea7dee072a683bffb97a4968f2e8b2586b58e990ae5889dc188
+checksum=e5d9dcc31c53551e79b4ee6024529ec6fbf6282b740df2698877aceae5ac72c1

From 391d95fa51d7e925bf9868d4d1ff37cb0da364d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:21:02 +0100
Subject: [PATCH 2555/4088] knights: update to 21.08.3.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index f726a6bb2c8a..9eb9ee4550bd 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=1f2080d98e57a6bf748e8401ceb52d98232f3e1b6e844158386624fb75b4e26c
+checksum=f162c9337f665508fb4a3f46bdde1f990b164a3cac489cd03c0906a524b2562a

From 5e719fcd3175f2470bd1b9e0e1fe97099dcf35b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:21:03 +0100
Subject: [PATCH 2556/4088] kqtquickcharts: update to 21.08.3.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index e4a32c9bce0f..3072a3c78790 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=164accd3d41ed98601816c0d7f06fa21e8f965aa83ba6f3f39b29e4d11e29d11
+checksum=8a15c5225a47a123efd560095b171e76ee3f08b1efce90002bf2cb75b0b6df4f
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0225d8d8c9ba8adca4cdb5e98d6ed6ad6ab58c12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:21:05 +0100
Subject: [PATCH 2557/4088] libkipi5: update to 21.08.3.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 45820d806cb5..999315eae0dc 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.2
+version=21.08.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=90eb5f3b61b86b766d8c8da181b928d333d0df2dd34418553a3e11db9e52918c
+checksum=6e4f0ff4cc4d34ee0704f866daba8adf2d87be019234d1221e6329eb4fdb128b
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 869905bd2342081fec06d674489516498a9acd74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Nov 2021 22:21:06 +0100
Subject: [PATCH 2558/4088] spectacle: update to 21.08.3.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 71647a6ee88c..799c189db7c3 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=30cb4ac4eccbc8d08818e9506e6b3342e3afa92b2f48af4c4c67d4899d65a954
+checksum=bec40c64c11c930f637b949226e755e527c65708da865f13770434e18b293750

From 2f0d9280fba7309153a59395f672b3583054de8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Nov 2021 22:53:23 +0100
Subject: [PATCH 2559/4088] fcitx: use enchant2.

---
 srcpkgs/fcitx/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 1bcb6bee3523..590f93109621 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,14 +1,16 @@
 # Template file for 'fcitx'
 pkgname=fcitx
 version=4.2.9.8
-revision=4
+revision=5
 build_style=cmake
 build_helper=gir
 configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
  -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF
- -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)"
+ -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)
+ -DENCHANT_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/enchant-2/
+ -DENCHANT_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libenchant-2.so"
 hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel"
-makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
+makedepends="iso-codes gettext-devel enchant2-devel libxml2-devel
  json-c-devel opencc-devel
  libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
 depends="fcitx5-icons fcitx5-chinese-addons-icons"
@@ -37,6 +39,8 @@ pre_configure() {
 	vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \
 		cmake/FcitxConfig.cmake
 
+	vsed -i -e 's;enchant/enchant.h;enchant-2/enchant.h;' cmake/FindEnchant.cmake
+
 	if [ "$CROSS_BUILD" ]; then
 		# use host binaries
 		vsed -i -e 's;${PROJECT_BINARY_DIR}/tools/dev;/usr/lib/fcitx/libexec;' \

From 3699683fa3fa78736d297caefc66a123c3f715a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Nov 2021 22:54:41 +0100
Subject: [PATCH 2560/4088] enchant: removed, obsoleted by enchant2.

Closes #27710.
---
 common/shlibs                                 |  1 -
 srcpkgs/enchant-devel                         |  1 -
 .../enchant/patches/hunspell14_buildfix.diff  | 14 ---------
 srcpkgs/enchant/template                      | 31 -------------------
 4 files changed, 47 deletions(-)
 delete mode 120000 srcpkgs/enchant-devel
 delete mode 100644 srcpkgs/enchant/patches/hunspell14_buildfix.diff
 delete mode 100644 srcpkgs/enchant/template

diff --git a/common/shlibs b/common/shlibs
index 1011051af4d4..9664f48a6514 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -523,7 +523,6 @@ libicuuc.so.69 icu-libs-69.1_1
 libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
-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
 libpackagekit-glib2.so.18 PackageKit-1.1.12_1
diff --git a/srcpkgs/enchant-devel b/srcpkgs/enchant-devel
deleted file mode 120000
index 58fecba7d86d..000000000000
--- a/srcpkgs/enchant-devel
+++ /dev/null
@@ -1 +0,0 @@
-enchant
\ No newline at end of file
diff --git a/srcpkgs/enchant/patches/hunspell14_buildfix.diff b/srcpkgs/enchant/patches/hunspell14_buildfix.diff
deleted file mode 100644
index 0ecdb24b30cf..000000000000
--- a/srcpkgs/enchant/patches/hunspell14_buildfix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru enchant-1.6.0-orig/src/myspell/myspell_checker.cpp enchant-1.6.0/src/myspell/myspell_checker.cpp
---- enchant-1.6.0-orig/src/myspell/myspell_checker.cpp	2016-04-18 12:25:00.094614256 +0100
-+++ enchant-1.6.0/src/myspell/myspell_checker.cpp	2016-04-18 12:26:09.108569576 +0100
-@@ -148,6 +148,10 @@
- 		g_iconv_close(m_translate_out);
- }
- 
-+#ifndef MAXWORDLEN
-+#   define MAXWORDLEN 100
-+#endif
-+
- bool
- MySpellChecker::checkWord(const char *utf8Word, size_t len)
- {
diff --git a/srcpkgs/enchant/template b/srcpkgs/enchant/template
deleted file mode 100644
index 69458ae39180..000000000000
--- a/srcpkgs/enchant/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'enchant'
-pkgname=enchant
-version=1.6.0
-revision=8
-build_style=gnu-configure
-configure_args="--disable-zemberek --disable-ispell --disable-aspell
- --with-myspell-dir=/usr/share/hunspell"
-hostmakedepends="automake libtool pkg-config"
-makedepends="glib-devel hunspell-devel"
-short_desc="Generic spell checking library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="http://www.abisource.com/projects/enchant/"
-distfiles="http://www.abisource.com/downloads/enchant/${version}/enchant-${version}.tar.gz"
-checksum=2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f
-
-pre_configure() {
-	autoreconf -fi
-}
-
-enchant-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/enchant/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
-}

From 049af1c1fa449c6195ae41eb6acde0e5bbae6f24 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 10:14:17 +0100
Subject: [PATCH 2561/4088] linux5.4: update to 5.4.158.

---
 srcpkgs/linux5.4/patches/ppcle-broken-vdso.patch | 14 +++++++-------
 srcpkgs/linux5.4/template                        |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/linux5.4/patches/ppcle-broken-vdso.patch b/srcpkgs/linux5.4/patches/ppcle-broken-vdso.patch
index 38563abaf167..d9a81c40c761 100644
--- a/srcpkgs/linux5.4/patches/ppcle-broken-vdso.patch
+++ b/srcpkgs/linux5.4/patches/ppcle-broken-vdso.patch
@@ -6,12 +6,12 @@ diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso3
 index ce3e7f3e5..7600f9c11 100644
 --- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
 +++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
-@@ -144,7 +144,7 @@ VERSION
-     __kernel_datapage_offset;
-
-     __kernel_get_syscall_map;
+@@ -144,7 +144,7 @@
+ 		__kernel_datapage_offset;
+ 
+ 		__kernel_get_syscall_map;
 -#ifndef CONFIG_PPC_BOOK3S_601
 +#if !defined(__LITTLE_ENDIAN__) && !defined(CONFIG_PPC_BOOK3S_601)
-     __kernel_gettimeofday;
-     __kernel_clock_gettime;
-     __kernel_clock_getres;
+ 		__kernel_gettimeofday;
+ 		__kernel_clock_gettime;
+ 		__kernel_clock_getres;
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 349a62af67dc..3aacd4b5d173 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.156
+version=5.4.158
 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=06fe73e4623fcf1b3c0d0e1983d8286a2ff5b8fffbcb2163f4c01696a1c377fe
+checksum=6e018fecdc8fc24553756e582d83b82d65b10a6b03ef36262a24911f839b8d59
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From e058732631347da7d7a48a0d57602edeaed36b4e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 10:15:43 +0100
Subject: [PATCH 2562/4088] linux4.19: update to 4.19.216.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c79dac80d3d3..def00f83a3b7 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.214
+version=4.19.216
 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=ffe1df2f3e63a7d5f727b28ea2d6ba4a8085db45624873213b7ac6fec8b50844
+checksum=6d6cafaaacf319f546718198205ba75e3a2009f37f0e9764897b2f278bf74833
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From fc7f6ab945e00a39caaa06d0a04253b53c083861 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 10:27:58 +0100
Subject: [PATCH 2563/4088] libvirt: update to 7.9.0.

---
 srcpkgs/libvirt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 9991d3e78af1..2f62efaaf5d5 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.8.0
-revision=2
+version=7.9.0
+revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
  -Dpolkit=enabled"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=a727cd0a47bfa24fa7de2874d23f3a9f9f02ceb6b49ba15288f6d9a098b19921
+checksum=829cf2b5f574279c40f0446e1168815d3f36b89710560263ca2ce70256f72e8c
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From 36f388ba57b517de9938b85d8f8e36f282b34557 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 10:30:25 +0100
Subject: [PATCH 2564/4088] libvirt-python3: update to 7.9.0.

---
 srcpkgs/libvirt-python3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 4924bb423015..1b43577da260 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.8.0
-revision=2
+version=7.9.0
+revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel libvirt-devel libapparmor-devel"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5
+checksum=8535cffa5fbf05185648f9f57a2f71899c3bc12c897d320351c53725a48e5359

From 60015ce2aa2543a34590a795d5cc98d43b23be11 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 12:19:51 +0100
Subject: [PATCH 2565/4088] libgdiplus: update to 6.1.

---
 srcpkgs/libgdiplus/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libgdiplus/template b/srcpkgs/libgdiplus/template
index 494d5dc7cbd7..94c915cae0b1 100644
--- a/srcpkgs/libgdiplus/template
+++ b/srcpkgs/libgdiplus/template
@@ -1,9 +1,8 @@
 # Template file for 'libgdiplus'
 pkgname=libgdiplus
-version=6.0.5
+version=6.1
 revision=1
 build_style=gnu-configure
-configure_args="--with-cairo=system"
 hostmakedepends="pkg-config automake libtool"
 makedepends="tiff-devel cairo-devel giflib-devel glib-devel libexif-devel
  libpng-devel"
@@ -11,8 +10,8 @@ short_desc="Open Source Implementation of the GDI+ API"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="MIT"
 homepage="http://www.mono-project.com/"
-distfiles="https://github.com/mono/${pkgname}/archive/${version}.tar.gz"
-checksum=1fd034f4b636214cc24e94c563cd10b3f3444d9f0660927b60e63fd4131d97fa
+distfiles="https://download.mono-project.com/sources/libgdiplus-1.1/libgdiplus-${version}.tar.gz"
+checksum=97d5a83d6d6d8f96c27fb7626f4ae11d3b38bc88a1726b4466aeb91451f3255b
 
 pre_configure() {
 	autoreconf -fiv

From e4e1613edf4acf0fd9b22fea6fa0ce3129569470 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 12:28:26 +0100
Subject: [PATCH 2566/4088] libkdcraw5: update to 21.08.3.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 3630adfa4380..b97774e4e909 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.2
+version=21.08.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=a83969796b51a68766b290b9ed3ace394952c230cfd79dc2b7f1c57be8cf0c7a
+checksum=06bd50e9a86b637f7c7a8b0c424de7ed66f76df1707ba2d68de1796598b3a83e
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From fa7a8a95e3fd6e867f3bcbb96e103a903dc5ff5f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 12:37:42 +0100
Subject: [PATCH 2567/4088] gwenview: update to 21.08.3.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8a1a3a502514..129f6cc3730e 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -16,4 +16,4 @@ 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=8e2d0576cefd57582c708360161af7fca286b58df1df9ee41f7f9307bcb22f7a
+checksum=04e7bd26c07a87d8fd3baa2792eac5b8a8f58b362dc4e7e272ddc4e735100f1a

From 3788f62eccc93604adb7122662b12251baae8a48 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 16:38:42 +0100
Subject: [PATCH 2568/4088] b3sum: update to 1.2.0.

---
 srcpkgs/b3sum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/b3sum/template b/srcpkgs/b3sum/template
index e21418685b36..4f9b1698bb0b 100644
--- a/srcpkgs/b3sum/template
+++ b/srcpkgs/b3sum/template
@@ -1,6 +1,6 @@
 # Template file for 'b3sum'
 pkgname=b3sum
-version=1.1.0
+version=1.2.0
 revision=1
 wrksrc="BLAKE3-${version}"
 build_wrksrc="b3sum"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CC0-1.0"
 homepage="https://github.com/BLAKE3-team/BLAKE3/"
 distfiles="https://github.com/BLAKE3-team/BLAKE3/archive/${version}.tar.gz"
-checksum=0bfba4ba71a9b04afbaa6bfc45c38e0598ce404e2cc5094b1d4ef45e83db2ca1
+checksum=2873f42f89c0553b7105bda4b3edb93584ba3a163b31bbfae6b6e1bc203ca8c3

From 0b5a7a9aff9cf3f1ff4eb3fcb61776d985329acb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 16:39:41 +0100
Subject: [PATCH 2569/4088] fzf: update to 0.28.0.

---
 srcpkgs/fzf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 8c312d3399a2..c4c869c3e4c9 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.27.3
+version=0.28.0
 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=a0ad8dc6dd5c7a0c87ad623c0d9164cc2861489b76cb7a8b66f51cb4f9a81254
+checksum=05bbfa4dd84b72e55afc3fe56c0fc185d6dd1fa1c4eef56a1559b68341f3d029
 
 post_install() {
 	cd ${wrksrc}

From 049b1df72957ce06d024e68e1232351e668474d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 16:41:26 +0100
Subject: [PATCH 2570/4088] libkdumpfile: update to 0.4.1.

---
 common/shlibs                 | 2 +-
 srcpkgs/libkdumpfile/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9664f48a6514..729fa0354331 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4037,4 +4037,4 @@ libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libavif.so.13 libavif-0.9.3_1
-libkdumpfile.so.8 libkdumpfile-0.4.0_1
+libkdumpfile.so.9 libkdumpfile-0.4.1_1
diff --git a/srcpkgs/libkdumpfile/template b/srcpkgs/libkdumpfile/template
index 3299ae3414f0..3e8de1a72cd3 100644
--- a/srcpkgs/libkdumpfile/template
+++ b/srcpkgs/libkdumpfile/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdumpfile'
 pkgname=libkdumpfile
-version=0.4.0
+version=0.4.1
 revision=1
 build_style=gnu-configure
 configure_args="PYTHON=python3"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/ptesarik/libkdumpfile"
 distfiles="https://github.com/ptesarik/libkdumpfile/archive/refs/tags/v${version}.tar.gz"
-checksum=0bee18de9dfe2dc4c164307df3a5a51f8f8a7cc2452398deb3931182fe1b0a21
+checksum=766bc76a360f269f8bc3e0833e31f142efa1c7dcc4b7036df912bb5f5ef494d6
 
 pre_configure() {
 	autoreconf -fi

From 20cbdce61149ee15dc7a704f7565b1ff24d00703 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 16:41:45 +0100
Subject: [PATCH 2571/4088] python3-drgn: rebuild for libkdumpfile-0.4.1.

---
 srcpkgs/python3-drgn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-drgn/template b/srcpkgs/python3-drgn/template
index f5bd4b72a2e9..9834bd20f034 100644
--- a/srcpkgs/python3-drgn/template
+++ b/srcpkgs/python3-drgn/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-drgn'
 pkgname=python3-drgn
 version=0.0.14
-revision=1
+revision=2
 wrksrc="drgn-${version}"
 build_style=python3-module
 hostmakedepends="automake libtool pkg-config python3-setuptools"

From acd208eeb00627ec9a465c6a3442470e70401bde Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 16:42:35 +0100
Subject: [PATCH 2572/4088] python3-boto3: update to 1.19.9.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 381f66d226e2..ded314aba0b6 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.62
+version=1.19.9
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=983d7e16edd7f396655012e9ca09d25e908c3271403584eed18f1c2d0ca44205
+checksum=7845b16b023410f9b8e2e7ef1e9bfb72f384de4e675f4166ffb5463dfc5d8a0b
 
 post_install() {
 	vlicense LICENSE

From 23940925ac3e501e8c3548aa4ad9930fd6224e29 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 16:51:37 +0100
Subject: [PATCH 2573/4088] babashka: update to 0.6.4.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 4d2c328489ed..f9a5e52f03f3 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.6.2
+version=0.6.4
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=9cd4b8b2eb9db2c1e9000813c58672e08b3957d9
-_babashka_curl_commit=bc021581ad89d70d456175179847abad047aa13c
+_sci_commit=75b9ba73f7c9afca4c8d00023ba71456fac0f4af
+_babashka_curl_commit=2187f908c033da45978512979c53bb53321120ce
 _babashka_nrepl_commit=eadb3330f0a65e781755d8b328727698f1d41fb0
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
 _process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
-_pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=4b53187be2b44ee799cc83c22b83519a1cf34692
-_fs_commit=1f0b8ff14ffce8024a4c2340d74d7998555f2123
+_pods_commit=f360afa6135b8bd2d384d9ba4582c0de6fdac804
+_deps_clj_commit=e3e80c5676e8f4c6e3f674f879afc061f222c0a3
+_fs_commit=d3dfbd6832ba819340f4d494cca3d55b38870cdf
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="a03bff53c1953dd2be34cb141213ffefbb3e73b2a300b1f55e7bc7680cf52515
- 86988afc9f57ebf3c6465a0fb700bba43da03368bf093248f4c87171d9f70ad3
- 83ec20e495efde12dd4cd24e786612f873fa7d627b9dd18e6b241e8d3e83f8dc
+checksum="329d263fa6ac1d8712742aff95c92ece477130c7ab7055124a338e9ae1ebb779
+ 8f07f49c4a6ffb67b5679eafbe5662937dd109ce0559c481c006123a8fef9c44
+ d4efe2c84512c3914d80087a43f9dc8377b4318ab63579959c4488038d6b766b
  916d9cc8c0a3b895a72068b95c6ac985a65d30465a9d556af8acea20aaaacc42
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
  dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
- 9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 0ce3635be4510570d3a9593d8c2b021da2090f4e3279b8401638b4703c25bed1
- 5d5f3159a5c8455f2142fc78c80b1e6d32f942c2eb447767488fe71520194de2"
+ 4070395956fc3cb0c22bac6fb4de1ad27130d24916e1915d8a3fe9eb591f6143
+ cb0f8b0a35df214949a9d6a8cee5bfd35c9dfd6d5f7a0c22fd6bd27a54dbdb3b
+ 3d03aefe44839aa61c9a3db28751d9d9bdf941843d7441a6ff5601c17c4aaec8"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From 232e7e6b2285f1f9a7427f2f12e40d77562ce74c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 16:52:28 +0100
Subject: [PATCH 2574/4088] linux5.10: update to 5.10.78.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index da77cc4c13af..a8c864a9fa2e 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.76
+version=5.10.78
 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=480a09ba1962862ff18df9453fa0df6ba11cbe19eefedeab81bf2c84f49e1890
+checksum=be806c98e222ea581530727a8e83b0b96fcd678afd12944eb530e58776a6050f
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 5dfac3709e2fb8fb1b0fd152b4e6d73d24e290cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 16:56:18 +0100
Subject: [PATCH 2575/4088] netpbm: update to 10.96.03.

---
 srcpkgs/netpbm/files/netpbm-security-code.patch | 12 ------------
 srcpkgs/netpbm/template                         |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch
index 294df11f18d9..408b566ef412 100644
--- a/srcpkgs/netpbm/files/netpbm-security-code.patch
+++ b/srcpkgs/netpbm/files/netpbm-security-code.patch
@@ -158,18 +158,6 @@ diff -up netpbm-10.58.01/converter/pbm/mdatopbm.c.security-code netpbm-10.58.01/
  
      data = pbm_allocarray(nOutCols, nOutRows);
      
-diff -up netpbm-10.58.01/converter/pbm/mgrtopbm.c.security-code netpbm-10.58.01/converter/pbm/mgrtopbm.c
---- netpbm-10.58.01/converter/pbm/mgrtopbm.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/converter/pbm/mgrtopbm.c	2012-04-09 15:40:03.193619915 +0200
-@@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
-     if (head.h_high < ' ' || head.l_high < ' ')
-         pm_error("Invalid width field in MGR header");
-     
-+    overflow_add(*colsP, pad);
-+
-     *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
-     *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
-     *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
 diff -up netpbm-10.58.01/converter/pbm/pbmtogem.c.security-code netpbm-10.58.01/converter/pbm/pbmtogem.c
 --- netpbm-10.58.01/converter/pbm/pbmtogem.c.security-code	2012-04-09 15:31:45.000000000 +0200
 +++ netpbm-10.58.01/converter/pbm/pbmtogem.c	2012-04-09 15:40:03.193619915 +0200
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 5d90924439d1..a1fb5f6d9966 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,9 +1,9 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.96.02
+version=10.96.03
 revision=1
-_githash=4d5728723616f3713725d85df790666e8d75b963
+_githash=54081f1e108cb4a385f951cbc293368829e39320
 _githash_guide=54910a3304543a702b0720c3b9c6d6be4ba12100
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
@@ -16,7 +16,7 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="7b88f49bb1c7cf20ad1ad94ac8d5b6dd1648ababe3a5a70cace704a7fee7f20e
+checksum="b2184c438d2e9e7a7f99123196719b8a1d1d55a7d28607afb4842ba1ab550cbc
  b966580dcf5d72fc6a3cfa6c95d46206b9b4c252ec911e14633113c45cb49626"
 
 post_extract() {

From ef4f814841eb82de18eae4132a69e9de3776befa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 17:03:31 +0100
Subject: [PATCH 2576/4088] chez-scheme: update to 9.5.6.

---
 srcpkgs/chez-scheme/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chez-scheme/template b/srcpkgs/chez-scheme/template
index 276670962370..e2369c47543c 100644
--- a/srcpkgs/chez-scheme/template
+++ b/srcpkgs/chez-scheme/template
@@ -1,7 +1,8 @@
 # Template file for 'chez-scheme'
 pkgname=chez-scheme
-version=9.5.4
+version=9.5.6
 revision=1
+_nanopass_version=1.9.2
 wrksrc="ChezScheme-${version}"
 build_style=gnu-configure
 hostmakedepends="git libX11-devel liblz4-devel libuuid-devel ncurses-devel zlib-devel"
@@ -11,9 +12,9 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://scheme.com/"
 distfiles="https://github.com/cisco/ChezScheme/archive/v${version}.tar.gz
- https://github.com/nanopass/nanopass-framework-scheme/archive/v1.9.1.tar.gz"
-checksum="258a4b5284bb13ac6e8b56acf89a7ab9e8726a90cc57ea1cd71c5da442323840
-92afa571484e58bb0f4baa3e13f7239a116bfb3b5d4585e3c4c7b28fdbdc93c4"
+ https://github.com/nanopass/nanopass-framework-scheme/archive/v${_nanopass_version}.tar.gz"
+checksum="e23c556493f9a661852ea046f3317500feac5f223ea6ef3aa3b9234567e14c0e
+ 46d3ab75f425ef93a6ac31f0b0b2f893b9cb3154219832ad52ea044dd36b021c"
 alternatives="
  scheme:scheme:/usr/bin/chez-scheme
  scheme:scheme.1:/usr/share/man/man1/chez-scheme.1
@@ -43,7 +44,7 @@ post_extract() {
 	sed -i '/git submodule/s/^/: #/' configure
 
 	rmdir nanopass
-	mv ../nanopass-framework-scheme-1.9.1 nanopass
+	mv ../nanopass-framework-scheme-${_nanopass_version} nanopass
 }
 
 do_configure() {

From d99304bdec61905b3ee9577d48dd6046c5e68ec8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 18:06:37 +0100
Subject: [PATCH 2577/4088] public-inbox: update to 1.7.0.

---
 srcpkgs/public-inbox/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/public-inbox/template b/srcpkgs/public-inbox/template
index 88fef050b83a..d95bb6f3a0b2 100644
--- a/srcpkgs/public-inbox/template
+++ b/srcpkgs/public-inbox/template
@@ -1,24 +1,24 @@
 # Template file for 'public-inbox'
 pkgname=public-inbox
-version=1.6.1
+version=1.7.0
 revision=1
 wrksrc="${pkgname}-${version/pre/-pre}"
 build_style=perl-module
-hostmakedepends="git perl perl-DBD-SQLite perl-Danga-Socket
+hostmakedepends="git mdocml perl perl-DBD-SQLite perl-Danga-Socket
  perl-Email-MIME-ContentType perl-Email-Simple perl-Email-Address-XS
  perl-Filesys-Notify-Simple perl-HTTP-Date perl-Inline-C perl-Net-Server
- perl-Plack perl-Plack-Middleware-ReverseProxy
+ perl-Plack perl-Plack-Middleware-ReverseProxy perl-Linux-Inotify2
  perl-Search-Xapian perl-Socket6 perl-TimeDate perl-URI xapian-core"
-makedepends="$hostmakedepends"
-depends="$hostmakedepends"
-checkdepends="$depends curl perl-HTTP-Message perl-Test-SharedFork
- perl-Email-MIME"
+makedepends="${hostmakedepends}"
+depends="${hostmakedepends}"
+checkdepends="${depends} curl perl-Email-MIME perl-HTTP-Message
+ perl-Test-SharedFork"
 short_desc="An 'archives first' approach to mailing lists"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="AGPL-3.0-or-later"
 homepage="https://public-inbox.org/"
 distfiles="https://public-inbox.org/public-inbox.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=099c222622fc425f7490f52cff298238705d294120d54852a78096b031722857
+checksum=8504a998014556e3e65d9bdceeaeb23f966197cea86abf3738b6059fee36c8c9
 
 pre_check() {
 	mkdir -p ~/.public-inbox

From 9007b04b52870241d16a1e9ce15f1dcee4c5e76d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 18:13:02 +0100
Subject: [PATCH 2578/4088] quickjs: move qjsc to quickjs-devel.

Also fix path to libquickjs.a.

Closes #33935.
---
 srcpkgs/quickjs/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index a1c9f8d1c36a..1bfbdb432420 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -1,7 +1,7 @@
 # Template file for 'quickjs'
 pkgname=quickjs
 version=2021.03.27
-revision=2
+revision=3
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
 make_use_env=true
@@ -26,6 +26,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
+	vsed -i -e 's|%s/lib/quickjs|%s/lib|' qjsc.c
 	vsed -i -e '/HOST_CC/s/CFLAGS_OPT/BUILD_CFLAGS/' Makefile
 	cat >>Makefile <<EOF
 CFLAGS += ${CFLAGS}
@@ -43,6 +44,7 @@ quickjs-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		vmove usr/bin/qjsc
 		vmove usr/include
 		vmove usr/lib/*.a
 	}

From c43af570a0266e2b0865b7b9b5d5c68b2d95a7c3 Mon Sep 17 00:00:00 2001
From: Daxot <filohin.pavel@gmail.com>
Date: Sun, 10 Oct 2021 12:57:44 +0300
Subject: [PATCH 2579/4088] New package: nvtop-1.2.2

Closes: #33460 [via git-merge-pr]
---
 srcpkgs/nvtop/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/nvtop/template

diff --git a/srcpkgs/nvtop/template b/srcpkgs/nvtop/template
new file mode 100644
index 000000000000..149fdc8e7d1e
--- /dev/null
+++ b/srcpkgs/nvtop/template
@@ -0,0 +1,14 @@
+# Template file for 'nvtop'
+pkgname=nvtop
+version=1.2.2
+revision=1
+archs="x86_64"
+build_style=cmake
+makedepends="ncurses-devel"
+depends="nvidia"
+short_desc="NVIDIA GPUs htop-like monitoring tool"
+maintainer="Filokhin Pavel <filohin.pavel@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Syllo/nvtop"
+distfiles="https://github.com/Syllo/nvtop/archive/$version/$pkgname-$version.tar.gz"
+checksum=d6ca7f467cc1048ebd1ebf7add753650c5d7c8868752c0c57ed2c85df62f5810

From 3f847088375f7dabfc14465ed5c4488c54fd876c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 17:06:32 +0100
Subject: [PATCH 2580/4088] libtls: update to 3.4.1.

---
 common/shlibs           | 2 +-
 srcpkgs/libtls/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 729fa0354331..32574fa7a0a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3521,7 +3521,7 @@ libmanette-0.2.so.0 libmanette-0.2.1_1
 libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
-libtls.so.20 libtls-3.2.4_1
+libtls.so.22 libtls-3.4.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
 libfstrcmp.so.0 libfstrcmp-0.7.D001_1
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index aeb878bf7b63..3a0922788b7e 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.3.5
+version=3.4.1
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="OpenSSL, ISC"
 homepage="http://www.libressl.org/"
 changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
-checksum=0a51393f0df1cf27e070054a2788a4d073339f363d79cd594076a1b4c48be9a5
+checksum=107ceae6ca800e81cb563584c16afa36d6c7138fade94a2b3e9da65456f7c61c
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 

From 7286ee974eb72d6b9fe7561432a60b8327f2e3e1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 17:06:57 +0100
Subject: [PATCH 2581/4088] catgirl: rebuild for libtls-3.4.1.

---
 srcpkgs/catgirl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index d1bfe1245a94..3316f2ae3633 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,7 +1,7 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.9a
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From 08e78c5eadcf7b572ccf251be9ed8f60cc5c5811 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 17:07:08 +0100
Subject: [PATCH 2582/4088] litterbox: rebuild for libtls-3.4.1.

---
 srcpkgs/litterbox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index 2da0bb435d06..03f412ee709c 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,7 +1,7 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From 5abe3c04f26519c916677624faac0004aaaa2956 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 17:07:19 +0100
Subject: [PATCH 2583/4088] pounce: rebuild for libtls-3.4.1.

---
 srcpkgs/pounce/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 0697f6ded4db..a3a98bfba452 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,7 +1,7 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.5
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From ec237225fbf7a240deeaa54982759882215a63fe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Nov 2021 17:07:29 +0100
Subject: [PATCH 2584/4088] openntpd: rebuild for libtls-3.4.1.

---
 srcpkgs/openntpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 55428ba368a6..17565797cec7 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,7 +1,7 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.8p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"

From d3364a773da258b9af9a7f967cc911cc5f1c477c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 Nov 2021 13:07:35 +0100
Subject: [PATCH 2585/4088] python3-pytest: remove unnecessary dependencies

---
 srcpkgs/python3-pytest/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index 9db1ca76408e..8c907f54b140 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,13 +1,12 @@
 # Template file for 'python3-pytest'
 pkgname=python3-pytest
 version=6.2.5
-revision=2
+revision=3
 wrksrc="pytest-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-Sphinx"
-depends="python3-py python3-packaging python3-attrs python3-more-itertools
- python3-atomicwrites python3-pluggy python3-wcwidth python3-setuptools
- python3-iniconfig python3-toml"
+depends="python3-py python3-packaging python3-attrs python3-pluggy
+ python3-iniconfig python3-toml python3-setuptools"
 checkdepends="$depends python3-argcomplete python3-hypothesis python3-mock
  python3-nose python3-requests python3-parsing python3-xmlschema"
 short_desc="Simple powerful testing with Python 3"

From 002cae2621c07610f4cd365adf3acfbd221475d0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 7 Nov 2021 08:39:38 +0100
Subject: [PATCH 2586/4088] praat: update to 6.1.56

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index f6a1e8c1ebc6..d079df57cdee 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.55
+version=6.1.56
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=100d2dda42556ee816bbec7fd3dd4433987947e1feb5fcc7d58406710ff108f6
+checksum=474056adcc85642645de335a9286375826195559dcc425396bb21d6afc5a05b6
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From 5e67931d02da9fa96bb45574dc75922d92d2f69a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 7 Nov 2021 20:11:33 +0100
Subject: [PATCH 2587/4088] pixman: clean up template

---
 srcpkgs/pixman/template | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 26c65462af60..456e9d1628e8 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -4,9 +4,11 @@ version=0.40.0
 revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
-configure_args="-Dgtk=disabled -Dgnu-inline-asm=enabled -Diwmmxt=disabled"
+# openmp is only used in demos and tests, and things still test without it
+configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
+ -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
-checkdepends="libpng-devel libgomp-devel"
+makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
@@ -17,16 +19,6 @@ checksum=6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
 # set stacksize for musl: https://gitlab.gnome.org/GNOME/librsvg/-/issues/595
 LDFLAGS="-Wl,-z,stack-size=2097152"
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	# libpng and openmp are used only for testing; the make-blue-noise.c file isn't built
-	# https://gitlab.freedesktop.org/pixman/pixman/-/blob/9b49f4e08751885289333fed652bf5e0f45976b4/pixman/dither/make-blue-noise.c
-	configure_args+=" -Dtests=enabled -Dlibpng=enabled -Dopenmp=enabled"
-else
-	# dynamic libgomp is available only when running tests, better to disable explicitly.
-	# -Dtests will only take effect on the next release.
-	configure_args+=" -Dtests=disabled -Dopenmp=disabled"
-fi
-
 post_install() {
 	vlicense COPYING LICENSE
 }

From 426f5ad747baad6b12fded49195f4fa247b6a71a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 19:24:34 +0100
Subject: [PATCH 2588/4088] lxqt-build-tools: update to 0.10.0.

---
 srcpkgs/lxqt-build-tools/template  |  4 ++--
 srcpkgs/lxqt-build-tools/template+ | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/lxqt-build-tools/template+

diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template
index f97ecbaa8f73..8b88c28e20c2 100644
--- a/srcpkgs/lxqt-build-tools/template
+++ b/srcpkgs/lxqt-build-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-build-tools'
 pkgname=lxqt-build-tools
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="BSD-3-Clause"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-build-tools/releases/download/${version}/lxqt-build-tools-${version}.tar.xz"
-checksum=9782878d6c0cc896d4a54fce5cc322561cdf1df270b8f941b2088a434b535e4d
+checksum=facb86b0bf3bd4fd20306d3ae965a148ed59785eaf7d73169a82a97473d03bea
 
 post_install() {
 	vlicense BSD-3-Clause LICENSE
diff --git a/srcpkgs/lxqt-build-tools/template+ b/srcpkgs/lxqt-build-tools/template+
new file mode 100644
index 000000000000..9f8169832bf3
--- /dev/null
+++ b/srcpkgs/lxqt-build-tools/template+
@@ -0,0 +1,17 @@
+# Template file for 'lxqt-build-tools'
+pkgname=lxqt-build-tools
+version=0.10.0
+revision=1
+build_style=cmake
+hostmakedepends="qt5-host-tools qt5-qmake pkg-config"
+makedepends="qt5-devel"
+short_desc="LXQt build tools"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="BSD-3-Clause"
+homepage="https://lxqt.org/"
+distfiles="https://github.com/lxqt/lxqt-build-tools/releases/download/${version}/lxqt-build-tools-${version}.tar.xz"
+checksum=9782878d6c0cc896d4a54fce5cc322561cdf1df270b8f941b2088a434b535e4d
+
+post_install() {
+	vlicense BSD-3-Clause LICENSE
+}

From d8841bc85cc4b49ad1dedccd08de107e0e5afc0b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 19:29:21 +0100
Subject: [PATCH 2589/4088] libqtxdg: update to 3.8.0.

---
 srcpkgs/libqtxdg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index 0db0a08fd9ea..a9c665844f3c 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,6 +1,6 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
-version=3.7.1
+version=3.8.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/libqtxdg/releases/download/${version}/libqtxdg-${version}.tar.xz"
-checksum=477cbe76b3305071ff5f5bfa31dbcddcc51f3434b9ed75d91988219296d88a9b
+checksum=ce824fb2dda47758b44e57e8e4b63437a5bc5bd476cf37dbba61442990d7ccec
 
 libqtxdg-devel_package() {
 	short_desc+=" - development files"

From a9c59ad19d788c81b4925eaf54a057d04c3f0c5b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 19:37:53 +0100
Subject: [PATCH 2590/4088] liblxqt: update to 1.0.0.

---
 common/shlibs            | 2 +-
 srcpkgs/liblxqt/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 32574fa7a0a7..8be459b7fe04 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2181,7 +2181,7 @@ libuecc.so.0 libuecc-5_1
 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
 libLayerShellQtInterface.so.5 layer-shell-qt-5.21.90_1
-liblxqt.so.0 liblxqt-0.9.0_1
+liblxqt.so.1 liblxqt-1.0.0_1
 liblxqt-globalkeys.so.0 lxqt-globalkeys-0.9.0_1
 liblxqt-globalkeys-ui.so.0 lxqt-globalkeys-0.9.0_1
 libenet.so.7 libenet-1.3.12_1
diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template
index 5e1048909cb7..c39a0398f965 100644
--- a/srcpkgs/liblxqt/template
+++ b/srcpkgs/liblxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'liblxqt'
 pkgname=liblxqt
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/liblxqt/releases/download/${version}/liblxqt-${version}.tar.xz"
-checksum=d44e3b4c0963537d5032328ac29bb0d61d454dc28d0fac7e1ddcb9d7be91c32b
+checksum=d62820a94839637aedd6a0ceecc232f85d8ccd2173d4ec655cd92c9cbcbcc98c
 
 liblxqt-devel_package() {
 	short_desc+=" - development files"

From b9790db0632653b99385b2490fc3bdad78fbd045 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 19:49:10 +0100
Subject: [PATCH 2591/4088] libsysstat: update to 0.4.6.

---
 srcpkgs/libsysstat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libsysstat/template b/srcpkgs/libsysstat/template
index f0a847453ca7..71cd9d7f9a6a 100644
--- a/srcpkgs/libsysstat/template
+++ b/srcpkgs/libsysstat/template
@@ -1,6 +1,6 @@
 # Template file for 'libsysstat'
 pkgname=libsysstat
-version=0.4.5
+version=0.4.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/libsysstat/releases/download/${version}/libsysstat-${version}.tar.xz"
-checksum=f19b6550d78939cc1ad11c5788e2a7293f7f886d037837cd1cf56ebcdf2b5ed2
+checksum=e6c6383d6d6e0e67791be812329cb245035eed35e201e01088515e3ffefb13be
 replaces="lxde-libsysstat>=0"
 
 libsysstat-devel_package() {

From 864eefe9874c5f1c497b85563b3c49b5cfa3ebbd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:04:51 +0100
Subject: [PATCH 2592/4088] libfm-qt: update to 1.0.0.

---
 common/shlibs             | 2 +-
 srcpkgs/libfm-qt/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8be459b7fe04..82aedede5de4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1977,7 +1977,7 @@ 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.9 libfm-qt-0.17.0_1
+libfm-qt.so.10 libfm-qt-1.0.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
 libQt6Core.so.6 qt6-core-6.0.0_1
 libQt6OpenGL.so.6 qt6-gui-6.0.0_1
diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template
index acb198f17cd8..9b2009242a83 100644
--- a/srcpkgs/libfm-qt/template
+++ b/srcpkgs/libfm-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'libfm-qt'
 pkgname=libfm-qt
-version=0.17.1
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 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=aa3f8f4d8035d106ed80e0b0ae5fced5ad61d4dac3f960392f3a71fb42a521a5
+checksum=743d9c8fc30d065d7fefc12e72f31085891733184f1320ba3ade890dae54993b
 replaces="libfm-qt5>=0"
 
 libfm-qt-devel_package() {

From b4a305e16862a6c620cdf144fa2420b805e7db03 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:06:13 +0100
Subject: [PATCH 2593/4088] lxqt-themes: update to 1.0.0.

---
 srcpkgs/lxqt-themes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template
index 80e21761371d..01038f959c5d 100644
--- a/srcpkgs/lxqt-themes/template
+++ b/srcpkgs/lxqt-themes/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-themes'
 pkgname=lxqt-themes
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools perl"
@@ -10,5 +10,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-themes/releases/download/${version}/lxqt-themes-${version}.tar.xz"
-checksum=3ff1960f593ffb591ebf8ce48a54953f30e6f7fac4880ad6eb1dbe9ecd67bb4e
+checksum=e3a6c96311bbf471ce0af72953b2f34ecf15461ab5e57a6f5b924de41758562b
 replaces="lxqt-common>=0"

From 2b1e11427e0d8ae909c8744157c2abcfb4da5b61 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:09:32 +0100
Subject: [PATCH 2594/4088] lxqt-qtplugin: update to 1.0.0.

---
 srcpkgs/lxqt-qtplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template
index 947ad4a5ce10..8148c7119f10 100644
--- a/srcpkgs/lxqt-qtplugin/template
+++ b/srcpkgs/lxqt-qtplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-qtplugin'
 pkgname=lxqt-qtplugin
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel"
@@ -10,4 +10,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-qtplugin/releases/download/${version}/lxqt-qtplugin-${version}.tar.xz"
-checksum=65ef1156eb3257bd875e944963968585b042262d6b673ec6506d8fe7fa528691
+checksum=8e789430e1f3b6a354f61d496440a59b797f699320bb8c001d8ef7ac8e1db05e

From 6897fc1ea07e68088237621cfb72a5c0712bc256 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:13:46 +0100
Subject: [PATCH 2595/4088] pavucontrol-qt: update to 1.0.0.

---
 srcpkgs/pavucontrol-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template
index ff9ded52f453..2faef3430dc0 100644
--- a/srcpkgs/pavucontrol-qt/template
+++ b/srcpkgs/pavucontrol-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'pavucontrol-qt'
 pkgname=pavucontrol-qt
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/pavucontrol-qt/releases/download/${version}/pavucontrol-qt-${version}.tar.xz"
-checksum=6c274cd3a80a699c4b3f4dbf4eccaef3fafdc677c6240e2b45672bafe46da170
+checksum=2407aa55a2d3dc0fdc7074b461c02b97fd455514fbbf9f5b711e68fadd45ac69

From 26341afc6c2938ef9ffbe9fa3e601c57b73b8ab7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:18:51 +0100
Subject: [PATCH 2596/4088] qtermwidget: update to 1.0.0.

---
 common/shlibs                | 2 +-
 srcpkgs/qtermwidget/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 82aedede5de4..d1a68aa29ba9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1978,7 +1978,7 @@ 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.10 libfm-qt-1.0.0_1
-libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libqtermwidget5.so.1 qtermwidget-1.0.0_1
 libQt6Core.so.6 qt6-core-6.0.0_1
 libQt6OpenGL.so.6 qt6-gui-6.0.0_1
 libQt6DBus.so.6 qt6-dbus-6.0.0_1
diff --git a/srcpkgs/qtermwidget/template b/srcpkgs/qtermwidget/template
index 0d792066f4a0..938f79879735 100644
--- a/srcpkgs/qtermwidget/template
+++ b/srcpkgs/qtermwidget/template
@@ -1,6 +1,6 @@
 # Template file for 'qtermwidget'
 pkgname=qtermwidget
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/qtermwidget/releases/download/${version}/qtermwidget-${version}.tar.xz"
-checksum=4e04b2fb71d7382266a1ea168bf02d1283e04df6127a42f760a30389cb219b82
+checksum=2af0e9f212932cb36bbbf20722eaf4a1d3acf640dfed9b763ca7d388af8b7fd2
 
 qtermwidget-devel_package() {
 	short_desc+=" - development files"

From 23b7533115018365bd9c65d8359201e70f2b92dd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:27:50 +0100
Subject: [PATCH 2597/4088] octoxbps: rebuild against qtermwidget-1.0.0

---
 srcpkgs/octoxbps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index 135429b01176..fef8bb3ab323 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,7 +1,7 @@
 # Template file for 'octoxbps'
 pkgname=octoxbps
 version=0.3.0
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-declarative-devel qtermwidget-devel"

From 589f3162b78998458f4c9fcedffa843dfd6c9076 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:33:55 +0100
Subject: [PATCH 2598/4088] lximage-qt: update to 1.0.0.

---
 srcpkgs/lximage-qt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lximage-qt/template b/srcpkgs/lximage-qt/template
index f9033e6950a4..b64d2568b9d4 100644
--- a/srcpkgs/lximage-qt/template
+++ b/srcpkgs/lximage-qt/template
@@ -1,14 +1,14 @@
 # Template file for 'lximage-qt'
 pkgname=lximage-qt
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="qt5-x11extras-devel qt5-tools-devel qt5-svg-devel libfm-qt-devel
- libexif-devel libX11-devel"
+ libexif-devel libX11-devel libXfixes-devel"
 short_desc="LXQt image viewer"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lximage-qt/releases/download/${version}/lximage-qt-${version}.tar.xz"
-checksum=2e284f3f42506d5b6df6091982d24e1dc41c99c838037939844f70d703d1d03c
+checksum=04fdff9d0d20dbfeddca2ca8166f7dd14b691badb6ca65909ca8bce75c4a7225

From 673112a061dfff20a31b2f11991ae788e5b86a1a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:36:57 +0100
Subject: [PATCH 2599/4088] lxqt-about: update to 1.0.0.

---
 srcpkgs/lxqt-about/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-about/template b/srcpkgs/lxqt-about/template
index 94a7a2c8b5a8..4103f1a6038e 100644
--- a/srcpkgs/lxqt-about/template
+++ b/srcpkgs/lxqt-about/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-about'
 pkgname=lxqt-about
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -10,4 +10,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-about/releases/download/${version}/lxqt-about-${version}.tar.xz"
-checksum=f5033a4eb339f64de5b0eea32ee9178ab06aad6b60fd428fc196add785c33113
+checksum=1c14f68bf65099fbd46b062ffc6c92656620aa1a9eec5a0fd2d1b11888939203

From 81e22743e83d31c6561bf4328c539bea18d2a21c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:41:27 +0100
Subject: [PATCH 2600/4088] lxqt-admin: update to 1.0.0.

---
 srcpkgs/lxqt-admin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-admin/template b/srcpkgs/lxqt-admin/template
index 0374d69117ff..9bf02478a149 100644
--- a/srcpkgs/lxqt-admin/template
+++ b/srcpkgs/lxqt-admin/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-admin'
 pkgname=lxqt-admin
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-admin/releases/download/${version}/lxqt-admin-${version}.tar.xz"
-checksum=83485e4cf8d61861711934ca4e41b0a90cd03528dbc3b0f5ffb2bb5bffb0d31d
+checksum=f6eebb0da1563f14e9e4d39d3ff2622ee1c8ffa5b130ba26321cfe5261c1411e
 
 post_install() {
 	# depends on systemd-{timedated,timesyncd}

From 5eafb00d3b1a73fb3e9d356ebd44f49eb0b37b32 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:45:35 +0100
Subject: [PATCH 2601/4088] lxqt-archiver: update to 0.5.0.

---
 srcpkgs/lxqt-archiver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-archiver/template b/srcpkgs/lxqt-archiver/template
index 632f90508432..5a5dd96932b2 100644
--- a/srcpkgs/lxqt-archiver/template
+++ b/srcpkgs/lxqt-archiver/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-archiver'
 pkgname=lxqt-archiver
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools pkg-config qt5-host-tools qt5-qmake perl"
@@ -10,4 +10,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org"
 distfiles="https://github.com/lxqt/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=9f8c00b517771d99ceaf05ff7d72609580def47aae13842b461d9eecd9c1ef3b
+checksum=8ae5259ec00761b1f178e54b9e99bcf64685a6000a148501c4bbe862b4b08fc7

From ebed4bb778f6893a53508a3d68637f26cb3a471e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 20:55:22 +0100
Subject: [PATCH 2602/4088] lxqt-config: update to 1.0.0.

---
 srcpkgs/lxqt-config/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template
index 8f0743a84c2a..c38f2486029f 100644
--- a/srcpkgs/lxqt-config/template
+++ b/srcpkgs/lxqt-config/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-config'
 pkgname=lxqt-config
-version=0.17.1
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkgconf lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-config/releases/download/${version}/lxqt-config-${version}.tar.xz"
-checksum=23c1c9a3aa3bf3537b3433439501463ea3e29950ecf2381679bf30ef4c1b245b
+checksum=64d7dd43e5ec1f98f0ba41e99f4438bb1f881fcbc2b2931f798cc82643c2d8a5

From 7505bd4df6659a77dcd152d16a98d3417218c8d6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:02:01 +0100
Subject: [PATCH 2603/4088] lxqt-globalkeys: update to 1.0.0.

---
 common/shlibs                    | 4 ++--
 srcpkgs/lxqt-globalkeys/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d1a68aa29ba9..330255fcde56 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2182,8 +2182,8 @@ libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
 libLayerShellQtInterface.so.5 layer-shell-qt-5.21.90_1
 liblxqt.so.1 liblxqt-1.0.0_1
-liblxqt-globalkeys.so.0 lxqt-globalkeys-0.9.0_1
-liblxqt-globalkeys-ui.so.0 lxqt-globalkeys-0.9.0_1
+liblxqt-globalkeys.so.1 lxqt-globalkeys-1.0.0_1
+liblxqt-globalkeys-ui.so.1 lxqt-globalkeys-1.0.0_1
 libenet.so.7 libenet-1.3.12_1
 librrd.so.8 rrdtool-1.6.0_1
 librrd_th.so.4 rrdtool-1.4.9_1
diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template
index 36af9f79bac3..b2e58f2695f5 100644
--- a/srcpkgs/lxqt-globalkeys/template
+++ b/srcpkgs/lxqt-globalkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-globalkeys'
 pkgname=lxqt-globalkeys
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-globalkeys/releases/download/${version}/lxqt-globalkeys-${version}.tar.xz"
-checksum=90c409e95efefb2ee87e99504b955a2a84d4404157d2c1b7b7992b0571c4de5e
+checksum=a90923328a660a5d49f6e51df983213b8c152a8148a49f2eaa2965d3bed92594
 replaces="lxqt-common>=0"
 
 lxqt-globalkeys-devel_package() {

From 2bdcbaa4ef6126ce8d6863fe0885d36e0b157b48 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:05:50 +0100
Subject: [PATCH 2604/4088] lxqt-notificationd: update to 1.0.0.

---
 srcpkgs/lxqt-notificationd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-notificationd/template b/srcpkgs/lxqt-notificationd/template
index fecec344570f..0158f56a3364 100644
--- a/srcpkgs/lxqt-notificationd/template
+++ b/srcpkgs/lxqt-notificationd/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-notificationd'
 pkgname=lxqt-notificationd
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -10,5 +10,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-notificationd/releases/download/${version}/lxqt-notificationd-${version}.tar.xz"
-checksum=d392cac3d7300a6b8be3431fdde37f453ac439b6fd52b39e6bdeba9ad7a1cab7
+checksum=94c10fd904995d3eea3b587dd521ed01b839d863ff80205af0af8cab6cb2a660
 replaces="lxqt-common>=0"

From 8b41acc921d6a7a50161c91d751522ceafa0cc72 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:08:39 +0100
Subject: [PATCH 2605/4088] lxqt-openssh-askpass: update to 1.0.0.

---
 srcpkgs/lxqt-openssh-askpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template
index 89163894c72a..57fe03004c15 100644
--- a/srcpkgs/lxqt-openssh-askpass/template
+++ b/srcpkgs/lxqt-openssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-openssh-askpass'
 pkgname=lxqt-openssh-askpass
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -11,5 +11,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-openssh-askpass/releases/download/${version}/lxqt-openssh-askpass-${version}.tar.xz"
-checksum=19322332443151ceadc24f4eea12188eb7dd08c77fb0f41dcd6ee92018f2ac3d
+checksum=9de22a06646cfa50b0ddeef26ac87b510f820501ff8832dc80c7d88a55d878b5
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass"

From 0efb30549e4de037c141b4691b2bfd954992710d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:12:24 +0100
Subject: [PATCH 2606/4088] lxqt-policykit: update to 1.0.0.

---
 srcpkgs/lxqt-policykit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-policykit/template b/srcpkgs/lxqt-policykit/template
index 37469c1157b6..ef972dba1961 100644
--- a/srcpkgs/lxqt-policykit/template
+++ b/srcpkgs/lxqt-policykit/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-policykit'
 pkgname=lxqt-policykit
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools polkit-qt5-devel perl"
@@ -10,5 +10,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-policykit/releases/download/${version}/lxqt-policykit-${version}.tar.xz"
-checksum=915e6b87966f11d70ef8dfe8a9027e6a1bcac7920a64946be7e721203a942b85
+checksum=8e3ae58196c55c28a5a231f44154a83d6697aa5f6b40dffdedb6b9ea776b4d35
 replaces="lxqt-common>=0"

From 2e01456cd82ca9df89cd6e7850396ecbb6b20892 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:16:47 +0100
Subject: [PATCH 2607/4088] lxqt-session: update to 1.0.0.

---
 srcpkgs/lxqt-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template
index 88c301d98955..f78ed075f418 100644
--- a/srcpkgs/lxqt-session/template
+++ b/srcpkgs/lxqt-session/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-session'
 pkgname=lxqt-session
-version=0.17.1
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs
@@ -12,5 +12,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-session/releases/download/${version}/lxqt-session-${version}.tar.xz"
-checksum=d9058ceedb355a43ea2ef070292fc30b0fb740640cf0b579131aaefbac779c47
+checksum=5ad5f810907db7ecfc98f3c562d6df1b04d1d532fc7f8fa953e7b057bc442ac5
 replaces="lxqt-common>=0"

From 8ef536f46de16a9a247e9a47b7da29cad744399e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:19:40 +0100
Subject: [PATCH 2608/4088] lxqt-sudo: update to 1.0.0.

---
 srcpkgs/lxqt-sudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-sudo/template b/srcpkgs/lxqt-sudo/template
index 439eb1030403..88b8389b1968 100644
--- a/srcpkgs/lxqt-sudo/template
+++ b/srcpkgs/lxqt-sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-sudo'
 pkgname=lxqt-sudo
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-sudo/releases/download/${version}/lxqt-sudo-${version}.tar.xz"
-checksum=2c42a8f6a92c8f164ceb040149a55a50db1743262cefcfe4940f5cee4145430b
+checksum=6072f6914942fff5884388be9c7c5d38d259fed14358c4c2a9103d0cdd0a43f0

From 2e19bc92bfcbf38a4a6f9fd4d4d3092c10da47de Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:24:44 +0100
Subject: [PATCH 2609/4088] pcmanfm-qt: update to 1.0.0.

---
 srcpkgs/pcmanfm-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template
index ef38beab392f..fc09b2987170 100644
--- a/srcpkgs/pcmanfm-qt/template
+++ b/srcpkgs/pcmanfm-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'pcmanfm-qt'
 pkgname=pcmanfm-qt
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel perl"
@@ -11,5 +11,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.lxqt.org"
 distfiles="https://github.com/lxqt/pcmanfm-qt/releases/download/${version}/pcmanfm-qt-${version}.tar.xz"
-checksum=74acbf55cdb22bd4d0068ef22ba298254ce6de72374624fcf3087c016d3bbaab
+checksum=fa45cc0d3e870db3fb56f474e854aa1284576023082b770b3e4a44410f22cce3
 replaces="lxqt-common>=0"

From abdd5916a735e191c9e8d703a69cf9cedbe21ed9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:29:42 +0100
Subject: [PATCH 2610/4088] qterminal: update to 1.0.0.

---
 srcpkgs/qterminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qterminal/template b/srcpkgs/qterminal/template
index 93e8b8263f8a..079c89b00a15 100644
--- a/srcpkgs/qterminal/template
+++ b/srcpkgs/qterminal/template
@@ -1,6 +1,6 @@
 # Template file for 'qterminal'
 pkgname=qterminal
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/qterminal/releases/download/${version}/qterminal-${version}.tar.xz"
-checksum=a9859876205940566519e763f6fb33c3109e044dd0461615d20e55668d3adb65
+checksum=f169a5279ae5afe386ec3016385c7692b551fea1bae639a8ae438ec90165a643

From 6fb44909a53a1d1d060f149be35221a246d0f633 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:42:22 +0100
Subject: [PATCH 2611/4088] lxqt-panel: update to 1.0.0.

---
 srcpkgs/lxqt-panel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template
index 27bed23be287..f486e3e3a258 100644
--- a/srcpkgs/lxqt-panel/template
+++ b/srcpkgs/lxqt-panel/template
@@ -1,16 +1,16 @@
 # Template file for 'lxqt-panel'
 pkgname=lxqt-panel
-version=0.17.1
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="libxkbcommon-devel liblxqt-devel ksolid-devel kguiaddons-devel
  lxqt-globalkeys-devel alsa-lib-devel pulseaudio-devel libstatgrab-devel
  libsensors-devel libXcomposite-devel libsysstat-devel libdbusmenu-qt5-devel
- libqtxdg-devel"
+ libqtxdg-devel libXdamage-devel"
 short_desc="LXQt desktop panel"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-panel/releases/download/${version}/lxqt-panel-${version}.tar.xz"
-checksum=1830fb5a595495176eed61cb0fc9d5535e3954ed6b8f04a741a4295883764ccc
+checksum=ea63939c557fa639d2ab3fae48341c1a59ae8baae1a79d11f15e4bc0e38468d5

From de242a7b41347d2bc9aefb0535a2760af5f37528 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:46:45 +0100
Subject: [PATCH 2612/4088] lxqt-powermanagement: update to 1.0.0.

---
 srcpkgs/lxqt-powermanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template
index e68666dddab4..f7c8b8d85e8f 100644
--- a/srcpkgs/lxqt-powermanagement/template
+++ b/srcpkgs/lxqt-powermanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-powermanagement'
 pkgname=lxqt-powermanagement
-version=0.17.1
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -10,4 +10,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-powermanagement/releases/download/${version}/lxqt-powermanagement-${version}.tar.xz"
-checksum=93e14720571c6c9f30abb507df3cf0249e69824c0ca374fefd1f688614ead202
+checksum=c0a444faeed60337c966bfd562e65e936f132f578762c2f01f136038a3f058ee

From 580b7c83315a4c9d6251a310462b0e50cc8d2bc1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:51:56 +0100
Subject: [PATCH 2613/4088] lxqt-runner: update to 1.0.0.

---
 srcpkgs/lxqt-runner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-runner/template b/srcpkgs/lxqt-runner/template
index 73bda4373292..e85e2f5a7602 100644
--- a/srcpkgs/lxqt-runner/template
+++ b/srcpkgs/lxqt-runner/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-runner'
 pkgname=lxqt-runner
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -10,4 +10,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-runner/releases/download/${version}/lxqt-runner-${version}.tar.xz"
-checksum=24a68c50961e1157aabdb9a3899727f50012b77e401c15447c9bdc3af792a358
+checksum=24daa86680ef78daf8753b60b3a0c6df391e760b851796a0abeddeed61ae13b9

From 77093a536024cbb6f31beb1637b1e82f9a4f9066 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Nov 2021 21:54:32 +0100
Subject: [PATCH 2614/4088] libvirt: broken on armv7l-musl for now

---
 srcpkgs/libvirt/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 2f62efaaf5d5..0ff0509b90f4 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -33,6 +33,9 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 case "$XBPS_TARGET_MACHINE" in
+	armv7l-musl)
+		broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/36531/steps/shell_3/logs/stdio"
+		;;
 	*-musl) ;;
 	*)
 		# LTO apparently causes the linker to confuse the glibc symbol

From c86465e1bdebb52eb9e805d445d8e76537e3336e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 Nov 2021 18:53:12 +0100
Subject: [PATCH 2615/4088] mirage: update to 0.11.1.

---
 srcpkgs/mirage/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/mirage/template b/srcpkgs/mirage/template
index d2baca9ed8c5..2562d4a23a87 100644
--- a/srcpkgs/mirage/template
+++ b/srcpkgs/mirage/template
@@ -1,14 +1,14 @@
 # Template file for 'mirage'
 pkgname=mirage
-version=0.9.5.2
-revision=2
-build_style="python2-module"
-hostmakedepends="gettext python-devel pygtk-devel"
-makedepends="python-devel pygtk-devel"
-depends="pygtk desktop-file-utils"
-short_desc="Simple GTK+ image viewer"
+version=0.11.1
+revision=1
+build_style="python3-module"
+hostmakedepends="python3-setuptools gettext glib-devel"
+makedepends="python3-devel libX11-devel"
+depends="python3-gobject gtk+3 libgexiv2"
+short_desc="Simple GTK image viewer"
 maintainer="Sergei Akhmatdinov <sakhmatd@riseup.net>"
 license="GPL-3.0-only"
-homepage="http://mirageiv.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/mirageiv.berlios/${pkgname}-${version}.tar.bz2"
-checksum=d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c
+homepage="https://gitlab.com/thomasross/mirage"
+distfiles="https://gitlab.com/thomasross/mirage/-/archive/$version/mirage-$version.tar.gz"
+checksum=3d8cce3d0cd98f48c7e280f10cdce71ff7e18fd366758aaa8cba15b7bba8c866

From ac35674ed3621cdf8be12f4b82cc32d4676057a1 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 8 Nov 2021 00:04:53 +0100
Subject: [PATCH 2616/4088] terraform: update to 1.0.10.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index b23f18007919..3d0e141d5721 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.8
+version=1.0.10
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b12daf73d366e11fdceec78479613703e123712bb06abd8a2006931a667d5459
+checksum=53b85c17258c134987ed67b61be10a9b5186aa1a0f1942a57ed21785186cbcd3

From edce7f5e15c3707ebded228149356d39046de51f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 8 Nov 2021 00:06:42 +0100
Subject: [PATCH 2617/4088] terragrunt: update to 0.35.6.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 3188caf25b6e..7511ab6b969c 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.35.5
+version=0.35.6
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=b6c221311a2092b61f281e448d6e0ce7e953c3e2cb0deab646bf4f68884f30d7
+checksum=c9166789a1645f5595e4ea4f56ac9fbaa0087e8bbc4d80c6913325edb4e05faf
 
 post_install() {
 	vlicense LICENSE.txt

From 92fdaa7c8c8df4ed6753f5a9fa40ea567509d38b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 8 Nov 2021 00:09:35 +0100
Subject: [PATCH 2618/4088] hugo: update to 0.89.1.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index e21dc9634025..d2765c6722db 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.89.0
+version=0.89.1
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=0fbee83dd04927b6c467caad245cf3159463c5114e0624edc1536f75e4c6cf17
+checksum=c47f144291819a8d9f065f69ab290a198dfabde86a27ac2325a89f03c6e5ea3f
 
 post_install() {
 	vdoc README.md

From 26af5d6d88c3275e85cd085d2ae2cc1550de753f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 8 Nov 2021 00:13:59 +0100
Subject: [PATCH 2619/4088] flannel: update to 0.15.1.

---
 srcpkgs/flannel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index a3687a26ad7f..2910e01e56a1 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,6 +1,6 @@
 # Template file for 'flannel'
 pkgname=flannel
-version=0.14.0
+version=0.15.1
 revision=1
 build_style=go
 short_desc="Etcd backed network fabric for containers"
@@ -10,7 +10,7 @@ license="Apache-2.0"
 go_import_path="github.com/coreos/flannel"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v${version}.tar.gz"
-checksum=e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca
+checksum=d882df8b2389dbb3c41f8d3eb026836c6d17c35de5db9ee9c95b08335af1463d
 
 post_extract() {
 	ln -s $wrksrc vendor/$go_import_path

From db2d038f7de1a9e17d5bff59fa087db1270006df Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 8 Nov 2021 00:15:11 +0100
Subject: [PATCH 2620/4088] docker-cli: update to 20.10.10.

---
 srcpkgs/docker-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 62f52b9d91e9..18aecd2486da 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-cli'
 pkgname=docker-cli
-version=20.10.9
+version=20.10.10
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.docker.com"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=d91010813824070dd2380013c8f343e61e6dda170f7853f024bda39b432b64ba
+checksum=9cbae9cf1593063813ccbf7462b1cfeea14dea609708cc4ff2f92696c912d9f4
 system_groups="docker"
 
 pre_build() {

From f05e3d582b16afd96f6f419de2a569edd3eb2071 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 7 Nov 2021 18:23:02 -0500
Subject: [PATCH 2621/4088] chezmoi: update to 2.7.5.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index f97aed9b70eb..b3305a56ea10 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.7.4
+version=2.7.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=71cdf60840a1674e929f9faa5220e0175077f5a6e72b58dcc5d1b17596aa3ae2
+checksum=ed9de88a851cbbb2acce77e13615fe45a19350112f58d9acc268b2ff4961d8ab
 
 export CGO_ENABLED=1
 

From 84ac48c4a782db883ef8d5e744e1a632c38fb760 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 8 Nov 2021 08:27:32 +0100
Subject: [PATCH 2622/4088] lxqt: update to 1.0.0.

---
 srcpkgs/lxqt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template
index 45b99159daad..a510106d65db 100644
--- a/srcpkgs/lxqt/template
+++ b/srcpkgs/lxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt'
 pkgname=lxqt
-version=0.17.0
+version=1.0.0
 revision=1
 build_style=meta
 depends="

From 1ae456a8178c87b4b8cd978388c2024d6b2c8ec9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 8 Nov 2021 08:30:56 +0100
Subject: [PATCH 2623/4088] New package: qps-2.4.0_1

---
 srcpkgs/qps/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/qps/template

diff --git a/srcpkgs/qps/template b/srcpkgs/qps/template
new file mode 100644
index 000000000000..4934c280c4db
--- /dev/null
+++ b/srcpkgs/qps/template
@@ -0,0 +1,13 @@
+# Template file for 'qps'
+pkgname=qps
+version=2.4.0
+revision=1
+build_style=cmake
+hostmakedepends="lxqt-build-tools perl qt5-qmake qt5-host-tools"
+makedepends="liblxqt-devel"
+short_desc="Qt process manager"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/lxqt/qps"
+distfiles="https://github.com/lxqt/qps/releases/download/${version}/qps-${version}.tar.xz"
+checksum=c2a6c1d5e40e96997cca834f88ca1104aa179bef576a1a8b355b987eaaac69cd

From 79600ba50a6afe8278e2e8578111e0df976a3bb7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 8 Nov 2021 09:10:54 +0100
Subject: [PATCH 2624/4088] wine: update to 6.21.

---
 srcpkgs/wine/patches/musl-limits.patch       |  4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 48 --------------------
 srcpkgs/wine/patches/musl-uid-t.patch        |  4 +-
 srcpkgs/wine/template                        |  6 +--
 4 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/wine/patches/musl-ns_name_skip.patch

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 525b2615de63..520be713ea0b 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-6.20/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-6.20/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-6.21/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-6.21/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
deleted file mode 100644
index 6ab72d412a31..000000000000
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
-index ac52147..0f8c2ef 100644
---- a/wine-6.20/dlls/dnsapi/libresolv.c
-+++ b/wine-6.20/dlls/dnsapi/libresolv.c
-@@ -57,6 +57,43 @@
- 
- WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
- 
-+/* code from glibc's resolv/ns_name.c, with errno setting removed */
-+/*%
-+ *	Advance *ptrptr to skip over the compressed name it points at.
-+ *
-+ * return:
-+ *\li	0 on success, -1 (with errno set) on failure.
-+ */
-+#ifndef __GLIBC__
-+static int
-+ns_name_skip(const u_char **ptrptr, const u_char *eom)
-+{
-+	const u_char *cp;
-+	u_int n;
-+
-+	cp = *ptrptr;
-+	while (cp < eom && (n = *cp++) != 0) {
-+		/* Check for indirection. */
-+		switch (n & NS_CMPRSFLGS) {
-+		case 0:			/*%< normal case, n == len */
-+			cp += n;
-+			continue;
-+		case NS_CMPRSFLGS:	/*%< indirection */
-+			cp++;
-+			break;
-+		default:		/*%< illegal type */
-+			return (-1);
-+		}
-+		break;
-+	}
-+	if (cp > eom) {
-+		return (-1);
-+	}
-+	*ptrptr = cp;
-+	return (0);
-+}
-+#endif
-+
- static const char *debugstr_type( unsigned short type )
- {
-     const char *str;
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 8e8eaaf5598b..9fb95cc03b0e 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-6.20/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-6.20/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-6.21/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-6.21/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index b752200cab61..d2b914e11155 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.20
+version=6.21
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="4028237e9c7bfdd56d7604af19783ff812f645f29c27de742a688e4535528471
- 360fd304a0f4c12e3aa149dde0bc3ac7a2c8787740e1f228bd13158f855166ea"
+checksum="f7b67572b52a7150f3dcc43318b40cf10425171319edf6368a60274642e079ce
+ df986de7d6ce6536c18bba4dbeab05e2bd199cfa73e3194fd6c805cdc6d51dfd"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 2905db0bb0516e22846553e5848113d785839239 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 7 Nov 2021 13:54:28 +0100
Subject: [PATCH 2625/4088] kakoune: update to 2021.11.08.

---
 srcpkgs/kakoune/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index 2e5955d2b293..ecab13423b99 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -1,7 +1,7 @@
 # Template file for 'kakoune'
 pkgname=kakoune
 reverts=20180409_1
-version=2021.10.28
+version=2021.11.08
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ maintainer="Jakub Skrzypnik <j.skrzypnik@openmailbox.org>"
 license="Unlicense"
 homepage="https://kakoune.org"
 distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
-checksum=2f4c93871dc31f6281712281a7119928b1d6d6f300dded84b2d3ce0ab27f2126
+checksum=aa30889d9da11331a243a8f40fe4f6a8619321b19217debac8f565e06eddb5f4
 
 post_patch() {
 	vsed -i -e 's/-O3//' Makefile

From 0c5ffcee064e1562b5e1b6eb395e2d330f37dac8 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Mon, 8 Nov 2021 10:42:52 +0100
Subject: [PATCH 2626/4088] tiny: update to 0.10.0.

---
 srcpkgs/tiny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tiny/template b/srcpkgs/tiny/template
index 06dcedae6cbb..bfcafbf86e83 100644
--- a/srcpkgs/tiny/template
+++ b/srcpkgs/tiny/template
@@ -1,6 +1,6 @@
 # Template file for 'tiny'
 pkgname=tiny
-version=0.9.0
+version=0.10.0
 revision=1
 build_wrksrc="crates/tiny"
 build_style=cargo
@@ -12,7 +12,7 @@ maintainer="eoli3n <jonathan.kirszling@runbox.com>"
 license="MIT"
 homepage="https://github.com/osa1/tiny"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=63e11c8b2708b26311f97d8bef5fba4618ff4212b0b98c21e8ad005a2fd8fe32
+checksum=7f4751b5e34057ba65e86f3819f2ae8288307a5a8e83e5fbb2733759c8100cb7
 
 post_install() {
 	vlicense ../../LICENSE

From 931d8cdba9cd41d43b1e45782b65d66ebeece3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 8 Nov 2021 11:50:42 +0100
Subject: [PATCH 2627/4088] yggdrasil: update to 0.4.2.

---
 srcpkgs/yggdrasil/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 4a6b2936bc5f..704beca6dad0 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
-version=0.4.0
-revision=2
+version=0.4.2
+revision=1
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
@@ -11,7 +11,7 @@ maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"
 homepage="https://yggdrasil-network.github.io/"
 distfiles="https://github.com/yggdrasil-network/yggdrasil-go/archive/v${version}.tar.gz"
-checksum=6ad762012ef1a73bfb718db4a23c5a0067e13939d0655221afc4c1f723736cbf
+checksum=ac21671e2ed0bf5313d277dead703190c6bdccfe8bbb4ccb4ad8d1258ff79689
 
 do_build() {
 	PKGNAME=${pkgname} PKGVER=${version} ./build

From 56b1ad0b523059f6f512a05448631efafa0b8a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 8 Nov 2021 11:35:13 +0100
Subject: [PATCH 2628/4088] cargo-crev: update to 0.21.3.

---
 srcpkgs/cargo-crev/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 05b0635dcf51..673cede92bd4 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,17 +1,18 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
-version=0.21.1
+version=0.21.3
 revision=1
 build_style=cargo
 make_install_args="--path ./cargo-crev"
+make_check_args="-- --skip creates_new_id_implicitly"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"
 homepage="https://github.com/crev-dev/cargo-crev"
-distfiles="https://github.com/crev-dev/cargo-crev/archive/refs/tags/${version}.tar.gz"
-checksum=223f2603afe739a618275b89c4b79528fc5b766beab70614f22dddfebef3935d
+distfiles="https://github.com/crev-dev/cargo-crev/archive/refs/tags/v${version}.tar.gz"
+checksum=2d848c38772013bce638dd9056e32a4922afa3a88d0450f71ac158e7ad22b76e
 
 post_install() {
 	vlicense LICENSE-APACHE

From 6bd71f35b04b5b7a85dc13c48dcb71f2ce8ff91e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 8 Nov 2021 10:36:41 +0100
Subject: [PATCH 2629/4088] slack-desktop: update to 4.21.1

---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 2d8fa3450e20..c395fc8c6fc1 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.20.0
+version=4.21.1
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=b08207389246837536ea769425d458411c08dc6802ffaae9249092e387461ce5
+checksum=58ee2bf34f94a60c7bbafe856267461bf5056b57c6330033cc4aba275edeb756
 restricted=yes
 repository="nonfree"
 nopie=yes

From 954654dad2c2a219081e7aeeadb1518b2376d7cb Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Sat, 6 Nov 2021 10:12:17 +0000
Subject: [PATCH 2630/4088] xdg-desktop-portal-wlr: update to 0.5.0.

---
 srcpkgs/xdg-desktop-portal-wlr/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-wlr/template b/srcpkgs/xdg-desktop-portal-wlr/template
index 9606bf3b4207..45af17740066 100644
--- a/srcpkgs/xdg-desktop-portal-wlr/template
+++ b/srcpkgs/xdg-desktop-portal-wlr/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-wlr'
 pkgname=xdg-desktop-portal-wlr
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc"
@@ -11,8 +11,8 @@ short_desc="Backend of xdg-desktop-portal for wlroots"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/emersion/xdg-desktop-portal-wlr"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb97248c3625a2e6775a250de4bd53d50c5a548bf880fc716e28b6b9c51447d5
+distfiles="https://github.com/emersion/xdg-desktop-portal-wlr/archive/v${version}.tar.gz"
+checksum=961cdfbaf7873124f96c86f41e90d304888e93a1da7ebe4a6ea2f1a824788307
 
 post_install() {
 	vlicense LICENSE

From 3667d54f6df3183d4046daee4f9ce906a2c8555e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 8 Nov 2021 15:26:58 +0100
Subject: [PATCH 2631/4088] plocate: update to 1.1.13.

---
 srcpkgs/plocate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 681a766400e4..f7b3f9673dfe 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,6 +1,6 @@
 # Template file for 'plocate'
 pkgname=plocate
-version=1.1.12
+version=1.1.13
 revision=1
 build_style=meson
 configure_args="
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://plocate.sesse.net/"
 changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=a11d25ad118f5a534dc079150667f92c9a1844f12eb290df3ce9383c51e555b5
+checksum=9ce3d7217550e7f0e9a01a30454c1c5dbe39633e5bce5964cb95c82a738c979a
 
 system_accounts="_plocate"
 

From 494eec051d30d8ae4e663ec70f79b8bdb08d7ad5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Nov 2021 10:03:49 -0500
Subject: [PATCH 2632/4088] python3-typeguard: make checks work, use
 setuptools_scm for proper versioning

---
 srcpkgs/python3-typeguard/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-typeguard/template b/srcpkgs/python3-typeguard/template
index 23083f04f3a4..1b4db9bce7f3 100644
--- a/srcpkgs/python3-typeguard/template
+++ b/srcpkgs/python3-typeguard/template
@@ -1,11 +1,14 @@
 # Template file for 'python3-typeguard'
 pkgname=python3-typeguard
 version=2.13.0
-revision=1
+revision=2
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+# mypy checks seem to require that the module be installed
+make_check_args="--ignore=tests/mypy"
+hostmakedepends="python3-setuptools_scm"
 depends="python3"
+checkdepends="python3-pytest python3-typing_extensions"
 short_desc="Run-time type checker for python"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 67fc972eabded784cf3add947d8fb37f1da4dda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 8 Nov 2021 12:23:18 +0100
Subject: [PATCH 2633/4088] python3-wcmatch: update to 8.3.

---
 srcpkgs/python3-wcmatch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-wcmatch/template b/srcpkgs/python3-wcmatch/template
index 8237206b2b40..d132c7721d80 100644
--- a/srcpkgs/python3-wcmatch/template
+++ b/srcpkgs/python3-wcmatch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-wcmatch'
 pkgname=python3-wcmatch
-version=8.2
+version=8.3
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://github.com/facelessuser/wcmatch"
 changelog="https://raw.githubusercontent.com/facelessuser/wcmatch/main/docs/src/markdown/about/changelog.md"
 distfiles="${PYPI_SITE}/w/wcmatch/wcmatch-${version}.tar.gz"
-checksum=4d54ddb506c90b5a5bba3a96a1cfb0bb07127909e19046a71d689ddfb18c3617
+checksum=371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db
 
 post_install() {
 	vlicense LICENSE.md

From d4a9da0ab9d1e784e031ae3e30e01bf918b9fa75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 8 Nov 2021 12:22:51 +0100
Subject: [PATCH 2634/4088] python3-bracex: update to 2.2.1.

---
 srcpkgs/python3-bracex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-bracex/template b/srcpkgs/python3-bracex/template
index 7e6ffbc08f21..a88b1f66737c 100644
--- a/srcpkgs/python3-bracex/template
+++ b/srcpkgs/python3-bracex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-bracex'
 pkgname=python3-bracex
-version=2.1.1
+version=2.2.1
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/facelessuser/bracex"
 changelog="https://raw.githubusercontent.com/facelessuser/bracex/master/docs/src/markdown/about/changelog.md"
 distfiles="${PYPI_SITE}/b/bracex/bracex-${version}.tar.gz"
-checksum=01f715cd0ed7a622ec8b32322e715813f7574de531f09b70f6f3b2c10f682425
+checksum=1c8d1296e00ad9a91030ccb4c291f9e4dc7c054f12c707ba3c5ff3e9a81bcd21
 
 post_install() {
 	vlicense LICENSE.md

From bb85da796ccb2c5f98636707d6974518e6f039dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 1 Jun 2020 22:51:44 -0300
Subject: [PATCH 2635/4088] New package: FlintQS-1.0

---
 srcpkgs/FlintQS/template | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/FlintQS/template

diff --git a/srcpkgs/FlintQS/template b/srcpkgs/FlintQS/template
new file mode 100644
index 000000000000..37ecad28b441
--- /dev/null
+++ b/srcpkgs/FlintQS/template
@@ -0,0 +1,40 @@
+# Template file for 'FlintQS'
+pkgname=FlintQS
+version=1.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake"
+makedepends="gmp-devel"
+checkdepends="bc"
+short_desc="Multi-polynomial quadratic sieve for integer factorization"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/sagemath/FlintQS"
+distfiles="https://github.com/sagemath/FlintQS/archive/v${version}.tar.gz"
+checksum=b983052f267988192c9ec59c9d2754470e5f2db74b45e364cf7ad62f349bc9eb
+
+pre_configure() {
+	touch ChangeLog
+	autoreconf -fi
+}
+
+_check_factor() {
+	echo -n "Factor $1 ... "
+	factors=$(echo "$1" | src/QuadraticSieve | awk 'x{print}/FACTORS:/{x=1}' | sort -u)
+	echo -n $factors | sed -e 's/ / * /'
+	prod=$(echo $factors | sed -e 's/ /*/' | bc)
+	if [ "$prod" == "$1" ] ; then
+		echo " - OK"
+		return 0
+	else
+		echo " - FAIL"
+		return 1
+	fi
+}
+
+do_check() {
+	# check that it can factor
+	_check_factor 7115311179635024735652627015068546182713648318529
+	_check_factor 55100662978045942257527719411373552579109062399339
+	_check_factor 179926028483627295233062780598576300117675953698228811539221
+}

From 3959351b86abd4272d0163b086260e5f6b0732ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 26 Aug 2021 22:48:27 -0300
Subject: [PATCH 2636/4088] New package: fplll-5.4.1

---
 common/shlibs          |  1 +
 srcpkgs/fplll-devel    |  1 +
 srcpkgs/fplll/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/fplll-devel
 create mode 100644 srcpkgs/fplll/template

diff --git a/common/shlibs b/common/shlibs
index 330255fcde56..73d3de9e2a0e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,6 +70,7 @@ libncursesw.so.6 ncurses-libs-5.8_1 ignore
 libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
 libnetcdf.so.15 netcdf-4.7.0_1
 libformw.so.6 ncurses-libs-5.8_1 ignore
+libfplll.so.7 fplll-5.4.1_1
 libpanelw.so.6 ncurses-libs-5.8_1 ignore
 libmenuw.so.6 ncurses-libs-5.8_1 ignore
 libobjc.so.4 libobjc-4.7.3_12
diff --git a/srcpkgs/fplll-devel b/srcpkgs/fplll-devel
new file mode 120000
index 000000000000..af32f9e54f1e
--- /dev/null
+++ b/srcpkgs/fplll-devel
@@ -0,0 +1 @@
+fplll
\ No newline at end of file
diff --git a/srcpkgs/fplll/template b/srcpkgs/fplll/template
new file mode 100644
index 000000000000..524ce18887f7
--- /dev/null
+++ b/srcpkgs/fplll/template
@@ -0,0 +1,27 @@
+# Template file for 'fplll'
+pkgname=fplll
+version=5.4.1
+revision=1
+build_style=gnu-configure
+makedepends="gmp-devel mpfr-devel"
+short_desc="Lattice algorithms using floating-point orthogonalization and LLL"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fplll/fplll"
+distfiles="https://github.com/fplll/fplll/releases/download/${version}/fplll-${version}.tar.gz"
+checksum=7bd887957173aa592091772c1c36f6aa606b3b2ace0d14e2c26c7463dcf2deb7
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+fplll-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 5c09314fe32721112d446508c8f1a13a86e0fecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 26 Aug 2021 20:02:30 -0300
Subject: [PATCH 2637/4088] New package: iml-1.0.5

---
 common/shlibs        |  1 +
 srcpkgs/iml-devel    |  1 +
 srcpkgs/iml/template | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/iml-devel
 create mode 100644 srcpkgs/iml/template

diff --git a/common/shlibs b/common/shlibs
index 73d3de9e2a0e..7759cba92223 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1052,6 +1052,7 @@ libfltk_images.so.1.3 fltk-1.3.0_1
 libspectre.so.1 libspectre-0.2.6_1
 libsratom-0.so.0 sratom-0.4.0_1
 libpwquality.so.1 libpwquality-1.1.1_1
+libiml.so.0 iml-1.0.5_1
 libisl.so.23 isl-0.23_1
 libisl.so.19 isl15-0.19_1
 libcloog-isl.so.4 cloog-0.18.1_1
diff --git a/srcpkgs/iml-devel b/srcpkgs/iml-devel
new file mode 120000
index 000000000000..dd95935ba7da
--- /dev/null
+++ b/srcpkgs/iml-devel
@@ -0,0 +1 @@
+iml
\ No newline at end of file
diff --git a/srcpkgs/iml/template b/srcpkgs/iml/template
new file mode 100644
index 000000000000..420a7df5ec49
--- /dev/null
+++ b/srcpkgs/iml/template
@@ -0,0 +1,33 @@
+# Template file for 'iml'
+pkgname=iml
+version=1.0.5
+revision=1
+build_style=gnu-configure
+configure_args="--enable-shared --with-cblas=-lopenblas"
+makedepends="gmp-devel openblas-devel"
+short_desc="Integer Matrix Library"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://cs.uwaterloo.ca/~astorjoh/iml.html"
+distfiles="https://cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2"
+checksum=1dad666850895a5709b00b97422e2273f293cfadea7697a9f90b90953e847c2a
+
+if [ -n "$CROSS_BUILD" ]; then
+	configure_args+=" --with-default=$XBPS_CROSS_BASE/usr"
+fi
+
+post_install() {
+	sed '/^$/q' < src/iml.h > LICENSE
+	vlicense LICENSE
+}
+
+iml-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/iml
+	}
+}

From 86b767cab1936be44be5eec35aa2f2c536960519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 3 Jun 2020 23:22:18 -0300
Subject: [PATCH 2638/4088] New package: mpfi-1.5.3

---
 common/shlibs         |  1 +
 srcpkgs/mpfi-devel    |  1 +
 srcpkgs/mpfi/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/mpfi/update   |  2 ++
 4 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/mpfi-devel
 create mode 100644 srcpkgs/mpfi/template
 create mode 100644 srcpkgs/mpfi/update

diff --git a/common/shlibs b/common/shlibs
index 7759cba92223..52c2f17b7198 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -60,6 +60,7 @@ libgo.so.16 libgo-10.2.0_1
 libperl.so.5.34 perl-5.34.0_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
+libmpfi.so.0 mpfi-1.5.3_1
 libmpfr.so.6 mpfr-4.0.0_1
 libppl.so.14 ppl-1.2_1
 libppl_c.so.4 ppl-0.11_1
diff --git a/srcpkgs/mpfi-devel b/srcpkgs/mpfi-devel
new file mode 120000
index 000000000000..d36f752f91b3
--- /dev/null
+++ b/srcpkgs/mpfi-devel
@@ -0,0 +1 @@
+mpfi
\ No newline at end of file
diff --git a/srcpkgs/mpfi/template b/srcpkgs/mpfi/template
new file mode 100644
index 000000000000..72f6db6716c8
--- /dev/null
+++ b/srcpkgs/mpfi/template
@@ -0,0 +1,29 @@
+# Template file for 'mpfi'
+pkgname=mpfi
+version=1.5.3
+revision=1
+build_wrksrc=mpfi
+build_style=gnu-configure
+hostmakedepends="automake autoconf libtool texinfo"
+makedepends="mpfr-devel"
+short_desc="C library for interval arithmetic"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="http://perso.ens-lyon.fr/nathalie.revol/software.html"
+distfiles="https://gitlab.inria.fr/mpfi/mpfi/-/archive/${version}/mpfi-${version}.tar.bz2"
+checksum=6ad5247b37b9f9c024103fd64e76b6360294f471d448aac3797a0f44428024c3
+
+pre_configure() {
+	autoreconf -fi
+}
+
+mpfi-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/info
+	}
+}
diff --git a/srcpkgs/mpfi/update b/srcpkgs/mpfi/update
new file mode 100644
index 000000000000..b53ba902cbb1
--- /dev/null
+++ b/srcpkgs/mpfi/update
@@ -0,0 +1,2 @@
+# This release is broken
+ignore=1.5.4

From 837389d808b2016ba2252f5d90fb6510b5b9c20e Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 8 Nov 2021 12:06:15 +0300
Subject: [PATCH 2639/4088] fzf: update installation path for completions and
 key-bindings

---
 srcpkgs/fzf/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index c4c869c3e4c9..6f6afd6686ff 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.28.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 hostmakedepends="git"
@@ -23,9 +23,10 @@ post_install() {
 	sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
 	vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
 	vinstall plugin/fzf.vim 644 usr/share/nvim/runtime/plugin
-	vinstall shell/completion.bash 644 usr/share/doc/fzf
-	vinstall shell/completion.zsh 644 usr/share/doc/fzf
-	vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf
-	vinstall shell/key-bindings.bash 644 usr/share/doc/fzf
-	vinstall shell/key-bindings.fish 644 usr/share/doc/fzf
+
+	vinstall shell/completion.bash 644 usr/share/fzf
+	vinstall shell/completion.zsh 644 usr/share/fzf
+	vinstall shell/key-bindings.zsh 644 usr/share/fzf
+	vinstall shell/key-bindings.bash 644 usr/share/fzf
+	vinstall shell/key-bindings.fish 644 usr/share/fzf
 }

From ebfef2d694d094d89afad54b383770a7b9605758 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Nov 2021 19:03:22 +0100
Subject: [PATCH 2640/4088] New package: ding-1.9

---
 srcpkgs/ding/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/ding/template

diff --git a/srcpkgs/ding/template b/srcpkgs/ding/template
new file mode 100644
index 000000000000..3bdf51884015
--- /dev/null
+++ b/srcpkgs/ding/template
@@ -0,0 +1,19 @@
+# Template file for 'ding'
+pkgname=ding
+version=1.9
+revision=1
+depends="tk"
+short_desc="English-German dictionary lookup program using grep"
+maintainer="Juergen Lorenz <ju@jugilo.de>"
+license="GPL-2.0-or-later"
+homepage="https://www-user.tu-chemnitz.de/~fri/ding"
+distfiles="https://ftp.tu-chemnitz.de/pub/Local/urz/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=69a6c81fcf785a286c053a352f3201cc8671c72851615c4b707a434309b098e5
+
+do_install() {
+	vbin ding
+	vman ding.1
+	vinstall ding.desktop 644 /usr/share/applications
+	vinstall ding.png 644 /usr/share/pixmaps
+	vinstall de-en.txt 644 /usr/share/dict
+}

From 5e979f0a839d88d55e584b168897137187e0f4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 8 Nov 2021 16:31:02 +0100
Subject: [PATCH 2641/4088] postfix: update to 3.6.3.

---
 srcpkgs/postfix/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..ce938ad545f3 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.3
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=0f1241d456a0158e0c418abf62c52c2ff83f8f1dcf2fbdd4c40765b67789b1bc
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From e3ccc6c281faa94c1c43f354f9f118b951ddbfe3 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 5 Nov 2021 16:07:17 -0500
Subject: [PATCH 2642/4088] MultiMC: fix checksums, update wrksrc

---
 srcpkgs/MultiMC/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 2e21f35987e6..1ce848f0873d 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,8 +1,8 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
 version=0.6.12
-revision=3
-wrksrc="${pkgname}5-${version}"
+revision=4
+wrksrc="Launcher-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
 _nbtversion="multimc-0.6.1"
 _quazipversion="multimc-3"
@@ -15,10 +15,10 @@ short_desc="Instanced Minecraft client"
 maintainer="Henry Naguski <henry@nilsu.org>"
 license="Apache-2.0"
 homepage="http://multimc.org"
-distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz
+distfiles="https://github.com/MultiMC/Launcher/archive/${version}.tar.gz
  https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
  https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="c251744b77d93db4ead56940b7b81d30dc5390fb86a1676d3f0364cc4e570185
+checksum="9be496910e53a7e07454b6c4433cf6d540a3c3fea01762ac3390f19a001cb4c9
  36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
  ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
 skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"

From c97d935f2df53d2824705994a2840d15875ec941 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Nov 2021 19:34:39 +0100
Subject: [PATCH 2643/4088] scite: update to 5.1.5.

---
 srcpkgs/scite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 0bb70c0b7da6..1e94a3295b10 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.1.1
+version=5.1.5
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=560128ece3afe3a33207c01b72dfd6cda33c014b4c9c1270d23fc7ba1eb7b0bf
+checksum=7b4410d32bbc9fc5c81102287588631e00e5b63a31d2f5e709f9ac12fbbfc73d
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From 3b5347fdcf979a61533eba3ed88a85d27d643525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 8 Nov 2021 19:57:08 +0100
Subject: [PATCH 2644/4088] xmonad-contrib: remove

---
 srcpkgs/removed-packages/template       |  1 +
 srcpkgs/xmonad-contrib/files/stack.yaml |  5 -----
 srcpkgs/xmonad-contrib/template         | 18 ------------------
 srcpkgs/xmonad-contrib/update           |  2 --
 4 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 srcpkgs/xmonad-contrib/files/stack.yaml
 delete mode 100644 srcpkgs/xmonad-contrib/template
 delete mode 100644 srcpkgs/xmonad-contrib/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8a6164c31e11..d9eee3b9aded 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -330,6 +330,7 @@ replaces="
  xlennart<=1.1.1_1
  xnoise<=0.2.21_4
  xnoise-devel<=0.2.21_4
+ xmonad-contrib<=0.16_3
  yturl<=2.0.2_5
  yt-play<=20140117_2
  nvidia340<=340.108_4
diff --git a/srcpkgs/xmonad-contrib/files/stack.yaml b/srcpkgs/xmonad-contrib/files/stack.yaml
deleted file mode 100644
index 74227aa2e1e9..000000000000
--- a/srcpkgs/xmonad-contrib/files/stack.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resolver: lts-16.13
-packages:
-  - .
-extra-deps:
-  - xmonad-0.15
diff --git a/srcpkgs/xmonad-contrib/template b/srcpkgs/xmonad-contrib/template
deleted file mode 100644
index 03a4de861b58..000000000000
--- a/srcpkgs/xmonad-contrib/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'xmonad-contrib'
-pkgname=xmonad-contrib
-version=0.16
-revision=3
-build_style=haskell-stack
-hostmakedepends="pkg-config"
-makedepends="libX11-devel libXinerama-devel libXrandr-devel libXft-devel libXScrnSaver-devel"
-short_desc="Third party extensions for xmonad"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://xmonad.org/"
-distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=ad72c38de1bf4f9e176bd0da7ee62a6153b03c9087313b3d4782f365f77caddd
-nocross=yes
-
-post_install() {
-	    vlicense LICENSE
-}
diff --git a/srcpkgs/xmonad-contrib/update b/srcpkgs/xmonad-contrib/update
deleted file mode 100644
index d111b2b2ce9c..000000000000
--- a/srcpkgs/xmonad-contrib/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=http://hackage.haskell.org/package/xmonad-contrib
-pattern="Readme for xmonad-contrib-\K[\d\.]+"

From 307cbb6379a4622b509d1405acf5572465b14796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 8 Nov 2021 19:57:54 +0100
Subject: [PATCH 2645/4088] xmonad: remove

---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xmonad/template           | 20 --------------------
 srcpkgs/xmonad/update             |  2 --
 3 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 srcpkgs/xmonad/template
 delete mode 100644 srcpkgs/xmonad/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d9eee3b9aded..9d6a5483e88f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -330,6 +330,7 @@ replaces="
  xlennart<=1.1.1_1
  xnoise<=0.2.21_4
  xnoise-devel<=0.2.21_4
+ xmonad<=0.15_5
  xmonad-contrib<=0.16_3
  yturl<=2.0.2_5
  yt-play<=20140117_2
diff --git a/srcpkgs/xmonad/template b/srcpkgs/xmonad/template
deleted file mode 100644
index a9cf809c87a2..000000000000
--- a/srcpkgs/xmonad/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'xmonad'
-pkgname=xmonad
-version=0.15
-revision=5
-build_style=haskell-stack
-stackage=lts-16.13
-makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel"
-short_desc="Tiling window manager fully configurable in Haskell"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://xmonad.org"
-distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=4a7948e6eee5e34a27d15444589ade3b3fa1adecadbf37b943cff8348380f928
-nopie_files="/usr/bin/xmonad"
-nocross=yes
-
-post_install() {
-	    vman man/xmonad.1
-	    vlicense LICENSE
-}
diff --git a/srcpkgs/xmonad/update b/srcpkgs/xmonad/update
deleted file mode 100644
index 6959312f769b..000000000000
--- a/srcpkgs/xmonad/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=http://hackage.haskell.org/package/xmonad
-pattern="Readme for xmonad-\K[\d\.]+"

From ac2253f113186262dfad4e41b9035cbe38893077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 8 Nov 2021 20:03:54 +0100
Subject: [PATCH 2646/4088] removed packages: revbump for xmonad, sort

---
 srcpkgs/removed-packages/template | 128 +++++++++++++++---------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9d6a5483e88f..12fff3d089ed 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=53
+revision=54
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -9,6 +9,7 @@ license="Public Domain"
 homepage="https://voidlinux.org"
 
 replaces="
+ ImageMagick6<=6.9.12.12_2
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
  acme-client<=0.1.16_5
@@ -18,12 +19,12 @@ replaces="
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
  atom<=1.44.0_1
- avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
+ avogadro<=1.2.0_8
  bokken<=1.8_3
  bomi<=0.9.11_17
- burp-server<=1.4.40_13
  burp-client<=1.4.40_13
+ burp-server<=1.4.40_13
  bzr<=2.7.0_1
  bzrtools<=2.6.0_4
  caja-gksu<=1.20.2_2
@@ -33,31 +34,31 @@ replaces="
  couchdb<=1.7.1_2
  cracklib-python<=2.9.7_1
  crystal<=0.34.0_4
- ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7
- dht-node<=0.2.0_3
- deepin-menu<=3.4.8_3
- deepin-screenshot<=5.0.0_2
- dtkwidget<=2.1.1_2
- dtkwidget-devel<=2.1.1_2
- dtkcore<=2.1.1_2
- dtkcore-devel<=2.1.1_2
- dtkwm<=2.0.12_1
- dtkwm-devel<=2.0.12_1
+ ctpp2<=2.8.3_7
  deepin-calculator<=5.0.1_1
  deepin-draw<=1.0.0_1
  deepin-editor<=1.2.9.1_1
- deepin-movie-reborn<=5.0.0_2
+ deepin-menu<=3.4.8_3
  deepin-movie-reborn-devel<=5.0.0_2
- deepin-turbo<=0.0.3_1
+ deepin-movie-reborn<=5.0.0_2
+ deepin-screenshot<=5.0.0_2
  deepin-turbo-devel<=0.0.3_1
+ deepin-turbo<=0.0.3_1
  deepin-voice-recorder<=5.0.0_2
+ dht-node<=0.2.0_3
  djmount<=0.71_8
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2
  dleyna-server<=0.6.0_2
  dnote-cli<=0.6.2_1
  docker2aci<=0.17.2_4
+ dtkcore-devel<=2.1.1_2
+ dtkcore<=2.1.1_2
+ dtkwidget-devel<=2.1.1_2
+ dtkwidget<=2.1.1_2
+ dtkwm-devel<=2.0.12_1
+ dtkwm<=2.0.12_1
  ebtables<=2.0.10.4_8
  eclipse-ecj<=4.9_3
  electron7<=7.3.3_1
@@ -73,22 +74,20 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
- gnome-twitch<=0.4.2_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
+ gnome-twitch<=0.4.2_1
+ go-gdm<=1.4_7
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
  goproxy<=7.0_1
- go-gdm<=1.4_7
+ grv<=0.3.1_3
  gsettings-qt<=0.1+17.10.20170824_3
  gst1-python<=1.18.3_1
- grv<=0.3.1_3
- gtkhtml<=4.10.0_1
  gtkhtml-devel<=4.10.0_1
+ gtkhtml<=4.10.0_1
  gx-go<=1.9.0_1
- libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
- icecat<=78.6.1_1
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1
  icecat-i18n-an<=78.6.1_1
@@ -182,39 +181,44 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
+ icecat<=78.6.1_1
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
  jwm-settings-manager<=2.1.5_1
  k3s<=1.0.0_1
  kadu<=4.3_6
- keepassx<=0.4.4_2
  keepassx2<=2.0.3_2
+ keepassx<=0.4.4_2
  key-mon<=1.17_5
  libapp<=20140527_2
+ libco-devel<=20_1
+ libco<=20_1
  libdbusmenu-qt<=0.9.2_4
- libfcitx-qt<=4.2.9.8_1
  libfcitx-qt-devel<=4.2.9.8_1
+ libfcitx-qt<=4.2.9.8_1
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
+ libgtkhtml<=4.10.0_1
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
  libpyside-python3<=5.15.0_2
- libqmatrixclient<=0.5.3.2_1
  libqmatrixclient-devel<=0.5.3.2_1
+ libqmatrixclient<=0.5.3.2_1
  libqzeitgeist<=0.8.0_6
- librpcsecgss<=0.19_6
  librpcsecgss-devel<=0.19_6
+ librpcsecgss<=0.19_6
  libshiboken-python3<=5.15.0_3
+ libspa-ffmpeg<=0.3.32_1
+ libxnoise<=0.2.21_4
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
  ls++-git<=20140919_3
  luxmark<=3.1_9
- luxrays<=3.1_18
  luxrays-devel<=3.1_18
+ luxrays<=3.1_18
  mac<=3.99u4b5s7_3
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
@@ -224,10 +228,15 @@ replaces="
  mozjs68<=68.11.0_1
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
- orage<=4.12.1_7
- onionshare<=2.2_5
- oce<=0.18.3_1
+ nodejs-lts-10<=10.24.0_2
+ nvidia340-dkms<=340.108_4
+ nvidia340-libs<=340.108_4
+ nvidia340-opencl<=340.108_4
+ nvidia340<=340.108_4
  oce-devel<=0.18.3_1
+ oce<=0.18.3_1
+ onionshare<=2.2_5
+ orage<=4.12.1_7
  paraview<=5.8.1_3
  perl-Gtk2-Ex-Simple-List<=0.50_4
  perl-Gtk2-ImageView<=0.05_8
@@ -247,8 +256,8 @@ replaces="
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
- python-matplotlib<=2.2.4_2
  python-matplotlib-data<=2.2.4_2
+ python-matplotlib<=2.2.4_2
  python-netifaces<=0.10.9_3
  python-nose<=1.3.7_7
  python-pivy<=0.6.4_2
@@ -259,28 +268,24 @@ replaces="
  python-xlib<0.29_1
  python3-Django<=3.0.7_2
  python3-SPARQLWrapper<=1.8.4_4
+ python3-aiohttp-cors2<=0.7.0_3
+ python3-aiohttp2<=2.3.10_4
  python3-bluez<=0.23_2
+ python3-docker-pycreds<=0.4.0_4
  python3-grako<=3.99.9_7
+ python3-idna-ssl<=1.1.0_3
  python3-keepalive<=0.5_6
  python3-pyPEG2<=2.15.2_7
  python3-pyenet<=5.15.0_2
- python3-pyside<=5.15.0_2
  python3-pyside-phonon<=5.15.0_2
+ python3-pyside<=5.15.0_2
  python3-shiboken<=5.15.0_3
- python3-aiohttp2<=2.3.10_4
- python3-aiohttp-cors2<=0.7.0_3
- python3-idna-ssl<=1.1.0_3
- python3-docker-pycreds<=0.4.0_4
  qimageblitz<=0.0.6_4
- quake4<=1.4.2_3
- qucs<=0.0.19_2
- qupzilla1<=1.8.9_16
- qt<=4.8.7_29
- qt-designer<=4.8.7_29
  qt-designer-devel<=4.8.7_29
  qt-designer-libs<=4.8.7_29
- qt-devel<=4.8.7_29
+ qt-designer<=4.8.7_29
  qt-devel-tools<=4.8.7_29
+ qt-devel<=4.8.7_29
  qt-doc<=4.8.7_29
  qt-host-tools<=4.8.7_29
  qt-plugin-mysql<=4.8.7_29
@@ -290,13 +295,17 @@ replaces="
  qt-qmake<=4.8.7_29
  qt5dxcb-plugin<=5.0.11_1
  qt5integration<=5.0.0_7
+ qt<=4.8.7_29
+ quake4<=1.4.2_3
+ qucs<=0.0.19_2
+ qupzilla1<=1.8.9_16
  qupzilla<=3.0.1_1
  r2-bindings<=1.0.1_2
  redkite<=1.3.1_1
  reminiscence<=0.4.6_1
- rkt<=1.30.0_3
- rkt-stage1-fly<=1.30.0_3
  rkt-stage1-coreos<=1.30.0_3
+ rkt-stage1-fly<=1.30.0_3
+ rkt<=1.30.0_3
  scantailor<=0.9.12.1_2
  seahorse-sharing<=3.8.0_4
  seriespl<=2.3.5_2
@@ -309,8 +318,8 @@ replaces="
  sqlite-replication<=3.32.3_2
  srw<=0.7_1
  tagainijisho<=1.0.3_1
- tlsdate<=0.0.13_16
  taizen<=0.0.0.20180808_4
+ tlsdate<=0.0.13_16
  traverso<=0.49.6_2
  ttyload-git<=20141117_4
  tuxc<=1.1_3
@@ -318,34 +327,25 @@ replaces="
  uwsgi-python<=2.0.18_3
  v8<=3.24.35.33_4
  volnoti<=0.1_1
- vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
  vte290-devel<=0.36.5_5
  vte290<=0.36.5_5
+ vte<=0.28.2_16
  w_scan<=20170107_1
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
- libxnoise<=0.2.21_4
  xlennart<=1.1.1_1
- xnoise<=0.2.21_4
- xnoise-devel<=0.2.21_4
- xmonad<=0.15_5
  xmonad-contrib<=0.16_3
- yturl<=2.0.2_5
+ xmonad<=0.15_5
+ xnoise-devel<=0.2.21_4
+ xnoise<=0.2.21_4
  yt-play<=20140117_2
- nvidia340<=340.108_4
- nvidia340-dkms<=340.108_4
- nvidia340-opencl<=340.108_4
- nvidia340-libs<=340.108_4
+ yturl<=2.0.2_5
+ zbackup<=1.4.4_23
  zou<=0.2.0_7
- zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
- libco<=20_1
- libco-devel<=20_1
- zbackup<=1.4.4_23
+ zuluplay<=1.1_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 6643459be5446a7cd32bffbdb771a1c30f12ccca Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 8 Nov 2021 21:11:12 +0100
Subject: [PATCH 2647/4088] vscode: update to 1.62.0

---
 srcpkgs/vscode/patches/product.patch |  8 ++++----
 srcpkgs/vscode/patches/ripgrep.patch | 14 ++++++--------
 srcpkgs/vscode/template              |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index 827b90297879..2725320b4adb 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,18 +1,18 @@
 diff --git a/product.json b/product.json
-index 7b60eac641d..c9aeeeecfe6 100644
+index 14ef10628d3..a5b1df55002 100644
 --- a/product.json
 +++ b/product.json
-@@ -22,6 +22,9 @@
+@@ -23,6 +23,9 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/dc1a6699060423b8c4d2ced736ad70195378fddf/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
-@@ -31,6 +34,11 @@
+@@ -32,6 +35,11 @@
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
  	],
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index a00a0e348168..389dd6a5aa13 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -6,25 +6,23 @@ ship a prebuilt ripgrep.
 
 --- a/package.json
 +++ b/package.json
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
      "vscode-oniguruma": "1.5.1",
      "vscode-proxy-agent": "^0.11.0",
      "vscode-regexpp": "^3.1.0",
 -    "vscode-ripgrep": "^1.12.1",
 +    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.4.0",
-     "xterm": "4.15.0-beta.3",
+     "vscode-textmate": "5.4.1",
+     "xterm": "4.15.0-beta.10",
      "xterm-addon-search": "0.9.0-beta.5",
-diff --git a/remote/package.json b/remote/package.json
-index b0bff62..88a036e 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
      "vscode-oniguruma": "1.5.1",
      "vscode-proxy-agent": "^0.11.0",
      "vscode-regexpp": "^3.1.0",
 -    "vscode-ripgrep": "^1.12.1",
 +    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.4.0",
-     "xterm": "4.15.0-beta.3",
+     "vscode-textmate": "5.4.1",
+     "xterm": "4.15.0-beta.10",
      "xterm-addon-search": "0.9.0-beta.5",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 35151cf029b7..bbf881b4ba6b 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.61.2
+version=1.62.0
 revision=1
 _electronver=13.3.0
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=8854cb40d508ad30f3c83a5f6d9ef3072b82593a28c28ad7e7f62937217003ed
+checksum=e7e961d8115c94d37a2e360f92a3f4778a43eaddbf6fe183028e0c1759ccc803
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From ad637a3fb6616d6b99f835fa9ea2598821201f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 8 Nov 2021 10:52:36 +0100
Subject: [PATCH 2648/4088] ansible: update to 4.8.0.

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 47981ea3e8aa..e1cc45a1107a 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=4.6.0
+version=4.8.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=2955fcbf51367f8bd88c38a86f8be83d4fcd05f778afb4feed31abfe8dcff639
+checksum=1345fa61c9ac2edcc6c16e0d3f872a73303a61b799a7f16236ca6279e0ae8e36
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From dadb7580945ab124ff0b454433ceaaf12dd945e3 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 Nov 2021 13:55:44 +0100
Subject: [PATCH 2649/4088] hunspell-de_CH: fix update-check

---
 srcpkgs/hunspell-de_CH/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hunspell-de_CH/update b/srcpkgs/hunspell-de_CH/update
index b2cf8b29bff3..d0578197e61a 100644
--- a/srcpkgs/hunspell-de_CH/update
+++ b/srcpkgs/hunspell-de_CH/update
@@ -1,2 +1,2 @@
-pattern='<span>\K[-_.\d]+(?=</span></a>)'
-version="${_version}"
+pattern='<span>\K[-_.\d]+(?=</span>)'
+version="${version:0:4}.${version:4:2}.${version:6:2}"

From 1d99d8b37bc98470a4a6337a93f4f3f712f71917 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 8 Nov 2021 16:36:19 +0000
Subject: [PATCH 2650/4088] StyLua: update to 0.11.1.

---
 srcpkgs/StyLua/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index e62ba29789aa..10ca2d6d6520 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.11.0
+version=0.11.1
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=39f0bad4cc175202eae2551e4ddaf3dd6a229943e8da3e462d4fa15a024fd0fa
+checksum=af4149a5a5733624dda6bb220a9411eff147b07ecb7c263d5dbce90a483d1df1
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

From 2c1725e5cb4212f153582b0d8adf92c7e64bf8bf Mon Sep 17 00:00:00 2001
From: Kamil Smardzewski <roderyk197@gmail.com>
Date: Sat, 6 Nov 2021 12:41:03 +0100
Subject: [PATCH 2651/4088] pcre: replace the no longer available distfile URL

---
 srcpkgs/pcre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template
index 4e23babf8f87..22b520b1a7c4 100644
--- a/srcpkgs/pcre/template
+++ b/srcpkgs/pcre/template
@@ -1,7 +1,7 @@
 # Template file for 'pcre'
 pkgname=pcre
 version=8.45
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-utf8 --enable-unicode-properties --with-pic
  --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-newline-is-anycrlf
@@ -11,7 +11,7 @@ short_desc="Perl Compatible Regular Expressions"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.pcre.org/"
-distfiles="https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2"
+distfiles="${SOURCEFORGE_SITE}/pcre/pcre/${version}/${pkgname}-${version}.tar.bz2"
 checksum=4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8
 
 case "$XBPS_TARGET_MACHINE" in

From c5d0d3d12b7f85a6998130f9b5e08498da5c4ba7 Mon Sep 17 00:00:00 2001
From: Jonathan Larsson <jonathan.larsson@dom.se>
Date: Mon, 8 Nov 2021 14:16:03 +0100
Subject: [PATCH 2652/4088] barrier: version update to 2.4.0

---
 srcpkgs/barrier/template | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index f36a9914585c..79a4351077d4 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
-version=2.3.3
-revision=2
+version=2.4.0
+revision=1
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -11,22 +11,28 @@ short_desc="Open-source KVM software based on Synergy"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://github.com/debauchee/barrier"
-_gmock_commit=7d33fee11ec480beae4c28ad09ca56d974140a72
-_gtest_commit=800f5422ac9d9e0ad59cd860a2ef3a679588acb4
-distfiles="https://github.com/debauchee/barrier/archive/v${version}.tar.gz
- https://github.com/google/googlemock/archive/${_gmock_commit}.tar.gz
- https://github.com/google/googletest/archive/${_gtest_commit}.tar.gz"
-checksum="259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5
- f4191fd64e8a961c06b7cc90a2bbf3774bd315254884675a900f8f34fc2c4c81
- 57bc26ac31e1bc47a12e4ae99a0f6e17506ba10f0f82ae16aa52cc7cc215a3b0"
+_gtest_commit=bf0701daa9f5b30e5882e2f8f9a5280bcba87e77
+_ghc_commit=a07ddedeae722c09e819895e1c31ae500e9abad6
+distfiles="https://github.com/google/googletest/archive/${_gtest_commit}.tar.gz
+ https://github.com/gulrak/filesystem/archive/${_ghc_commit}.tar.gz
+ https://github.com/debauchee/barrier/archive/v${version}.tar.gz"
+checksum="b44b5d37b62e7e54887f07f9862e7dce537aa9922e80995007bcffe6ab9058d4
+ a0311bf91e6b4a7dbeb40be076d4b8e28f54f5034c9b9c5ce3ccd55c9b7a8819
+ 20046cae7a831d9bb3740b6f04feb9bded4c794c11586a70089080e94ae2fe77"
 
 pre_configure() {
 	# move submodule to proper location
 	rmdir ext/gmock
 	rmdir ext/gtest
+	rmdir ext/gulrak-filesystem
 
-	mv -v ../googlemock-${_gmock_commit} ext/gmock
-	mv -v ../googletest-${_gtest_commit} ext/gtest
+	mv -v ../googletest-${_gtest_commit}/googlemock ext/gmock
+	mv -v ../googletest-${_gtest_commit}/googletest ext/gtest
+	mv -v ../filesystem-${_ghc_commit}/include/ghc src/lib/ghc
+}
+
+do_check() {
+	: # CTest is wrongly configured, can't find the test binaries
 }
 
 do_install() {

From befa74791924e84b1a34a0b8940e4ab4b57e9e59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Nov 2021 08:29:29 +0100
Subject: [PATCH 2653/4088] telegram-desktop: update to 3.2.2.

---
 srcpkgs/telegram-desktop/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 063da2de496d..664c58842e70 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=3.1.11
+version=3.2.2
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -10,7 +10,8 @@ configure_args="-DTDESKTOP_API_ID=209235
  -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
  -DTDESKTOP_LAUNCHER_BASENAME=org.telegram.desktop.desktop
  -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DDESKTOP_APP_QT6=OFF"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools python extra-cmake-modules
  wayland-devel qt5-wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
@@ -26,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=0f7ee7bd7c5746026744de2eb447b11f83e77eb30be49e9e894bc37008b49d4a
+checksum=f9b82a2133f8811ba465a54c70335b14c281eefe55668a7670522f3c5719fb9d
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 97ca973024afb1fc43bf8a67c3f96b8470f24fec Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 10:54:57 +0100
Subject: [PATCH 2654/4088] mozjs78: patch to fix building with Python 3.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

mozjs78 also needs ahesford’s firefox-esr patch

Closes: #33976 [via git-merge-pr]
---
 srcpkgs/mozjs78/patches/fix-python3.10.patch | 826 +++++++++++++++++++
 1 file changed, 826 insertions(+)
 create mode 100644 srcpkgs/mozjs78/patches/fix-python3.10.patch

diff --git a/srcpkgs/mozjs78/patches/fix-python3.10.patch b/srcpkgs/mozjs78/patches/fix-python3.10.patch
new file mode 100644
index 000000000000..143e58782581
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/fix-python3.10.patch
@@ -0,0 +1,826 @@
+diff -ur a/python/mach/mach/config.py b/python/mach/mach/config.py
+--- a/python/mach/mach/config.py	2021-09-01 13:26:18.000000000 -0400
++++ b/python/mach/mach/config.py	2021-11-05 15:29:12.000000000 -0400
+@@ -144,7 +144,7 @@
+     return _
+ 
+ 
+-class ConfigSettings(collections.Mapping):
++class ConfigSettings(collections.abc.Mapping):
+     """Interface for configuration settings.
+ 
+     This is the main interface to the configuration.
+@@ -190,7 +190,7 @@
+     will result in exceptions being raised.
+     """
+ 
+-    class ConfigSection(collections.MutableMapping, object):
++    class ConfigSection(collections.abc.MutableMapping, object):
+         """Represents an individual config section."""
+         def __init__(self, config, name, settings):
+             object.__setattr__(self, '_config', config)
+diff -ur a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
+--- a/python/mach/mach/decorators.py	2021-09-01 13:26:18.000000000 -0400
++++ b/python/mach/mach/decorators.py	2021-11-05 15:29:12.000000000 -0400
+@@ -140,7 +140,7 @@
+               'Conditions argument must take a list ' + \
+               'of functions. Found %s instead.'
+ 
+-        if not isinstance(command.conditions, collections.Iterable):
++        if not isinstance(command.conditions, collections.abc.Iterable):
+             msg = msg % (command.name, type(command.conditions))
+             raise MachError(msg)
+ 
+diff -ur a/python/mach/mach/main.py b/python/mach/mach/main.py
+--- a/python/mach/mach/main.py	2021-09-01 13:26:23.000000000 -0400
++++ b/python/mach/mach/main.py	2021-11-05 15:29:12.000000000 -0400
+@@ -16,7 +16,7 @@
+ import sys
+ import traceback
+ import uuid
+-from collections import Iterable
++from collections.abc import Iterable
+ 
+ from six import string_types
+ 
+diff -ur a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
+--- a/python/mozbuild/mozbuild/backend/configenvironment.py	2021-09-01 13:26:34.000000000 -0400
++++ b/python/mozbuild/mozbuild/backend/configenvironment.py	2021-11-05 15:29:12.000000000 -0400
+@@ -9,7 +9,8 @@
+ import sys
+ import json
+ 
+-from collections import Iterable, OrderedDict
++from collections import OrderedDict
++from collections.abc import Iterable
+ from types import ModuleType
+ 
+ import mozpack.path as mozpath
+diff -ur a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py
+--- a/python/mozbuild/mozbuild/makeutil.py	2021-09-01 13:26:18.000000000 -0400
++++ b/python/mozbuild/mozbuild/makeutil.py	2021-11-05 15:29:12.000000000 -0400
+@@ -7,7 +7,7 @@
+ import os
+ import re
+ import six
+-from collections import Iterable
++from collections.abc import Iterable
+ 
+ 
+ class Makefile(object):
+diff -ur a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+--- a/python/mozbuild/mozbuild/util.py	2021-09-01 13:26:18.000000000 -0400
++++ b/python/mozbuild/mozbuild/util.py	2021-11-05 15:29:12.000000000 -0400
+@@ -782,7 +782,7 @@
+         self._strings = StrictOrderingOnAppendList()
+         self._children = {}
+ 
+-    class StringListAdaptor(collections.Sequence):
++    class StringListAdaptor(collections.abc.Sequence):
+         def __init__(self, hsl):
+             self._hsl = hsl
+ 
+diff -ur a/testing/marionette/client/marionette_driver/wait.py b/testing/marionette/client/marionette_driver/wait.py
+--- a/testing/marionette/client/marionette_driver/wait.py	2021-09-01 13:26:30.000000000 -0400
++++ b/testing/marionette/client/marionette_driver/wait.py	2021-11-05 15:29:12.000000000 -0400
+@@ -82,7 +82,7 @@
+ 
+         exceptions = []
+         if ignored_exceptions is not None:
+-            if isinstance(ignored_exceptions, collections.Iterable):
++            if isinstance(ignored_exceptions, collections.abc.Iterable):
+                 exceptions.extend(iter(ignored_exceptions))
+             else:
+                 exceptions.append(ignored_exceptions)
+diff -ur a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py
+--- a/testing/mozbase/manifestparser/manifestparser/filters.py	2021-09-01 13:26:23.000000000 -0400
++++ b/testing/mozbase/manifestparser/manifestparser/filters.py	2021-11-05 15:29:12.000000000 -0400
+@@ -12,7 +12,8 @@
+ 
+ import itertools
+ import os
+-from collections import defaultdict, MutableSequence
++from collections import defaultdict
++from collections.abc import MutableSequence
+ 
+ import six
+ from six import string_types
+diff -ur a/testing/mozbase/versioninfo.py b/testing/mozbase/versioninfo.py
+--- a/testing/mozbase/versioninfo.py	2021-09-01 13:26:23.000000000 -0400
++++ b/testing/mozbase/versioninfo.py	2021-11-05 15:29:12.000000000 -0400
+@@ -11,7 +11,7 @@
+ 
+ from __future__ import absolute_import, print_function
+ 
+-from collections import Iterable
++from collections.abc import Iterable
+ from distutils.version import StrictVersion
+ import argparse
+ import os
+diff -ur a/testing/web-platform/tests/tools/manifest/typedata.py b/testing/web-platform/tests/tools/manifest/typedata.py
+--- a/testing/web-platform/tests/tools/manifest/typedata.py	2021-09-01 13:26:40.000000000 -0400
++++ b/testing/web-platform/tests/tools/manifest/typedata.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,4 +1,4 @@
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ 
+ from six import itervalues, iteritems
+ 
+diff -ur a/testing/web-platform/tests/tools/manifest/vcs.py b/testing/web-platform/tests/tools/manifest/vcs.py
+--- a/testing/web-platform/tests/tools/manifest/vcs.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/manifest/vcs.py	2021-11-05 15:29:12.000000000 -0400
+@@ -3,7 +3,7 @@
+ import os
+ import stat
+ from collections import deque
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ 
+ from six import with_metaclass, PY2
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py b/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py
+--- a/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py	2021-09-01 13:26:56.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py	2021-11-05 15:29:12.000000000 -0400
+@@ -4,7 +4,8 @@
+ 
+ from __future__ import absolute_import, division, print_function
+ 
+-from collections import Mapping, OrderedDict, Sequence
++from collections import OrderedDict
++from collections.abc import Mapping, Sequence
+ 
+ import pytest
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py
+--- a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py	2021-11-05 15:32:28.817737357 -0400
+@@ -88,7 +88,7 @@
+         )
+ 
+ 
+-class Settings(collections.MutableMapping):
++class Settings(collections.abc.MutableMapping):
+     """
+     An object that encapsulates HTTP/2 settings state.
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py
+--- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,6 +1,6 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+-from collections import Mapping
++from collections.abc import Mapping
+ 
+ 
+ class Trie(Mapping):
+diff -ur a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py
+--- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,7 +1,7 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+ 
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ from xml.dom import minidom, Node
+ import weakref
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py
+--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py	2021-09-01 13:27:00.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py	2021-11-05 15:29:12.000000000 -0400
+@@ -10,7 +10,7 @@
+ from hyper.common.util import to_bytestring, to_bytestring_tuple
+ 
+ 
+-class HTTPHeaderMap(collections.MutableMapping):
++class HTTPHeaderMap(collections.abc.MutableMapping):
+     """
+     A structure that contains HTTP headers.
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py
+--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py	2021-09-01 13:26:56.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py	2021-11-05 15:29:12.000000000 -0400
+@@ -151,7 +151,7 @@
+         )
+ 
+ 
+-class Settings(collections.MutableMapping):
++class Settings(collections.abc.MutableMapping):
+     """
+     An object that encapsulates HTTP/2 settings state.
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py
+--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py	2021-09-01 13:27:00.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py	2021-11-05 15:29:12.000000000 -0400
+@@ -10,7 +10,7 @@
+ import socket
+ import base64
+ 
+-from collections import Iterable, Mapping
++from collections.abc import Iterable, Mapping
+ 
+ import collections
+ from hyperframe.frame import SettingsFrame
+@@ -295,7 +295,7 @@
+                 return
+ 
+             # Iterables that set a specific content length.
+-            elif isinstance(body, collections.Iterable):
++            elif isinstance(body, collections.abc.Iterable):
+                 for item in body:
+                     try:
+                         self._sock.send(item)
+diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py
+--- a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py	2021-11-05 15:29:12.000000000 -0400
+@@ -11,7 +11,7 @@
+ Flag = collections.namedtuple("Flag", ["name", "bit"])
+ 
+ 
+-class Flags(collections.MutableSet):
++class Flags(collections.abc.MutableSet):
+     """
+     A simple MutableSet implementation that will only accept known flags as elements.
+ 
+diff -ur a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py
+--- a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py	2021-09-01 13:26:39.000000000 -0400
++++ b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py	2021-11-05 15:29:12.000000000 -0400
+@@ -11,7 +11,7 @@
+ Flag = collections.namedtuple("Flag", ["name", "bit"])
+ 
+ 
+-class Flags(collections.MutableSet):
++class Flags(collections.abc.MutableSet):
+     """
+     A simple MutableSet implementation that will only accept known flags as
+     elements.
+diff -ur a/testing/web-platform/tests/tools/wptserve/wptserve/config.py b/testing/web-platform/tests/tools/wptserve/wptserve/config.py
+--- a/testing/web-platform/tests/tools/wptserve/wptserve/config.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/tools/wptserve/wptserve/config.py	2021-11-05 15:29:12.000000000 -0400
+@@ -2,7 +2,8 @@
+ import logging
+ import os
+ 
+-from collections import defaultdict, Mapping
++from collections import defaultdict
++from collections.abc import Mapping
+ from six import integer_types, iteritems, itervalues, string_types
+ 
+ from . import sslutils
+diff -ur a/testing/web-platform/tests/webdriver/tests/support/sync.py b/testing/web-platform/tests/webdriver/tests/support/sync.py
+--- a/testing/web-platform/tests/webdriver/tests/support/sync.py	2021-09-01 13:27:05.000000000 -0400
++++ b/testing/web-platform/tests/webdriver/tests/support/sync.py	2021-11-05 15:29:12.000000000 -0400
+@@ -81,7 +81,7 @@
+ 
+         exceptions = []
+         if ignored_exceptions is not None:
+-            if isinstance(ignored_exceptions, collections.Iterable):
++            if isinstance(ignored_exceptions, collections.abc.Iterable):
+                 exceptions.extend(iter(ignored_exceptions))
+             else:
+                 exceptions.append(ignored_exceptions)
+diff -ur a/third_party/python/gyp/pylib/gyp/common.py b/third_party/python/gyp/pylib/gyp/common.py
+--- a/third_party/python/gyp/pylib/gyp/common.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/gyp/pylib/gyp/common.py	2021-11-05 15:29:12.000000000 -0400
+@@ -494,7 +494,7 @@
+ 
+ 
+ # Based on http://code.activestate.com/recipes/576694/.
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+   def __init__(self, iterable=None):
+     self.end = end = []
+     end += [None, end, end]         # sentinel node for doubly linked list
+diff -ur a/third_party/python/gyp/pylib/gyp/msvs_emulation.py b/third_party/python/gyp/pylib/gyp/msvs_emulation.py
+--- a/third_party/python/gyp/pylib/gyp/msvs_emulation.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/gyp/pylib/gyp/msvs_emulation.py	2021-11-05 15:30:47.757760820 -0400
+@@ -91,7 +91,7 @@
+   """Add |prefix| to |element| or each subelement if element is iterable."""
+   if element is None:
+     return element
+-  if (isinstance(element, collections.Iterable) and
++  if (isinstance(element, collections.abc.Iterable) and
+       not isinstance(element, basestring)):
+     return [prefix + e for e in element]
+   else:
+@@ -104,7 +104,7 @@
+   if map is not None and element is not None:
+     if not callable(map):
+       map = map.get # Assume it's a dict, otherwise a callable to do the remap.
+-    if (isinstance(element, collections.Iterable) and
++    if (isinstance(element, collections.abc.Iterable) and
+         not isinstance(element, basestring)):
+       element = filter(None, [map(elem) for elem in element])
+     else:
+@@ -117,7 +117,7 @@
+   then add |element| to it, adding each item in |element| if it's a list or
+   tuple."""
+   if append is not None and element is not None:
+-    if (isinstance(element, collections.Iterable) and
++    if (isinstance(element, collections.abc.Iterable) and
+         not isinstance(element, basestring)):
+       append.extend(element)
+     else:
+diff -ur a/third_party/python/gyp/test/lib/TestGyp.py b/third_party/python/gyp/test/lib/TestGyp.py
+--- a/third_party/python/gyp/test/lib/TestGyp.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/gyp/test/lib/TestGyp.py	2021-11-05 15:30:37.671763157 -0400
+@@ -496,7 +496,7 @@
+     if status is None:
+       kw['status'] = None
+     else:
+-      if not isinstance(status, collections.Iterable): status = (status,)
++      if not isinstance(status, collections.abc.Iterable): status = (status,)
+       kw['status'] = list(itertools.chain((0,), status))
+     self.cmake_build(gyp_file, target, **kw)
+     kw['status'] = status
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
+@@ -319,7 +319,7 @@
+ try:
+     callable = callable
+ except NameError:   # pragma: no cover
+-    from collections import Callable
++    from collections.abc import Callable
+ 
+     def callable(obj):
+         return isinstance(obj, Callable)
+@@ -475,7 +475,7 @@
+ try:
+     from collections import ChainMap
+ except ImportError: # pragma: no cover
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+ 
+     try:
+         from reprlib import recursive_repr as _recursive_repr
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,7 +1,7 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+ 
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ from xml.dom import minidom, Node
+ import weakref
+ 
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py	2021-11-05 15:29:12.000000000 -0400
+@@ -940,7 +940,7 @@
+     def __dir__(self):
+         return (dir(type(self)) + list(self.keys()))
+ 
+-collections.MutableMapping.register(ParseResults)
++collections.abc.MutableMapping.register(ParseResults)
+ 
+ def col (loc,strg):
+     """Returns current column within a string, counting newlines as line separators.
+@@ -3223,7 +3223,7 @@
+ 
+         if isinstance( exprs, basestring ):
+             self.exprs = [ ParserElement._literalStringClass( exprs ) ]
+-        elif isinstance( exprs, collections.Iterable ):
++        elif isinstance( exprs, collections.abc.Iterable ):
+             exprs = list(exprs)
+             # if sequence of strings provided, wrap with Literal
+             if all(isinstance(expr, basestring) for expr in exprs):
+@@ -4564,7 +4564,7 @@
+     symbols = []
+     if isinstance(strs,basestring):
+         symbols = strs.split()
+-    elif isinstance(strs, collections.Iterable):
++    elif isinstance(strs, collections.abc.Iterable):
+         symbols = list(strs)
+     else:
+         warnings.warn("Invalid argument to oneOf, expected string or iterable",
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
+@@ -169,7 +169,7 @@
+     """
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py	2021-11-05 15:31:35.745749692 -0400
+@@ -174,10 +174,10 @@
+         if event not in self.hooks:
+             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
+ 
+-        if isinstance(hook, collections.Callable):
++        if isinstance(hook, collections.abc.Callable):
+             self.hooks[event].append(hook)
+         elif hasattr(hook, '__iter__'):
+-            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
++            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
+ 
+     def deregister_hook(self, event, hook):
+         """Deregister a previously registered hook.
+@@ -461,7 +461,7 @@
+ 
+         is_stream = all([
+             hasattr(data, '__iter__'),
+-            not isinstance(data, (basestring, list, tuple, collections.Mapping))
++            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
+         ])
+ 
+         try:
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
+@@ -12,7 +12,7 @@
+ from .compat import OrderedDict
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """A case-insensitive ``dict``-like object.
+ 
+     Implements all methods and operations of
+@@ -71,7 +71,7 @@
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, collections.abc.Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py	2021-11-05 15:31:40.157748665 -0400
+@@ -262,7 +262,7 @@
+     if isinstance(value, (str, bytes, bool, int)):
+         raise ValueError('cannot encode objects that are not 2-tuples')
+ 
+-    if isinstance(value, collections.Mapping):
++    if isinstance(value, collections.abc.Mapping):
+         value = value.items()
+ 
+     return list(value)
+diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py
+--- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from collections import Mapping, MutableMapping
++from collections.abc import Mapping, MutableMapping
+ try:
+     from threading import RLock
+ except ImportError:  # Platform-specific: No threads available
+diff -ur a/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py b/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py
+--- a/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py	2021-11-05 15:29:12.000000000 -0400
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+diff -ur a/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py b/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py
+--- a/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py	2021-11-05 15:29:12.000000000 -0400
+@@ -482,7 +482,7 @@
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py	2021-09-01 13:27:05.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
+@@ -319,7 +319,7 @@
+ try:
+     callable = callable
+ except NameError:   # pragma: no cover
+-    from collections import Callable
++    from collections.abc import Callable
+ 
+     def callable(obj):
+         return isinstance(obj, Callable)
+@@ -475,7 +475,7 @@
+ try:
+     from collections import ChainMap
+ except ImportError: # pragma: no cover
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+ 
+     try:
+         from reprlib import recursive_repr as _recursive_repr
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,7 +1,7 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+ 
+-from collections import MutableMapping
++from collections.abc import MutableMapping
+ from xml.dom import minidom, Node
+ import weakref
+ 
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py	2021-11-05 15:29:12.000000000 -0400
+@@ -940,7 +940,7 @@
+     def __dir__(self):
+         return (dir(type(self)) + list(self.keys()))
+ 
+-collections.MutableMapping.register(ParseResults)
++collections.abc.MutableMapping.register(ParseResults)
+ 
+ def col (loc,strg):
+     """Returns current column within a string, counting newlines as line separators.
+@@ -3223,7 +3223,7 @@
+ 
+         if isinstance( exprs, basestring ):
+             self.exprs = [ ParserElement._literalStringClass( exprs ) ]
+-        elif isinstance( exprs, collections.Iterable ):
++        elif isinstance( exprs, collections.abc.Iterable ):
+             exprs = list(exprs)
+             # if sequence of strings provided, wrap with Literal
+             if all(isinstance(expr, basestring) for expr in exprs):
+@@ -4564,7 +4564,7 @@
+     symbols = []
+     if isinstance(strs,basestring):
+         symbols = strs.split()
+-    elif isinstance(strs, collections.Iterable):
++    elif isinstance(strs, collections.abc.Iterable):
+         symbols = list(strs)
+     else:
+         warnings.warn("Invalid argument to oneOf, expected string or iterable",
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
+@@ -169,7 +169,7 @@
+     """
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py	2021-11-05 15:31:52.397745825 -0400
+@@ -174,10 +174,10 @@
+         if event not in self.hooks:
+             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
+ 
+-        if isinstance(hook, collections.Callable):
++        if isinstance(hook, collections.abc.Callable):
+             self.hooks[event].append(hook)
+         elif hasattr(hook, '__iter__'):
+-            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
++            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
+ 
+     def deregister_hook(self, event, hook):
+         """Deregister a previously registered hook.
+@@ -461,7 +461,7 @@
+ 
+         is_stream = all([
+             hasattr(data, '__iter__'),
+-            not isinstance(data, (basestring, list, tuple, collections.Mapping))
++            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
+         ])
+ 
+         try:
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py	2021-11-05 15:32:02.765743413 -0400
+@@ -12,7 +12,7 @@
+ from .compat import OrderedDict
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """A case-insensitive ``dict``-like object.
+ 
+     Implements all methods and operations of
+@@ -71,7 +71,7 @@
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, collections.abc.Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py	2021-11-05 15:31:57.123744724 -0400
+@@ -262,7 +262,7 @@
+     if isinstance(value, (str, bytes, bool, int)):
+         raise ValueError('cannot encode objects that are not 2-tuples')
+ 
+-    if isinstance(value, collections.Mapping):
++    if isinstance(value, collections.abc.Mapping):
+         value = value.items()
+ 
+     return list(value)
+diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py
+--- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from collections import Mapping, MutableMapping
++from collections.abc import Mapping, MutableMapping
+ try:
+     from threading import RLock
+ except ImportError:  # Platform-specific: No threads available
+diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/vendor/requests/cookies.py
+--- a/third_party/python/pipenv/pipenv/vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
+@@ -169,7 +169,7 @@
+     """
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/models.py b/third_party/python/pipenv/pipenv/vendor/requests/models.py
+--- a/third_party/python/pipenv/pipenv/vendor/requests/models.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/requests/models.py	2021-11-05 15:32:09.732741793 -0400
+@@ -174,10 +174,10 @@
+         if event not in self.hooks:
+             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
+ 
+-        if isinstance(hook, collections.Callable):
++        if isinstance(hook, collections.abc.Callable):
+             self.hooks[event].append(hook)
+         elif hasattr(hook, '__iter__'):
+-            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
++            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
+ 
+     def deregister_hook(self, event, hook):
+         """Deregister a previously registered hook.
+@@ -461,7 +461,7 @@
+ 
+         is_stream = all([
+             hasattr(data, '__iter__'),
+-            not isinstance(data, (basestring, list, tuple, collections.Mapping))
++            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
+         ])
+ 
+         try:
+diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/structures.py b/third_party/python/pipenv/pipenv/vendor/requests/structures.py
+--- a/third_party/python/pipenv/pipenv/vendor/requests/structures.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
+@@ -12,7 +12,7 @@
+ from .compat import OrderedDict
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """A case-insensitive ``dict``-like object.
+ 
+     Implements all methods and operations of
+@@ -71,7 +71,7 @@
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, collections.abc.Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/utils.py b/third_party/python/pipenv/pipenv/vendor/requests/utils.py
+--- a/third_party/python/pipenv/pipenv/vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/requests/utils.py	2021-11-05 15:32:13.776740860 -0400
+@@ -262,7 +262,7 @@
+     if isinstance(value, (str, bytes, bool, int)):
+         raise ValueError('cannot encode objects that are not 2-tuples')
+ 
+-    if isinstance(value, collections.Mapping):
++    if isinstance(value, collections.abc.Mapping):
+         value = value.items()
+ 
+     return list(value)
+diff -ur a/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py
+--- a/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py	2021-09-01 13:26:46.000000000 -0400
++++ b/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from collections import Mapping, MutableMapping
++from collections.abc import Mapping, MutableMapping
+ try:
+     from threading import RLock
+ except ImportError:  # Platform-specific: No threads available
+diff -ur a/third_party/python/pyyaml/lib3/yaml/constructor.py b/third_party/python/pyyaml/lib3/yaml/constructor.py
+--- a/third_party/python/pyyaml/lib3/yaml/constructor.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/pyyaml/lib3/yaml/constructor.py	2021-11-05 15:29:12.000000000 -0400
+@@ -123,7 +123,7 @@
+         mapping = {}
+         for key_node, value_node in node.value:
+             key = self.construct_object(key_node, deep=deep)
+-            if not isinstance(key, collections.Hashable):
++            if not isinstance(key, collections.abc.Hashable):
+                 raise ConstructorError("while constructing a mapping", node.start_mark,
+                         "found unhashable key", key_node.start_mark)
+             value = self.construct_object(value_node, deep=deep)
+diff -ur a/third_party/python/requests/requests/cookies.py b/third_party/python/requests/requests/cookies.py
+--- a/third_party/python/requests/requests/cookies.py	2021-09-01 13:27:05.000000000 -0400
++++ b/third_party/python/requests/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
+@@ -161,7 +161,7 @@
+     Use .get and .set and include domain and path args in order to be more specific."""
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+diff -ur a/third_party/python/requests/requests/packages/urllib3/_collections.py b/third_party/python/requests/requests/packages/urllib3/_collections.py
+--- a/third_party/python/requests/requests/packages/urllib3/_collections.py	2021-09-01 13:27:13.000000000 -0400
++++ b/third_party/python/requests/requests/packages/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from collections import Mapping, MutableMapping
++from collections.abc import Mapping, MutableMapping
+ try:
+     from threading import RLock
+ except ImportError:  # Platform-specific: No threads available
+diff -ur a/third_party/python/requests/requests/structures.py b/third_party/python/requests/requests/structures.py
+--- a/third_party/python/requests/requests/structures.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/requests/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
+@@ -11,7 +11,7 @@
+ import collections
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """
+     A case-insensitive ``dict``-like object.
+ 
+@@ -71,7 +71,7 @@
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, collections.abc.Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+diff -ur a/third_party/python/requests/requests/utils.py b/third_party/python/requests/requests/utils.py
+--- a/third_party/python/requests/requests/utils.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/requests/requests/utils.py	2021-11-05 15:30:55.420759045 -0400
+@@ -189,7 +189,7 @@
+     if isinstance(value, (str, bytes, bool, int)):
+         raise ValueError('cannot encode objects that are not 2-tuples')
+ 
+-    if isinstance(value, collections.Mapping):
++    if isinstance(value, collections.abc.Mapping):
+         value = value.items()
+ 
+     return list(value)
+diff -ur a/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py b/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py
+--- a/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py	2021-09-01 13:27:00.000000000 -0400
++++ b/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
+@@ -481,7 +481,7 @@
+ try:
+     from collections import ChainMap
+ except ImportError: # pragma: no cover
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+ 
+     try:
+         from reprlib import recursive_repr as _recursive_repr
+diff -ur a/third_party/python/voluptuous/voluptuous/schema_builder.py b/third_party/python/voluptuous/voluptuous/schema_builder.py
+--- a/third_party/python/voluptuous/voluptuous/schema_builder.py	2021-09-01 13:27:09.000000000 -0400
++++ b/third_party/python/voluptuous/voluptuous/schema_builder.py	2021-11-05 15:30:32.399764374 -0400
+@@ -280,7 +280,7 @@
+             return schema.__voluptuous_compile__(self)
+         if isinstance(schema, Object):
+             return self._compile_object(schema)
+-        if isinstance(schema, collections.Mapping):
++        if isinstance(schema, collections.abc.Mapping):
+             return self._compile_dict(schema)
+         elif isinstance(schema, list):
+             return self._compile_list(schema)

From 0bd3f3c3bfd1b38f6c7c3919a6eb67a2bb22e229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 9 Nov 2021 10:16:00 -0300
Subject: [PATCH 2655/4088] flintlib: update to 2.8.3.

---
 srcpkgs/flintlib/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index d255014d7e89..a14a69fb8fa4 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -1,6 +1,6 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=2.8.2
+version=2.8.3
 revision=1
 wrksrc="flint-${version}"
 build_style=configure
@@ -10,8 +10,9 @@ short_desc="Fast Library for Number Theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://flintlib.org"
+changelog="https://raw.githubusercontent.com/wbhart/flint2/trunk/NEWS"
 distfiles="https://flintlib.org/flint-${version}.tar.gz"
-checksum=4e878577dc1e17b27887272ff1dff1721189b078d36682c5ceb71b34cd1b3484
+checksum=2c3c2dbfb82242c835be44341d893ca69384d4d0b9448a3aac874e16c623cd59
 
 build_options="ntl"
 desc_option_ntl="enable NTL support"

From a54405a0504fd438adb2bc42d65feeefc036665b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Nov 2021 11:53:53 +0200
Subject: [PATCH 2656/4088] skype: update to 8.78.0.161.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 29473f724608..a09223ab1b54 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.77.0.97
+version=8.78.0.161
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=abffa2e1237e3b6c2cb9e590a829d36a8d3162b22dd872086526586b36070e58
+checksum=db6a9aafa028c16f2f789e3d496adb465f1b6476f88c384752d95130d6af72a1
 repository="nonfree"
 nostrip="yes"
 

From 35ac089ca6fc618f4622678d30be760573165b2f Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 8 Nov 2021 23:04:15 +0100
Subject: [PATCH 2657/4088] gopls: update to 0.7.3.

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 7f392f44722f..c477e6a6b789 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.2
+version=0.7.3
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -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=7c4d5fab07890106b337cd292485bccc0fcf82da7ce246ac3fc55914aaf9d140
+checksum=8a50c76328469602d0e26fcd145d3ce7e3076684024e55d84c80db570ec94405
 
 post_install() {
 	vlicense ../LICENSE

From 14f25befaab0e333717db50a954a28f574591ad6 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 8 Nov 2021 22:50:51 +0100
Subject: [PATCH 2658/4088] procs: fix completion

Procs prepend generated completion with following string if stdout
of procs --completion is redirected to file:

    completion file is generated: ./procs.bash
---
 srcpkgs/procs/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 8da431f119bb..b82f4ac4e004 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,7 +1,7 @@
 # Template file for 'procs'
 pkgname=procs
 version=0.11.10
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 short_desc="Modern replacement for ps written in Rust"
@@ -14,15 +14,15 @@ checksum=e6a869722181f2122a5a223517a2d1f6505d19b8b9d46ffd59c61fb02f472403
 
 post_build() {
 	PROCS="target/${RUST_TARGET}/release/procs"
-	vtargetrun ${PROCS} --completion bash > procs.bash
-	vtargetrun ${PROCS} --completion fish > procs.fish
-	vtargetrun ${PROCS} --completion zsh > procs.zsh
+	vtargetrun ${PROCS} --completion bash
+	vtargetrun ${PROCS} --completion fish
+	vtargetrun ${PROCS} --completion zsh
 }
 
 post_install() {
 	vcompletion procs.bash bash
 	vcompletion procs.fish fish
-	vcompletion procs.zsh zsh
+	vcompletion _procs zsh
 
 	vlicense LICENSE
 }

From 7ce82f27f097aefdf24e852bed32cdc3fb967f5f Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitorrentsj@gmail.com>
Date: Thu, 2 Sep 2021 22:39:15 +0200
Subject: [PATCH 2659/4088] New package: m4ri-20200125

---
 common/shlibs         |  1 +
 srcpkgs/m4ri-devel    |  1 +
 srcpkgs/m4ri/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/m4ri-devel
 create mode 100644 srcpkgs/m4ri/template

diff --git a/common/shlibs b/common/shlibs
index 52c2f17b7198..fff8db2b0e73 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4041,3 +4041,4 @@ libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libavif.so.13 libavif-0.9.3_1
 libkdumpfile.so.9 libkdumpfile-0.4.1_1
+libm4ri-0.0.20200125.so m4ri-20200125_1
diff --git a/srcpkgs/m4ri-devel b/srcpkgs/m4ri-devel
new file mode 120000
index 000000000000..a269c97b0d75
--- /dev/null
+++ b/srcpkgs/m4ri-devel
@@ -0,0 +1 @@
+m4ri
\ No newline at end of file
diff --git a/srcpkgs/m4ri/template b/srcpkgs/m4ri/template
new file mode 100644
index 000000000000..54a8981e5176
--- /dev/null
+++ b/srcpkgs/m4ri/template
@@ -0,0 +1,25 @@
+# Template file for 'm4ri'
+pkgname=m4ri
+version=20200125
+revision=1
+build_style=gnu-configure
+configure_args="--enable-openmp ax_cv_have_sse3_ext=no ax_cv_have_ssse3_ext=no"
+hostmakedepends="pkg-config"
+makedepends="libgomp-devel libpng-devel"
+short_desc="Library for fast arithmetic with dense matrices over GF(2)"
+maintainer="Eloi Torrents <eloitorrentsj@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bitbucket.org/malb/m4ri"
+distfiles="https://bitbucket.org/malb/m4ri/downloads/${pkgname}-${version}.tar.gz"
+checksum=0dfb34aed351882a0f2281535ea6f81c690a5efeb14edab131d9ba0dffe44863
+
+m4ri-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/libm4ri.so
+		vmove usr/lib/pkgconfig
+	}
+}

From e6a0d290396556e0de05dab0b2920528de5008d9 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitorrentsj@gmail.com>
Date: Thu, 2 Sep 2021 23:18:10 +0200
Subject: [PATCH 2660/4088] New package: m4rie-20200125

Closes: #32601 [via git-merge-pr]
---
 common/shlibs          |  1 +
 srcpkgs/m4rie-devel    |  1 +
 srcpkgs/m4rie/template | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 120000 srcpkgs/m4rie-devel
 create mode 100644 srcpkgs/m4rie/template

diff --git a/common/shlibs b/common/shlibs
index fff8db2b0e73..1b16bbcdc427 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4042,3 +4042,4 @@ libdecor-0.so.0 libdecor-0.1.0_1
 libavif.so.13 libavif-0.9.3_1
 libkdumpfile.so.9 libkdumpfile-0.4.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
+libm4rie-0.0.20200125.so m4rie-20200125_1
diff --git a/srcpkgs/m4rie-devel b/srcpkgs/m4rie-devel
new file mode 120000
index 000000000000..664b7673e9ca
--- /dev/null
+++ b/srcpkgs/m4rie-devel
@@ -0,0 +1 @@
+m4rie
\ No newline at end of file
diff --git a/srcpkgs/m4rie/template b/srcpkgs/m4rie/template
new file mode 100644
index 000000000000..541095c1e866
--- /dev/null
+++ b/srcpkgs/m4rie/template
@@ -0,0 +1,23 @@
+# Template file for 'm4rie'
+pkgname=m4rie
+version=20200125
+revision=1
+build_style=gnu-configure
+makedepends="m4ri-devel"
+short_desc="Library for fast arithmetic with dense matrices over GF(2^e)"
+maintainer="Eloi Torrents <eloi.torrentsj@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bitbucket.org/malb/m4rie/wiki/Home"
+distfiles="https://bitbucket.org/malb/m4rie/downloads/m4rie-${version}.tar.gz"
+checksum=7f3107f7cd10f6c22d9663d9536e1af2f551e10183601852a60d760918caf58d
+
+m4rie-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/libm4rie.so
+		vmove usr/lib/pkgconfig
+	}
+}

From 4b38c06756a2857ad3517a1615e28f7ab33a0fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 18 Aug 2021 17:11:45 -0300
Subject: [PATCH 2661/4088] New package: perl-SVG-2.86

---
 srcpkgs/perl-SVG/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/perl-SVG/template

diff --git a/srcpkgs/perl-SVG/template b/srcpkgs/perl-SVG/template
new file mode 100644
index 000000000000..66fc5e6e755c
--- /dev/null
+++ b/srcpkgs/perl-SVG/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-SVG'
+pkgname=perl-SVG
+version=2.86
+revision=1
+wrksrc="SVG-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="$hostmakedepends"
+depends="perl"
+short_desc="Generate standalone or inline SVG (Scalable Vector Graphics)"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/SVG"
+distfiles="${CPAN_SITE}/SVG/SVG-${version}.tar.gz"
+checksum=72c6eb6f86bb2c330280f9f3d342bb2673ad5da22d1f44fba3e04cfb5d30a67b

From 102755ea8eefe8f816536cae11e3a011774ce4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 22 Aug 2021 13:02:49 -0300
Subject: [PATCH 2662/4088] pari-elldata: update to 20210301.

Also:
- fix license
- change homepage and use https for downloads
- rename distfiles to include version in name
- compress files (installed-size: 157M -> 57M)
- drop depends on pari so pari can checkdepends on this (cf #29159, #32614)
- split a reasonable small subset as pari-elldata-small (1.8M vs 57M)
- add update file
- change of maintainer agreed by motorto
---
 srcpkgs/pari-elldata-small    |  1 +
 srcpkgs/pari-elldata/template | 33 ++++++++++++++++++++++++---------
 srcpkgs/pari-elldata/update   |  3 +++
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/pari-elldata-small
 create mode 100644 srcpkgs/pari-elldata/update

diff --git a/srcpkgs/pari-elldata-small b/srcpkgs/pari-elldata-small
new file mode 120000
index 000000000000..b202971d614e
--- /dev/null
+++ b/srcpkgs/pari-elldata-small
@@ -0,0 +1 @@
+pari-elldata
\ No newline at end of file
diff --git a/srcpkgs/pari-elldata/template b/srcpkgs/pari-elldata/template
index 8bbe310b1e34..12e0d21dc7e8 100644
--- a/srcpkgs/pari-elldata/template
+++ b/srcpkgs/pari-elldata/template
@@ -1,17 +1,32 @@
 # Template file for 'pari-elldata'
 pkgname=pari-elldata
-version=20190912
+version=20210301
 revision=1
 create_wrksrc=yes
-depends="pari"
+depends="pari-elldata-small"
 short_desc="PARI/GP version of J. E. Cremona Elliptic Curve Data"
-maintainer="André Cerqueira <acerqueira021@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="http://pari.math.u-bordeaux.fr/"
-distfiles="http://pari.math.u-bordeaux.fr/pub/pari/packages/elldata.tgz"
-checksum=c5757bbeba779fbf4c69718bccbe039fd98159bf2c8d13017284cf8b5a10ddc4
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://pari.math.u-bordeaux.fr/packages.html"
+distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz"
+checksum=dd551e64932d4ab27b3f2b2d1da871c2353672fc1a74705c52e3c0de84bd0cf6
+
+do_build() {
+	# compressed data files work ok (install-size: 156M -> 57M)
+	find data -type f -size +4k -print0 | xargs -0 gzip -9
+}
 
 do_install() {
- vmkdir usr/share/pari
- vcopy data/elldata usr/share/pari
+	vmkdir usr/share/pari
+	vcopy "data/*" usr/share/pari
+}
+
+pari-elldata-small_package() {
+	short_desc+=" - conductors up to 20000"
+	pkg_install() {
+		# a reasonable small subset (1.8M)
+		vmove "usr/share/pari/elldata/ell?.gz"
+		vmove "usr/share/pari/elldata/ell1?.gz"
+		vmove usr/share/pari/elldata/README
+	}
 }
diff --git a/srcpkgs/pari-elldata/update b/srcpkgs/pari-elldata/update
new file mode 100644
index 000000000000..bea0b3258ee5
--- /dev/null
+++ b/srcpkgs/pari-elldata/update
@@ -0,0 +1,3 @@
+site="http://pari.math.u-bordeaux.fr/pub/pari/packages/"
+pattern="href=\"${pkgname#pari-}.t(ar|gz)\".*\K\d\d\d\d-\d\d-\d\d(?= \d\d:\d\d )"
+version=${version:0:4}.${version:4:2}.${version:6:2}

From b052d6919a24f7e9c2470d549242b1b2a8443bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 22 Aug 2021 18:10:27 -0300
Subject: [PATCH 2663/4088] pari-galdata: several improvements

- fix license
- change homepage
- rename distfiles to include version in name
- drop depends on pari so pari can checkdepends on this (cf #29159, #32614)
- add update file
- change of maintainer agreed by motorto
---
 srcpkgs/pari-galdata/template | 17 ++++++++---------
 srcpkgs/pari-galdata/update   |  5 +++++
 2 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/pari-galdata/update

diff --git a/srcpkgs/pari-galdata/template b/srcpkgs/pari-galdata/template
index 63d930104b1a..fc76df875e31 100644
--- a/srcpkgs/pari-galdata/template
+++ b/srcpkgs/pari-galdata/template
@@ -1,17 +1,16 @@
 # Template file for 'pari-galdata'
 pkgname=pari-galdata
 version=20080411
-revision=1
+revision=2
 create_wrksrc=yes
-depends="pari"
-short_desc="PARI database needed to compute Galois group in degrees 8 through 11"
-maintainer="André Cerqueira <acerqueira021@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://pari.math.u-bordeaux.fr/"
-distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz"
+short_desc="PARI/GP database needed to compute Galois group in degrees 8 through 11"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://pari.math.u-bordeaux.fr/packages.html"
+distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz"
 checksum=b7c1650099b24a20bdade47a85a928351c586287f0d4c73933313873e63290dd
 
 do_install() {
- vmkdir  usr/share/pari/galdata
- vcopy data/galdata usr/share/pari
+	vmkdir usr/share/pari
+	vcopy "data/*" usr/share/pari
 }
diff --git a/srcpkgs/pari-galdata/update b/srcpkgs/pari-galdata/update
new file mode 100644
index 000000000000..c34e5c8bc800
--- /dev/null
+++ b/srcpkgs/pari-galdata/update
@@ -0,0 +1,5 @@
+site="http://pari.math.u-bordeaux.fr/pub/pari/packages/"
+pattern="href=\"${pkgname#pari-}.t(ar|gz)\".*\K\d\d\d\d-\d\d-\d\d(?= \d\d:\d\d )"
+version=${version:0:4}.${version:4:2}.${version:6:2}
+# the current version 20080411 is reported as 2008-04-12 by website
+ignore=2008-04-12

From 4a441a016d4c8a9f3b62b8cb41f0327b3ed19af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 22 Aug 2021 18:19:24 -0300
Subject: [PATCH 2664/4088] pari-galpol: several improvements

- fix license
- change homepage and use https for downloads
- rename distfiles to include version in name
- compress files (installed-size: 80M -> 73M)
- drop depends on pari so pari can checkdepends on this (cf #29159, #32614)
- skip slow post-install hooks since pkg contains 14681 data files
- split a small subset as pari-galpol-small (12M vs 73M)
- add update file
- change of maintainer agreed by motorto
---
 srcpkgs/pari-galpol-small    |  1 +
 srcpkgs/pari-galpol/template | 40 +++++++++++++++++++++++++++---------
 srcpkgs/pari-galpol/update   |  3 +++
 3 files changed, 34 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/pari-galpol-small
 create mode 100644 srcpkgs/pari-galpol/update

diff --git a/srcpkgs/pari-galpol-small b/srcpkgs/pari-galpol-small
new file mode 120000
index 000000000000..b4ab81425fe1
--- /dev/null
+++ b/srcpkgs/pari-galpol-small
@@ -0,0 +1 @@
+pari-galpol
\ No newline at end of file
diff --git a/srcpkgs/pari-galpol/template b/srcpkgs/pari-galpol/template
index a3c5a0882634..8cbb5d684ca9 100644
--- a/srcpkgs/pari-galpol/template
+++ b/srcpkgs/pari-galpol/template
@@ -1,18 +1,38 @@
 # Template file for 'pari-galpol'
 pkgname=pari-galpol
 version=20180625
-revision=1
+revision=2
 create_wrksrc=yes
-depends="pari"
-short_desc="PARI package of the GALPOL database of polynomials"
-maintainer="André Cerqueira <acerqueira021@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="http://pari.math.u-bordeaux.fr/"
-distfiles="http://pari.math.u-bordeaux.fr/pub/pari/packages/galpol.tgz"
+depends="pari-galpol-small"
+short_desc="PARI/GP package of the GALPOL database of polynomials"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://pari.math.u-bordeaux.fr/packages.html"
+distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz"
 checksum=562af28316ee335ee38c1172c2d5ecccb79f55c368fb9f2c6f40fc0f416bb01b
-nostrip=yes
+# skip slow post-install hooks for 14681 files: saves ~ 3m in install
+nostrip=yes                     # skip 06-strip-and-debug-pkgs
+ignore_elf_dirs=/usr/share/pari # skip 11-pkglint-elf-in-usrshare
+
+do_build() {
+	# compressed data files work ok (install-size: 80M -> 73M)
+	find data -type f -size +4k -print0 | xargs -0 gzip -9
+}
 
 do_install() {
- vmkdir  usr/share/pari
- vcopy data/galpol usr/share/pari
+	vmkdir usr/share/pari
+	vcopy "data/*" usr/share/pari
+}
+
+pari-galpol-small_package() {
+	short_desc+=" - groups of order up to 64"
+	nostrip=yes
+	ignore_elf_dirs=/usr/share/pari
+	pkg_install() {
+		# a subset enough for testing (12M)
+		vmove "usr/share/pari/galpol/?"
+		vmove "usr/share/pari/galpol/[1-5]?"
+		vmove "usr/share/pari/galpol/6[0-4]"
+		vmove usr/share/pari/galpol/README
+	}
 }
diff --git a/srcpkgs/pari-galpol/update b/srcpkgs/pari-galpol/update
new file mode 100644
index 000000000000..bea0b3258ee5
--- /dev/null
+++ b/srcpkgs/pari-galpol/update
@@ -0,0 +1,3 @@
+site="http://pari.math.u-bordeaux.fr/pub/pari/packages/"
+pattern="href=\"${pkgname#pari-}.t(ar|gz)\".*\K\d\d\d\d-\d\d-\d\d(?= \d\d:\d\d )"
+version=${version:0:4}.${version:4:2}.${version:6:2}

From ad84cac9b754d3c178646b2eeb172bfce4fa30e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 22 Aug 2021 18:32:15 -0300
Subject: [PATCH 2665/4088] pari-seadata: several improvements

- fix license
- change homepage and use https for downloads
- rename distfiles to include version in name
- compress files (installed-size: 40M -> 19M)
- drop depends on pari so pari can checkdepends on this (cf #29159, #32614)
- add a smaller subpkg pari-seadata-small as in upstream (668k vs 19M)
- add update file
- change of maintainer agreed by motorto
---
 srcpkgs/pari-seadata-small    |  1 +
 srcpkgs/pari-seadata/template | 34 +++++++++++++++++++++++++---------
 srcpkgs/pari-seadata/update   |  3 +++
 3 files changed, 29 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/pari-seadata-small
 create mode 100644 srcpkgs/pari-seadata/update

diff --git a/srcpkgs/pari-seadata-small b/srcpkgs/pari-seadata-small
new file mode 120000
index 000000000000..319551467468
--- /dev/null
+++ b/srcpkgs/pari-seadata-small
@@ -0,0 +1 @@
+pari-seadata
\ No newline at end of file
diff --git a/srcpkgs/pari-seadata/template b/srcpkgs/pari-seadata/template
index 3c836eafc156..e0221e5fd7b0 100644
--- a/srcpkgs/pari-seadata/template
+++ b/srcpkgs/pari-seadata/template
@@ -1,17 +1,33 @@
 # Template file for 'pari-seadata'
 pkgname=pari-seadata
 version=20090618
-revision=3
+revision=4
 create_wrksrc=yes
-depends="pari"
-short_desc="PARI/GP package needed by ellap for large primes up to 750 bit"
-maintainer="André Cerqueira <acerqueira021@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="http://pari.math.u-bordeaux.fr/packages.html"
-distfiles="http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata.tgz"
+depends="pari-seadata-small"
+short_desc="PARI/GP package needed by ellap for large primes up to 750 bits"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://pari.math.u-bordeaux.fr/packages.html"
+distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz"
 checksum=c9282a525ea3f92c1f9c6c69e37ac5a87b48fb9ccd943cfd7c881a3851195833
 
+do_build() {
+	# compressed data files work ok (install-size: 40M -> 19M)
+	find data -type f -size +4k -print0 | xargs -0 gzip -9
+}
+
 do_install() {
- vmkdir usr/share/pari/seadata
- vcopy data/seadata/sea* usr/share/pari/seadata
+	vmkdir usr/share/pari
+	vcopy "data/*" usr/share/pari
+}
+
+pari-seadata-small_package() {
+	short_desc="PARI/GP package needed by ellap for large primes up to 350 bits"
+	pkg_install() {
+		# much smaller version suitable for primes up to 350 bits.
+		# identical to seadata-small.tgz in pari packages (668k)
+		vmove usr/share/pari/seadata/sea2
+		vmove usr/share/pari/seadata/sea0.gz
+		vmove usr/share/pari/seadata/README
+	}
 }
diff --git a/srcpkgs/pari-seadata/update b/srcpkgs/pari-seadata/update
new file mode 100644
index 000000000000..bea0b3258ee5
--- /dev/null
+++ b/srcpkgs/pari-seadata/update
@@ -0,0 +1,3 @@
+site="http://pari.math.u-bordeaux.fr/pub/pari/packages/"
+pattern="href=\"${pkgname#pari-}.t(ar|gz)\".*\K\d\d\d\d-\d\d-\d\d(?= \d\d:\d\d )"
+version=${version:0:4}.${version:4:2}.${version:6:2}

From 1fb6ea3d14cb1dedcab8fa03d00fccd3df8615d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 22 Aug 2021 18:36:12 -0300
Subject: [PATCH 2666/4088] pari-seadata-big: several improvements

- fix license
- change homepage to https
- rename distfiles to include version in name
- drop depends on pari so pari can checkdepends on this (cf #29159, #32614)
- add update file
- change of maintainer agreed by motorto
---
 srcpkgs/pari-seadata-big/template | 16 ++++++++--------
 srcpkgs/pari-seadata-big/update   |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/pari-seadata-big/update

diff --git a/srcpkgs/pari-seadata-big/template b/srcpkgs/pari-seadata-big/template
index 31aa207eae56..706320194597 100644
--- a/srcpkgs/pari-seadata-big/template
+++ b/srcpkgs/pari-seadata-big/template
@@ -1,17 +1,17 @@
 # Template file for 'pari-seadata-big'
 pkgname=pari-seadata-big
 version=20170418
-revision=2
+revision=3
 create_wrksrc=yes
-depends="pari pari-seadata"
+depends="pari-seadata"
 short_desc="PARI/GP package needed by ellap for large primes up to 1100 bits"
-maintainer="André Cerqueira <acerqueira021@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="http://pari.math.u-bordeaux.fr/packages.html"
-distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-big.tar"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://pari.math.u-bordeaux.fr/packages.html"
+distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tar>${pkgname}-${version}.tar"
 checksum=7c4db2624808a5bbd2ba00f8b644a439f0508532efd680a247610fdd5822a5f2
 
 do_install() {
- vmkdir  usr/share/pari
- vcopy data/seadata/sea*.gz usr/share/pari
+	vmkdir usr/share/pari
+	vcopy "data/*" usr/share/pari
 }
diff --git a/srcpkgs/pari-seadata-big/update b/srcpkgs/pari-seadata-big/update
new file mode 100644
index 000000000000..bea0b3258ee5
--- /dev/null
+++ b/srcpkgs/pari-seadata-big/update
@@ -0,0 +1,3 @@
+site="http://pari.math.u-bordeaux.fr/pub/pari/packages/"
+pattern="href=\"${pkgname#pari-}.t(ar|gz)\".*\K\d\d\d\d-\d\d-\d\d(?= \d\d:\d\d )"
+version=${version:0:4}.${version:4:2}.${version:6:2}

From 16cb639471cace13451e4715c4ea75165a3f370c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 22 Aug 2021 18:57:33 -0300
Subject: [PATCH 2667/4088] New package: pari-nflistdata-20210527

---
 srcpkgs/pari-nflistdata/template | 21 +++++++++++++++++++++
 srcpkgs/pari-nflistdata/update   |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 srcpkgs/pari-nflistdata/template
 create mode 100644 srcpkgs/pari-nflistdata/update

diff --git a/srcpkgs/pari-nflistdata/template b/srcpkgs/pari-nflistdata/template
new file mode 100644
index 000000000000..c6e66f228b98
--- /dev/null
+++ b/srcpkgs/pari-nflistdata/template
@@ -0,0 +1,21 @@
+# Template file for 'pari-nflistdata'
+pkgname=pari-nflistdata
+version=20210527
+revision=1
+create_wrksrc=yes
+short_desc="PARI/GP database needed by nflist"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://pari.math.u-bordeaux.fr/packages.html"
+distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz"
+checksum=a123b2a6776a6579108254f5dbe9fd720ddbc7e46456b45e90a69e92a73b0597
+
+do_build() {
+	# compressed data files work ok (install-size: 4.1M -> 2.9M)
+	find data -type f -size +4k -print0 | xargs -0 gzip -9
+}
+
+do_install() {
+	vmkdir usr/share/pari
+	vcopy "data/*" usr/share/pari
+}
diff --git a/srcpkgs/pari-nflistdata/update b/srcpkgs/pari-nflistdata/update
new file mode 100644
index 000000000000..bea0b3258ee5
--- /dev/null
+++ b/srcpkgs/pari-nflistdata/update
@@ -0,0 +1,3 @@
+site="http://pari.math.u-bordeaux.fr/pub/pari/packages/"
+pattern="href=\"${pkgname#pari-}.t(ar|gz)\".*\K\d\d\d\d-\d\d-\d\d(?= \d\d:\d\d )"
+version=${version:0:4}.${version:4:2}.${version:6:2}

From 09e3828cea58c7a0569ca42cf787c9fe002db315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 26 Aug 2021 10:44:42 -0300
Subject: [PATCH 2668/4088] New package: pari-nftables-20080929

---
 srcpkgs/pari-nftables/template | 21 +++++++++++++++++++++
 srcpkgs/pari-nftables/update   |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 srcpkgs/pari-nftables/template
 create mode 100644 srcpkgs/pari-nftables/update

diff --git a/srcpkgs/pari-nftables/template b/srcpkgs/pari-nftables/template
new file mode 100644
index 000000000000..ba3b3ab166d2
--- /dev/null
+++ b/srcpkgs/pari-nftables/template
@@ -0,0 +1,21 @@
+# Template file for 'pari-nftables'
+pkgname=pari-nftables
+version=20080929
+revision=1
+create_wrksrc=yes
+short_desc="PARI/GP megrez number field tables"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://pari.math.u-bordeaux.fr/packages.html"
+distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz"
+checksum=8dd3393ce6b3cfcf599f094f7b22bdffe17c3ba25deb912513d54676bd7cfe92
+
+do_build() {
+	# compressed data files work ok (install-size: 35M -> 8M)
+	find . -type f -size +4k -print0 | xargs -0 gzip -9
+}
+
+do_install() {
+	vmkdir usr/share/pari
+	vcopy "*" usr/share/pari
+}
diff --git a/srcpkgs/pari-nftables/update b/srcpkgs/pari-nftables/update
new file mode 100644
index 000000000000..bea0b3258ee5
--- /dev/null
+++ b/srcpkgs/pari-nftables/update
@@ -0,0 +1,3 @@
+site="http://pari.math.u-bordeaux.fr/pub/pari/packages/"
+pattern="href=\"${pkgname#pari-}.t(ar|gz)\".*\K\d\d\d\d-\d\d-\d\d(?= \d\d:\d\d )"
+version=${version:0:4}.${version:4:2}.${version:6:2}

From 22ff198db367f3bb302c0dd2bab098236e0ee26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 22 Aug 2021 23:07:24 -0300
Subject: [PATCH 2669/4088] pari: add checkdepends to packages

---
 srcpkgs/pari/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 0fbfb340d4c9..9543739472ac 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -11,6 +11,7 @@ make_check_target=statest-all
 make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
+checkdepends="pari-elldata-small pari-galdata pari-galpol-small pari-seadata-small"
 short_desc="Fast computations library in number theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"

From 700af20ee184a5b5ccde9ef7cb3895f19262fb6f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Sep 2021 16:32:12 +0200
Subject: [PATCH 2670/4088] New package: cddlib-0.94m

---
 common/shlibs           |  2 ++
 srcpkgs/cddlib-devel    |  1 +
 srcpkgs/cddlib/template | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/cddlib-devel
 create mode 100644 srcpkgs/cddlib/template

diff --git a/common/shlibs b/common/shlibs
index 1b16bbcdc427..5d5c7ef58dd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -47,6 +47,8 @@ libSegFault.so glibc-2.32_1
 libpcprofile.so glibc-2.32_1
 libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
+libcddgmp.so.0 cddlib-0.94m_1
+libcdd.so.0 cddlib-0.94m_1
 libz.so.1 zlib-1.2.3_1
 libb2.so.1 libb2-0.98.1_1
 libbz2.so.1 bzip2-1.0.5_1
diff --git a/srcpkgs/cddlib-devel b/srcpkgs/cddlib-devel
new file mode 120000
index 000000000000..401ad0a0b1bc
--- /dev/null
+++ b/srcpkgs/cddlib-devel
@@ -0,0 +1 @@
+cddlib
\ No newline at end of file
diff --git a/srcpkgs/cddlib/template b/srcpkgs/cddlib/template
new file mode 100644
index 000000000000..7d847efbfe7d
--- /dev/null
+++ b/srcpkgs/cddlib/template
@@ -0,0 +1,24 @@
+# Template file for 'cddlib'
+pkgname=cddlib
+version=0.94m
+revision=1
+build_style=gnu-configure
+makedepends="gmp-devel"
+short_desc="Efficient implementation of the Double Description Method"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://people.inf.ethz.ch/fukudak/cdd_home/"
+distfiles="https://github.com/cddlib/cddlib/releases/download/${version}/cddlib-${version}.tar.gz"
+checksum=70dffdb3369b8704dc75428a1b3c42ab9047b81ce039f12f427e2eb2b1b0dee2
+
+cddlib-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove "usr/bin/test*"
+	}
+}

From 28a90d2e457af94ce7bd074b6b7d0a01e98f76b9 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Sep 2021 17:41:02 +0200
Subject: [PATCH 2671/4088] New package: singular-4.2.1

---
 .../patches/upstream_omalloc_new_musl.patch   | 40 +++++++++++++++++++
 .../patches/upstream_polys_test_musl.patch    | 22 ++++++++++
 srcpkgs/singular/template                     | 26 ++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
 create mode 100644 srcpkgs/singular/patches/upstream_polys_test_musl.patch
 create mode 100644 srcpkgs/singular/template

diff --git a/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch b/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
new file mode 100644
index 000000000000..354603bb2c44
--- /dev/null
+++ b/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
@@ -0,0 +1,40 @@
+From e1643135645a3cc97af8659018defd2b8617bb4e Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
+Date: Thu, 23 Sep 2021 10:57:25 +0200
+Subject: [PATCH] omalloc: fix alignment stuff for "make check"
+
+---
+ omalloc/omtTest.c | 6 ------
+ omalloc/omtTest.h | 2 +-
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/omalloc/omtTest.c b/omalloc/omtTest.c
+index 715fbb113c..75c8cdb210 100644
+--- a/omalloc/omtTest.c
++++ b/omalloc/omtTest.c
+@@ -70,12 +70,6 @@ void omtTestDebug(omMemCell cell)
+   }
+ 
+   is_size = omSizeOfAddr(cell->addr);
+-  if (!OM_IS_ALIGNED(is_size))
+-  {
+-    omReportError(omError_Unknown, omError_NoError, OM_FLR,
+-                  "is_size == %u is unaligned", is_size);
+-    return;
+-  }
+   if (is_size < size)
+   {
+     omReportError(omError_Unknown, omError_NoError, OM_FLR,
+diff --git a/omalloc/omtTest.h b/omalloc/omtTest.h
+index a579d88011..6faa099c89 100644
+--- a/omalloc/omtTest.h
++++ b/omalloc/omtTest.h
+@@ -48,7 +48,7 @@ void TestFree(omMemCell cell);
+ 
+ #define IS_STICKY_BIN(spec) (spec & 1)
+ // #define IS_STICKY_BIN(spec) (0)
+-#define GET_SIZE(spec)      (spec & ((((unsigned long) 1) << 14) -1))
++#define GET_SIZE(spec)      OM_ALIGN_SIZE((spec & ((((unsigned long) 1) << 14) -1)))
+ #define SET_SIZE(spec, size) spec = ((spec & ~((((unsigned long) 1) << 14) -1)) | (size))
+ #define IS_ALIGNED(spec)    (spec & (((unsigned long) 1) << 15))
+ #define IS_ZERO(spec)       (spec & (((unsigned long) 1) << 16))
diff --git a/srcpkgs/singular/patches/upstream_polys_test_musl.patch b/srcpkgs/singular/patches/upstream_polys_test_musl.patch
new file mode 100644
index 000000000000..73ee062e2f89
--- /dev/null
+++ b/srcpkgs/singular/patches/upstream_polys_test_musl.patch
@@ -0,0 +1,22 @@
+From 6e2383111a18b2fa2d3421045625d1d424eb1e25 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
+Date: Mon, 20 Sep 2021 15:13:36 +0200
+Subject: [PATCH] fix: make check: polys_test
+
+---
+ libpolys/tests/polys_test.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libpolys/tests/polys_test.h b/libpolys/tests/polys_test.h
+index 5526aa5a6b..5b4c561238 100644
+--- a/libpolys/tests/polys_test.h
++++ b/libpolys/tests/polys_test.h
+@@ -2481,7 +2481,7 @@ class PolysTestSuite : public CxxTest::TestSuite
+     {
+       for (int qi = 0; qi <= 100; qi++)
+       {
+-        int c = rand() % 1000000;
++        int c = rand() % 1000000+1; /* c must not be 0 */
+         poly qterm = p_ISet(c, r); p_SetExp(qterm, 1, qi, r);
+         p_Setm(qterm, r);
+         number qtermAsN = toFractionNumber(qterm, cf);
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
new file mode 100644
index 000000000000..d3af1c8b919b
--- /dev/null
+++ b/srcpkgs/singular/template
@@ -0,0 +1,26 @@
+# Template file for 'singular'
+pkgname=singular
+version=4.2.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-readline=ncurses
+	--enable-gfanlib
+	--enable-Singular
+	--enable-factory
+	--disable-doc
+	--disable-polymake
+	--without-python
+	--with-libparse
+	ac_cv_lib_cddgmp_dd_free_global_constants=yes"
+hostmakedepends="perl tar doxygen"
+makedepends="flintlib-devel cddlib-devel readline-devel graphviz"
+short_desc="Computer algebra system for polynomial computations"
+maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.singular.uni-kl.de"
+distfiles="https://service.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/${version//./-}/singular-${version}.tar.gz"
+checksum=28a56df84f85b116e0068ffecf92fbe08fc27bd4c5ba902997f1a367db0bfe8d
+
+if [ -z "$CROSS_BUILD" ]; then
+	makedepends+=" ntl-devel"
+fi

From 07818772dde318e497439fc509f8d5ca72beb8b9 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 9 Nov 2021 16:29:33 +0100
Subject: [PATCH 2672/4088] blueman: update to 2.2.3.

---
 srcpkgs/blueman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index 60abad4af4a7..ff74f1751b09 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -1,6 +1,6 @@
 # Template file for 'blueman'
 pkgname=blueman
-version=2.2.2
+version=2.2.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/blueman-project/blueman"
 distfiles="https://github.com/blueman-project/blueman/releases/download/${version}/blueman-${version}.tar.xz"
-checksum=19ed59b1a134f584fc005f47295fef640a9709fd9b9b2307388e112a32ecd0f6
+checksum=6edd791da6afd8f610ffb08d5138cfcf50e6257ad30efad686287f3a2be106e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel python3-devel"

From 37fcb0bd2585dc58d736db743511babdb1db01d2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Nov 2021 17:52:13 +0200
Subject: [PATCH 2673/4088] FeatherPad: update to 1.0.1.

---
 srcpkgs/FeatherPad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index 29b90eadab5b..987a25690190 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=1.0.0
+version=1.0.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=ad9f090241053aeafd3238cf8d2e175de1a49988c620ad9629b2557cb8a9d5df
+checksum=62bcb8ceb788a1626c41ee7dc3f3fbebf73b82db31cf76708a79073da0f04414

From 62ccd5fcbeeb1b3f6525453c7276a2b267a9b850 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 09:39:41 +0100
Subject: [PATCH 2674/4088] openjade: fix patch whitespace

---
 srcpkgs/openjade/patches/openjade-1.3.2-lt.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjade/patches/openjade-1.3.2-lt.patch b/srcpkgs/openjade/patches/openjade-1.3.2-lt.patch
index fb4f35589e17..552e1a62f432 100644
--- a/srcpkgs/openjade/patches/openjade-1.3.2-lt.patch
+++ b/srcpkgs/openjade/patches/openjade-1.3.2-lt.patch
@@ -3,8 +3,8 @@
 @@ -13,6 +13,7 @@
  ALL_LIBS = $(XLIBS) $(LIBS)
  Makefile.lt:
-        echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
-+       echo '.PHONY: -losp' >>Makefile.lt
+	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++	echo '.PHONY: -losp' >>Makefile.lt
 
  PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
 

From ac9e4e6b78456ed3011236f300181061421c5fb6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Nov 2021 17:37:39 +0200
Subject: [PATCH 2675/4088] papirus-icon-theme: update to 20211101.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index ce21cacefd59..508bb8ddc35c 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20211001
+version=20211101
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=a81c2b6613df650d02ff6c69846d653a02e4bda7df5e8507934019539c08592c
+checksum=dc0bf96fdc751684e7d8dc178b5194754082f89bc91ddc2952754d721266c50a
 
 do_install() {
 	vmkdir usr/share/icons

From 80c2c53acd0fd85f198e5187f39fd61df9833451 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Tue, 9 Nov 2021 12:51:25 -0500
Subject: [PATCH 2676/4088] tzdata: update to 2021e

---
 srcpkgs/tzdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 0d3bd5da5dbf..576f199552d3 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -1,6 +1,6 @@
 # Template file for 'tzdata'
 pkgname=tzdata
-version=2021c
+version=2021e
 revision=1
 bootstrap=yes
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.iana.org/time-zones"
 distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=b4f1d1c8cb11c3500276dac862d8c7e6f88c69b1e8ee4c5e9d1daad17fbe3542
+checksum=07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1
 
 do_install() {
 	local timezones="africa antarctica asia australasia europe northamerica \

From fa365149102d1296cd188d5e15025ebecc512efb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 Nov 2021 19:04:36 +0100
Subject: [PATCH 2677/4088] tzutils: update to 2021e.

---
 srcpkgs/tzutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 4b3b8e80c9f8..814693a3a56f 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,6 +1,6 @@
 # Template file for 'tzutils'
 pkgname=tzutils
-version=2021c
+version=2021e
 revision=1
 bootstrap=yes
 wrksrc="tz-${version}"
@@ -9,7 +9,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Public Domain, BSD-3-Clause"
 homepage="https://www.iana.org/time-zones"
 distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
-checksum=43e657d877c73bd130dc3ddba83f64d654e8269d38f731b13d5cb23b79befeb1
+checksum=11908a7f18530ca3013c8458d902a54cdd3382276bdd56891db074b1af4a26b8
 
 do_build() {
 	echo "$version" >version

From 9d4d46e3674aceaa5627225d87f8d694d8ff788f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 9 Nov 2021 07:47:25 -0500
Subject: [PATCH 2678/4088] python-iso8601: remove package

python3-iso8601: update to 1.0.0
---
 srcpkgs/python-iso8601/template               | 35 -------------------
 srcpkgs/python3-iso8601                       |  1 -
 srcpkgs/python3-iso8601/template              | 20 +++++++++++
 .../update                                    |  0
 4 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-iso8601/template
 delete mode 120000 srcpkgs/python3-iso8601
 create mode 100644 srcpkgs/python3-iso8601/template
 rename srcpkgs/{python-iso8601 => python3-iso8601}/update (100%)

diff --git a/srcpkgs/python-iso8601/template b/srcpkgs/python-iso8601/template
deleted file mode 100644
index c397a2310fb6..000000000000
--- a/srcpkgs/python-iso8601/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-iso8601'
-pkgname=python-iso8601
-version=0.1.16
-revision=2
-wrksrc="iso8601-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python-pytest python3-pytest"
-short_desc="ISO8601 formatted dated parser for Python2"
-maintainer="Andrew J. Hesford <ajh@sideband.org>"
-license="MIT"
-homepage="https://github.com/micktwomey/pyiso8601"
-distfiles="${PYPI_SITE}/i/iso8601/iso8601-${version}.tar.gz"
-checksum=36532f77cc800594e8f16641edae7f1baf7932f05d8e508545b95fc53c6dc85b
-replaces="python-iso-8601>=0"
-
-do_check() {
-	python2 -m pytest iso8601
-	python3 -m pytest iso8601
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-iso8601_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3"
-	replaces="python3-iso-8601>=0"
-	pkg_install() {
-		vlicense LICENSE
-		vmove ${py3_lib}
-	}
-}
diff --git a/srcpkgs/python3-iso8601 b/srcpkgs/python3-iso8601
deleted file mode 120000
index 23cdd05bb548..000000000000
--- a/srcpkgs/python3-iso8601
+++ /dev/null
@@ -1 +0,0 @@
-python-iso8601
\ No newline at end of file
diff --git a/srcpkgs/python3-iso8601/template b/srcpkgs/python3-iso8601/template
new file mode 100644
index 000000000000..55d696ac4e1f
--- /dev/null
+++ b/srcpkgs/python3-iso8601/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-iso8601'
+pkgname=python3-iso8601
+version=1.0.0
+revision=1
+wrksrc="iso8601-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-hypothesis python3-pytz"
+short_desc="ISO8601 formatted dated parser for Python3"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://github.com/micktwomey/pyiso8601"
+distfiles="${PYPI_SITE}/i/iso8601/iso8601-${version}.tar.gz"
+checksum=79ec9749f8bf35ffae77f835e80e96d2f95affa0f79d3d7b25c0fa7e06207a8b
+replaces="python3-iso-8601>=0"
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python-iso8601/update b/srcpkgs/python3-iso8601/update
similarity index 100%
rename from srcpkgs/python-iso8601/update
rename to srcpkgs/python3-iso8601/update

From 51cb716540131acadc69beb19950b0f0ab621694 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 9 Nov 2021 07:48:32 -0500
Subject: [PATCH 2679/4088] removed-packages: add python-iso8601

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 12fff3d089ed..abdaba87c465 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -255,6 +255,7 @@ replaces="
  python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
+ python-iso8601<=0.1.16_2
  python-jellyfish<=0.6.1_2
  python-matplotlib-data<=2.2.4_2
  python-matplotlib<=2.2.4_2

From 4402a47d20af279d4ed9b29b81fef7946de5d4dc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 9 Nov 2021 08:09:30 -0500
Subject: [PATCH 2680/4088] python3-numpy: update to 1.21.4.

---
 srcpkgs/python3-numpy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 8f08cc746ecf..d46a7bc1c06c 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.3
+version=1.21.4
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=21240294ff9f6312118c3ac7541d84df351b23d3d131756f9955892794211608
+checksum=59a157443cfdb9d2576a14833ca1c1c9ef96fc091955a9b6829464df39501d8c
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"

From f968e406e4e6d9480d468cff49ecb5d50ca58d7c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 9 Nov 2021 08:25:19 -0500
Subject: [PATCH 2681/4088] python3-scipy: update to 1.7.2.

---
 srcpkgs/python3-scipy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 5ffc5385a74b..1e39f97d895a 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
-revision=2
+version=1.7.2
+revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
 build_helper="numpy"
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=ee5d018ecad0364289efe3301f6445d7ef548637e0e14d0205bbf363f0dfe66a
 
 build_options="openblas"
 

From 1ddd619f82e14fed7ecaec68c4fe158939bfc89f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 9 Nov 2021 08:26:37 -0500
Subject: [PATCH 2682/4088] python3-imageio: update to 2.10.3.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index a367df980791..bccb6961d20a 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.10.1
+version=2.10.3
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=43eefc54146c42d95c8212150216f952c4e6e8270d58b6e01118348aa2c0e252
+checksum=7314f74dab1919a38de10b0cfa27decf66ca600e19bdcd9ba2f95b4572bf36de
 
 post_install() {
 	vlicense LICENSE

From ff5f18b1d6753680b83c71a4143b66b5d273f1c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 9 Nov 2021 09:41:39 -0500
Subject: [PATCH 2683/4088] python3-hypercorn: update to 0.12.0.

---
 srcpkgs/python3-hypercorn/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index f44154778e51..cf8fe5cdee43 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-hypercorn'
 pkgname=python3-hypercorn
-version=0.11.2
-revision=2
+version=0.12.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+make_install_target="Hypercorn-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-h11 python3-h2 python3-priority
  python3-toml python3-typing_extensions python3-wsproto"
 checkdepends="python3-pytest-asyncio $depends"
@@ -14,10 +15,10 @@ license="MIT"
 homepage="https://gitlab.com/pgjones/hypercorn"
 changelog="https://gitlab.com/pgjones/hypercorn/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=5030666663b3a048f971db9f728a76d4e0075a06e2a1fbed67b5c47cb11e7a5f
+checksum=c373eda54f301fdf58c5728454fb8c7cb9585aeb73f169430d9d88b5a62f7d10
 
 do_check() {
-	vsed -i setup.cfg -e '/addopts/d'
+	vsed -i pyproject.toml -e '/addopts/d'
 	# Ignored tests depend on packages not offered by Void
 	PYTHONPATH=src python3 -m pytest \
 		--ignore-glob="tests/trio/*" \

From 990d5ac29c73f2c88b8c0db62ba94c314793e918 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 9 Nov 2021 10:15:29 -0500
Subject: [PATCH 2684/4088] python3-pywt: update to 1.2.0.

---
 srcpkgs/python3-pywt/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template
index 0320b03b0e6c..3fdb9e576558 100644
--- a/srcpkgs/python3-pywt/template
+++ b/srcpkgs/python3-pywt/template
@@ -1,19 +1,24 @@
 # Template file for 'python3-pywt'
 pkgname=python3-pywt
-version=1.1.1
-revision=3
+version=1.2.0
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="numpy"
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel"
 depends="python3-numpy"
+checkdepends="python3-pytest $depends"
 short_desc="PyWavelets wavelet transform module for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/PyWavelets/pywt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=50fe2aae1b6d2462cf9e9b0dcc18dbcbd0b5ed65225abb4a272ed188dbcbceb0
+checksum=ad88e5745eeaccaf759287f11b63539353df31324fe7498d9f8121e01e4106ed
+
+do_check() {
+	(cd build/lib* && python3 -m pytest pywt/tests)
+}
 
 post_install() {
 	vlicense LICENSE

From a60ba47d8a34903ba08048bc0bd1c0d9a724755c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:53:26 +0100
Subject: [PATCH 2685/4088] pipewire: fix patch whitespace

---
 .../pipewire/patches/autostart-media-session.patch    |  6 +++---
 srcpkgs/pipewire/patches/fix-neon-detection.patch     | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
index a5c1168ae6ec..c5753a3719c2 100644
--- a/srcpkgs/pipewire/patches/autostart-media-session.patch
+++ b/srcpkgs/pipewire/patches/autostart-media-session.patch
@@ -6,12 +6,12 @@ diff --git a/src/daemon/pipewire.conf.in.orig b/src/daemon/pipewire.conf.in
 index 95632c2..ab0b097 100644
 --- a/src/daemon/pipewire.conf.in.orig
 +++ b/src/daemon/pipewire.conf.in
-@@ -235,7 +235,7 @@ context.exec = [
+@@ -236,7 +236,7 @@
      # but it is better to start it as a systemd service.
      # Run the session manager with -h for options.
      #
--    @sm_comment@{ path = "@session_manager_path@"  args = "@session_manager_args@" }
-+    { path = "@session_manager_path@"  args = "@session_manager_args@" }
+-    @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
++    { path = "@session_manager_path@" args = "@session_manager_args@" }
      #
      # You can optionally start the pulseaudio-server here as well
      # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/patches/fix-neon-detection.patch b/srcpkgs/pipewire/patches/fix-neon-detection.patch
index 597a4a3d30cd..cf65d1b4cdfd 100644
--- a/srcpkgs/pipewire/patches/fix-neon-detection.patch
+++ b/srcpkgs/pipewire/patches/fix-neon-detection.patch
@@ -5,9 +5,9 @@ diff --git meson.build meson.build
 index 29b4b892..0d048a1f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -99,36 +99,16 @@ have_avx = cc.has_argument(avx_args)
+@@ -116,37 +116,17 @@
  have_avx2 = cc.has_argument(avx2_args)
-
+ 
  have_neon = false
 -if host_machine.cpu_family() == 'aarch64'
 -  if cc.compiles('''
@@ -15,9 +15,9 @@ index 29b4b892..0d048a1f 100644
 -    int main () {
 -      float *s;
 -      asm volatile(
--	"      ld1 { v0.4s }, [%[s]], #16\n"
+-        "      ld1 { v0.4s }, [%[s]], #16\n"
 -        "      fcvtzs v0.4s, v0.4s, #31\n"
--	: [s] "+r" (s) : :);
+-        : [s] "+r" (s) : :);
 -    }
 -    ''',
 -    name : 'aarch64 Neon Support')
@@ -33,7 +33,7 @@ index 29b4b892..0d048a1f 100644
 -      asm volatile(
 -        "      vld1.32 { q0 }, [%[s]]!\n"
 -        "      vcvt.s32.f32 q0, q0, #31\n"
--	: [s] "+r" (s) : :);
+-        : [s] "+r" (s) : :);
 -    }
 -    ''',
 -    args: '-mfpu=neon',
@@ -53,3 +53,4 @@ index 29b4b892..0d048a1f 100644
 +    have_neon = true
    endif
  endif
+ 

From 4304d0f87e70e77b1adb60134f85cf65f80d64bf Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 27 Aug 2021 13:47:01 +0000
Subject: [PATCH 2686/4088] dnsmap: update to 0.36.

---
 srcpkgs/dnsmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnsmap/template b/srcpkgs/dnsmap/template
index 230b0365f78f..814d92cca6e8 100644
--- a/srcpkgs/dnsmap/template
+++ b/srcpkgs/dnsmap/template
@@ -1,6 +1,6 @@
 # Template file for 'dnsmap'
 pkgname=dnsmap
-version=0.35
+version=0.36
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake"
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/resurrecting-open-source-projects/dnsmap"
 changelog="https://raw.githubusercontent.com/resurrecting-open-source-projects/dnsmap/master/ChangeLog"
 distfiles="https://github.com/resurrecting-open-source-projects/dnsmap/archive/${version}.tar.gz"
-checksum=6c8d28e461530721ed19314a6788f756a46c98356b5d66fa8b54294778c1f193
+checksum=f52d6d49cbf9a60f601c919f99457f108d51ecd011c63e669d58f38d50ad853c
 
 pre_configure() {
 	./autogen.sh

From 4965f1fa64e2c7c77a4441060d129b1a3a3fa2e4 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 5 Nov 2021 21:36:58 +0400
Subject: [PATCH 2687/4088] iso-codes: update to 4.8.0.

---
 srcpkgs/iso-codes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template
index c509fcf01b31..1003ef170f5e 100644
--- a/srcpkgs/iso-codes/template
+++ b/srcpkgs/iso-codes/template
@@ -1,6 +1,6 @@
 # Template file for 'iso-codes'
 pkgname=iso-codes
-version=4.7.0
+version=4.8.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext python3"
@@ -8,6 +8,6 @@ short_desc="List of country, language and currency names"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://salsa.debian.org/iso-codes-team/iso-codes"
-changelog="https://salsa.debian.org/iso-codes-team/iso-codes/-/raw/main/ChangeLog.md"
+changelog="https://salsa.debian.org/iso-codes-team/iso-codes/-/raw/main/CHANGELOG.md"
 distfiles="${DEBIAN_SITE}/main/i/iso-codes/${pkgname}_${version}.orig.tar.xz"
-checksum=bdfd06cdd77d73d491dcd57d6c946cb95a939f19f7ffc6a31f2f93923412219b
+checksum=b02b9c8bb81dcfa03e4baa25b266df47710832cbf550081cf43f72dcedfc8768

From f8a1a752b7ec92bbbd0caec81266f465e7a2d8ed Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 12 Sep 2021 08:27:30 +0200
Subject: [PATCH 2688/4088] fwupd: add deps, edit config

Drop plugin_altos=false config option, as suggested by upstream.
---
 srcpkgs/fwupd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 388e46127502..2205b555154b 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,19 +1,19 @@
 # Template file for 'fwupd'
 pkgname=fwupd
 version=1.6.4
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
+configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true
+ -Dintrospection=true -Dtests=false"
 # tests require unpackaged umockdev
-configure_args="-Dsupported_build=true -Dconsolekit=false -Dintrospection=true
- -Dsystemd=false -Dplugin_altos=false -Delogind=true -Dtests=false"
 hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
  vala glib-devel polkit gettext pango python3-gobject python3-Pillow"
 makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel
  sqlite-devel libsoup-devel gcab-devel pango-devel elogind-devel
  tpm2-tss-devel libjcat-devel libcurl-devel"
-depends="udisks2"
+depends="dbus udisks2"
 conf_files="
  /etc/fwupd/*.conf
  /etc/fwupd/remotes.d/*.conf"

From ea8eb91b5f438b500aef104f498e829c8e324399 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 9 Nov 2021 16:41:26 -0600
Subject: [PATCH 2689/4088] gef: update to 2021.10.

---
 srcpkgs/gef/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index fdbd5eeeb831..85853e8c0f55 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,7 +1,7 @@
 # Template file for 'gef'
 pkgname=gef
-version=2021.07
-revision=2
+version=2021.10
+revision=1
 pycompile_dirs="usr/share/gef"
 depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
 short_desc="GDB Enhanced Features for exploit devs & reversers"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://gef.readthedocs.io/en/master/"
 distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=4af3ef5d6c26ed98c7f81a9a28597fb695d0f4168bd2d6e2aadd13312837505a
+checksum=31b2658e9c72e29533ad9188fd991f79334ae00ea31b8dff3696f81a62606467
 python_version="3"
 
 do_install() {

From 2abfc645dba959e7c9b41917dad0b1362ee5fe08 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 9 Nov 2021 16:42:44 -0600
Subject: [PATCH 2690/4088] downloader-cli: update to 0.3.2.

---
 srcpkgs/downloader-cli/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index 9b54bb31cf90..bbc6a4cc8b3b 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,16 +1,17 @@
 # Template file for 'downloader-cli'
 pkgname=downloader-cli
-version=0.3.1
-revision=2
+version=0.3.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3 python3-downloader-cli"
+checkdepends="python3-pytest"
 short_desc="Simple downloader with an awesome progressbar"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/downloader-cli"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=bd88aad5967b2fc7f70f715725a51a398c56e4fae791463dafda3a69730b277d
+checksum=ad00b5ab905e57b8c275465c2b8bbeb187068ceff6614e68cf0b86de635acfe5
 
 post_install() {
 	vlicense LICENSE

From 783b7932bc6a005d44d8e518e1b93c8119d8130f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 9 Nov 2021 16:43:28 -0600
Subject: [PATCH 2691/4088] python3-rich: update to 10.13.0.

---
 srcpkgs/python3-rich/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 8226c8e0bee7..36e177ff4629 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.12.0
-revision=2
+version=10.13.0
+revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=83fb3eff778beec3c55201455c17cccde1ccdf66d5b4dade8ef28f56b50c4bd4
+checksum=d80fc76f34d819c481a48f73ec9ac396bed3bd6a16ecd57f9e0654cd89a8fb56
 
 post_install() {
 	vlicense LICENSE

From f3fb55c07643e5798a7205a8daa4d1315c980a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:45 +0100
Subject: [PATCH 2692/4088] qtcreator: update to 5.0.3.

---
 srcpkgs/qtcreator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 668c38d027e8..28e871b406e5 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=5.0.2
+version=5.0.3
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
@@ -16,7 +16,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=1bf07150226da46237f26f5eaa9f090ce81ed79b9bc75e0dfa6328043e360103
+checksum=7fd3b14310bcecee6b134f8cb7f4c0ed2385d7f4cecd48d756c5c1fd650ce2eb
 replaces="qtcreator-data>=0"
 python_version=3
 

From 536394210107c107d700a85aee3b4f553894a7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:45 +0100
Subject: [PATCH 2693/4088] filelight: update to 21.08.3.

---
 srcpkgs/filelight/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index cf7d94105d77..a1c325747a74 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -10,5 +10,6 @@ short_desc="Interactive map that helps visualize disk usage on your computer"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=4d9e026318994488806fee19d3fa363e14cb50f7aab951440ad1b06eb3d7115e
+checksum=9cff01597df3fcc235bda4b10340b677f096daf6413390666753d291ba01a148

From 9231f12dd3db3fc9062a60e56e2ecee3f987ec59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:45 +0100
Subject: [PATCH 2694/4088] kaccounts-integration: update to 21.08.3.

---
 srcpkgs/kaccounts-integration/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 393a26b4e050..37a91cc5a74c 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -11,8 +11,9 @@ short_desc="Administer web accounts for sites and services across the KDE deskto
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=005e9967267762e523774ef91d1a9ff02372daad99874412a273a0c5a7a87cb2
+checksum=c4f2a16e2bf84d2794d15f0cc217efb0f0c2032d3f294eb449dadca6f3f3ca43
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From f6583df5386d4e5b900d8799c26d64637cb766f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2695/4088] kaccounts-providers: update to 21.08.3.

---
 srcpkgs/kaccounts-providers/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 6ce301a7225d..f724f4680043 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -11,8 +11,9 @@ short_desc="KDE Accounts Providers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=8fd28e9073ae08db80f80ba5164e5905df08adf7908b65acd49b75dee18a0197
+checksum=99c10671b985c0479f403982d467ebd2683992ebcbc043910af70d7e10950a32
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From dcd68d6e28407947485bbf6587cf92b5aba06f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2696/4088] kcachegrind: update to 21.08.3.

---
 srcpkgs/kcachegrind/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 26d052163476..87e7502fd390 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,6 +11,7 @@ short_desc="Visualization of Performance Profiling Data"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=898492e020308e05ea3edc8738f83ee0d79480d86b07713469e2f3150c50d888
+checksum=22e7991609f363cec8ff7b8631c4700fda391f5d6f9894b29727487d7c0915a1
 python_version=2

From cfe80c549b3a831e8841339c3f81afbeccc0db16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2697/4088] kcron: update to 21.08.3.

---
 srcpkgs/kcron/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 052c0df92932..57ec8b1526da 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -10,5 +10,6 @@ short_desc="KDE Configure and schedule tasks"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=08aec3d7ffa18761e3567efd6b3d3895d8d13391a8e44543d8e73a461050cee7
+checksum=6522abb432e398726e2a8b73620569521ffc48aa084fe64175b1309ce453e48c

From 7329efb54fc4f29c069544760bdd9e4081ea0b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2698/4088] kdialog: update to 21.08.3.

---
 srcpkgs/kdialog/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index c0e411dfd12e..7988a7bf1072 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -10,5 +10,6 @@ short_desc="Utility for displaying dialog boxes from shell scripts"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=dd833fa0691a491372b7f4ec8695c12e854354d45c9f2d8fabe3f2cedc557422
+checksum=f709e99441ae2a447a24f93a983529357f6fe5b03cb84190ef19a48b34fa78c5

From b5e3f2141a11691b458b2e61a3f662da248f8e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2699/4088] keditbookmarks: update to 21.08.3.

---
 srcpkgs/keditbookmarks/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index db4c3033235f..dc6bb05094f0 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -10,5 +10,6 @@ short_desc="Bookmarks editor"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=715f0750e38e521048c8acc92c77cf1ced772b8d60066a75585bfe3f3266da1f
+checksum=56647b9ed5c6441872db749175e6fc6ee74dd16707892bb1beddff8246cd2f6d

From 4be73adb84644eb06306fd360956a32c26ea39eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2700/4088] kfind: update to 21.08.3.

---
 srcpkgs/kfind/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index c47a577b409e..86132d41fcd1 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -10,5 +10,6 @@ short_desc="Find files and folders"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8decee5367fd8a94a2692080330a196c7618bd23b43d82a79ddb8d88ea3916e7
+checksum=17f79c62e11b3afc31dbd3a23e65137e2a6a97cc9ddea94a9537ba8714ee0d13

From 6fb6b85d1f913513a0924395b15ab031639ac0e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2701/4088] kio-gdrive: update to 21.08.3.

---
 srcpkgs/kio-gdrive/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 00e98c426e2e..497c712f9c49 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -12,5 +12,6 @@ short_desc="KIO slave that enables access and edit Google Drive files"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=62b678eb3f90293752c4cbe65ffae5edd485f04cbab53831b4cec7c1192b7055
+checksum=2dbf3f288cd80bb7051284c6f102cdb77cc746078c66809455b860ac270be8c0

From db3d74ee3dea41a8892b8a0799f2cafd5f7a4fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2702/4088] kmag: update to 21.08.3.

---
 srcpkgs/kmag/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 4b0dc79665d1..cd3408293f10 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -10,5 +10,6 @@ short_desc="Screen Magnifier"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=8059075ce395f1fd72975a05190232ce809d2509220abbb7d40e4a57d2dbc878
+checksum=0bcece44b12262808d9eb4d36ea2d29fd5502da3ee7e49390ea3aa0661b85b26

From 664081e4a863b972ff382bae362f1fdd16d67861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2703/4088] kmix: update to 21.08.3.

---
 srcpkgs/kmix/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 25ae9d02c779..b9ce16c086a9 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,5 +12,6 @@ short_desc="KDE's mixer application"
 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/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=b8b9cae11dc23d62fc0c4990c0cf7560e5337cf831cbb46b3e880b9ca90a3beb
+checksum=a870c7f4bb225bf3a6737300610594d284e26ba1c30da74773e46d8df8dcae6a

From 99bcebedce42ef79a835d0556664064326326e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2704/4088] kolourpaint: update to 21.08.3.

---
 srcpkgs/kolourpaint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 695c1e6db907..0c939c396589 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -10,8 +10,9 @@ short_desc="Free, easy-to-use paint program for KDE"
 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/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=cdc83bd1c5013c78f95cf211ee1b8ec58363dc6bceb49771f1cca33acc6dc45c
+checksum=11b2b987ed34a561f18336ec00d1e161bed06d9b31f7f747b3482994af8c9185
 
 post_install() {
 	vlicense COPYING

From c0655710a019b30d53fd63958123c1508c81ce57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2705/4088] kompare: update to 21.08.3.

---
 srcpkgs/kompare/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index d2cdd1c94819..8dfdfae03598 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -10,5 +10,6 @@ short_desc="File difference viewer"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=2d2cec54c21b4b543fa6ae10efab4dff2fb24d5748fcfa4d15ef18f95bc76b91
+checksum=e0ee1279a17e3a1009fba1e10817215a6da29a9f904d020d4b9f975501f008a5

From a3b384d9065361f350e353504e414b1cdc723b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2706/4088] konversation: update to 21.08.3.

---
 srcpkgs/konversation/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1af3070cc54f..1d5b8dba829b 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,6 +1,6 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
@@ -11,6 +11,7 @@ short_desc="User friendly IRC client for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=ea22da9832e3e049369098fd80d752d83b3704ded4932d78766120706fef8aae
+checksum=fb1f4ac9e3242a20cacd1055d4a295659d293e73c9954c69510967a6cd85d271
 python_version=3

From 9500a4263e853cf16c0cf9f8b5dff8314441f5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2707/4088] kpat: update to 21.08.3.

---
 srcpkgs/kpat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 9975c8d68651..e29d93131959 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -12,5 +12,6 @@ short_desc="Relaxing card sorting game"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=8274922b2bd15278ed881b329f0685adfd398489a32a2e020e59adc8081f9299
+checksum=24f600f9e196245175323a4b62f13d29821febe1c53e3498f8916d2802461369

From c9f9afbd3f5031e4007e154b6dc7fcf3cc1928ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:46 +0100
Subject: [PATCH 2708/4088] kruler: update to 21.08.3.

---
 srcpkgs/kruler/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index a84f19d0b5da..872357ad886b 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -10,5 +10,6 @@ short_desc="Screen Ruler"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=19ac77e9c104de4ee4be9101337ec6b178731f1281769aa5209c87cb36095f20
+checksum=15d393163ae23bc6024dc2c6002ea128fcadcaab8967f8290f69f67e23f15d66

From 2b870abb7dabdd99161bec9e98514b9e0e82c34f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2709/4088] ksystemlog: update to 21.08.3.

---
 srcpkgs/ksystemlog/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 6031c22b901f..597310eda58f 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -10,5 +10,6 @@ short_desc="KDE System log viewer tool"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=92c6eeaf6b1291ea684a90ec930f7d1e9a6e70fec5df7a37db8fbe72e282d6e2
+checksum=e6252c796519d29921d0b84733d8b3f2ad506f591a1eafd468ff2db7f7b640d4

From f4f998dcfe8601613906266fb4583cb99c4c73b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2710/4088] kteatime: update to 21.08.3.

---
 srcpkgs/kteatime/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 223fdaa4b1dc..5e8bab11ac84 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -10,5 +10,6 @@ short_desc="Handy timer for steeping tea"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=5707d239675f1dc3fac3ceca7a3e471014a9237a4822fa414f6a31e5db80730b
+checksum=b6fa24a667a8662da67b51c6c839f060c6a1ae04913e05ab3656510817abbb9c

From f2d5c50962d72864abed26852325a9a999ab2a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2711/4088] kturtle: update to 21.08.3.

---
 srcpkgs/kturtle/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index ceb48a7635a2..e4bca4534108 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -10,5 +10,6 @@ short_desc="Educational Programming Environment"
 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/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=8f5e5311251fe74c7a09e502b7a241bc7e69e492583565ad14185132dde071b8
+checksum=0c6e4ba188c207f0a3b74fb58da48c29a5c2c71c0ecaea130d54f70ffa8387bb

From 5b7b494c3538e90d74812429cdd5d0f98c565d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2712/4088] kwalletmanager: update to 21.08.3.

---
 srcpkgs/kwalletmanager/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 122a48e6bf19..59e18ccf7fa0 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -10,5 +10,6 @@ short_desc="KDE Wallet Management Tools"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=2bfae765d18f8b60cedab313b42acefc3d354c30e7a0d7f96772c2451648868c
+checksum=582a73846787da55bd9c797d1afd07b65419ac7a6c634749bbd19d305a057831

From ec7d5df16fdb0cc61c1acf9fcdec3675b1dcec1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2713/4088] libkcddb: update to 21.08.3.

---
 srcpkgs/libkcddb/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 19da76f25ed9..79943bff49a2 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.1
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -10,8 +10,9 @@ short_desc="KDE CDDB library"
 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"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=f8c756a4832ad4f984c0ec69cc4593cb5265bb4430629048dce9b1ae750e0421
+checksum=bb321855ced7f692aeb2470b28bf3b1f0079f44d7574cda80fbcf0b8cdda9103
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From cb084aebae34b3b61284be0ee8af2447b16a410c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2714/4088] libkdegames: update to 21.08.3.

---
 srcpkgs/libkdegames/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fa40197866e5..4bf29f9a1bc4 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -10,8 +10,9 @@ short_desc="Common code and data for many KDE games"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=077203df97c7b41b1f87d790a8107066d59b1fa65ae176320230b1120a246b49
+checksum=2a10f38868cc52a09d6b8cbdf6f1e706e6b96b57d1e7817d610788abcc2b4c7b
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 293ece6cb59f831a4a9d5953570f062ee177dea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2715/4088] libkomparediff2: update to 21.08.3.

---
 srcpkgs/libkomparediff2/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 812a0d784f68..9036330e5b6f 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -9,8 +9,9 @@ short_desc="Library to compare files and strings"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=1d84be7b279c170783a6a49525e9b9d67be3d20e376d41b057ba4440e3b8c923
+checksum=1e47cd1cc462d62477eaec0dc26c266ee4b73ba38fb8ee279e85bd1827406928
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 759351ff1a7f08d0ceaa6cfb842c159d99a1af53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2716/4088] marble5: update to 21.08.3.

---
 srcpkgs/marble5/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 8267f4b13889..8b0206e4255a 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.2
+version=21.08.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -14,8 +14,9 @@ short_desc="Virtual globe and world atlas"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=aa57a65e0c20e9c63b9cf4c1ce0c0da9fc4517c95a6a71151b19613f81e40dd1
+checksum=0a285852438ab4cf0205c74fc4082cef742f16ce4b84f68aae30822e6ab5572d
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From 60d988fc059db85cb9835f3c09d85a3ea8656dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2717/4088] signon-kwallet-extension: update to 21.08.3.

---
 srcpkgs/signon-kwallet-extension/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index b253701780a0..8340f33c1f34 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -9,5 +9,6 @@ short_desc="KWallet integration for signon framework"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=9af3a61f9b73174b37828501912aeeec02bfc8f9323dff5adb9e42dc133457a6
+checksum=96aa05bacea3f8c0551a3e19ba02e8f4960fcf19b290ffa5d56472daacf77cd4

From ce8e7ba776bbccd30ca8a782c69da47ea2f3543c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2718/4088] svgpart: update to 21.08.3.

---
 srcpkgs/svgpart/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 9b9911501f3a..e6d002012733 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -9,5 +9,6 @@ short_desc="KPart to display SVG images"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=dce1239167a9eecf56e10bdb092972a9a301553961f847a404fc6d7677e3af93
+checksum=a863f67850f46709073efb9f4ce815dc954fef9986106b09a6cad3be1facfffe

From 577a62794e47a6778290dbeb408051b7c5b6b813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2719/4088] umbrello: update to 21.08.3.

---
 srcpkgs/umbrello/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 4f4817de0d8c..b5a2161284cd 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -9,8 +9,9 @@ short_desc="UML modelling tool and code generator"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=d917cc43706e9064651e9e4a1870047535b6b27dcdd2f37a365abf7b0d003ff6
+checksum=dd888f8e81c3ee0d845ffcad4c9580dbecdbd1a48b4892e29da642658f6eb808
 python_version=2
 
 pre_configure() {

From ede5b1791067bb1ee133121ede74a273e46ddebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 10 Nov 2021 00:02:47 +0100
Subject: [PATCH 2720/4088] yakuake: update to 21.08.3.

---
 srcpkgs/yakuake/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 00ea85858f4e..be91d392ba1a 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -10,5 +10,6 @@ short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=0f12ff2124d05e4da17a2337f31c982f95bd799b7505e850bda4de2941800db5
+checksum=b38d322aadd8cb7559015d223feaaf35585fb7b20ae3ac7253ad24922ddc44fd

From 302ada8df44caed3186e3bcd9bee7d4dd92fb933 Mon Sep 17 00:00:00 2001
From: 674Y3r <87250374+674Y3r@users.noreply.github.com>
Date: Thu, 2 Sep 2021 21:59:01 +0200
Subject: [PATCH 2721/4088] kmines: update to 21.08.3.

---
 srcpkgs/kmines/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmines/template b/srcpkgs/kmines/template
index 30af032cb6c0..be300245b1ad 100644
--- a/srcpkgs/kmines/template
+++ b/srcpkgs/kmines/template
@@ -1,6 +1,6 @@
 # Template file for 'kmines'
 pkgname=kmines
-version=21.08.0
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kmines"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmines-${version}.tar.xz"
-checksum=81dbbde8c98115f0f66f945f711b851d61ba97f945691aa49c2d3f8e27a190ec
+checksum=a1b3c4864cffa60977f3833ac57cb25a0396232bf207fa6f57ca54d5e58b5474

From c5f5fdaf15bbd3a8a0095a24b4ca2dfda795e2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 29 Aug 2021 20:05:24 -0300
Subject: [PATCH 2722/4088] New package: zn_poly-0.9.2

---
 srcpkgs/zn_poly/files/tuning-32.c | 444 +++++++++++++++
 srcpkgs/zn_poly/files/tuning-64.c | 860 ++++++++++++++++++++++++++++++
 srcpkgs/zn_poly/template          |  32 ++
 3 files changed, 1336 insertions(+)
 create mode 100644 srcpkgs/zn_poly/files/tuning-32.c
 create mode 100644 srcpkgs/zn_poly/files/tuning-64.c
 create mode 100644 srcpkgs/zn_poly/template

diff --git a/srcpkgs/zn_poly/files/tuning-32.c b/srcpkgs/zn_poly/files/tuning-32.c
new file mode 100644
index 000000000000..18396ce3d444
--- /dev/null
+++ b/srcpkgs/zn_poly/files/tuning-32.c
@@ -0,0 +1,444 @@
+/*
+   NOTE: do not edit this file! It is auto-generated by the "tune" program.
+   (Run "make tune" and then "./tune > tuning.c" to regenerate it.)
+*/
+
+/*
+   tuning.c:  global tuning values
+
+   Copyright (C) 2007, 2008, David Harvey
+
+   This file is part of the zn_poly library (version 0.9).
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 2 of the License, or
+   (at your option) version 3 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "zn_poly_internal.h"
+
+size_t ZNP_mpn_smp_kara_thresh = 43;
+size_t ZNP_mpn_mulmid_fallback_thresh = 551;
+
+tuning_info_t tuning_info[] = 
+{
+   {  // bits = 0
+   },
+   {  // bits = 1
+   },
+   {  // bits = 2
+         47,   // KS1 -> KS2 multiplication threshold
+       1053,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         43,   // KS1 -> KS2 squaring threshold
+       1053,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         56,   // KS1 -> KS2 middle product threshold
+        689,   // KS2 -> KS4 middle product threshold
+      23040,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 3
+         39,   // KS1 -> KS2 multiplication threshold
+        412,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         39,   // KS1 -> KS2 squaring threshold
+        315,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         43,   // KS1 -> KS2 middle product threshold
+        264,   // KS2 -> KS4 middle product threshold
+      23040,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+         12    // nussbaumer squaring threshold
+   },
+   {  // bits = 4
+         39,   // KS1 -> KS2 multiplication threshold
+        901,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         33,   // KS1 -> KS2 squaring threshold
+        901,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         43,   // KS1 -> KS2 middle product threshold
+        185,   // KS2 -> KS4 middle product threshold
+      23040,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 5
+         35,   // KS1 -> KS2 multiplication threshold
+        264,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         31,   // KS1 -> KS2 squaring threshold
+        264,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         35,   // KS1 -> KS2 middle product threshold
+        144,   // KS2 -> KS4 middle product threshold
+      21569,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 6
+         33,   // KS1 -> KS2 multiplication threshold
+        247,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         31,   // KS1 -> KS2 squaring threshold
+        173,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         33,   // KS1 -> KS2 middle product threshold
+        116,   // KS2 -> KS4 middle product threshold
+      14044,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         12    // nussbaumer squaring threshold
+   },
+   {  // bits = 7
+         33,   // KS1 -> KS2 multiplication threshold
+        247,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         23,   // KS1 -> KS2 squaring threshold
+        226,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         33,   // KS1 -> KS2 middle product threshold
+        116,   // KS2 -> KS4 middle product threshold
+      12720,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 8
+         27,   // KS1 -> KS2 multiplication threshold
+        123,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         21,   // KS1 -> KS2 squaring threshold
+        112,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         33,   // KS1 -> KS2 middle product threshold
+         94,   // KS2 -> KS4 middle product threshold
+       7753,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 9
+         24,   // KS1 -> KS2 multiplication threshold
+        206,   // KS2 -> KS4 multiplication threshold
+      62020,   // KS4 -> FFT multiplication threshold
+         21,   // KS1 -> KS2 squaring threshold
+        158,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         27,   // KS1 -> KS2 middle product threshold
+         86,   // KS2 -> KS4 middle product threshold
+       9451,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 10
+         25,   // KS1 -> KS2 multiplication threshold
+         86,   // KS2 -> KS4 multiplication threshold
+      68475,   // KS4 -> FFT multiplication threshold
+         17,   // KS1 -> KS2 squaring threshold
+         66,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         24,   // KS1 -> KS2 middle product threshold
+         70,   // KS2 -> KS4 middle product threshold
+       4726,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 11
+         23,   // KS1 -> KS2 multiplication threshold
+        134,   // KS2 -> KS4 multiplication threshold
+      62020,   // KS4 -> FFT multiplication threshold
+         21,   // KS1 -> KS2 squaring threshold
+        107,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         23,   // KS1 -> KS2 middle product threshold
+         75,   // KS2 -> KS4 middle product threshold
+       5393,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 12
+         17,   // KS1 -> KS2 multiplication threshold
+         78,   // KS2 -> KS4 multiplication threshold
+      75603,   // KS4 -> FFT multiplication threshold
+         16,   // KS1 -> KS2 squaring threshold
+         72,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         19,   // KS1 -> KS2 middle product threshold
+         66,   // KS2 -> KS4 middle product threshold
+       4280,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 13
+         17,   // KS1 -> KS2 multiplication threshold
+         86,   // KS2 -> KS4 multiplication threshold
+      56173,   // KS4 -> FFT multiplication threshold
+         14,   // KS1 -> KS2 squaring threshold
+         78,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         19,   // KS1 -> KS2 middle product threshold
+         66,   // KS2 -> KS4 middle product threshold
+       4726,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 14
+         19,   // KS1 -> KS2 multiplication threshold
+         66,   // KS2 -> KS4 multiplication threshold
+      62020,   // KS4 -> FFT multiplication threshold
+         16,   // KS1 -> KS2 squaring threshold
+         62,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         21,   // KS1 -> KS2 middle product threshold
+         66,   // KS2 -> KS4 middle product threshold
+       3877,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 15
+         16,   // KS1 -> KS2 multiplication threshold
+         67,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         13,   // KS1 -> KS2 squaring threshold
+         43,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         51,   // KS2 -> KS4 middle product threshold
+       3877,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 16
+         14,   // KS1 -> KS2 multiplication threshold
+         66,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         13,   // KS1 -> KS2 squaring threshold
+         56,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         54,   // KS2 -> KS4 middle product threshold
+       3877,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 17
+         14,   // KS1 -> KS2 multiplication threshold
+         47,   // KS2 -> KS4 multiplication threshold
+      50877,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         33,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         47,   // KS2 -> KS4 middle product threshold
+       3077,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 18
+         13,   // KS1 -> KS2 multiplication threshold
+         47,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         13,   // KS1 -> KS2 squaring threshold
+         33,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         14,   // KS1 -> KS2 middle product threshold
+         47,   // KS2 -> KS4 middle product threshold
+       3077,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 19
+         13,   // KS1 -> KS2 multiplication threshold
+         31,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         27,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         38,   // KS2 -> KS4 middle product threshold
+       2363,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 20
+         12,   // KS1 -> KS2 multiplication threshold
+         43,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         33,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         39,   // KS2 -> KS4 middle product threshold
+       2363,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 21
+         13,   // KS1 -> KS2 multiplication threshold
+         32,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         25,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         35,   // KS2 -> KS4 middle product threshold
+       1756,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 22
+         12,   // KS1 -> KS2 multiplication threshold
+         31,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         24,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         35,   // KS2 -> KS4 middle product threshold
+       2071,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 23
+         12,   // KS1 -> KS2 multiplication threshold
+         24,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          8,   // KS1 -> KS2 squaring threshold
+         21,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         27,   // KS2 -> KS4 middle product threshold
+       1539,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 24
+          9,   // KS1 -> KS2 multiplication threshold
+         28,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         23,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         12,   // KS1 -> KS2 middle product threshold
+         29,   // KS2 -> KS4 middle product threshold
+       1756,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 25
+         12,   // KS1 -> KS2 multiplication threshold
+         21,   // KS2 -> KS4 multiplication threshold
+      25439,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         21,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         12,   // KS1 -> KS2 middle product threshold
+         25,   // KS2 -> KS4 middle product threshold
+       1305,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 26
+         10,   // KS1 -> KS2 multiplication threshold
+         19,   // KS2 -> KS4 multiplication threshold
+      31010,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         19,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         25,   // KS2 -> KS4 middle product threshold
+       1349,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 27
+          9,   // KS1 -> KS2 multiplication threshold
+         17,   // KS2 -> KS4 multiplication threshold
+      28087,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         17,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         23,   // KS2 -> KS4 middle product threshold
+       1070,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 28
+         10,   // KS1 -> KS2 multiplication threshold
+         17,   // KS2 -> KS4 multiplication threshold
+      28087,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         17,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         12,   // KS1 -> KS2 middle product threshold
+         21,   // KS2 -> KS4 middle product threshold
+       1070,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 29
+          8,   // KS1 -> KS2 multiplication threshold
+         17,   // KS2 -> KS4 multiplication threshold
+      20868,   // KS4 -> FFT multiplication threshold
+          7,   // KS1 -> KS2 squaring threshold
+         14,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         21,   // KS2 -> KS4 middle product threshold
+        970,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          8    // nussbaumer squaring threshold
+   },
+   {  // bits = 30
+          8,   // KS1 -> KS2 multiplication threshold
+         27,   // KS2 -> KS4 multiplication threshold
+      28087,   // KS4 -> FFT multiplication threshold
+          7,   // KS1 -> KS2 squaring threshold
+         23,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         27,   // KS2 -> KS4 middle product threshold
+       1305,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          8    // nussbaumer squaring threshold
+   },
+   {  // bits = 31
+          9,   // KS1 -> KS2 multiplication threshold
+         23,   // KS2 -> KS4 multiplication threshold
+      28087,   // KS4 -> FFT multiplication threshold
+          8,   // KS1 -> KS2 squaring threshold
+         17,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         10,   // KS1 -> KS2 middle product threshold
+         23,   // KS2 -> KS4 middle product threshold
+       1070,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 32
+          8,   // KS1 -> KS2 multiplication threshold
+         25,   // KS2 -> KS4 multiplication threshold
+      28087,   // KS4 -> FFT multiplication threshold
+          8,   // KS1 -> KS2 squaring threshold
+         19,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          8,   // KS1 -> KS2 middle product threshold
+         27,   // KS2 -> KS4 middle product threshold
+       1539,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+};
+
+// end of file ****************************************************************
diff --git a/srcpkgs/zn_poly/files/tuning-64.c b/srcpkgs/zn_poly/files/tuning-64.c
new file mode 100644
index 000000000000..34ac692c83b0
--- /dev/null
+++ b/srcpkgs/zn_poly/files/tuning-64.c
@@ -0,0 +1,860 @@
+/*
+   NOTE: do not edit this file! It is auto-generated by the "tune" program.
+   (Run "make tune" and then "./tune > tuning.c" to regenerate it.)
+*/
+
+/*
+   tuning.c:  global tuning values
+
+   Copyright (C) 2007, 2008, David Harvey
+
+   This file is part of the zn_poly library (version 0.9).
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 2 of the License, or
+   (at your option) version 3 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "zn_poly_internal.h"
+
+size_t ZNP_mpn_smp_kara_thresh = 35;
+size_t ZNP_mpn_mulmid_fallback_thresh = 458;
+
+tuning_info_t tuning_info[] = 
+{
+   {  // bits = 0
+   },
+   {  // bits = 1
+   },
+   {  // bits = 2
+        141,   // KS1 -> KS2 multiplication threshold
+      14733,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+        102,   // KS1 -> KS2 squaring threshold
+       3602,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+        102,   // KS1 -> KS2 middle product threshold
+       1378,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 3
+        112,   // KS1 -> KS2 multiplication threshold
+       4308,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         61,   // KS1 -> KS2 squaring threshold
+       4817,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+        102,   // KS1 -> KS2 middle product threshold
+       2356,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 4
+         80,   // KS1 -> KS2 multiplication threshold
+       2576,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         57,   // KS1 -> KS2 squaring threshold
+       1801,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         72,   // KS1 -> KS2 middle product threshold
+       1053,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 5
+         67,   // KS1 -> KS2 multiplication threshold
+       3294,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         56,   // KS1 -> KS2 squaring threshold
+       2303,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         65,   // KS1 -> KS2 middle product threshold
+        901,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 6
+         57,   // KS1 -> KS2 multiplication threshold
+       1152,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         51,   // KS1 -> KS2 squaring threshold
+        985,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         62,   // KS1 -> KS2 middle product threshold
+        985,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 7
+         47,   // KS1 -> KS2 multiplication threshold
+       1540,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         43,   // KS1 -> KS2 squaring threshold
+        788,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         51,   // KS1 -> KS2 middle product threshold
+        451,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 8
+         47,   // KS1 -> KS2 multiplication threshold
+        901,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         35,   // KS1 -> KS2 squaring threshold
+        753,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         43,   // KS1 -> KS2 middle product threshold
+        576,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 9
+         43,   // KS1 -> KS2 multiplication threshold
+        589,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         43,   // KS1 -> KS2 squaring threshold
+        493,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         39,   // KS1 -> KS2 middle product threshold
+        302,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 10
+         38,   // KS1 -> KS2 multiplication threshold
+        824,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         35,   // KS1 -> KS2 squaring threshold
+        576,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         38,   // KS1 -> KS2 middle product threshold
+        337,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 11
+         43,   // KS1 -> KS2 multiplication threshold
+        431,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         33,   // KS1 -> KS2 squaring threshold
+        377,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         33,   // KS1 -> KS2 middle product threshold
+        247,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 12
+         38,   // KS1 -> KS2 multiplication threshold
+        482,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         33,   // KS1 -> KS2 squaring threshold
+        403,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         33,   // KS1 -> KS2 middle product threshold
+        216,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 13
+         33,   // KS1 -> KS2 multiplication threshold
+        345,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         30,   // KS1 -> KS2 squaring threshold
+        315,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         33,   // KS1 -> KS2 middle product threshold
+        189,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 14
+         33,   // KS1 -> KS2 multiplication threshold
+        345,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         29,   // KS1 -> KS2 squaring threshold
+        286,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         31,   // KS1 -> KS2 middle product threshold
+        116,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 15
+         31,   // KS1 -> KS2 multiplication threshold
+        322,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         23,   // KS1 -> KS2 squaring threshold
+        226,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         29,   // KS1 -> KS2 middle product threshold
+        121,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+       1000    // nussbaumer squaring threshold
+   },
+   {  // bits = 16
+         29,   // KS1 -> KS2 multiplication threshold
+        337,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         25,   // KS1 -> KS2 squaring threshold
+        173,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         29,   // KS1 -> KS2 middle product threshold
+        101,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 17
+         29,   // KS1 -> KS2 multiplication threshold
+        231,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         23,   // KS1 -> KS2 squaring threshold
+        216,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         27,   // KS1 -> KS2 middle product threshold
+         94,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 18
+         25,   // KS1 -> KS2 multiplication threshold
+        189,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         23,   // KS1 -> KS2 squaring threshold
+        134,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         23,   // KS1 -> KS2 middle product threshold
+         94,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 19
+         27,   // KS1 -> KS2 multiplication threshold
+        226,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         21,   // KS1 -> KS2 squaring threshold
+        216,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         21,   // KS1 -> KS2 middle product threshold
+         86,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+       1000,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 20
+         22,   // KS1 -> KS2 multiplication threshold
+        144,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         21,   // KS1 -> KS2 squaring threshold
+        119,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         21,   // KS1 -> KS2 middle product threshold
+         80,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 21
+         25,   // KS1 -> KS2 multiplication threshold
+        189,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         19,   // KS1 -> KS2 squaring threshold
+        121,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         21,   // KS1 -> KS2 middle product threshold
+         80,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 22
+         21,   // KS1 -> KS2 multiplication threshold
+        102,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         21,   // KS1 -> KS2 squaring threshold
+        102,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         21,   // KS1 -> KS2 middle product threshold
+         70,   // KS2 -> KS4 middle product threshold
+   SIZE_MAX,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         13    // nussbaumer squaring threshold
+   },
+   {  // bits = 23
+         22,   // KS1 -> KS2 multiplication threshold
+        147,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         17,   // KS1 -> KS2 squaring threshold
+        102,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         19,   // KS1 -> KS2 middle product threshold
+         72,   // KS2 -> KS4 middle product threshold
+      23040,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         12    // nussbaumer squaring threshold
+   },
+   {  // bits = 24
+         19,   // KS1 -> KS2 multiplication threshold
+         86,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         19,   // KS1 -> KS2 squaring threshold
+         72,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         19,   // KS1 -> KS2 middle product threshold
+         66,   // KS2 -> KS4 middle product threshold
+      20868,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         12    // nussbaumer squaring threshold
+   },
+   {  // bits = 25
+         21,   // KS1 -> KS2 multiplication threshold
+        149,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         19,   // KS1 -> KS2 squaring threshold
+        102,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         21,   // KS1 -> KS2 middle product threshold
+         66,   // KS2 -> KS4 middle product threshold
+      20868,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         12    // nussbaumer squaring threshold
+   },
+   {  // bits = 26
+         17,   // KS1 -> KS2 multiplication threshold
+         86,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         16,   // KS1 -> KS2 squaring threshold
+         72,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         66,   // KS2 -> KS4 middle product threshold
+      16026,   // KS4 -> FFT middle product threshold
+         13,   // nussbaumer multiplication threshold
+         12    // nussbaumer squaring threshold
+   },
+   {  // bits = 27
+         17,   // KS1 -> KS2 multiplication threshold
+        119,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         16,   // KS1 -> KS2 squaring threshold
+         64,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         16,   // KS1 -> KS2 middle product threshold
+         66,   // KS2 -> KS4 middle product threshold
+      16026,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 28
+         23,   // KS1 -> KS2 multiplication threshold
+        107,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         14,   // KS1 -> KS2 squaring threshold
+         62,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         66,   // KS2 -> KS4 middle product threshold
+       9451,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 29
+         17,   // KS1 -> KS2 multiplication threshold
+         85,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         14,   // KS1 -> KS2 squaring threshold
+         65,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         16,   // KS1 -> KS2 middle product threshold
+         61,   // KS2 -> KS4 middle product threshold
+      14044,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 30
+         17,   // KS1 -> KS2 multiplication threshold
+         66,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         17,   // KS1 -> KS2 squaring threshold
+         43,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         61,   // KS2 -> KS4 middle product threshold
+      12307,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 31
+         17,   // KS1 -> KS2 multiplication threshold
+         73,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         13,   // KS1 -> KS2 squaring threshold
+         35,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         57,   // KS2 -> KS4 middle product threshold
+      16026,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 32
+         17,   // KS1 -> KS2 multiplication threshold
+         56,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         14,   // KS1 -> KS2 squaring threshold
+         40,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         56,   // KS2 -> KS4 middle product threshold
+       8013,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 33
+         16,   // KS1 -> KS2 multiplication threshold
+         47,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         15,   // KS1 -> KS2 squaring threshold
+         29,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         14,   // KS1 -> KS2 middle product threshold
+         51,   // KS2 -> KS4 middle product threshold
+       8560,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 34
+         16,   // KS1 -> KS2 multiplication threshold
+         47,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         15,   // KS1 -> KS2 squaring threshold
+         27,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         17,   // KS1 -> KS2 middle product threshold
+         47,   // KS2 -> KS4 middle product threshold
+       6154,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 35
+         16,   // KS1 -> KS2 multiplication threshold
+         47,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         13,   // KS1 -> KS2 squaring threshold
+         29,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         43,   // KS2 -> KS4 middle product threshold
+       7022,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 36
+         16,   // KS1 -> KS2 multiplication threshold
+         36,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         29,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         43,   // KS2 -> KS4 middle product threshold
+       6154,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 37
+         14,   // KS1 -> KS2 multiplication threshold
+         36,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         25,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         14,   // KS1 -> KS2 middle product threshold
+         47,   // KS2 -> KS4 middle product threshold
+       7022,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 38
+         16,   // KS1 -> KS2 multiplication threshold
+         30,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         13,   // KS1 -> KS2 squaring threshold
+         25,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         14,   // KS1 -> KS2 middle product threshold
+         43,   // KS2 -> KS4 middle product threshold
+       4726,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 39
+         15,   // KS1 -> KS2 multiplication threshold
+         32,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         23,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         40,   // KS2 -> KS4 middle product threshold
+       5393,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         11    // nussbaumer squaring threshold
+   },
+   {  // bits = 40
+         13,   // KS1 -> KS2 multiplication threshold
+         32,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         23,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         12,   // KS1 -> KS2 middle product threshold
+         38,   // KS2 -> KS4 middle product threshold
+       4726,   // KS4 -> FFT middle product threshold
+         12,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 41
+         13,   // KS1 -> KS2 multiplication threshold
+         25,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         21,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         33,   // KS2 -> KS4 middle product threshold
+       4726,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 42
+         13,   // KS1 -> KS2 multiplication threshold
+         27,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         23,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         33,   // KS2 -> KS4 middle product threshold
+       4280,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 43
+         13,   // KS1 -> KS2 multiplication threshold
+         24,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         21,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         31,   // KS2 -> KS4 middle product threshold
+       4726,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 44
+         13,   // KS1 -> KS2 multiplication threshold
+         33,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         18,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         33,   // KS2 -> KS4 middle product threshold
+       4280,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 45
+         12,   // KS1 -> KS2 multiplication threshold
+         23,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         19,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         29,   // KS2 -> KS4 middle product threshold
+       3877,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 46
+         15,   // KS1 -> KS2 multiplication threshold
+         25,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         17,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         13,   // KS1 -> KS2 middle product threshold
+         31,   // KS2 -> KS4 middle product threshold
+       3877,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 47
+         12,   // KS1 -> KS2 multiplication threshold
+         23,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         12,   // KS1 -> KS2 squaring threshold
+         17,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         12,   // KS1 -> KS2 middle product threshold
+         29,   // KS2 -> KS4 middle product threshold
+       3877,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 48
+         13,   // KS1 -> KS2 multiplication threshold
+         23,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         17,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         10,   // KS1 -> KS2 middle product threshold
+         25,   // KS2 -> KS4 middle product threshold
+       3877,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 49
+         12,   // KS1 -> KS2 multiplication threshold
+         19,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          8,   // KS1 -> KS2 squaring threshold
+         16,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         10,   // KS1 -> KS2 middle product threshold
+         25,   // KS2 -> KS4 middle product threshold
+       3511,   // KS4 -> FFT middle product threshold
+         11,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 50
+         10,   // KS1 -> KS2 multiplication threshold
+         19,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         17,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         12,   // KS1 -> KS2 middle product threshold
+         27,   // KS2 -> KS4 middle product threshold
+       3511,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 51
+         10,   // KS1 -> KS2 multiplication threshold
+         19,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         16,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         10,   // KS1 -> KS2 middle product threshold
+         23,   // KS2 -> KS4 middle product threshold
+       2363,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 52
+         12,   // KS1 -> KS2 multiplication threshold
+         21,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+         10,   // KS1 -> KS2 squaring threshold
+         16,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         24,   // KS2 -> KS4 middle product threshold
+       2697,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 53
+         12,   // KS1 -> KS2 multiplication threshold
+         19,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          8,   // KS1 -> KS2 squaring threshold
+         16,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         10,   // KS1 -> KS2 middle product threshold
+         24,   // KS2 -> KS4 middle product threshold
+       2140,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+         10    // nussbaumer squaring threshold
+   },
+   {  // bits = 54
+         12,   // KS1 -> KS2 multiplication threshold
+         19,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         16,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         10,   // KS1 -> KS2 middle product threshold
+         23,   // KS2 -> KS4 middle product threshold
+       2363,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 55
+          9,   // KS1 -> KS2 multiplication threshold
+         16,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          8,   // KS1 -> KS2 squaring threshold
+         12,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         10,   // KS1 -> KS2 middle product threshold
+         19,   // KS2 -> KS4 middle product threshold
+       1939,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 56
+          9,   // KS1 -> KS2 multiplication threshold
+         16,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          8,   // KS1 -> KS2 squaring threshold
+         13,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         19,   // KS2 -> KS4 middle product threshold
+       2140,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 57
+         10,   // KS1 -> KS2 multiplication threshold
+         16,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         15,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         21,   // KS2 -> KS4 middle product threshold
+       2071,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 58
+         12,   // KS1 -> KS2 multiplication threshold
+         16,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          9,   // KS1 -> KS2 squaring threshold
+         12,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+         12,   // KS1 -> KS2 middle product threshold
+         25,   // KS2 -> KS4 middle product threshold
+       2071,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 59
+          8,   // KS1 -> KS2 multiplication threshold
+         16,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          7,   // KS1 -> KS2 squaring threshold
+         13,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          8,   // KS1 -> KS2 middle product threshold
+         19,   // KS2 -> KS4 middle product threshold
+       1756,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 60
+          8,   // KS1 -> KS2 multiplication threshold
+         16,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          7,   // KS1 -> KS2 squaring threshold
+         13,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          8,   // KS1 -> KS2 middle product threshold
+         17,   // KS2 -> KS4 middle product threshold
+       1756,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 61
+          8,   // KS1 -> KS2 multiplication threshold
+         12,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          7,   // KS1 -> KS2 squaring threshold
+         12,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          8,   // KS1 -> KS2 middle product threshold
+         19,   // KS2 -> KS4 middle product threshold
+       1939,   // KS4 -> FFT middle product threshold
+          9,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 62
+         10,   // KS1 -> KS2 multiplication threshold
+         19,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          7,   // KS1 -> KS2 squaring threshold
+         14,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         23,   // KS2 -> KS4 middle product threshold
+       2697,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 63
+          9,   // KS1 -> KS2 multiplication threshold
+         25,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          7,   // KS1 -> KS2 squaring threshold
+         19,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         23,   // KS2 -> KS4 middle product threshold
+       2363,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+   {  // bits = 64
+          9,   // KS1 -> KS2 multiplication threshold
+         31,   // KS2 -> KS4 multiplication threshold
+   SIZE_MAX,   // KS4 -> FFT multiplication threshold
+          7,   // KS1 -> KS2 squaring threshold
+         25,   // KS2 -> KS4 squaring threshold
+   SIZE_MAX,   // KS4 -> FFT squaring threshold
+          9,   // KS1 -> KS2 middle product threshold
+         25,   // KS2 -> KS4 middle product threshold
+       2697,   // KS4 -> FFT middle product threshold
+         10,   // nussbaumer multiplication threshold
+          9    // nussbaumer squaring threshold
+   },
+};
+
+// end of file ****************************************************************
diff --git a/srcpkgs/zn_poly/template b/srcpkgs/zn_poly/template
new file mode 100644
index 000000000000..ca6d0c764f16
--- /dev/null
+++ b/srcpkgs/zn_poly/template
@@ -0,0 +1,32 @@
+# Template file for 'zn_poly'
+pkgname=zn_poly
+version=0.9.2
+revision=1
+build_style=configure
+configure_args="--prefix=\$(DESTDIR)/usr"
+hostmakedepends="python3"
+makedepends="gmp-devel"
+short_desc="Library for polynomial arithmetic in Z/nZ[x], for unsigned long n"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-only, GPL-3.0-only"
+homepage="https://gitlab.com/sagemath/zn_poly"
+distfiles="https://gitlab.com/sagemath/zn_poly/-/archive/${version}/zn_poly-${version}.tar.bz2"
+checksum=29d88ce19939f53e920adf118d8cd6c8c9594bc8cb71a992a6137bd86f6fb7f5
+
+CFLAGS=-fPIC
+
+build_options="native_build"
+
+if [ -z "$build_option_native_build" ]; then
+	configure_args+=" --disable-tuning"
+fi
+
+post_extract() {
+	cp -v ${FILESDIR}/tuning-${XBPS_WORDSIZE}.c tune/tuning.c
+}
+
+do_configure() {
+	./configure ${configure_args} \
+		--cflags="$CFLAGS" --ldflags="$LDFLAGS" \
+		--cppflags="$CPPFLAGS" --cxxflags="$CXXFLAGS"
+}

From 8c891ba30df91678c38d691e2f28ca82d4035678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 9 Nov 2021 17:30:59 -0300
Subject: [PATCH 2723/4088] New package: sympow-2.023.6

---
 srcpkgs/sympow/template | 24 ++++++++++++++++++++++++
 srcpkgs/sympow/update   |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 srcpkgs/sympow/template
 create mode 100644 srcpkgs/sympow/update

diff --git a/srcpkgs/sympow/template b/srcpkgs/sympow/template
new file mode 100644
index 000000000000..0cbf01b30205
--- /dev/null
+++ b/srcpkgs/sympow/template
@@ -0,0 +1,24 @@
+# Template file for 'sympow'
+pkgname=sympow
+version=2.023.6
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=configure
+make_build_target=all
+hostmakedepends="which pari help2man"
+short_desc="Computes special values of symmetric power elliptic curve L-functions"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://gitlab.com/rezozer/forks/sympow"
+changelog="https://gitlab.com/rezozer/forks/sympow/-/raw/master/HISTORY"
+distfiles="https://gitlab.com/rezozer/forks/sympow/-/archive/v${version}/sympow-v${version}.tar.bz2"
+checksum=d153530dfdd46da05c954121640e50771064536fedc22c7fef24fb11083172ef
+nocross=yes # runs binaries built for target
+
+do_configure() {
+	PREFIX=/usr ./Configure
+}
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/sympow/update b/srcpkgs/sympow/update
new file mode 100644
index 000000000000..943b1cd66547
--- /dev/null
+++ b/srcpkgs/sympow/update
@@ -0,0 +1 @@
+site=https://gitlab.com/rezozer/forks/sympow/tags

From f574cdd0e0267ff9e87e6ca74bc1fb308301d9f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 9 Nov 2021 20:17:54 +0100
Subject: [PATCH 2724/4088] libvirt-python3: fix tests

---
 srcpkgs/libvirt-python3/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 1b43577da260..672cca09e742 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -6,10 +6,14 @@ wrksrc="libvirt-python-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel libvirt-devel libapparmor-devel"
 makedepends="libvirt-devel python3-devel"
-checkdepends="python3-lxml python3-nose"
+checkdepends="python3-pytest python3-lxml python3-nose"
 short_desc="Libvirt virtualization API Python3 binding"
 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=8535cffa5fbf05185648f9f57a2f71899c3bc12c897d320351c53725a48e5359
+
+do_check() {
+	PYTHONPATH="$(cd build/lib.* && pwd)" pytest
+}

From 7808d1050edf8aa777e3db59e24cb3271749996a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 25 Sep 2021 14:56:06 +0200
Subject: [PATCH 2725/4088] .github: improve the PR template

* switch from using checkboxes to **YES**|**NO** options
* make it clear that filling out the part about manual builds is only
  necessary when the CI is skipped, this was easy to miss
---
 .github/pull_request_template.md | 36 ++++++++++++++------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 1fdf9e94ea93..cc4b5721590e 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,26 +1,22 @@
-<!-- Mark items with [x] where applicable -->
+<!-- Uncomment relevant sections and delete options which are not applicable -->
 
-#### General
-- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
-
-#### Have the results of the proposed changes been tested?
-- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
-- [ ] I generally don't use the affected packages but briefly tested this PR
+#### Testing the changes
+- I tested the changes in this PR: **YES**|**briefly**|**NO**
 
 <!--
-If GitHub CI cannot be used to validate the build result (for example, if the
-build is likely to take several hours), make sure to
-[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
-When skipping CI, uncomment and fill out the following section.
-Note: for builds that are likely to complete in less than 2 hours, it is not
-acceptable to skip CI.
+#### New package
+- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
+-->
+
+<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
+and test at least one native build and, if supported, at least one cross build.
+Ignore this section if this PR is not skipping CI.
 -->
 <!-- 
-#### Does it build and run successfully? 
-(Please choose at least one native build and, if supported, at least one cross build. More are better.)
-- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
-- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
-  - [ ] aarch64-musl
-  - [ ] armv7l
-  - [ ] armv6l-musl
+#### Local build testing
+- I built this PR locally for my native architecture, (ARCH-LIBC)
+- I built this PR locally for these architectures (if supported. mark crossbuilds):
+  - aarch64-musl
+  - armv7l
+  - armv6l-musl
 -->

From 06d82fdcc9c04ed08e1b64ef8ecf5dff7aeb7ea2 Mon Sep 17 00:00:00 2001
From: alex <alex@cloudware.io>
Date: Sat, 6 Nov 2021 17:21:13 +0100
Subject: [PATCH 2726/4088] neomutt: update to 20211029

Also, update test files to the latest master: they have been lagging
behind for quite some time now.
---
 srcpkgs/neomutt/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index b405c1bae137..3e9e433395f9 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,10 +1,9 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20210205
-revision=2
-wrksrc="neomutt-${version}"
+version=20211029
+revision=1
 create_wrksrc=true
-build_wrksrc="$wrksrc"
+build_wrksrc="${pkgname}-${version}"
 build_style=configure
 configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl --zlib --tdb
  --rocksdb --testing"
@@ -20,11 +19,11 @@ short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
-_test_files_hash=8629adab700a75c54e8e28bf05ad092503a98f75
+_test_files_hash=8e4fc46e731da0863c04b005885f92aa925b6367
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="77e177780fc2d8abb475d9cac4342c7e61d53c243f6ce2f9bc86d819fc962cdb
- a53d6447cf4e8f60bd9a3caf68a1cfe1bfda878b5bcb8c60b965b5214de73ff9"
+checksum="08245cfa7aec80b895771fd1adcbb7b86e9c0434dfa64574e3c8c4d692aaa078
+ 818ff9642ac396e18854486078320ce03a58c8aa8f7d6af44d1b0b5de822ccc3"
 python_version=3
 
 # fix:

From cccccaacf1f8138c1697da9fdad9ef8aae6ec5f0 Mon Sep 17 00:00:00 2001
From: AI-nsley69 <62105998+AI-nsley69@users.noreply.github.com>
Date: Tue, 9 Nov 2021 09:22:31 +0100
Subject: [PATCH 2727/4088] tailscale: update to 1.16.2

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 89ea8c8134a3..fe0f2c701035 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.16.0
+version=1.16.2
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=dae0eaa5aef8cb9d3cdd83cb07039b57b202c44e4f581e26cfee98707c251c78
+checksum=fe6ef40d668cdd559fabc21eca754985999661f32d6962a19d219896cf05626e
 
 post_install() {
 	vlicense LICENSE

From 4bc062f6e9c8075aa4aa03b1c5598f1e0d1a49fb Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 21:35:07 +0100
Subject: [PATCH 2728/4088] soundtouch: update to 2.3.1

and fix distfiles
---
 srcpkgs/soundtouch/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template
index 8b516289492a..f2ed0f607fdf 100644
--- a/srcpkgs/soundtouch/template
+++ b/srcpkgs/soundtouch/template
@@ -1,6 +1,6 @@
 # Template file for 'soundtouch'
 pkgname=soundtouch
-version=2.2
+version=2.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-openmp"
@@ -10,8 +10,8 @@ short_desc="SoundTouch Audio Processing Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.surina.net/soundtouch"
-distfiles="https://gitlab.com/soundtouch/soundtouch/-/archive/${version}/soundtouch-${version}.tar.gz"
-checksum=525478c745a51dadaf7adb8e5386ec1f903d47196fab5947dc37414344684560
+distfiles="https://www.surina.net/soundtouch/soundtouch-${version}.tar.gz"
+checksum=6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1
 
 pre_configure() {
 	./bootstrap

From d7c7106ffa0da5de26a8d338c372788c64ef9868 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 7 Nov 2021 09:39:28 -0600
Subject: [PATCH 2729/4088] shellcheck: update to 0.8.0.

---
 srcpkgs/shellcheck/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 76d479a12fca..08e64456eda9 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,7 +1,7 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
-version=0.7.2
-revision=2
+version=0.8.0
+revision=1
 build_style=haskell-stack
 stackage="lts-17.5"
 hostmakedepends="pandoc"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.shellcheck.net/"
 distfiles="https://github.com/koalaman/shellcheck/archive/v${version}.tar.gz"
-checksum=5911f6133951d0ba6d643025bc50f2afb6c6f66d7225dc3d42e8845bfdf74c3c
+checksum=dad3a2140389f5032996e6d381a47074ddbad6e5d9155f72ef732952c8861a3b
 nocross=yes
 nopie_files="/usr/bin/shellcheck"
 

From b0d80795bf0564ce458f1910db460ed5fdb34aaf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 10 Nov 2021 00:46:10 +0100
Subject: [PATCH 2730/4088] pounce: update to 3.0.

---
 srcpkgs/pounce/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index a3a98bfba452..3ac742851872 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,7 +1,7 @@
 # Template file for 'pounce'
 pkgname=pounce
-version=2.5
-revision=2
+version=3.0
+revision=1
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/pounce/"
 distfiles="https://git.causal.agency/pounce/snapshot/pounce-$version.tar.gz"
-checksum=c3f88f85ea6b3211d77b8193731704cb01871aee68762d2f6b5e9b102f83d0ad
+checksum=f776f7f170493697a97923e7dce9597dff5577fd40ba756e9a1bcfab17199df0

From af1190e88f9f65c8d81353b8129843944097414c Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 7 Nov 2021 14:34:40 +0100
Subject: [PATCH 2731/4088] iwd: update to 1.19

---
 ...fig_Remove_usage_of_in6_addr.__in6_u.patch | 30 -------------------
 srcpkgs/iwd/template                          |  4 +--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/iwd/patches/netconfig_Remove_usage_of_in6_addr.__in6_u.patch

diff --git a/srcpkgs/iwd/patches/netconfig_Remove_usage_of_in6_addr.__in6_u.patch b/srcpkgs/iwd/patches/netconfig_Remove_usage_of_in6_addr.__in6_u.patch
deleted file mode 100644
index 99371ca3bb4e..000000000000
--- a/srcpkgs/iwd/patches/netconfig_Remove_usage_of_in6_addr.__in6_u.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 Mon Sep 17 00:00:00 2001
-From: Andrew Zaborowski <andrew.zaborowski@intel.com>
-Date: Thu, 16 Sep 2021 01:58:29 +0200
-Subject: netconfig: Remove usage of in6_addr.__in6_u
-
-in6_addr.__in6_u.__u6_addr8 is glibc-specific and named differently in
-the headers shipped with musl libc for example.  The POSIX compliant and
-universal way of accessing it is in6_addr.s6_addr.
----
- src/netconfig.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/netconfig.c')
-
-diff --git a/src/netconfig.c b/src/netconfig.c
-index ce95db0b..421270c9 100644
---- a/src/netconfig.c
-+++ b/src/netconfig.c
-@@ -171,7 +171,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr)
- 	struct in6_addr in6_addr;
- 	char *addr_str = l_malloc(INET6_ADDRSTRLEN);
- 
--	memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16);
-+	memcpy(in6_addr.s6_addr, addr, 16);
- 
- 	if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str,
- 						INET6_ADDRSTRLEN)))) {
--- 
-cgit 1.2.3-1.el7
-
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index d55ea04bd401..69b4925b9aab 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.18
+version=1.19
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55
+checksum=dd65a8795f6127fb1b9e29f2092686b0590a0d3738c2b90c792ccd320deaf966
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From a9603678d72234353b77fa307457ed36c2a8e118 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 Nov 2021 06:19:48 -0500
Subject: [PATCH 2732/4088] python-cryptography: disable tests, python-iso8601
 has been dropped

---
 srcpkgs/python-cryptography/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 0a0ccbefd5f0..e3e3405e3c4e 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -8,8 +8,6 @@ hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
 makedepends="openssl-devel python-devel"
 depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
-checkdepends="python-cryptography_vectors python-hypothesis python-pretend
- python-pytest python-pytz python-iso8601 ${depends}"
 short_desc="Python2 library that provides cryptographic recipes and primitives"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause, Apache-2.0"
@@ -17,10 +15,8 @@ homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
 checksum=5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed
-
-do_check() {
-	PYTHONPATH="$(cd build/lib* && pwd)" python2.7 -m pytest tests
-}
+# Test dependency python-iso8601 has been dropped
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 285fe421fbacc21275d8213fe1c0ed843a70f73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 9 Nov 2021 22:16:10 -0300
Subject: [PATCH 2733/4088] m4ri: fix m4ri-devel depends and i686 check

1.  add ${makedepends} to m4ri-devel depends

For instance, building m4rie fails without this, since libgomp-devel is
missing but it is needed to compile with m4ri-devel.

2. patch tests/Makefile to use SIMD_CFLAGS

Without the patch running make check fails on i686, because the library
is compiled with -msse2 but tests are not.
---
 srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch | 11 +++++++++++
 srcpkgs/m4ri/template                                |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch

diff --git a/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch b/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch
new file mode 100644
index 000000000000..ffa64b120fc2
--- /dev/null
+++ b/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch
@@ -0,0 +1,11 @@
+--- a/tests/Makefile.in	2020-01-25 01:34:59.000000000 -0300
++++ b/tests/Makefile.in	2021-11-10 08:13:46.505793446 -0300
+@@ -609,7 +609,7 @@
+ TOPBUILDDIR = $(builddir)/..
+ DEFINES = 
+ # include TOPBUILDIR for m4ri_config.h
+-AM_CFLAGS = -I$(TOPSRCDIR) -I$(TOPBUILDDIR) -D_XOPEN_SOURCE=600 $(DEFINES) @OPENMP_CFLAGS@ @PAPI_CFLAGS@
++AM_CFLAGS = -I$(TOPSRCDIR) -I$(TOPBUILDDIR) -D_XOPEN_SOURCE=600 $(DEFINES) $(SIMD_CFLAGS) $(OPENMP_CFLAGS) $(PAPI_CFLAGS)
+ STAGEDIR := $(realpath -s $(TOPBUILDDIR)/.libs)
+ AM_LDFLAGS = -L$(STAGEDIR) -Wl,-rpath,$(STAGEDIR) -lm4ri $(LIBM) @PAPI_LDFLAGS@ @PAPI_LIBS@ -no-install
+ test_smallops_SOURCES = test_smallops.c testing.c testing.h
diff --git a/srcpkgs/m4ri/template b/srcpkgs/m4ri/template
index 54a8981e5176..56e60ed16f59 100644
--- a/srcpkgs/m4ri/template
+++ b/srcpkgs/m4ri/template
@@ -1,7 +1,7 @@
 # Template file for 'm4ri'
 pkgname=m4ri
 version=20200125
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openmp ax_cv_have_sse3_ext=no ax_cv_have_ssse3_ext=no"
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ checksum=0dfb34aed351882a0f2281535ea6f81c690a5efeb14edab131d9ba0dffe44863
 
 m4ri-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From fff95fcbed90abfbf4d9d22dfca5c56be215f178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Aug 2021 22:34:53 -0300
Subject: [PATCH 2734/4088] New package: SuiteSparse-5.10.1

---
 common/shlibs                |  1 +
 srcpkgs/SuiteSparse-devel    |  1 +
 srcpkgs/SuiteSparse/template | 42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/SuiteSparse-devel
 create mode 100644 srcpkgs/SuiteSparse/template

diff --git a/common/shlibs b/common/shlibs
index 5d5c7ef58dd9..d030725940c8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -68,6 +68,7 @@ libppl.so.14 ppl-1.2_1
 libppl_c.so.4 ppl-0.11_1
 libstdc++.so.6 libstdc++-4.4.0_1
 libssp.so.0 libssp-4.4.0_1
+libcxsparse.so.3 SuiteSparse-5.10.1_1
 libncurses.so.6 ncurses-libs-6.0_1 ignore
 libncursesw.so.6 ncurses-libs-5.8_1 ignore
 libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/SuiteSparse-devel b/srcpkgs/SuiteSparse-devel
new file mode 120000
index 000000000000..cfb45e420a6f
--- /dev/null
+++ b/srcpkgs/SuiteSparse-devel
@@ -0,0 +1 @@
+SuiteSparse
\ No newline at end of file
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
new file mode 100644
index 000000000000..23f75ff6dd7a
--- /dev/null
+++ b/srcpkgs/SuiteSparse/template
@@ -0,0 +1,42 @@
+# Template file for 'SuiteSparse'
+pkgname=SuiteSparse
+version=5.10.1
+revision=1
+make_build_args="BLAS=-lblas LAPACK=-llapack TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB"
+hostmakedepends="cmake chrpath"
+makedepends="tbb-devel libgomp-devel lapack-devel mpfr-devel"
+short_desc="Suite of sparse matrix software"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="custom:multiple"
+homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
+distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
+checksum=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee
+
+do_build() {
+	make config library $make_build_args JOBS=$XBPS_MAKEJOBS
+}
+
+do_check() {
+	make go $make_build_args LD_LIBRARY_PATH=$wrksrc/lib JOBS=$XBPS_MAKEJOBS
+}
+
+do_install() {
+	make install $make_build_args INSTALL=$DESTDIR/usr
+	vlicense LICENSE.txt
+
+	# remove invalid rpath
+	chrpath -d $DESTDIR/usr/lib/lib*.so
+}
+
+SuiteSparse-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		# do not vmove libmetis.so
+		vmove "usr/lib/lib[a-ln-z]*.so"
+		vmove "usr/lib/libmo*.so"
+		vmove usr/share/doc
+	}
+}

From 62e3d2ffed1ba563c780e7517429d13764c1c1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Aug 2021 22:35:49 -0300
Subject: [PATCH 2735/4088] New package: igraph-0.9.4

---
 common/shlibs           |  2 ++
 srcpkgs/igraph-devel    |  1 +
 srcpkgs/igraph/template | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/igraph-devel
 create mode 100644 srcpkgs/igraph/template

diff --git a/common/shlibs b/common/shlibs
index d030725940c8..b41e25161743 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3869,6 +3869,8 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-21.3.1_1
 libigfxcmrt.so.7 intel-media-driver-21.3.5_1
+libigdgmm.so.11 intel-gmmlib-19.4.1_1
+libigraph.so.0 igraph-0.9.4_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
 librdkafka.so.1 librdkafka-1.4.4_3
 librdkafka++.so.1 librdkafka-1.4.4_3
diff --git a/srcpkgs/igraph-devel b/srcpkgs/igraph-devel
new file mode 120000
index 000000000000..fcd7873f9600
--- /dev/null
+++ b/srcpkgs/igraph-devel
@@ -0,0 +1 @@
+igraph
\ No newline at end of file
diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template
new file mode 100644
index 000000000000..9ad070206203
--- /dev/null
+++ b/srcpkgs/igraph/template
@@ -0,0 +1,25 @@
+# Template file for 'igraph'
+pkgname=igraph
+version=0.9.4
+revision=1
+build_style=cmake
+configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="flex bison python3"
+makedepends="arpack-ng-devel glpk-devel gmp-devel lapack-devel libgomp-devel libxml2-devel SuiteSparse-devel"
+short_desc="Graph library"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://igraph.org/c/"
+distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz"
+checksum=a3285cccf4f043c9ced2bc8d8d2609ff8398cb92ed49fdf86264ed91929137dd
+
+igraph-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 72d1a5c912f4d794589640d81fc4fafca7ac5921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Aug 2021 22:36:11 -0300
Subject: [PATCH 2736/4088] New package: rankwidth-0.9

---
 common/shlibs              |  1 +
 srcpkgs/rankwidth-devel    |  1 +
 srcpkgs/rankwidth/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/rankwidth/update   |  1 +
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/rankwidth-devel
 create mode 100644 srcpkgs/rankwidth/template
 create mode 100644 srcpkgs/rankwidth/update

diff --git a/common/shlibs b/common/shlibs
index b41e25161743..d6f6a725304f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -440,6 +440,7 @@ libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.89 ntfs-3g-2021.8.22_1
 libruby.so.3.0 ruby-3.0.2_1
+librw.so.0 rankwidth-0.9_1
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
 libksgrd.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/rankwidth-devel b/srcpkgs/rankwidth-devel
new file mode 120000
index 000000000000..ae0ae25eafc9
--- /dev/null
+++ b/srcpkgs/rankwidth-devel
@@ -0,0 +1 @@
+rankwidth
\ No newline at end of file
diff --git a/srcpkgs/rankwidth/template b/srcpkgs/rankwidth/template
new file mode 100644
index 000000000000..c322a6e1a12a
--- /dev/null
+++ b/srcpkgs/rankwidth/template
@@ -0,0 +1,32 @@
+# Template file for 'rankwidth'
+pkgname=rankwidth
+version=0.9
+revision=1
+wrksrc=rw-${version}
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="igraph-devel"
+short_desc="Calculates rank-width and rank-decompositions"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://sourceforge.net/projects/rankwidth/"
+distfiles="${SOURCEFORGE_SITE}/rankwidth/rw-$version.tar.gz"
+checksum=c1e03506fe25cdfcb428c051fc56b2d2affb5b06fba3f2ce756631466befb441
+
+post_install() {
+	# the binary conflicts with rw package, and it's not needed for
+	# sagemath; if ever someone needs it we can decide whether to
+	# rename it or install in a separate package with conflicts=rw
+	rm -rf ${DESTDIR}/usr/bin/rw
+	rm -rf ${DESTDIR}/usr/share/doc/rw
+}
+
+rankwidth-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/rankwidth/update b/srcpkgs/rankwidth/update
new file mode 100644
index 000000000000..226d3b64d1c1
--- /dev/null
+++ b/srcpkgs/rankwidth/update
@@ -0,0 +1 @@
+pkgname=rw

From 4514d293273f9aa56f40b6f9436ae68502511a04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Nov 2021 13:16:21 +0100
Subject: [PATCH 2737/4088] m4rie: rebuild for changed m4ri-devel depends.

---
 srcpkgs/m4rie/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/m4rie/template b/srcpkgs/m4rie/template
index 541095c1e866..0e775df1dc1c 100644
--- a/srcpkgs/m4rie/template
+++ b/srcpkgs/m4rie/template
@@ -1,7 +1,7 @@
 # Template file for 'm4rie'
 pkgname=m4rie
 version=20200125
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="m4ri-devel"
 short_desc="Library for fast arithmetic with dense matrices over GF(2^e)"

From d9da4cd109feb5ab2a4faa7b1740e0d559a36600 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Nov 2021 16:46:34 +0100
Subject: [PATCH 2738/4088] debootstrap: update to 1.0.126.

---
 srcpkgs/debootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index a1dbbd35c350..df67a598d286 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.125
+version=1.0.126
 revision=1
 build_style=fetch
 depends="binutils gnupg gzip tar wget xz zstd"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
  ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2021.1.1_all.deb"
-checksum="71d8a4cb030ed2696a2637a24fde6c110eb61b6ab69bb0abab8d1844d518e9f4
+checksum="3084a2dcb4cd56a7c094c6b7cd745b6736ad78846b108275616d448fa6911f5e
  56beca470dcd9b6d7e6c3c9e9d702101e01e9467e62810a8c357bd7b9c26251d"
 
 case "$XBPS_TARGET_MACHINE" in

From 6ab096c0165a2fc6bd7e737c72fd0ae9a6a1c606 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Nov 2021 16:48:40 +0100
Subject: [PATCH 2739/4088] nncp: update to 8.0.2.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 317d2c862dd9..8a36af43ebf9 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.7.0
+version=8.0.2
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=a692a2fc963cb0a45bfd5b7f497a26d0bd7386304f9fa3cd526dc69fca3929ee
+checksum=84c6fb6c0764df115c51ee424eef4b9c847755224350a6cc484f3ab3c779b9d3
 
 do_build() {
 	make

From aff07306676d9f921da6eb7a6e66807d79944f38 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Nov 2021 16:49:51 +0100
Subject: [PATCH 2740/4088] python3-pipenv: update to 2021.11.9.

---
 srcpkgs/python3-pipenv/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 1509cdd1c83c..2d4535a61dc3 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2021.5.29
-revision=2
+version=2021.11.9
+revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/pypa/pipenv"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e
+checksum=7662399162bc887ee86e96d0baa6984236228af9c1fd6594be0b18910225579d
 conflicts="python-pipenv>=0"
 
 post_extract() {

From 317af5439e9b13e42ae7f16f9a5c9a12c58a7e63 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:28 -0500
Subject: [PATCH 2741/4088] libArcus: update to 4.12.0.

---
 srcpkgs/libArcus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index f1249f37faed..0b491f9d017c 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.11.0
-revision=3
+version=4.12.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=2682a898a033f855c9a9d24da976a5467f8823b448db86e308d54017c0c6a372
+checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From fdd9ba769bad7d15304a81ea23a29fd5194fa14b Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:32 -0500
Subject: [PATCH 2742/4088] Uranium: update to 4.12.0.

---
 srcpkgs/Uranium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 2b5d8de87994..5c7cfd3f50de 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
 hostmakedepends="python3 gettext"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Uranium"
 distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=1765d563a36c3158ea8abe4d87b0e3f5e0e595a1c7584b9bd672331e300c0677
+checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 1f99e12fca0e691c944b46e3723a97089cef776d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:38 -0500
Subject: [PATCH 2743/4088] cura-engine: update to 4.12.0.

---
 srcpkgs/cura-engine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index c1f2be20a24b..771901b0f02c 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=d654c2e0397f87d75d4481591f9d7f5e252a4fb4bc61cf84a477223618674f80
+checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
 
 post_install() {
 	vlicense LICENSE

From e32681f9910bf4c5f5463264f4538a630e0fff36 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:12 -0500
Subject: [PATCH 2744/4088] libSavitar: update to 4.12.0.

---
 srcpkgs/libSavitar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 6389c5d9d530..7e77ae1487a8 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,7 +1,7 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libSavitar"
 distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=fb0cb3d6b063e9f8ae88c0ef34dcbca5b0a4c6f8d841847c02cd4741decd16f9
+checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From a071f21f328d7ffe2c87560645f8943f66221399 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:17 -0500
Subject: [PATCH 2745/4088] python3-pynest2d: update to 4.12.0.

---
 srcpkgs/python3-pynest2d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 1af1547f5704..82d86b23d1e5 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynest2d'
 pkgname=python3-pynest2d
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="pynest2d-${version}"
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=14"
@@ -14,4 +14,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/pynest2d"
 distfiles="https://github.com/Ultimaker/pynest2d/archive/${version}.tar.gz"
-checksum=2d94a0cd7bfa8b9e0ed1fcdbb99002d8eff437d382301101bdab140dc0a4beac
+checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4

From 172d37e1fc01bc271b3ba0a45563c98b1d40d91c Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:20 -0500
Subject: [PATCH 2746/4088] cura: update to 4.12.0.

Closes: #34002 [via git-merge-pr]
---
 .../cura/patches/fix_support_blocker_crash.patch  | 15 +++++++++++++++
 srcpkgs/cura/template                             |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
new file mode 100644
index 000000000000..0ac249e2e5c8
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
@@ -0,0 +1,15 @@
+diff --git a/cura/PickingPass.py b/cura/PickingPass.py
+index 54e886fe6..4d6ef671d 100644
+--- a/cura/PickingPass.py
++++ b/cura/PickingPass.py
+@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
+ 
+         window_size = self._renderer.getWindowSize()
+ 
+-        px = (0.5 + x / 2.0) * window_size[0]
+-        py = (0.5 + y / 2.0) * window_size[1]
++        px = int((0.5 + x / 2.0) * window_size[0])
++        py = int((0.5 + y / 2.0) * window_size[1])
+ 
+         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
+             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 7a143a8b69a8..53bd19afc3b8 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}
@@ -18,4 +18,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=f8dcee2165141b9390c3144f2db4d7bbb0d62faf5f194e056266fa9409aa7a88
+checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38

From abedc188215e07a90b17efb31b6f78de79d7b8a6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 10 Nov 2021 13:07:04 -0600
Subject: [PATCH 2747/4088] ytmdl: update to 2021.11.07.

---
 srcpkgs/ytmdl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 0b7b01875eeb..dd28541cea49 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,7 +1,7 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
-version=2021.08.01
-revision=3
+version=2021.11.07
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/ytmdl"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b108c3c373b7c96d1e14ae586f41272132707e74915bf28803b8f2748a46b21
+checksum=1de4cdd9f256acac5518637d533c0737e8f3ab13a4990e171f2ffd16d1bdfd8f
 # There is no test to run
 make_check=no
 

From f9a2c182bafc8904332f116a1efd1dba09e3b095 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 10 Nov 2021 13:08:33 -0600
Subject: [PATCH 2748/4088] steam: update to 1.0.0.73.

---
 srcpkgs/steam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index a0712e3142ea..cbaefb5429d6 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,6 +1,6 @@
 # Template file for 'steam'
 pkgname=steam
-version=1.0.0.72
+version=1.0.0.73
 revision=1
 archs="i686 x86_64"
 wrksrc=steam-launcher
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom: Proprietary license"
 homepage="https://steampowered.com/"
 distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=85d42242b8c1f26e1fccfadb66c451cfef50043a5a5bad434c48744bada4a450
+checksum=b953ba0f52bccc696ad7696b22ceda4d01159e3d5b9353f8c1152d90f5a43591
 repository=nonfree
 
 do_install() {

From e4fe43f553e7b77e98fa218429d35f0a1bf0ea9b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 10 Nov 2021 20:16:29 +0100
Subject: [PATCH 2749/4088] warzone2100: update to 4.2.1.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index c4b120a6a91d..0a2fb94ca64b 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=d4cefbcee02aba77c08cad89beed3c67b8a708c741617f76026c8c0fd79ab9ef
+checksum=37d0f82b7fbf36ddcddffb870c3fa30fab732f414cc2657b97e5868c661add89
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From d5db8b7dd4c2cb651c83712df985e6447a35488a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 10 Nov 2021 14:59:20 -0300
Subject: [PATCH 2750/4088] New package: planarity-3.0.1.1

---
 common/shlibs              |  1 +
 srcpkgs/planarity-devel    |  1 +
 srcpkgs/planarity/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/planarity-devel
 create mode 100644 srcpkgs/planarity/template

diff --git a/common/shlibs b/common/shlibs
index d6f6a725304f..d5af0a708017 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,6 +4016,7 @@ liblinbox.so.0 linbox-1.6.3_1
 libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
+libplanarity.so.0 planarity-3.0.1.1_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
diff --git a/srcpkgs/planarity-devel b/srcpkgs/planarity-devel
new file mode 120000
index 000000000000..474ce05b0d78
--- /dev/null
+++ b/srcpkgs/planarity-devel
@@ -0,0 +1 @@
+planarity
\ No newline at end of file
diff --git a/srcpkgs/planarity/template b/srcpkgs/planarity/template
new file mode 100644
index 000000000000..aab5ce4a08fc
--- /dev/null
+++ b/srcpkgs/planarity/template
@@ -0,0 +1,25 @@
+# Template file for 'planarity'
+pkgname=planarity
+version=3.0.1.1
+revision=1
+build_style=gnu-configure
+short_desc="Graph algorithms for planar embedding and related algorithms"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/graph-algorithms/edge-addition-planarity-suite/"
+distfiles="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${version}/planarity-${version}.tar.gz"
+checksum=50b686fce6e67ba3a4d0634632c16566539a95d7e51afd066f6b1d5ae0eab284
+
+post_install() {
+	vlicense LICENSE.TXT
+}
+
+planarity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From edd195e16c14cfaad28ddd682b0766590f6d28a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 10 Nov 2021 14:32:30 -0300
Subject: [PATCH 2751/4088] New package: symmetrica-3.0.1

---
 common/shlibs               |  1 +
 srcpkgs/symmetrica-devel    |  1 +
 srcpkgs/symmetrica/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/symmetrica-devel
 create mode 100644 srcpkgs/symmetrica/template

diff --git a/common/shlibs b/common/shlibs
index d5af0a708017..7e97899ce695 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4023,6 +4023,7 @@ libntl.so.44 ntl-11.5.1_1
 libflint.so.16 flintlib-2.8.0_1
 libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
+libsymmetrica.so.2 symmetrica-3.0.1_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/symmetrica-devel b/srcpkgs/symmetrica-devel
new file mode 120000
index 000000000000..e9b2e1945267
--- /dev/null
+++ b/srcpkgs/symmetrica-devel
@@ -0,0 +1 @@
+symmetrica
\ No newline at end of file
diff --git a/srcpkgs/symmetrica/template b/srcpkgs/symmetrica/template
new file mode 100644
index 000000000000..b6b53d3cbf6f
--- /dev/null
+++ b/srcpkgs/symmetrica/template
@@ -0,0 +1,30 @@
+# Template file for 'symmetrica'
+pkgname=symmetrica
+version=3.0.1
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Collection of C routines for representation theory"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="ISC"
+homepage="https://gitlab.com/sagemath/symmetrica"
+distfiles="https://gitlab.com/sagemath/symmetrica/-/archive/${version}/symmetrica-${version}.tar.bz2"
+checksum=260028143f3ea3594fed75651e10176d2f53edae5e1af1661d5b82d617e233d6
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+symmetrica-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 83a4b6650d4bcb005f0fd7c96dede15f006c18c8 Mon Sep 17 00:00:00 2001
From: Bikutoso <10584311+Bikutoso@users.noreply.github.com>
Date: Tue, 9 Nov 2021 13:38:54 +0100
Subject: [PATCH 2752/4088] bacon: update to 4.4.

---
 srcpkgs/bacon/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bacon/template b/srcpkgs/bacon/template
index 08c0b782e6cd..ce136cf91f89 100644
--- a/srcpkgs/bacon/template
+++ b/srcpkgs/bacon/template
@@ -1,6 +1,6 @@
 # Template file for 'bacon'
 pkgname=bacon
-version=4.3.1
+version=4.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-bash --enable-gui-fltk"
@@ -12,10 +12,16 @@ license="MIT"
 homepage="https://www.basic-converter.org"
 changelog="https://www.basic-converter.org/stable/CHANGES"
 distfiles="http://www.basic-converter.org/stable/bacon-${version}.tar.gz"
-checksum=96bbfeebb506018a6e208dc85e6daded49778ec8b4d037854bda721af890e501
+checksum=dbd7c983530743922c8ae21ef5c471df894ece9af12b4075564deb7e0659babf
 disable_parallel_build=yes
 nocross=yes
 
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+	depends+=" musl-fts-devel"
+	LDFLAGS="-lfts"
+fi
+
 post_install() {
 	rm -f ${DESTDIR}/usr/share/bacon/LICENSE
 	vlicense LICENSE

From 09c22f1ff183ef20fc6695a4b7e0ebd59e09ec71 Mon Sep 17 00:00:00 2001
From: Lorenzo Beretta <vc.net.loreb@gmail.com>
Date: Wed, 10 Nov 2021 13:46:45 +0100
Subject: [PATCH 2753/4088] pcc: add missing dependencies

Same as https://github.com/void-linux/void-packages/issues/30630

Close: #34009
---
 srcpkgs/pcc/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pcc/template b/srcpkgs/pcc/template
index 8d6b4748b8d5..a51da962f4e1 100644
--- a/srcpkgs/pcc/template
+++ b/srcpkgs/pcc/template
@@ -1,7 +1,7 @@
 # Template file for 'pcc'
 pkgname=pcc
 version=1.1.0.20190420
-revision=3
+revision=4
 _distver="${version%.*}"
 _snapshot="${version##*.}"
 archs="i686* x86_64*"
@@ -21,6 +21,10 @@ checksum="a114dfca04b8b0559ea5d67b87d2d0fcb2bae2b4d9b9ba16ebc27960b921c812
 nocross=yes
 
 CFLAGS="-fcommon"
+case "$XBPS_TARGET_LIBC" in
+	musl)	 depends+=" musl-devel";;
+	*) 	 depends+=" glibc-devel";;
+esac
 
 post_extract() {
 	mv pcc-${_distver}.BETA pcc

From 0d963f1241b350d12eb727a5e4ff80a1cb56f1c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 8 Nov 2021 11:38:32 +0100
Subject: [PATCH 2754/4088] cargo-deny: update to 0.10.1.

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 5ee0066d8cf9..6adc1fdd9cf2 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.9.1
+version=0.10.1
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=3fcb347ed35caf3a3e303c4ec3426fafab53dcc084d83ea5c62e79a600f4ed5f
+checksum=136764d16b6d60fc9ddec4989ab4cb2bdcee9a096d0f3cd40b1c574bcc1b7f44
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From b84a7d898335161b047711fcc927aad72185890f Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Tue, 9 Nov 2021 13:53:00 -0500
Subject: [PATCH 2755/4088] cpuid: update to 20211031

---
 srcpkgs/cpuid/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index b9df3bd7f339..a3f8e0038a3b 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20201006
+version=20211031
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,8 +10,4 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.etallen.com/cpuid.html"
 distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=13c53f16408341d11ed489b352f218ec4dbb5bedb796a9d059e924770a9c56a6
-
-post_extract() {
-	vsed -i 's|BUILDROOT=|BUILDROOT=${DESTDIR}|' Makefile
-}
+checksum=765d3336eb2e6f99765322e5f0f4e38c493c1c3c991e44c18ed73f9295585d8f

From e3f4e56aa9347033ef28adbbed11d372e43fe809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 11 Nov 2021 06:10:45 +0100
Subject: [PATCH 2756/4088] doctl: update to 1.67.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 2120ab291877..1a89b1adaebc 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.66.0
+version=1.67.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=ac15f584f4ccfbdc2b74ce7d708c71e0e1f201f80ef0f0d39faca6bafc0fda10
+checksum=97c9ee6f28efd621f04ff4bafa269d4f7f6632f5884178f443a22cb610e086a7

From f1a5856b509409b65f9d6f17b55a749b7f8e3f47 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 10 Nov 2021 21:28:20 -0500
Subject: [PATCH 2757/4088] castor: update to 0.8.18

---
 srcpkgs/castor/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index 18b116f0f5a6..851aad586a5f 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,7 +1,7 @@
 # Template file for 'castor'
 pkgname=castor
-version=0.8.16
-revision=3
+version=0.8.18
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
@@ -10,7 +10,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"
 homepage="https://git.sr.ht/~julienxx/castor"
 distfiles="https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz"
-checksum=9a72ed66a10abd9d6fb44c02349f6c4035ff7d89397eb928c90f1465c3cccf7d
+checksum=02ea3d8c6a3b705ca54e489cb67bf5149261222c352696afe374843ff3bc06bb
 
 post_install() {
 	make PREFIX=/usr DESTDIR="${DESTDIR}" copy-data

From b51d6fdd447dc82a69a065006908c5cc49861848 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Wed, 10 Nov 2021 21:54:29 +0100
Subject: [PATCH 2758/4088] hcloud: update to 1.29.0.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 6d59217e01b2..87d1f564ee13 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.28.1
+version=1.29.0
 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=fef9763ffe17668c8f434f27d99050b425039fb0d93d8d3a31ea55f99cfbad11
+checksum=ea8b08702f7285d5e886fc8797287ac05747eb66ad1d77d041725f9cf6c88893
 
 post_install() {
 	vlicense LICENSE

From 0578bacf359073a4c778456c61df8f8ce78ed715 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 10 Nov 2021 16:46:22 +0200
Subject: [PATCH 2759/4088] lazygit: update to 0.31.3.

---
 srcpkgs/lazygit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 5a0328ad326b..f213cb9ee19e 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.30
+version=0.31.3
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=e0d1f442acb45fbb1eac1a77d60ad6e4db35470e62a2b9efe91832fce8cffbc6
+checksum=7a9fcb0c5f1edf025d1e1f5fb21099770e0de7ed424af62e133bd9d4afffdc35
 
 post_install() {
 	vlicense LICENSE

From a58371f1e28d356ad8d804f15af7b62a1f2ddd18 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 10 Nov 2021 18:09:08 +0200
Subject: [PATCH 2760/4088] smtube: update to 21.10.0.

---
 srcpkgs/smtube/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/smtube/template b/srcpkgs/smtube/template
index 96421adb6243..20b8b181a26f 100644
--- a/srcpkgs/smtube/template
+++ b/srcpkgs/smtube/template
@@ -1,6 +1,6 @@
 # Template file for 'smtube'
 pkgname=smtube
-version=21.7.0
+version=21.10.0
 revision=1
 build_wrksrc=src
 build_style=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.smtube.org/"
 changelog="https://raw.githubusercontent.com/smplayer-dev/smtube/master/Release_notes.md"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=77e47778cd813ddaec63b5d7fba216a73e9c288cbf2f6c7488b647d264e07dc7
+checksum=650214022fd80becec607561969ad9e4ae8d1af4fa2e88e6750d59f960a0d655
 
 post_build() {
 	lrelease smtube.pro

From 8f2bc530a5e1a9c423444bffe973bbab5518f3a1 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 10 Nov 2021 11:14:40 +0100
Subject: [PATCH 2761/4088] vscode: update to 1.62.1

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index bbf881b4ba6b..b2ae3c6a0d69 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.62.0
+version=1.62.1
 revision=1
 _electronver=13.3.0
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=e7e961d8115c94d37a2e360f92a3f4778a43eaddbf6fe183028e0c1759ccc803
+checksum=f4ff57429bebf15155511bb84884cc110733376cbbfe5a1bcac598984a6d7714
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From fc4fdcda03d379cae6af983cbfd358521985e035 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Wed, 10 Nov 2021 19:13:54 +0700
Subject: [PATCH 2762/4088] vivaldi: update to 4.3.2439.65

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 69688904c974..98a12ab05eba 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=4.3.2439.63
+version=4.3.2439.65
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=e1e3212331dfcc9e338110c02534237bc6b181e8d7f9ca916a888390e26a095f
+checksum=42d6a7568b7b45c3b3d5a47e0ff51c46b80eab00645a17961be32f5320df10d1
 repository=nonfree
 restricted=yes
 nostrip=yes

From a893ac9a4c56032fa7d3cfb744ce4b60c4a20e35 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 10 Nov 2021 17:41:32 +0200
Subject: [PATCH 2763/4088] mercurial: update to 5.9.3.

---
 srcpkgs/mercurial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 8008c97d9b63..87d80c12555a 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.9.2
+version=5.9.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=1edad93096f64d5cae55b9550bb835ac73840c7406861c3cf4e14c3b443bec54
+checksum=3b43f68977ad0fa75aa7f1e5c8f0a83ba935621ab2396129abb498e56d1be08e
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From f1561b5e16d0ee0ca697b41184d9412882a84ac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 11 Nov 2021 09:32:53 -0300
Subject: [PATCH 2764/4088] lcalc: add shlib_provides

---
 common/shlibs          | 1 +
 srcpkgs/lcalc/template | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 7e97899ce695..beccba8af0a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4024,6 +4024,7 @@ libflint.so.16 flintlib-2.8.0_1
 libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
+libLfunction.so lcalc-1.23_2
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/lcalc/template b/srcpkgs/lcalc/template
index 0c1784fff871..1b3df018d527 100644
--- a/srcpkgs/lcalc/template
+++ b/srcpkgs/lcalc/template
@@ -1,7 +1,7 @@
 # Template file for 'lcalc'
 pkgname=lcalc
 version=1.23
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 makedepends="gmp-devel pari-devel"
@@ -22,6 +22,7 @@ checksum="83d4253ec2f38553b21190d6d0c6b71bab7ea14717f6dde5bd18f60775d3cdb0
  dde1f80b0ca42fb43917c24e6016c19e4a8d28de9c50cd0a523a318866bdc0eb
  941d4ac025f5d6f0142fb785b27f7a221729466dc83d45fd206cce102c012eaf
  045f23ea9131b8039001c8f13d22152f7b3c2e91adcf8c555354eaf39e7a7b48"
+shlib_provides="libLfunction.so"
 
 # get patches from sagemath
 _patchurl="https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches"

From dded173d5cb9b671594ba6aea80dc996e332688a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 11 Nov 2021 09:34:25 -0300
Subject: [PATCH 2765/4088] common/shlibs: add some missing libs

---
 common/shlibs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index beccba8af0a7..fd78e1e33c3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4050,5 +4050,15 @@ libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libavif.so.13 libavif-0.9.3_1
 libkdumpfile.so.9 libkdumpfile-0.4.1_1
+libamd.so.2 SuiteSparse-5.10.1_1
+libcholmod.so.3 SuiteSparse-5.10.1_1
+libumfpack.so.5 SuiteSparse-5.10.1_1
+libecl.so.21.2 ecl-21.2.1_1
+libecm.so.1 ecm-7.0.4_3
+libSingular-4.2.1.so singular-4.2.1_1
+libfactory-4.2.1.so singular-4.2.1_1
+libpolys-4.2.1.so singular-4.2.1_1
+libomalloc-0.9.6.so singular-4.2.1_1
+libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1

From d017c6fe80e322a7c790008f083fdc0ff2af3fcb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 11 Nov 2021 08:42:02 -0600
Subject: [PATCH 2766/4088] nvidia: update to 470.86.

---
 srcpkgs/nvidia/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index d792d3123fb6..fa150718e840 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.74
-revision=2
+version=470.86
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=33e513dee329f2a9b106882979f1747eccb64eb698952c12cd030987cecadf6a
+checksum=4fb7a039dbd210648c785030e81844350b1b69e8d56c8da6953b050958673c4f
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From 1cf82a1e669598bebc63d351e8d82e506dfc6e34 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Nov 2021 16:06:30 +0100
Subject: [PATCH 2767/4088] di: update to 4.51.

---
 srcpkgs/di/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 65f56f604143..2fdd80a61f60 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,6 +1,6 @@
 # Template file for 'di'
 pkgname=di
-version=4.50
+version=4.51
 revision=1
 build_style=gnu-makefile
 short_desc="A disk information utility"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Zlib"
 homepage="https://diskinfo-di.sourceforge.io/"
 distfiles="${SOURCEFORGE_SITE}/diskinfo-di/di-${version}.tar.gz"
-checksum=82f08b6c2549fd6ab2e9cb596135a70883ffd4136d176466ae0ec9ba67a3492a
+checksum=79b2129c4aff27428695441175940a1717fa0fe2ec2f46d1b886ebb4921461bb
 make_install_args="INSTALL_DIR=\${DESTDIR}/usr"
 
 post_install() {

From e007e0f648c9e118da4fded5e53d319c124f768a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Nov 2021 16:11:23 +0100
Subject: [PATCH 2768/4088] makedumpfile: update to 1.7.0.

---
 srcpkgs/makedumpfile/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template
index d23444187c90..ba00074bc4e1 100644
--- a/srcpkgs/makedumpfile/template
+++ b/srcpkgs/makedumpfile/template
@@ -1,6 +1,6 @@
 # Template file for 'makedumpfile'
 pkgname=makedumpfile
-version=1.6.9
+version=1.7.0
 revision=1
 makedepends="elfutils-devel zlib-devel bzip2-devel liblzma-devel lzo-devel"
 depends="perl"
@@ -9,15 +9,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/makedumpfile/makedumpfile"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=393ea8f22393c059ad21de9b1c3f45d9d0d8dbeb0ccb1417815b835d03f7c350
-
-CFLAGS="-fcommon"
+checksum=8985f8df249087ea68c6051dec6dac3ef0703fe2aa87d0266f3951f93aa8da5e
 
 post_extract() {
 	sed -i '/#define PAGESIZE/i#undef PAGESIZE' makedumpfile.h
 	sed -i '1i#include <limits.h>' common.h
 	sed -i 's@CFLAGS\(\|_ARCH\)[ \t]*= @& $(CF) @' Makefile
 }
+
 do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*) export ARCH=i386;;

From 362e6e4a1e66d2358d72879cb2bdd23da27557aa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 11 Nov 2021 09:00:34 -0600
Subject: [PATCH 2769/4088] rpi-firmware: add rpi4* wifi/bt firmware

---
 srcpkgs/rpi-firmware/template | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 6a328307ff8b..951782411446 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,7 +4,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20201123
-revision=4
+revision=5
 archs="armv6l* armv7l* aarch64*"
 wrksrc="firmware-${_githash}"
 provides="linux-firmware-broadcom-${version}_${revision}"
@@ -57,4 +57,17 @@ do_install() {
 	# Firmware for rpi3 b+ bluetooth chip
 	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd
 	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
+
+	# Firmware for rpi4/rpi400 wifi chip
+	for f in bin txt clm_blob; do
+		$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43456-sdio.${f}
+		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
+	done
+
+	# Firmware for rpi4/rpi400 bluetooth chip
+	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C5.hcd
+	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
+
+	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430B0.hcd
+	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
 }

From 4163b03e334347b9f8c45333aad72ae3362bd645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 11 Nov 2021 23:00:36 -0300
Subject: [PATCH 2770/4088] iwd: fix some non-interactive commands.

`get-networks` was one of the affected commands; it's especially
relevant here, given its possible usage in scripts.
---
 ...d04e0de69a2c02bb39c774adf84dcbae6bb9.patch | 31 +++++++++++++++++++
 srcpkgs/iwd/template                          |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/iwd/patches/4e61d04e0de69a2c02bb39c774adf84dcbae6bb9.patch

diff --git a/srcpkgs/iwd/patches/4e61d04e0de69a2c02bb39c774adf84dcbae6bb9.patch b/srcpkgs/iwd/patches/4e61d04e0de69a2c02bb39c774adf84dcbae6bb9.patch
new file mode 100644
index 000000000000..c4c040cee54a
--- /dev/null
+++ b/srcpkgs/iwd/patches/4e61d04e0de69a2c02bb39c774adf84dcbae6bb9.patch
@@ -0,0 +1,31 @@
+From 4e61d04e0de69a2c02bb39c774adf84dcbae6bb9 Mon Sep 17 00:00:00 2001
+From: James Prestwood <prestwoj@gmail.com>
+Date: Tue, 2 Nov 2021 12:57:49 -0700
+Subject: client: special case daemon interface for non-interactive
+
+In non-interactive mode, when a dbus method call returns the process
+exits. This is true for all methods except agent requests since e.g.
+Connect() call automatically requests credentials and the client must
+wait for that to return before exiting. The new daemon interface must
+also be treated in the same way and not exit.
+---
+ client/dbus-proxy.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/client/dbus-proxy.c b/client/dbus-proxy.c
+index ab9fb5a5..0373a3df 100644
+--- a/client/dbus-proxy.c
++++ b/client/dbus-proxy.c
+@@ -315,7 +315,8 @@ static void proxy_callback(struct l_dbus_message *message, void *user_data)
+ 	}
+ 
+ 	proxy = callback_data->user_data;
+-	if (!strcmp(proxy->type->interface, IWD_AGENT_MANAGER_INTERFACE))
++	if (!strcmp(proxy->type->interface, IWD_AGENT_MANAGER_INTERFACE) ||
++			!strcmp(proxy->type->interface, IWD_DAEMON_INTERFACE))
+ 		return;
+ 
+ quit:
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 69b4925b9aab..b01c42ad6cd1 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,7 +1,7 @@
 # Template file for 'iwd'
 pkgname=iwd
 version=1.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
  --enable-dbus-policy --enable-wired"

From ea4e5c7c507d7c9ef38e5587db4d8d4ee305f25b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 11 Nov 2021 22:37:05 +0100
Subject: [PATCH 2771/4088] python3-codespell: update to 2.1.0.

---
 srcpkgs/python3-codespell/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template
index c2f5a9931b7e..9f8d96bdc606 100644
--- a/srcpkgs/python3-codespell/template
+++ b/srcpkgs/python3-codespell/template
@@ -1,15 +1,21 @@
 # Template file for 'python3-codespell'
 pkgname=python3-codespell
-version=1.17.1
-revision=2
+version=2.1.0
+revision=1
 wrksrc="codespell-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3-chardet"
+checkdepends="python3-pytest-cov $depends"
 short_desc="Checks code for common spelling mistakes (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/codespell-project/codespell"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d9d90fdb223c3462cc3982f44c018bad873092ed7ac5b9efe23e1350fbe2d4c7
+distfiles="https://github.com/codespell-project/codespell/archive/v${version}.tar.gz"
+checksum=8d0730b6ff35e56bda8d9600ccffbf27bb83905600775bf869cb8b9936b108c0
 conflicts="python-codespell>=0"
+
+pre_check() {
+	# Remove test that needs itself
+	vsed -i '/run_codespell/,/==4/d' codespell_lib/tests/test_basic.py
+}

From 2a749895a1680489ba8664bd00c3bf27afdab537 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 12 Nov 2021 09:54:21 +0000
Subject: [PATCH 2772/4088] i3status-rust: update to 0.20.6.

---
 srcpkgs/i3status-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index b6e8d5b7f07e..36178f3938bc 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.5
+version=0.20.6
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,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=0ad5067f0762daf35b92fa60e127f228d5571af80cdd9a8720b001df5d51e4fb
+checksum=a8b1257b09b73add3969c8bff2a4c77142164449ae3fea37a050ee95cc138b95
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From bf10e4ee869d5833313fcd109c70a89b3ce9fe16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 12 Nov 2021 08:29:42 +0100
Subject: [PATCH 2773/4088] exiftool: update to 12.35.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 00700e58fc8d..07f263997adc 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.34
+version=12.35
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=85679f6293ae3032c7141fce164ea4bf68b2dd65b0e148219b290557981596cd
+checksum=93610630577d26b23c77100e0d3da96dffedd298119fe74710a9c486ab3fe971

From 37cb7c8a56ef85f61624a6051d805575acd42bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 10:44:27 -0300
Subject: [PATCH 2774/4088] curl: update to 7.80.0.

---
 srcpkgs/curl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index abc91167ee8e..b493e7e04778 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.79.1
-revision=2
+version=7.80.0
+revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -17,14 +17,14 @@ makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
-checkdepends="python3 stunnel nghttp2"
+checkdepends="python3 stunnel nghttp2 impacket"
 short_desc="Client that groks URLs"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=de62c4ab9a9316393962e8b94777a570bb9f71feb580fb4475e412f2f9387851
+checksum=dd0d150e49cd950aff35e16b628edf04927f0289df42883750cf952bb858189c
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls

From 74b89be945e3f21b9203a9f27f53905de5a30a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 10:44:28 -0300
Subject: [PATCH 2775/4088] aisleriot: update to 3.22.19.

---
 srcpkgs/aisleriot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 0c5c81200a9d..42614bc3bf45 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.18
+version=3.22.19
 revision=1
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
@@ -15,5 +15,5 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=d27e48153d4e92c6ff171961301cfbd7567692e1b5dab66ab966b1ac64825be2
+checksum=63d890479e2b9cf15702e264c5bbab0f7f2bbce610aecbfcfb5e88c547150e2f
 replaces="aisleriot-data>=0"

From 8310eef72bec684003bd93a6e8eeb6c7612715c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 10:44:28 -0300
Subject: [PATCH 2776/4088] qbittorrent: update to 4.3.9.

---
 srcpkgs/qbittorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 3043925a044f..9e765f73bbb1 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.8
+version=4.3.9
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=bc163405e79c86cdd0f1551a040f24df4a268bb9447c9e3732817afff51b70fe
+checksum=16ebe2e761922b3fb21c35d2bccc5d4b4b0a3e853434bcaddbbc00c72003d880
 
 do_extract() {
 	local n=${pkgname}-${version}

From 51079bdb3e4e9cbcaa5b2fe9ebc4cc2257514ef2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Nov 2021 14:36:52 +0100
Subject: [PATCH 2777/4088] tcsh: update to 6.23.00.

---
 srcpkgs/tcsh/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index a107625c7992..5c40904212e2 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
 # Template file for 'tcsh'
 pkgname=tcsh
-version=6.22.04
+version=6.23.00
 revision=1
 build_style=gnu-configure
 conf_files="/etc/csh.login /etc/csh.cshrc"
@@ -8,9 +8,9 @@ makedepends="ncurses-devel automake"
 short_desc="Enhanced but compatible version of the Berkeley C shell"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
-homepage="http://www.tcsh.org/"
-distfiles="http://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231
+homepage="https://www.tcsh.org/"
+distfiles="https://astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=4ebeb2f33633d115d9535f554c651a8523040d8d91e5de333fb2ee045b8e001e
 register_shell="/bin/tcsh /bin/csh"
 
 post_extract() {

From 997b6e895151387c2374453a7d1c4b0305735fb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Nov 2021 15:36:42 +0100
Subject: [PATCH 2778/4088] linux5.10: update to 5.10.79.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a8c864a9fa2e..9a418cd80646 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.78
+version=5.10.79
 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=be806c98e222ea581530727a8e83b0b96fcd678afd12944eb530e58776a6050f
+checksum=e49955e16a2ee26d0b3ca1521912daba5ab8f7a6b2c9e5f538bb0ae7b837a8ad
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 9bf3e0e18f4b85e42816e5f862a0f80ca62562f1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Nov 2021 15:39:01 +0100
Subject: [PATCH 2779/4088] linux5.15: update to 5.15.2.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index aa06fccd7097..056b001722f3 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.1
+version=5.15.2
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 07f435f2754bfa6a0d28720d53309bd04f339d4f3ec70db5aa5632dde2ae248c"
+ 42a0a582319be3cda01979970dbcd1c2cbe847d34b18f509bf4d27cc1a48dd34"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 0e66b54a481c687a6b38d4894050f1074a127ed8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Nov 2021 15:58:44 +0100
Subject: [PATCH 2780/4088] New package: linux-mainline-5.15

---
 srcpkgs/linux-mainline-headers  |  1 +
 srcpkgs/linux-mainline/template | 15 +++++++++++++++
 srcpkgs/linux-mainline/update   |  2 ++
 3 files changed, 18 insertions(+)
 create mode 120000 srcpkgs/linux-mainline-headers
 create mode 100644 srcpkgs/linux-mainline/template
 create mode 100644 srcpkgs/linux-mainline/update

diff --git a/srcpkgs/linux-mainline-headers b/srcpkgs/linux-mainline-headers
new file mode 120000
index 000000000000..1567474be21e
--- /dev/null
+++ b/srcpkgs/linux-mainline-headers
@@ -0,0 +1 @@
+linux-mainline
\ No newline at end of file
diff --git a/srcpkgs/linux-mainline/template b/srcpkgs/linux-mainline/template
new file mode 100644
index 000000000000..d2dffa360bfd
--- /dev/null
+++ b/srcpkgs/linux-mainline/template
@@ -0,0 +1,15 @@
+# Template file for 'linux-mainline'
+pkgname=linux-mainline
+version=5.15
+revision=1
+build_style=meta
+depends="linux${version} linux-base"
+short_desc="Linux latest mainline kernel meta package (for experts only)"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
+
+linux-mainline-headers_package() {
+	short_desc="Linux latest mainline kernel headers meta package"
+	depends="linux${version}-headers"
+}
diff --git a/srcpkgs/linux-mainline/update b/srcpkgs/linux-mainline/update
new file mode 100644
index 000000000000..884fa30db8ed
--- /dev/null
+++ b/srcpkgs/linux-mainline/update
@@ -0,0 +1,2 @@
+site="https://www.kernel.org/feeds/kdist.xml"
+pattern="<title>\K\d+.\d+(?=: mainline</title>)"

From 8840f9f06f6d7be516eab170d20b50dd5f9112e2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Nov 2021 20:41:40 +0100
Subject: [PATCH 2781/4088] linux5.15: revert CONFIG_SYSFB_SIMPLEFB=y.

This causes issues on all kinds of systems (with Intel, AMD, Nvidia
graphics), and sometimes can be remedied by adding graphics drivers into
the initramfs.  But disabling is easier for now and this setting
can be revisited at a later time.

Closes #34035.
---
 srcpkgs/linux5.15/files/arm64-dotconfig  | 4 ++--
 srcpkgs/linux5.15/files/i386-dotconfig   | 4 ++--
 srcpkgs/linux5.15/files/x86_64-dotconfig | 4 ++--
 srcpkgs/linux5.15/template               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index e75c7ade762a..2de7a57b2495 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.0 Kernel Configuration
+# Linux/arm64 5.15.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2381,7 +2381,7 @@ CONFIG_INTEL_STRATIX10_RSU=m
 CONFIG_QCOM_SCM=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
 CONFIG_TURRIS_MOX_RWTM=m
 CONFIG_ARM_FFA_TRANSPORT=m
 CONFIG_ARM_FFA_SMCCC=y
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 7128001d7d1d..fd370c349152 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.0 Kernel Configuration
+# Linux/i386 5.15.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2120,7 +2120,7 @@ CONFIG_ISCSI_IBFT=m
 CONFIG_FW_CFG_SYSFS=m
 CONFIG_FW_CFG_SYSFS_CMDLINE=y
 CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 3f0a39a87787..2f828640fa45 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.0 Kernel Configuration
+# Linux/x86_64 5.15.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2185,7 +2185,7 @@ CONFIG_ISCSI_IBFT=m
 CONFIG_FW_CFG_SYSFS=m
 # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 056b001722f3..e877db055390 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.2
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 80570209d9edc5c858d5107da32c08258b74f072 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 12 Nov 2021 12:47:25 +0100
Subject: [PATCH 2782/4088] xorg-server: needs libxshmfence-devel

---
 srcpkgs/xorg-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..2127cd7d1a30 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -14,9 +14,9 @@ hostmakedepends="pkg-config xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
  libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
- libxkbui-devel pixman-devel xcb-util-image-devel xcb-util-keysyms-devel
- xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel
- $(vopt_if elogind 'dbus-devel')"
+ libxkbui-devel libxshmfence-devel pixman-devel xcb-util-image-devel
+ xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp
+ nettle-devel $(vopt_if elogind 'dbus-devel')"
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
 depends="xkeyboard-config $(vopt_if elogind 'elogind') xorg-server-common"
 checkdepends="xkeyboard-config"

From f2e23062f40793d58b085bfadeddda63f81d4b57 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 12 Nov 2021 23:05:34 +0100
Subject: [PATCH 2783/4088] lagrange: update to 1.8.1.

---
 srcpkgs/lagrange/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 7baf49c65294..69d69e8de55f 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,9 +1,9 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.7.3
+version=1.8.1
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config zip"
 makedepends="pcre-devel SDL2-devel openssl-devel zlib-devel libunistring-devel
  mpg123-devel libcurl-devel fribidi-devel harfbuzz-devel libwebp-devel"
 short_desc="Beautiful Gemini Client"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=46d9ad305aca2cbe0ef52060a28634c9ed20098e1784e7e9f787ae5d0394ef9d
+checksum=5ecfbce492ffc2905f4980a95ec1f1b3118374c5de37120ad020d1fdaba19b32
 
 post_install() {
 	vlicense LICENSE.md

From 46fd2635421ce613cbfa6d031b98bfa30299a686 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 12 Nov 2021 23:05:38 +0100
Subject: [PATCH 2784/4088] yt-dlp: update to 2021.11.10.1.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 66678b44c731..b142e21ddba6 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2021.10.22
+version=2021.11.10.1
 revision=1
 wrksrc="$pkgname"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=075d7e04fb8882bd4722859e93d0eb465a8f7c13921fd091ed3791be2b670476
+checksum=2eb1c67e095ded9d328eaa0e6e26952248b55dd1031a3751c6d60b759aefa16a
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 6a463f009b0a0bb5a0a4abadd7e8ff43675788dd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 11 Nov 2021 16:54:45 +0200
Subject: [PATCH 2785/4088] opera: update to 81.0.4196.37.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 3c13f3b8603e..b9f6a3690181 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=81.0.4196.31
+version=81.0.4196.37
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
-checksum=f84bf86d8cfcb6f2d71d1d59cd94e0fc6cee7e891b1d7885bb5361e97f595f90
+checksum=f392415487f4678d762bfb4759694ec1e90ce94ae3fd0b46b41c9b91583d246d
 repository="nonfree"
 nostrip=yes
 

From 1d6de77ba3cf3f040c7f5b328ca3e24ecb16ba26 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 12 Nov 2021 12:08:04 +0100
Subject: [PATCH 2786/4088] sylpheed: fix localedir

---
 srcpkgs/sylpheed/patches/fix-localedir.patch | 11 +++++++++++
 srcpkgs/sylpheed/template                    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sylpheed/patches/fix-localedir.patch

diff --git a/srcpkgs/sylpheed/patches/fix-localedir.patch b/srcpkgs/sylpheed/patches/fix-localedir.patch
new file mode 100644
index 000000000000..4f80650db34b
--- /dev/null
+++ b/srcpkgs/sylpheed/patches/fix-localedir.patch
@@ -0,0 +1,11 @@
+--- a/po/Makefile.in.in	2008-11-13 07:05:30.000000000 +0100
++++ b/po/Makefile.in.in	2021-11-12 11:45:02.993224538 +0100
+@@ -28,7 +28,7 @@
+ datarootdir = @datarootdir@
+ datadir = @datadir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
++localedir = $(datadir)/locale
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+ subdir = po
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 5df8312b53dc..7fbf25276fbc 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,7 +1,7 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"

From 5e77876fe56da572b15ca10b1ac00ff562496e82 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 12 Nov 2021 19:07:19 -0600
Subject: [PATCH 2787/4088] lutris: update to 0.5.9.1.

---
 srcpkgs/lutris/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 7cab63f5bae9..431fcf6c59a2 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,7 +1,7 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.8.4
-revision=2
+version=0.5.9.1
+revision=1
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
 depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://lutris.net"
 changelog="https://raw.githubusercontent.com/lutris/lutris/master/debian/changelog"
 distfiles="https://github.com/lutris/lutris/archive/v${version}.tar.gz"
-checksum=32f07d321e582fa9775239ace59e63e9ec8438106472288a95db8de8212f1441
+checksum=c140ec6ac62b4f9eeaa7065229dfa1c4fb08194bc0fb118c831d894c43914f88

From 2abcf4f2251cca6d87da3aeb760de3c5d1baec6e Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Fri, 12 Nov 2021 18:46:59 +0600
Subject: [PATCH 2788/4088] crun: update to 1.3.

---
 srcpkgs/crun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c7886c200691..7c4ee1b96e8f 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=1.2
+version=1.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -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=1032a69878c18ddeeb97cd26251c2819afb76e0d4a50c047139829b00d147978
+checksum=bd65961e95c450bd0463bac6a9390fa06de2368a2be1e171e7d2b666f6830cff
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From d7b546f9bb535fff0857eb395f22975af27b9571 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 11 Nov 2021 19:44:44 +0100
Subject: [PATCH 2789/4088] caddy: update to 2.4.6.

---
 srcpkgs/caddy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index fc679e26edf1..5dcc5c0a42ab 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.4.5
-revision=2
+version=2.4.6
+revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -10,7 +10,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=f25a24dfd6398e02ed3e530621f800eb7c7496d302d0a86b6932c219e46320cd
+checksum=5a450a4ff0d2dbd165d62f957ecdaebdc4bd0445c66a06a27d0025a82843402d
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"

From 3d130813a9c52fc260dc4e9be45c7e474fd4fa5e Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Thu, 11 Nov 2021 22:06:00 +0100
Subject: [PATCH 2790/4088] pipewire: update to 0.3.40

---
 srcpkgs/pipewire/patches/1042.patch           | 77 -------------------
 ...0decea5f83730c271e9bed03cdd0048fcd49.patch | 22 ------
 srcpkgs/pipewire/template                     |  8 +-
 3 files changed, 4 insertions(+), 103 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/1042.patch
 delete mode 100644 srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch

diff --git a/srcpkgs/pipewire/patches/1042.patch b/srcpkgs/pipewire/patches/1042.patch
deleted file mode 100644
index fc4c5f2f35cd..000000000000
--- a/srcpkgs/pipewire/patches/1042.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From cf3c0431c387a72fdbc66ec78086f695d0b6de3c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 26 Oct 2021 11:14:06 +1000
-Subject: [PATCH 1/2] test: fix tmpdir value after setenv
-
-Introduced in a2856c6e0f692b7a379e06d3ed6ac8107f9b946b
-
-set_test_env() modifies TMPDIR so we must not use getenv until after
-that call.
-
-Fixes #1736
----
- test/pwtest.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/pwtest.c b/test/pwtest.c
-index fbf16cb2f..a000153fd 100644
---- a/test/pwtest.c
-+++ b/test/pwtest.c
-@@ -915,9 +915,7 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
- 	pid_t pw_daemon = 0;
- 	int read_fds[_FD_LAST], write_fds[_FD_LAST];
- 	int r;
--	const char *tmpdir = getenv("TMPDIR");
--
--	spa_assert_se(tmpdir != NULL);
-+	const char *tmpdir;
- 
- 	if (t->result == PWTEST_SKIP) {
- 		char *buf = pw_array_add(&t->logs[FD_LOG], 64);
-@@ -934,6 +932,8 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
- 	}
- 
- 	set_test_env(ctx, t);
-+	tmpdir = getenv("TMPDIR");
-+	spa_assert_se(tmpdir != NULL);
- 	r = chdir(tmpdir);
- 	if (r < 0) {
- 		t->sig_or_errno = -errno;
--- 
-GitLab
-
-
-From 07c5511aedf0b0606c0d3f92ce829c5402436d58 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 26 Oct 2021 11:03:22 +1000
-Subject: [PATCH 2/2] test: handle chdir errors correctly
-
-When we get to this code, we already updated the environment variables
-so we need to use the usual error path to restore them.
-
-And where chdir does fail, print an error to the log. 256 chars should
-be enough here, if your tmpdir exceeds that you just have the error
-message cut off.
----
- test/pwtest.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/pwtest.c b/test/pwtest.c
-index a000153fd..35e7b003c 100644
---- a/test/pwtest.c
-+++ b/test/pwtest.c
-@@ -936,8 +936,10 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
- 	spa_assert_se(tmpdir != NULL);
- 	r = chdir(tmpdir);
- 	if (r < 0) {
-+		char *buf = pw_array_add(&t->logs[FD_LOG], 256);
-+		spa_scnprintf(buf, 256, "pwtest: failed to chdir to '%s'\n", tmpdir);
- 		t->sig_or_errno = -errno;
--		return;
-+		goto error;
- 	}
- 
- 	if (t->args.pw_daemon) {
--- 
-GitLab
-
diff --git a/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch b/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch
deleted file mode 100644
index b0866c5b4309..000000000000
--- a/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 651f0decea5f83730c271e9bed03cdd0048fcd49 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 21 Oct 2021 11:09:48 +0200
-Subject: [PATCH] cpu: fix compilation on some architectures
-
----
- spa/plugins/support/cpu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/support/cpu.c b/spa/plugins/support/cpu.c
-index ee1816512..01cff4854 100644
---- a/spa/plugins/support/cpu.c
-+++ b/spa/plugins/support/cpu.c
-@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory,
- 		if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL)
- 			this->vm_type = atoi(str);
- 		if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL)
--			impl_cpu_zero_denormals(this, spa_atob(str));
-+			spa_cpu_zero_denormals(&this->cpu, spa_atob(str));
- 	}
- 
- 	spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x",
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index fc8b75f3aaf9..67ffc1882f3e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,8 +1,8 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.39
+version=0.3.40
 revision=1
-_pms_version=0.4.0
+_pms_version=0.4.1
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -32,8 +32,8 @@ homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
- c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b"
+checksum="a2c8176d757a2ac6db445c61a50802ff1c26f49f5a28174f5eb0278609a887cf
+ 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 

From 6ea3f8cd6423cb26face63b07c6db5d4d03370d6 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 12 Nov 2021 16:29:52 +0100
Subject: [PATCH 2791/4088] wireplumber: update to 0.4.5

---
 srcpkgs/wireplumber/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index b5ed09736967..5b11a41482f3 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,14 +1,12 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.4.4
+version=0.4.5
 revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dintrospection=enabled -Dsystem-lua=true -Dwpipc=enabled"
+configure_args="-Dintrospection=enabled -Dsystem-lua=true"
 hostmakedepends="pkg-config glib-devel python3-lxml doxygen"
 makedepends="libglib-devel pipewire-devel lua54-devel"
-# FIXME: required for it to launch at all, might be a config bug
-depends="libspa-v4l2"
 checkdepends="pipewire dbus"
 short_desc="Session and policy manager implementation for PipeWire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -16,7 +14,7 @@ license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=a09ef574990a39db134506079cc9abe76ab5931ea2bdbee8ac01023a9e6f3185
+checksum=73c76c8cd60d3f96e586122a13257586396d7e34b2f9ffad39d27015a1fa0a13
 
 post_install() {
 	vlicense LICENSE

From ad7fb901e1a4925d45d5f744702779651febf10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 11 Nov 2021 01:29:32 -0300
Subject: [PATCH 2792/4088] common/chroot-style: clean up bwrap.sh.

--dev-bind isn't necessary in any case it was being used for. We can
also use --ro-bind for /void-packages.

A possible future improvement would be to mount / read only during the
actual build.

Also exec bwrap, as done in the uchroot and uunshare chroot styles. And
update homepage.
---
 common/chroot-style/bwrap.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/chroot-style/bwrap.sh b/common/chroot-style/bwrap.sh
index dc1fca461a68..de4323506a3e 100755
--- a/common/chroot-style/bwrap.sh
+++ b/common/chroot-style/bwrap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# This chroot script uses bubblewrap (see https://github.com/projectatomic/bubblewrap)
+# This chroot script uses bubblewrap (see https://github.com/containers/bubblewrap)
 #
 set -e
 readonly MASTERDIR="$1"
@@ -18,6 +18,6 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
 	exit 1
 fi
 
-bwrap --dev-bind "$MASTERDIR" / --dev-bind "$DISTDIR" /void-packages \
+exec bwrap --bind "$MASTERDIR" / --ro-bind "$DISTDIR" /void-packages \
 	 --dev /dev --tmpfs /tmp --proc /proc \
-	${HOSTDIR:+--dev-bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"
+	${HOSTDIR:+--bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"

From 8d63a3f98e16f2572869fb9c2a756012b35323ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 10 Nov 2021 21:16:02 -0300
Subject: [PATCH 2793/4088] elfutils: update to 0.186.

---
 ...ompilation-on-platforms-without-erro.patch | 35 +++++++++++++++++++
 srcpkgs/elfutils/template                     |  6 ++--
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch

diff --git a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
new file mode 100644
index 000000000000..329baac25378
--- /dev/null
+++ b/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
@@ -0,0 +1,35 @@
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Wed, 10 Nov 2021 21:11:55 -0300
+Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h>
+
+"system.h" only declares the error() function, so it needs to be in an
+'extern "C"' block, otherwise linking fails.
+
+Since we are here, use quotes for "system.h" header, since it's a local
+header, not a system one.
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ debuginfod/debuginfod.cxx | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
+index 521cb529..764e7b94 100644
+--- a/debuginfod/debuginfod.cxx
++++ b/debuginfod/debuginfod.cxx
+@@ -33,11 +33,11 @@
+ 
+ extern "C" {
+ #include "printversion.h"
++#include "system.h"
+ }
+ 
+ #include "debuginfod.h"
+ #include <dwarf.h>
+-#include <system.h>
+ 
+ #include <argp.h>
+ #ifdef __GNUC__
+-- 
+2.33.1
+
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 9b7ab6beb63c..5d37eb20eeb8 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,6 +1,6 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.185
+version=0.186
 revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
@@ -14,12 +14,12 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6
+checksum=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel musl-legacy-compat"
+	makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel"
 
 	# mainly warnings from using error.h
 	CFLAGS="-Wno-error"

From 2ff8e93ed83d427110cb49d1db1b256d69fcc518 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 10 Nov 2021 21:56:38 -0500
Subject: [PATCH 2794/4088] fcft: update to 2.4.6

---
 srcpkgs/fcft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..1abd925cf1d1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.6
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=58641cb4f5eb2301d34f0e92437b10e5a2ee27dba9e8da3f76d23393278520be
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"

From 538422a5fb0d3bfe0f922a45e15268ed370e0cd7 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Sun, 7 Nov 2021 20:57:49 -0600
Subject: [PATCH 2795/4088] gns3-gui: allow newer versions of jsonschema

---
 srcpkgs/gns3-gui/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-gui/template                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
index e52bb30bfac6..624664192a4d 100644
--- a/srcpkgs/gns3-gui/patches/requirements.patch
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -2,7 +2,8 @@ diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -1,4 +1,3 @@
- jsonschema==3.2.0
+-jsonschema==3.2.0
++jsonschema>=3.2.0
 -sentry-sdk==1.3.1
  psutil==5.8.0
  distro==1.6.0
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index e122e2c7ecd3..8a6aabcc2157 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.26
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema

From 562e0cf84f0e612b57893a3573fac594151266e2 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Sun, 7 Nov 2021 20:57:54 -0600
Subject: [PATCH 2796/4088] gns3-server: allow newer versions of jsonschema

---
 srcpkgs/gns3-server/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-server/template                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 4954850f1dda..84ee86596b92 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -2,7 +2,8 @@ diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -1,9 +1,8 @@
- jsonschema==3.2.0
+-jsonschema==3.2.0
++jsonschema>=3.2.0
 -aiohttp==3.7.4.post0
 +aiohttp>=3.7.4
  aiohttp-cors==0.7.0
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 679b9ae3fb91..81fbf1db472a 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
 version=2.2.26
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl

From 875b8fb5254a157aefb3c855fa797934eca7f370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 00:53:41 -0300
Subject: [PATCH 2797/4088] thunderbird: update to 91.3.0.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 9063ead6161b..1757e6c9dfa1 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=91.2.0
+version=91.3.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=30476803f0bd4a46d2516ac5cbb831fc580b81d5d704af17c7df81e2bb6ee075
+checksum=d3abcf55637fb21bd9d68a19c01780edd82e6e72b5e850b31de186dddc2708ad
 
 lib32disabled=yes
 

From df7c4a7b77e08632b0a386eed7cff8be02b74dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 00:57:05 -0300
Subject: [PATCH 2798/4088] thunderbird-i18n: update to 91.3.0.

---
 srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index b63aad16f02f..cccf51a2fed7 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=91.2.0
+version=91.3.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -95,57 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="c39c8f12193e2cd4436dc5e627db6abdba4dd6916f301c9ca29017288912da40
- 99422da35e94debbe7a4148a6964b52cc6e259c2bafa8509d208fe7229f49042
- 22ed9e041b919972d044340d756a114c179fc5c271929b2f2568d05b47487679
- 526116a63bcc2ad7b7f338df80218a9999151adcc756a54dde10172b68ec90b1
- 0244961120886427939556da9702792a75b409929ed85a3aa03d42955aa50e29
- 463ff55ea0039f2931db3660269ea7c9f3b13e1fe437841763e76e74c2685746
- 318cb2bec65c9a2a32fbc6f2f295d6ea5eb852f0a3fbd43ca21c62e4b70eac7f
- 812143b553d097b323e2d18a0f26610c191427f7ffc2532cb47a0abf34a4c5c8
- f5e2b7cc99e9af6ff70364045580a2c95efe44c7958e3d69b7a589a6a967aebc
- 1f68904a07d2ad29843955affbb4fe5f0fd216c1566ffaa1eec15126eee08b96
- 0ceec7f6c36c6ead466254a9a3c760340ba775b4ae49fbba12f7d35e5d62c01b
- b9f1efb44cac93ab386d0c5ee17e1b12afac6e2545ca79aa5420b549dba3ea1f
- 4b4e66f78acae65501e45473a2f543418ca66026f67466ebba1cfc9f5b345651
- d6146644061cb17220ca0303cc69ce1a273c3228b997f0afed1dc0f6e4e153a3
- 4b921c5df6511161000ea3dbc56a5443b0a2a74bd879baa3fddc767023c96d70
- 9a340cbca2cef685e8087f2a4f75702796c71c28503bddf28dccbdbeee874716
- 36bd723b1276f8990d5ae254ae9da6c73b120f50d16e41b1e5041e2b774060a6
- 035515699058710f5e8fc0f6c2438a786113d408bf6bad5deefa6d3d90a05c20
- e81ea7f58e24511145b26f4431f1ffaac672002535ccb7e1a215f0740e194185
- fada43e831a17cf80a6c6774c77a39d21e53b3ae1bc8ca28da1480ac165667e6
- 8b724d589d4aa55f9a7a4ca5c1c87c5e206d091fb7684d7244b079fe8cea14e1
- e9fa6a49ab325e1beb83826900d6686400cc7c0c0da9063b35dc2ebea61f5b31
- 3f4a614257488838e9f87e251390430e3532436b2cfa34dfb5f3b9cc6d6a1860
- 2f08437a7fbdfc24da9a6af8616844dd6eea85bb7f4addc7125c639da668813b
- f001d540394a4a5cf302b7839a5cf5d567ca9b27967b25354c62d2f735961f51
- e5e33b6ed69c5c1f2af21844e303bbf4a934c8688f15ffc8ddddfa6137458030
- 5330a0c860a04cf92ece2b7d54b234e9055f6eb74d9789fd1246b7c19768d6d2
- 34c5405a5d93de7dee5c7e1cad3f47afcdaa34308643341b463e315d2d002a56
- 90f88de2ae7db2005b908f9ef6158d00188c6cd9da59a4d50a446248b479fe60
- d3e65a3635ad983ddefecd87aa315cbfcf61226bb000b8108eda33fd0dec0e78
- d866790db8dfe8c3180caa5dfe49f7b2a5604b2648de44a585564a0b14ac5880
- 406d5acca84aa87b108eff1d30b9b82f309166b485225315bb9f6289eb61864d
- f4de71597d928710babb63668744570289f64c81f87f2a51498391587ad56efa
- ce3219f61a47550a7f7b4b4d6aacff96cb7aacbd002106b05507aaa9c2e911ab
- ee2634b1cedd03445a4bf69802c19b82b0eaaaf04c05f48c89fbef62877bf6ba
- 73a7f172c24232ccb1baa4a84aa02127319cf5c0a3822b2d2443c81ddcae7b21
- 162835dc0225b72eb15c088ca237e99cc6b0eb29f750417766f441e20fc64bc9
- f14aeadadd0f714e4c5dd0b355abd9c6db519191b59231c121539d561d3c3d83
- 74a91082371432730ab1174c037d222e0c6ad055478303442b9a41ce34123193
- e6ef01427d4f2f6c567c57eafad50b4b5662d21c9299c90821eea15e8ba6f6e4
- 3e57081fa2cfc4072d0b5c5236dbdc5759464e5d2fa768e205e99eba0855c651
- 236cd697f44dc476891b7ef950e52172d59b9216102121d974b617f893449114
- b372e3140e728bcb67e11e432544afcf21d7bb93afd4f16829956b9a8dffd6b7
- 141a05223d1c09184ed63d027d55afd9c039e99cffdeb537b53735ad1179ceba
- cd4786ce7355699e947ccdd1dfa7598c072c9d2c7fb530e7b7dd4225d42eb556
- 3e11591505e1b9f11ab3019a05da0698a8af208539188bd99c38095c890cad77
- 25c2f0364798e6461aff8ad187c67116c5e6303aa93c7cee97d02e4040d773b3
- 054b03d96c485d27938424ab816707cc8661a8cc8c8ea76f1ef122463ee9fe76
- c39f9034eeb8ec8ada0169cbc036fe5849b887953f42daf1e7e8c1a0e33b93ed
- 1bb9a0b873e371a9a718f04fc3c5c94be380fb5c433808ff2a22f5bab95dc664
- 046cbb2767026be1c49158e23c683fa0761078c88e22ef4f8ccc27fc962f27fe
- 12e52f54b04d9ba41634e029b2b4edf6a4a753c583af189dd07b8d0f47d72253
- 0faeb87c9803ac28b66f059f9e8cef8347b4c81aee039ac18043f8bba56c9a0b
- 2e9a3736d33c083d846ef17476986fead36ce7e978dbfd3eba15265838d3db08"
+checksum="54aaacc9db66162d2ffea6c36642e92b545193c6a24e9ba6a13bbad0cfb692ef
+ 042db64a29dbb9c0826f8b86df3389e3bc4ae98a64f4edf1ecada75c464457b5
+ 5f8b86b763a3f3dfcfa0f3a803511f70d37a6ab9d028f4c636a21fcc2e8d97c1
+ 908d3a1a108e67b0833c8f815aa4e5610908d8145a181e942b4ff43b7ad6575e
+ f3f7a7c364d63fe3f29f5c10b137865add53e65d6b34a391142a19bf1d138b39
+ a0020bddefb84bbe5a68a86bcb8852e30739d3e5670c8e3ac25e8fa166b8c689
+ 6f8d12d2deba1df2ecf1ded751570a24a63c21f9393e5a59b7889696ab5d4d93
+ b7ebbb43d5721c6825b8859e7d8c7702bb06c3d4762c13d671143809b7ca8828
+ bbf25e35f372e420401d1ccbb51c038b307d2b0e8a23f788127c2aa2287315be
+ a66ca0af6e2ecac6032e4ccbdfcadd46aaec251805dda0567329df6674103e94
+ eda372a287843a450a3f40e1fc243b7f8662433b51185af63dcb0b666b08f370
+ 330bdd81270688e3265ca489c32f2f3427b39f432ffef24fc680f68360731a86
+ 75584278dd682485818f2f91f260754187f5c930da94b77032695077049c90af
+ 9d403380614ce709deb3c613b7da06b02c00d3ce9aa0ed33a1468aac6d882040
+ dd09cc0927a29aca676b954a342ea2a11692d27b1d3cb11decfb581c0d99abd7
+ 3a63e31ce53d0922b5caa0018f2cb91f75611488b5fab0d59918fc47319e314d
+ 0b97007f0b8b16fbb19b43b1a0dd28fed53041c91324e6f68bca55b55bc941ee
+ 30ca307bb447165710c8911539d89965875204abedbf57f8fbf77616bbba7379
+ d574c0a6439efac6e4cc462ef40fbddadf31f0cd735cdacb66899568275b0a1c
+ 172f238430867aafc66863e6e229e5c2416993fe0bd97b6fc285a1498a66078a
+ fa514d1d0cde0af3c3137e690525397b324760cd5dd4e3919721376011bb904a
+ 2148938002a1bb0e018dd0a5f4725a3f57ce5ebc9053d959c00c93766c58c6d4
+ fe3fb83cb738f6b7a3de033b6df5d6f5fdb87eb18370f36b5cb94c49894c2671
+ ca4ab1806947dca8aa67dc9780d8253117ae44764f4342eccb06d81b9624e58c
+ fb56fa4da47d487238227f38cff8ae80bde6ce205f0decd7001955530dd5c10b
+ 3be8f8f1c486125f6da08158c6219b632e1c380bfcc9b255a2b7abc459873c55
+ 2a3222f60e3943086066d9803d675c01b3c5e8fe411ea28a4d043ba5c28ce37c
+ 953d61e06f875c5023ca8016e8fa75f385e0e5d88ef0befad0aae7ea94f89d00
+ f87e38d51c06c9da9ee8fd55b67714a6ed7996d77e04f473e9404dc958cc09c6
+ d1b883ff2d35d4c02df4789b358c54c89ca5e29b4325be6a1c5abe172f99cb81
+ 0e6655e16af2bad6c0498d2698fbb1a82086d4d0c9e35e847c57843cf06cae35
+ f2f2a48a8099548d301b3b9a6cbfb64b01a9a0300f8ef60d17e963b1057918de
+ 3a0854d79a8b6c1713557561e8061fab1689ac8a792efc9ba659d55ba448f712
+ 2fa565d91c0793d30dd20ad6f44b3f55ef510f3a6bd30fc82d9a5caffe0a4a7b
+ 66ec9dfe5e8ab82f726ba1c1702a5c41282ef6ebf8dec9cddbc8e429db7ec8da
+ 7304c1451aa84c29ad1e9fd2896dcc3d0c71be1106cb5f4c59ed928c05f7298a
+ 9cc9c81ed0ec25c1affeeb285599993285917b344c40a8859609dccfbdf1ec50
+ e11e315748a8e3630b5e3ef33e4f4e41fd9e00ba488c612f1bccb25b889c5f7c
+ fafab2f3592998ea53e090d67f5ed15f7be34355f08c20d3b87bb17fd7d5c7ea
+ 0d642d944fbaedf8232dba8feec02560b2c543a0f2d48024a468f7fb1ec0cc96
+ 571974d5909c18e36aba64ab18e10886e6087e526311d8d22e8ecd5fc9a23534
+ b6f77f962743803c74f86c946bbc17e6353dae6ce849cd8597d71e11ea54b595
+ 2dc9be4bc0d168d1d7bc241cfec205745358ecae0215bb273dffb9c14f84f344
+ 03d723e839ab16179fcf255788a93e7820db3469dfa7f7fbdce1e2633397b086
+ d90230840b596f0ef1aa3ea0ae9bf7a116ee8a30e537c55b27a88fa825bcaad3
+ f140722daf5c1e14be850dc3540507f73ce36b814d4bb3dd30026c84aff41d07
+ 2e5db76cd24c641b78b5ddf032533a39afb3f2c6dbca7413d715585f16e975b0
+ 7cfb6f6e078226e4e8c8d4827544411228c98e08fd727fbec73e4e53b3bb7978
+ 57f15ad36bed50d908e6aa9e5b21a1e1c67b5b0ac78c634481e2a54f47703158
+ ebdc46df664d3d76c82e94951794f964fdc0e1248bd22c17524468118c97fcfc
+ 20a92b971a86a3db414bae904dc54842fa94f4e926a168d800c760efcbb00683
+ e81cebbee2858b7ffc92f9d74eaeed978c2fabafa827d5aa2870cc53ef795116
+ 3a702e18735c278d4dee08869a2442884a809688c81487b97ea088a3fd922761
+ 697ae2d5f007be138dc1e0e3132349f083de8d046de69dfa268ae542c498499c"

From 77642710723a380533a8f5fd22b6d6cb9e218d3a Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 21:50:31 +0100
Subject: [PATCH 2799/4088] spandsp: use debian mirror

because main site is down
and fix lint error
---
 srcpkgs/spandsp/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spandsp/template b/srcpkgs/spandsp/template
index 661790e139f4..6a8f3ab715f1 100644
--- a/srcpkgs/spandsp/template
+++ b/srcpkgs/spandsp/template
@@ -2,14 +2,15 @@
 pkgname=spandsp
 version=0.0.6
 revision=3
+wrksrc="${pkgname}-${version}+dfsg"
 build_style=gnu-configure
 makedepends="tiff-devel"
-short_desc="A library of many DSP functions for telephony"
+short_desc="Library of many DSP functions for telephony"
 maintainer="JohnZ <me@johnnynator.dev>"
 license="LGPL-2.1-only, GPL-2.0-only"
 homepage="https://www.soft-switch.org/"
-distfiles="https://www.soft-switch.org/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465
+distfiles="${DEBIAN_SITE}/main/s/spandsp/spandsp_${version}+dfsg.orig.tar.xz"
+checksum=3dcdc611b8a119f1f26540d05e6279c4c1e5cd576271f6d45df431359fc190f9
 
 spandsp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 1bcee5610f9a2000df70e4ad1e8f9c2cadd8de80 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:18:18 +0100
Subject: [PATCH 2800/4088] ISOEnts: install files with the right permissions

---
 srcpkgs/ISOEnts/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ISOEnts/template b/srcpkgs/ISOEnts/template
index 13cd868f9ba1..6b0376fdd6a8 100644
--- a/srcpkgs/ISOEnts/template
+++ b/srcpkgs/ISOEnts/template
@@ -1,7 +1,7 @@
 # Template file for 'ISOEnts'
 pkgname=ISOEnts
 version=1986
-revision=5
+revision=6
 create_wrksrc=yes
 depends="xmlcatmgr"
 short_desc="Character entity sets from ISO 8879:1986 (SGML)"
@@ -13,7 +13,8 @@ checksum=dce4359a3996ed2fd33ad5eaa11a9bcfc24b5b06992e24295132b06db19a99b2
 sgml_entries="CATALOG /usr/share/sgml/iso8879/catalog --"
 
 do_install() {
-	vmkdir usr/share/sgml/iso8879
-	vcopy "*" usr/share/sgml/iso8879
+	for f in *; do
+		vinstall $f 644 usr/share/sgml/iso8879
+	done
 	vinstall ${FILESDIR}/catalog 644 usr/share/sgml/iso8879
 }

From 93ff193b1e6742941b4304b183d70388b6540d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 23:34:40 -0300
Subject: [PATCH 2801/4088] sbctl: update to 0.7.

---
 srcpkgs/sbctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 2e45c787b117..a23de44c1bff 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbctl'
 pkgname=sbctl
-version=0.6
+version=0.7
 revision=1
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/Foxboron/sbctl"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=37c68dc07fdf2068c95161deb00848fa8a3c666598e234978bed048dcfdef6b6
+checksum=29ccc8e1ddda2c9539d7546263459daf797ded58ce69a2e6437df398eb17adfc
 
 do_build() {
 	make

From 5d807980a763ff82a57d0b3bb9a5a32b34a16373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 23:35:01 -0300
Subject: [PATCH 2802/4088] mdbook-linkcheck: update to 0.7.6.

---
 srcpkgs/mdbook-linkcheck/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 29154a6e82d3..1a9d110f7525 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -1,7 +1,7 @@
 # Template file for 'mdbook-linkcheck'
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
-version=0.7.5
+version=0.7.6
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://crates.io/crates/mdbook-linkcheck"
-distfiles="https://github.com/Michael-F-Bryan/${pkgname}/archive/v${version}.tar.gz"
-checksum=2fc98caeb0bc74c7cd10d1088c67359d2aa6066056d7eedd8b1afe1fed326f34
+distfiles="https://github.com/Michael-F-Bryan/mdbook-linkcheck/archive/v${version}.tar.gz"
+checksum=c26ea7841f41fba078c6c358a5733026fa4927421dcec2f6ef260c17abecbd9a
 
 post_install() {
 	vlicense LICENSE

From 51eb9237030fe3aa3d7b2d99d532b803ade339fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 23:39:37 -0300
Subject: [PATCH 2803/4088] ell: update to 0.45.

---
 common/shlibs        | 2 +-
 srcpkgs/ell/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fd78e1e33c3f..5f6154c610de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -962,7 +962,7 @@ libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
 libxdg-basedir.so.1 libxdg-basedir-1.1.1_1
 libev.so.4 libev-4.04_1
-libell.so.0 ell-0.41_1
+libell.so.0 ell-0.45_1
 libgvnc-1.0.so.0 gtk-vnc-0.4.4_1
 libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4_1
 libyaml-0.so.2 libyaml-0.1.4_1
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index f294a5f9259b..bb563505e80e 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,7 +1,7 @@
 # Template file for 'ell'
 # ell ABI isn't stable! Always test dependants after updates and update common/shlibs
 pkgname=ell
-version=0.44
+version=0.45
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -13,7 +13,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=41a6f8fa4d285b52cb7a5a87bda3e7370ecaac02d94aaa7ec1a23f0480b8bc3f
+checksum=fedfcceee56eb63ab1eb98bf120a3cfbecee50bcd893874328c889f1b381e7d7
 # tests depend on kernel features
 make_check=extended
 

From 70e0e7aced983144aa5f4f21ae00d587b1b2effa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Nov 2021 23:40:02 -0300
Subject: [PATCH 2804/4088] ofono: rebuild for ell-0.45.

---
 srcpkgs/ofono/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template
index 248e58d9502d..1f270c890079 100644
--- a/srcpkgs/ofono/template
+++ b/srcpkgs/ofono/template
@@ -1,7 +1,7 @@
 # Template file for 'ofono'
 pkgname=ofono
 version=1.31
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-bluez4 --enable-external-ell"
 conf_files="/etc/ofono/phonesim.conf /etc/dbus-1/system.d/ofono.conf"

From 8e885a8410aaa5e8507b75e9df71557a9d730b94 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Tue, 9 Nov 2021 13:33:28 -0500
Subject: [PATCH 2805/4088] kexec-tools: update to 2.0.23

---
 srcpkgs/kexec-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template
index 06f6f4527138..827c3ca108fd 100644
--- a/srcpkgs/kexec-tools/template
+++ b/srcpkgs/kexec-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kexec-tools'
 pkgname=kexec-tools
-version=2.0.22
+version=2.0.23
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only"
 homepage="http://kernel.org/pub/linux/utils/kernel/kexec/"
 distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz"
-checksum=96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2
+checksum=aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 CFLAGS="-fcommon"

From 31ea8ea0c8c39bb6e1f80416eefc704d3c6df6c7 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 24 Oct 2021 04:03:38 +0300
Subject: [PATCH 2806/4088] dmd: update to 2.098.0

---
 srcpkgs/dmd/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template
index 36f7fce51781..697efbf168dd 100644
--- a/srcpkgs/dmd/template
+++ b/srcpkgs/dmd/template
@@ -1,6 +1,6 @@
 # Template file for 'dmd'
 pkgname=dmd
-version=2.095.0
+version=2.098.0
 revision=1
 create_wrksrc=yes
 hostmakedepends="dmd2.091 which"
@@ -15,14 +15,17 @@ distfiles="
  https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz
  https://github.com/dlang/phobos/archive/v${version}.tar.gz>phobos-${version}.tar.gz
  http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz"
-checksum="d8b54cdd885b86e2cc30ccb4ccc6923940b3bd79183b499889b86d34dd22621b
- f8d6346aa13bdc6ff893eb9d9e5aa5e8ff5efe97dbfd92f7ecd8db8172d0c04a
- f5c9606a988917a38b3b9a495c6da0d4e36b60beac8e805f6dea719d042d50d4
- 02853f8a4988f55dab5daa1e0e9910ea91905b85bcaa7a5ffd83079147dc7d93"
+checksum="437e7abae7f747ce8a027e512d2f98f0c27badd623347141c3f6fb0834d85ad0
+ f150400756c7940bc9d67a3ed7f89777e49b42a1ef2dff6f40727f83b3cea6f4
+ f91c6c7f2d5683af2804a183c287bf6991b99c49692759d7844e1919ca59e974
+ 1104e5e59fd47828b798d77a72be547bf086bba1d374a1855c6b5814c4db0145"
 conf_files="/etc/dmd.conf"
 provides="d-compiler-${version}_${revision}"
 conflicts="dmd-bootstrap dmd2.081 dmd2.091"
 nopie=yes
+# from no to very little distinction between host CC and target CC in
+# makefiles or build.d
+nocross="broken build system"
 disable_parallel_build=yes
 LDFLAGS="-lpthread"
 

From 2a55132ac7526fd7c831c9908fd1d0a0691ace0d Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 24 Oct 2021 04:03:53 +0300
Subject: [PATCH 2807/4088] dtools: update to 2.098.0

---
 srcpkgs/dtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dtools/template b/srcpkgs/dtools/template
index d37489dd4281..0255d9e501a3 100644
--- a/srcpkgs/dtools/template
+++ b/srcpkgs/dtools/template
@@ -1,7 +1,7 @@
 # Template file for 'dtools'
 pkgname=dtools
 # keep this synchronized with libphobos and dmd
-version=2.095.0
+version=2.098.0
 revision=1
 wrksrc="tools-${version}"
 hostmakedepends="dmd"
@@ -12,7 +12,7 @@ maintainer="Auri <me@aurieh.me>"
 license="BSL-1.0"
 homepage="http://www.digitalmars.com/d/2.0/"
 distfiles="https://github.com/dlang/tools/archive/v${version}.tar.gz"
-checksum=7688c56285e098b91ec81a3efaaec6d236aa1a1736fe21797d3335175f8fea8c
+checksum=9466e62ed2cf80802158524fc4e7ff80cbefc0fadff23a8933f6f2892b42cb56
 
 do_build() {
 	# rdmd can't be built normally, is used to build others

From 6e85a7c0f8a2ee54173904575e7a82474d4c6c83 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Fri, 12 Nov 2021 08:51:41 -0600
Subject: [PATCH 2808/4088] minised: update to 1.16

---
 srcpkgs/minised/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/minised/template b/srcpkgs/minised/template
index b4f212a287d7..93c68498466f 100644
--- a/srcpkgs/minised/template
+++ b/srcpkgs/minised/template
@@ -1,14 +1,14 @@
 # Template file for 'minised'
 pkgname=minised
-version=1.15
-revision=2
+version=1.16
+revision=1
 build_style=gnu-makefile
-short_desc="A smaller, cheaper, faster sed implementation"
+short_desc="Smaller, cheaper, faster sed implementation"
 maintainer="Richard Taityr <dicktyr@yahoo.co.uk>"
 license="BSD-3-Clause"
-homepage="http://exactcode.com/opensource/minised/"
-distfiles="http://dl.exactcode.de/oss/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ada36a55b71d1f2eb61f2f3b95f112708ce51e69f601bf5ea5d7acb7c21b3481
+homepage="https://exactcode.com/opensource/minised/"
+distfiles="https://dl.exactcode.de/oss/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=46e072d5d45c9fd3d5b268523501bbea0ad016232b2d3f366a7aad0b1e7b3f71
 
 # arguably not an alternative as minised lacks common extensions
 #alternatives="

From 1d8cfcc081cda12af8439ac6dbda5b57f03a5129 Mon Sep 17 00:00:00 2001
From: Leonid Bobrov <curiousbeaver@disroot.org>
Date: Sat, 6 Nov 2021 15:11:28 +0200
Subject: [PATCH 2809/4088] godot: update to 3.4

---
 srcpkgs/godot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 2637d01eefd4..c38f3f8c525a 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.3.4
+version=3.4
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=4e3a4baa60b196db1d0109cfd6c32f0f1126d0ead466ae8bd1f16557ea6b9bf0
+checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From 37ac8ece384d212f7c9ca2eee96a037f0ca0613b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 13 Nov 2021 01:43:11 +0100
Subject: [PATCH 2810/4088] master-pdf-editor: update to 5.8.20.

---
 srcpkgs/master-pdf-editor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..c56b78b02d41 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.8.20
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=d987e34d14c2fd9be09d5e2d118e30c28a947941bcfb448262e44f07343c6dae
 nostrip=yes
 repository=nonfree
 restricted=yes

From 22a63396faa22fd3344e7f4b844f7b0b45b29a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 13 Nov 2021 02:22:48 -0300
Subject: [PATCH 2811/4088] wdisplays: update to 1.1.

Switch upstream to fork that made a release with the important patches.
Unfortunately, cyclopsian seems to have completely quit GitHub and can't
be found elsewhere.
---
 .../patches/correct-protocol-version.patch    | 48 -------------------
 srcpkgs/wdisplays/template                    | 10 ++--
 2 files changed, 5 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/wdisplays/patches/correct-protocol-version.patch

diff --git a/srcpkgs/wdisplays/patches/correct-protocol-version.patch b/srcpkgs/wdisplays/patches/correct-protocol-version.patch
deleted file mode 100644
index 10e13b9ee717..000000000000
--- a/srcpkgs/wdisplays/patches/correct-protocol-version.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 657e2966e556c78f121075c69fe1ba8d2b4dcb73 Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Wed, 8 Jul 2020 11:57:35 +0200
-Subject: [PATCH] Use correct versions when binding globals
-
-Changes to protocols aren't forward-compatible. It's not possible to use
-version n+1 when a client has been designed to work with version n. For
-instance in wlr-screencopy v5 a new event has been added. Binding to
-version 5 without upgrading the client leads to libwayland errors
-because libwayland doesn't know how to handle the event.
-
-The client needs to maintain its own version requirements.
-
-Closes: https://github.com/cyclopsian/wdisplays/issues/18
----
- src/outputs.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/outputs.c b/src/outputs.c
-index 9ebf7e5..40410ec 100644
---- a/src/outputs.c
-+++ b/src/outputs.c
-@@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
- 
-   if (strcmp(interface, zwlr_output_manager_v1_interface.name) == 0) {
-     state->output_manager = wl_registry_bind(registry, name,
--        &zwlr_output_manager_v1_interface, version);
-+        &zwlr_output_manager_v1_interface, 1);
-     zwlr_output_manager_v1_add_listener(state->output_manager,
-         &output_manager_listener, state);
-   } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
-     state->xdg_output_manager = wl_registry_bind(registry, name,
--        &zxdg_output_manager_v1_interface, version);
-+        &zxdg_output_manager_v1_interface, 3);
-   } else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) {
-     state->copy_manager = wl_registry_bind(registry, name,
--        &zwlr_screencopy_manager_v1_interface, version);
-+        &zwlr_screencopy_manager_v1_interface, 1);
-   } else if(strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
-     state->layer_shell = wl_registry_bind(registry, name,
--        &zwlr_layer_shell_v1_interface, version);
-+        &zwlr_layer_shell_v1_interface, 1);
-   } else if(strcmp(interface, wl_shm_interface.name) == 0) {
--    state->shm = wl_registry_bind(registry, name, &wl_shm_interface, version);
-+    state->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
-   }
- }
- 
diff --git a/srcpkgs/wdisplays/template b/srcpkgs/wdisplays/template
index 6378c2a118c1..ef685d093e6f 100644
--- a/srcpkgs/wdisplays/template
+++ b/srcpkgs/wdisplays/template
@@ -1,13 +1,13 @@
 # Template file for 'wdisplays'
 pkgname=wdisplays
-version=1.0
-revision=2
+version=1.1
+revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel glib-devel python3-scour"
 makedepends="wayland-devel libepoxy-devel gtk+3-devel"
 short_desc="GUI display configurator for wlroots compositors"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
-homepage="https://cyclopsian.github.io/wdisplays/"
-distfiles="https://github.com/cyclopsian/wdisplays/archive/${version}.tar.gz"
-checksum=fa34d5bdfd87d833e18a89b2acacc27833d7297374719773a705f2d3e89cdddf
+homepage="https://github.com/artizirk/wdisplays"
+distfiles="https://github.com/artizirk/wdisplays/archive/${version}.tar.gz"
+checksum=5aa739dece0d928fe7ca2f28d7f6b4b6750559ec6a0cd0a7520a4b47cebb6f80

From 3041475b521c34d0ed7e86c5166f0bc5bb854484 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 11 Nov 2021 11:23:30 +0100
Subject: [PATCH 2812/4088] zig: backport an upstream bugfix

This commit backports one bug fix from the zig master branch which is
critical for our use-case of building software for binary distribution.
---
 .../0001-std.build-fix-handling-of-Dcpu.patch | 48 +++++++++++++++++++
 srcpkgs/zig/template                          |  4 +-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch

diff --git a/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch b/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch
new file mode 100644
index 000000000000..4101f24459bb
--- /dev/null
+++ b/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch
@@ -0,0 +1,48 @@
+From 1e8cdace7ad324a42228aeb5cd6eb8dd15429413 Mon Sep 17 00:00:00 2001
+From: Isaac Freund <ifreund@ifreund.xyz>
+Date: Tue, 21 Sep 2021 21:06:10 +0200
+Subject: [PATCH] std.build: fix handling of -Dcpu
+
+Currently -Dcpu is completely ignored if -Dtarget isn't passed as well.
+Further, -Dcpu=baseline is ignored even if -Dtarget=native is passed.
+
+This patch fixes these 2 issues, always respecting the -Dcpu option if
+present.
+---
+ lib/std/build.zig | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/lib/std/build.zig b/lib/std/build.zig
+index 9b7ebb1f4..e398529f9 100644
+--- a/lib/std/build.zig
++++ b/lib/std/build.zig
+@@ -685,7 +685,11 @@ pub const Builder = struct {
+         );
+         const mcpu = self.option([]const u8, "cpu", "Target CPU");
+ 
+-        const triple = maybe_triple orelse return args.default_target;
++        if (maybe_triple == null and mcpu == null) {
++            return args.default_target;
++        }
++
++        const triple = maybe_triple orelse "native";
+ 
+         var diags: CrossTarget.ParseOptions.Diagnostics = .{};
+         const selected_target = CrossTarget.parse(.{
+@@ -2451,11 +2455,8 @@ pub const LibExeObjStep = struct {
+ 
+             if (populated_cpu_features.eql(cross.cpu.features)) {
+                 // The CPU name alone is sufficient.
+-                // If it is the baseline CPU, no command line args are required.
+-                if (cross.cpu.model != std.Target.Cpu.baseline(cross.cpu.arch).model) {
+-                    try zig_args.append("-mcpu");
+-                    try zig_args.append(cross.cpu.model.name);
+-                }
++                try zig_args.append("-mcpu");
++                try zig_args.append(cross.cpu.model.name);
+             } else {
+                 var mcpu_buffer = std.ArrayList(u8).init(builder.allocator);
+ 
+-- 
+2.33.1
+
diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index 893ba0ec054f..728c5a64e9df 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -1,13 +1,13 @@
 # Template file for 'zig'
 pkgname=zig
 version=0.8.1
-revision=1
+revision=2
 archs="x86_64* aarch64*"
 build_style=cmake
 make_cmd=make
 makedepends="clang llvm12 lld-devel"
 short_desc="Programming language designed for robustness, optimality, and clarity"
-maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://ziglang.org"
 distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz"

From f84ea9aeef646be827b671d991a99026780bbed1 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 11 Nov 2021 11:24:26 +0100
Subject: [PATCH 2813/4088] build-styles: add zig-build

We call this "zig-build" instead of just "zig" as this build-style
relies on usage of the zig build system. In the future, other build
systems such as meson may support zig code. Furthermore, the zig
build system may be used to build C/C++ code as well, not just zig.
---
 Manual.md                              |  4 +++
 common/build-profiles/README           |  2 ++
 common/build-profiles/aarch64-musl.sh  |  2 ++
 common/build-profiles/aarch64.sh       |  2 ++
 common/build-profiles/armv6l-musl.sh   |  2 ++
 common/build-profiles/armv6l.sh        |  2 ++
 common/build-profiles/armv7l-musl.sh   |  2 ++
 common/build-profiles/armv7l.sh        |  2 ++
 common/build-profiles/i686-musl.sh     |  2 ++
 common/build-profiles/i686.sh          |  2 ++
 common/build-profiles/ppc-musl.sh      |  2 ++
 common/build-profiles/ppc.sh           |  2 ++
 common/build-profiles/ppc64-musl.sh    |  2 ++
 common/build-profiles/ppc64.sh         |  2 ++
 common/build-profiles/ppc64le-musl.sh  |  2 ++
 common/build-profiles/ppc64le.sh       |  2 ++
 common/build-profiles/ppcle-musl.sh    |  2 ++
 common/build-profiles/ppcle.sh         |  2 ++
 common/build-profiles/x86_64-musl.sh   |  2 ++
 common/build-profiles/x86_64.sh        |  2 ++
 common/build-style/zig-build.sh        | 41 ++++++++++++++++++++++++++
 common/cross-profiles/README           |  2 ++
 common/cross-profiles/aarch64-musl.sh  |  2 ++
 common/cross-profiles/aarch64.sh       |  2 ++
 common/cross-profiles/armv5tel-musl.sh |  2 ++
 common/cross-profiles/armv5tel.sh      |  2 ++
 common/cross-profiles/armv6l-musl.sh   |  2 ++
 common/cross-profiles/armv6l.sh        |  2 ++
 common/cross-profiles/armv7l-musl.sh   |  2 ++
 common/cross-profiles/armv7l.sh        |  2 ++
 common/cross-profiles/i686-musl.sh     |  2 ++
 common/cross-profiles/i686.sh          |  2 ++
 common/cross-profiles/mips-musl.sh     |  2 ++
 common/cross-profiles/mipsel-musl.sh   |  2 ++
 common/cross-profiles/mipselhf-musl.sh |  2 ++
 common/cross-profiles/mipshf-musl.sh   |  2 ++
 common/cross-profiles/ppc-musl.sh      |  2 ++
 common/cross-profiles/ppc.sh           |  2 ++
 common/cross-profiles/ppc64-musl.sh    |  2 ++
 common/cross-profiles/ppc64.sh         |  2 ++
 common/cross-profiles/ppc64le-musl.sh  |  2 ++
 common/cross-profiles/ppc64le.sh       |  2 ++
 common/cross-profiles/ppcle-musl.sh    |  2 ++
 common/cross-profiles/ppcle.sh         |  2 ++
 common/cross-profiles/x86_64-musl.sh   |  2 ++
 common/cross-profiles/x86_64.sh        |  2 ++
 46 files changed, 133 insertions(+)
 create mode 100644 common/build-style/zig-build.sh

diff --git a/Manual.md b/Manual.md
index 5996e1502887..b0afd6db1596 100644
--- a/Manual.md
+++ b/Manual.md
@@ -998,6 +998,10 @@ configure arguments can be specified via `cross_*_configure_args` where `*` is `
 additionally passed to both early and final `gcc`. You can also specify custom `CFLAGS`
 and `LDFLAGS` for the libc as `cross_(glibc|musl)_(cflags|ldflags)`.
 
+- `zig-build` For packages using [Zig](https://ziglang.org)'s build
+system. Additional arguments may be passed to the `zig build` invocation using
+`configure_args`.
+
 For packages that use the Python module build method (`setup.py` or
 [PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
 
diff --git a/common/build-profiles/README b/common/build-profiles/README
index e4457c16f22c..41b18fc1174e 100644
--- a/common/build-profiles/README
+++ b/common/build-profiles/README
@@ -9,6 +9,8 @@ for a specific architecture:
 	- XBPS_CXXFLAGS		(C++ compiler flags for the host compiler)
 	- XBPS_FFLAGS		(Fortran compiler flags for the host compiler)
 	- XBPS_RUST_TARGET	(the compiler triplet for usage by cargo)
+	- XBPS_ZIG_TARGET	(the arch-os-abi target triplet for zig)
+	- XBPS_ZIG_CPU		(the cpu/feature set for zig)
 
 These properties are also set in a cross environment, but the compiler
 flags are not added into the global flags. XBPS_RUST_TARGET is also
diff --git a/common/build-profiles/aarch64-musl.sh b/common/build-profiles/aarch64-musl.sh
index 76249d0b75c8..8427d0478a9a 100644
--- a/common/build-profiles/aarch64-musl.sh
+++ b/common/build-profiles/aarch64-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="aarch64-unknown-linux-musl"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
+XBPS_ZIG_TARGET="aarch64-linux-musl"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-profiles/aarch64.sh b/common/build-profiles/aarch64.sh
index ccf7d5af3d54..59855dfc0c82 100644
--- a/common/build-profiles/aarch64.sh
+++ b/common/build-profiles/aarch64.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="aarch64-unknown-linux-gnu"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
+XBPS_ZIG_TARGET="aarch64-linux-gnu"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-profiles/armv6l-musl.sh b/common/build-profiles/armv6l-musl.sh
index 172e56e81a82..b46941a39976 100644
--- a/common/build-profiles/armv6l-musl.sh
+++ b/common/build-profiles/armv6l-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="armv6l-linux-musleabihf"
 XBPS_RUST_TARGET="arm-unknown-linux-musleabihf"
+XBPS_ZIG_TARGET="arm-linux-musleabihf"
+XBPS_ZIG_CPU="generic+v6"
diff --git a/common/build-profiles/armv6l.sh b/common/build-profiles/armv6l.sh
index d84b6bdb2cc2..3b182234cb6d 100644
--- a/common/build-profiles/armv6l.sh
+++ b/common/build-profiles/armv6l.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="armv6l-unknown-linux-gnueabihf"
 XBPS_RUST_TARGET="arm-unknown-linux-gnueabihf"
+XBPS_ZIG_TARGET="arm-linux-gnueabihf"
+XBPS_ZIG_CPU="generic+v6"
diff --git a/common/build-profiles/armv7l-musl.sh b/common/build-profiles/armv7l-musl.sh
index f81ad699e07a..dbf3eb0d5b92 100644
--- a/common/build-profiles/armv7l-musl.sh
+++ b/common/build-profiles/armv7l-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_CXXFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="armv7l-linux-musleabihf"
 XBPS_RUST_TARGET="armv7-unknown-linux-musleabihf"
+XBPS_ZIG_TARGET="arm-linux-musleabihf"
+XBPS_ZIG_CPU="generic+v7a+vfp3"
diff --git a/common/build-profiles/armv7l.sh b/common/build-profiles/armv7l.sh
index a100e410f9a9..141639b132b0 100644
--- a/common/build-profiles/armv7l.sh
+++ b/common/build-profiles/armv7l.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="armv7l-unknown-linux-gnueabihf"
 XBPS_RUST_TARGET="armv7-unknown-linux-gnueabihf"
+XBPS_CROSS_ZIG_TARGET="arm-linux-gnueabihf"
+XBPS_CROSS_ZIG_CPU="generic+v7a+vfp3"
diff --git a/common/build-profiles/i686-musl.sh b/common/build-profiles/i686-musl.sh
index e76ab89d6ae3..a607ef619e79 100644
--- a/common/build-profiles/i686-musl.sh
+++ b/common/build-profiles/i686-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="i686-linux-musl"
 XBPS_RUST_TARGET="i686-unknown-linux-musl"
+XBPS_ZIG_TARGET="i686-linux-musl"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-profiles/i686.sh b/common/build-profiles/i686.sh
index 036a91b2b92b..ac69fb0c519d 100644
--- a/common/build-profiles/i686.sh
+++ b/common/build-profiles/i686.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="i686-pc-linux-gnu"
 XBPS_RUST_TARGET="i686-unknown-linux-gnu"
+XBPS_ZIG_TARGET="i386-linux-gnu"
+XBPS_ZIG_CPU="_i686+sse2"
diff --git a/common/build-profiles/ppc-musl.sh b/common/build-profiles/ppc-musl.sh
index 17296432e97b..60b2e700270a 100644
--- a/common/build-profiles/ppc-musl.sh
+++ b/common/build-profiles/ppc-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc-linux-musl"
 XBPS_RUST_TARGET="powerpc-unknown-linux-musl"
+XBPS_ZIG_TARGET="powerpc-linux-musl"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-profiles/ppc.sh b/common/build-profiles/ppc.sh
index f7ec35b69a64..b7a113139792 100644
--- a/common/build-profiles/ppc.sh
+++ b/common/build-profiles/ppc.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc-linux-gnu"
 XBPS_RUST_TARGET="powerpc-unknown-linux-gnu"
+XBPS_ZIG_TARGET="powerpc-linux-gnu"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-profiles/ppc64-musl.sh b/common/build-profiles/ppc64-musl.sh
index 53c5ea6fb3f8..4ec7430b39a9 100644
--- a/common/build-profiles/ppc64-musl.sh
+++ b/common/build-profiles/ppc64-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc64-unknown-linux-musl"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
+XBPS_ZIG_TARGET="powerpc64-linux-musl"
+XBPS_ZIG_CPU="970"
diff --git a/common/build-profiles/ppc64.sh b/common/build-profiles/ppc64.sh
index aa9af966ea78..1d0c04ae3747 100644
--- a/common/build-profiles/ppc64.sh
+++ b/common/build-profiles/ppc64.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc64-unknown-linux-gnu"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
+XBPS_ZIG_TARGET="powerpc64-linux-gnu"
+XBPS_ZIG_CPU="970"
diff --git a/common/build-profiles/ppc64le-musl.sh b/common/build-profiles/ppc64le-musl.sh
index cb9423f99748..8d2db1b2b518 100644
--- a/common/build-profiles/ppc64le-musl.sh
+++ b/common/build-profiles/ppc64le-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc64le-unknown-linux-musl"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
+XBPS_ZIG_TARGET="powerpc64le-linux-musl"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-profiles/ppc64le.sh b/common/build-profiles/ppc64le.sh
index c91ea054789e..8f0e735f873e 100644
--- a/common/build-profiles/ppc64le.sh
+++ b/common/build-profiles/ppc64le.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc64le-unknown-linux-gnu"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
+XBPS_ZIG_TARGET="powerpc64le-linux-gnu"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-profiles/ppcle-musl.sh b/common/build-profiles/ppcle-musl.sh
index 7585c4f6919d..c8d7e28e4834 100644
--- a/common/build-profiles/ppcle-musl.sh
+++ b/common/build-profiles/ppcle-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpcle-linux-musl"
 XBPS_RUST_TARGET="powerpcle-unknown-linux-musl"
+XBPS_ZIG_TARGET="powerpcle-linux-musl"
+XBPS_ZIG_CPU="pwr8"
diff --git a/common/build-profiles/ppcle.sh b/common/build-profiles/ppcle.sh
index 0cdc6cc853c9..7eccadf4ed26 100644
--- a/common/build-profiles/ppcle.sh
+++ b/common/build-profiles/ppcle.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpcle-linux-gnu"
 XBPS_RUST_TARGET="powerpcle-unknown-linux-gnu"
+XBPS_ZIG_TARGET="powerpcle-linux-gnu"
+XBPS_ZIG_CPU="pwr8"
diff --git a/common/build-profiles/x86_64-musl.sh b/common/build-profiles/x86_64-musl.sh
index b0bbb30bd160..538baea0b613 100644
--- a/common/build-profiles/x86_64-musl.sh
+++ b/common/build-profiles/x86_64-musl.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="x86_64-unknown-linux-musl"
 XBPS_RUST_TARGET="${XBPS_TRIPLET}"
+XBPS_ZIG_TARGET="x86_64-linux-musl"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-profiles/x86_64.sh b/common/build-profiles/x86_64.sh
index a53f4aafdacd..388b5561a6d2 100644
--- a/common/build-profiles/x86_64.sh
+++ b/common/build-profiles/x86_64.sh
@@ -3,3 +3,5 @@ XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="x86_64-unknown-linux-gnu"
 XBPS_RUST_TARGET="${XBPS_TRIPLET}"
+XBPS_ZIG_TARGET="x86_64-linux-gnu"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/build-style/zig-build.sh b/common/build-style/zig-build.sh
new file mode 100644
index 000000000000..205c4cadf53f
--- /dev/null
+++ b/common/build-style/zig-build.sh
@@ -0,0 +1,41 @@
+do_build() {
+	local zig_target zig_cpu
+
+	# TODO: This duplication between build-profiles and cross-profiles
+	# is totally unnecessary. It would be nice if there was some way to
+	# avoid it.
+	if [ "$CROSS_BUILD" ]; then
+		zig_target="${XBPS_CROSS_ZIG_TARGET}"
+		zig_cpu="${XBPS_CROSS_ZIG_CPU}"
+	else
+		zig_target="${XBPS_ZIG_TARGET}"
+		zig_cpu="${XBPS_ZIG_CPU}"
+	fi
+
+	# Inform zig of the required libc include paths.
+	cat > xbps_zig_libc.txt <<-EOF
+		include_dir=${XBPS_CROSS_BASE}/usr/include
+		sys_include_dir=${XBPS_CROSS_BASE}/usr/include
+		crt_dir=${XBPS_CROSS_BASE}/usr/lib
+		msvc_lib_dir=
+		kernel32_lib_dir=
+		gcc_dir=
+	EOF
+
+	# The Zig build system only has a single install step, there is no
+	# way to build artifacts for a given prefix and then install those artifacts
+	# to that prefix at some later time. Therefore, we build and install to the zig-out
+	# directory and later copy the artifacts to the destdir in do_install().
+	# We use zig-out to avoid path conflicts as it is the default install
+	# prefix used by the zig build system.
+	DESTDIR="zig-out" zig build \
+		--sysroot "${XBPS_CROSS_BASE}" \
+		--libc xbps_zig_libc.txt \
+		-Dtarget="${zig_target}" -Dcpu="${zig_cpu}" \
+		-Drelease-safe --prefix /usr install \
+		${configure_args}
+}
+
+do_install() {
+	cp -r zig-out/* "${DESTDIR}"
+}
diff --git a/common/cross-profiles/README b/common/cross-profiles/README
index 2a2a1d4b423a..f2300b5d5a94 100644
--- a/common/cross-profiles/README
+++ b/common/cross-profiles/README
@@ -13,5 +13,7 @@ A cross profile file must provide the following variables:
 	- XBPS_CROSS_LDFLAGS	(Linker flags for the cross compiler)
 	- XBPS_CROSS_RUST_TARGET (the rust triplet for the rust cross compiler)
 	- XBPS_CROSS_RUSTFLAGS (rust compiler flags for the cross compiler)
+	- XBPS_CROSS_ZIG_TARGET	(the arch-os-abi target triplet for zig)
+	- XBPS_CROSS_ZIG_CPU	(the cpu/feature set for zig)
 
 A source package matching `cross-${XBPS_CROSS_TRIPLET}' must also exist.
diff --git a/common/cross-profiles/aarch64-musl.sh b/common/cross-profiles/aarch64-musl.sh
index 56ce2d32964a..892abba9ef3c 100644
--- a/common/cross-profiles/aarch64-musl.sh
+++ b/common/cross-profiles/aarch64-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="aarch64-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="aarch64-linux-musl"
+XBPS_CROSS_ZIG_CPU="baseline"
diff --git a/common/cross-profiles/aarch64.sh b/common/cross-profiles/aarch64.sh
index 068870a31588..7a99e6fc72c6 100644
--- a/common/cross-profiles/aarch64.sh
+++ b/common/cross-profiles/aarch64.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="aarch64-unknown-linux-gnu"
+XBPS_CROSS_ZIG_TARGET="aarch64-linux-gnu"
+XBPS_CROSS_ZIG_CPU="baseline"
diff --git a/common/cross-profiles/armv5tel-musl.sh b/common/cross-profiles/armv5tel-musl.sh
index 3894f0c87313..0eb813a54d64 100644
--- a/common/cross-profiles/armv5tel-musl.sh
+++ b/common/cross-profiles/armv5tel-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="arm-unknown-linux-musleabi"
+XBPS_CROSS_ZIG_TARGET="arm-linux-musleabi"
+XBPS_CROSS_ZIG_CPU="generic+v5te+soft_float"
diff --git a/common/cross-profiles/armv5tel.sh b/common/cross-profiles/armv5tel.sh
index d56c50a80063..f5828360f112 100644
--- a/common/cross-profiles/armv5tel.sh
+++ b/common/cross-profiles/armv5tel.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="arm-unknown-linux-gnueabi"
+XBPS_CROSS_ZIG_TARGET="arm-linux-gnueabi"
+XBPS_CROSS_ZIG_CPU="generic+v5te+soft_float"
diff --git a/common/cross-profiles/armv6l-musl.sh b/common/cross-profiles/armv6l-musl.sh
index 58b67f85a97e..5f32f9ba0aec 100644
--- a/common/cross-profiles/armv6l-musl.sh
+++ b/common/cross-profiles/armv6l-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="arm-unknown-linux-musleabihf"
+XBPS_CROSS_ZIG_TARGET="arm-linux-musleabihf"
+XBPS_CROSS_ZIG_CPU="generic+v6"
diff --git a/common/cross-profiles/armv6l.sh b/common/cross-profiles/armv6l.sh
index b146eb87219b..7040996ea1c1 100644
--- a/common/cross-profiles/armv6l.sh
+++ b/common/cross-profiles/armv6l.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="arm-unknown-linux-gnueabihf"
+XBPS_CROSS_ZIG_TARGET="arm-linux-gnueabihf"
+XBPS_CROSS_ZIG_CPU="generic+v6"
diff --git a/common/cross-profiles/armv7l-musl.sh b/common/cross-profiles/armv7l-musl.sh
index 93e3cc5b3d72..9a38832e0d7d 100644
--- a/common/cross-profiles/armv7l-musl.sh
+++ b/common/cross-profiles/armv7l-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="armv7-unknown-linux-musleabihf"
+XBPS_CROSS_ZIG_TARGET="arm-linux-musleabihf"
+XBPS_CROSS_ZIG_CPU="generic+v7a+vfp3"
diff --git a/common/cross-profiles/armv7l.sh b/common/cross-profiles/armv7l.sh
index 674165e238a1..b8c9c41d35a5 100644
--- a/common/cross-profiles/armv7l.sh
+++ b/common/cross-profiles/armv7l.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="armv7-unknown-linux-gnueabihf"
+XBPS_CROSS_ZIG_TARGET="arm-linux-gnueabihf"
+XBPS_CROSS_ZIG_CPU="generic+v7a+vfp3"
diff --git a/common/cross-profiles/i686-musl.sh b/common/cross-profiles/i686-musl.sh
index fcb3d8ec4b49..c1cdf60f5ebb 100644
--- a/common/cross-profiles/i686-musl.sh
+++ b/common/cross-profiles/i686-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="i686-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="i686-linux-musl"
+XBPS_CROSS_ZIG_CPU="baseline"
diff --git a/common/cross-profiles/i686.sh b/common/cross-profiles/i686.sh
index 07ee8883707a..16f44013ab76 100644
--- a/common/cross-profiles/i686.sh
+++ b/common/cross-profiles/i686.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="i686-unknown-linux-gnu"
+XBPS_CROSS_ZIG_TARGET="i386-linux-gnu"
+XBPS_CROSS_ZIG_CPU="_i686+sse2"
diff --git a/common/cross-profiles/mips-musl.sh b/common/cross-profiles/mips-musl.sh
index f1d9fe2fd1a3..7c44de7577e2 100644
--- a/common/cross-profiles/mips-musl.sh
+++ b/common/cross-profiles/mips-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="mips-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="mips-linux-musl"
+XBPS_CROSS_ZIG_CPU="generic+soft_float"
diff --git a/common/cross-profiles/mipsel-musl.sh b/common/cross-profiles/mipsel-musl.sh
index 0d1117deb06c..fa4390c98dcd 100644
--- a/common/cross-profiles/mipsel-musl.sh
+++ b/common/cross-profiles/mipsel-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="mipsel-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="mipsel-linux-musl"
+XBPS_CROSS_ZIG_CPU="generic+soft_float"
diff --git a/common/cross-profiles/mipselhf-musl.sh b/common/cross-profiles/mipselhf-musl.sh
index 8587a88e6ca5..49f4558ca2fa 100644
--- a/common/cross-profiles/mipselhf-musl.sh
+++ b/common/cross-profiles/mipselhf-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="mipsel-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="mipsel-linux-musl"
+XBPS_CROSS_ZIG_CPU="generic"
diff --git a/common/cross-profiles/mipshf-musl.sh b/common/cross-profiles/mipshf-musl.sh
index 2914eaf19f85..513391b6284e 100644
--- a/common/cross-profiles/mipshf-musl.sh
+++ b/common/cross-profiles/mipshf-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="mips-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="mips-linux-musl"
+XBPS_CROSS_ZIG_CPU="generic"
diff --git a/common/cross-profiles/ppc-musl.sh b/common/cross-profiles/ppc-musl.sh
index 631b1fb427e9..327ae2341b99 100644
--- a/common/cross-profiles/ppc-musl.sh
+++ b/common/cross-profiles/ppc-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc-unknown-linux-musl"
+XBPS_ZIG_TARGET="powerpc-linux-musl"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/cross-profiles/ppc.sh b/common/cross-profiles/ppc.sh
index 4647c62de2dd..787f6bb2943b 100644
--- a/common/cross-profiles/ppc.sh
+++ b/common/cross-profiles/ppc.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc-unknown-linux-gnu"
+XBPS_ZIG_TARGET="powerpc-linux-gnu"
+XBPS_ZIG_CPU="baseline"
diff --git a/common/cross-profiles/ppc64-musl.sh b/common/cross-profiles/ppc64-musl.sh
index 2cc74b352a13..c4b0f35e094b 100644
--- a/common/cross-profiles/ppc64-musl.sh
+++ b/common/cross-profiles/ppc64-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc64-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="powerpc64-linux-musl"
+XBPS_CROSS_ZIG_CPU="970"
diff --git a/common/cross-profiles/ppc64.sh b/common/cross-profiles/ppc64.sh
index 4fedf210000d..7ed5bc0d5f1f 100644
--- a/common/cross-profiles/ppc64.sh
+++ b/common/cross-profiles/ppc64.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc64-unknown-linux-gnu"
+XBPS_CROSS_ZIG_TARGET="powerpc64-linux-gnu"
+XBPS_CROSS_ZIG_CPU="970"
diff --git a/common/cross-profiles/ppc64le-musl.sh b/common/cross-profiles/ppc64le-musl.sh
index b08f78c91f33..df18c300ddb0 100644
--- a/common/cross-profiles/ppc64le-musl.sh
+++ b/common/cross-profiles/ppc64le-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc64le-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="powerpc64le-linux-musl"
+XBPS_CROSS_ZIG_CPU="baseline"
diff --git a/common/cross-profiles/ppc64le.sh b/common/cross-profiles/ppc64le.sh
index 88e8649a7658..3fe7b2da47b6 100644
--- a/common/cross-profiles/ppc64le.sh
+++ b/common/cross-profiles/ppc64le.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc64le-unknown-linux-gnu"
+XBPS_CROSS_ZIG_TARGET="powerpc64le-linux-gnu"
+XBPS_CROSS_ZIG_CPU="baseline"
diff --git a/common/cross-profiles/ppcle-musl.sh b/common/cross-profiles/ppcle-musl.sh
index 2ba308f224d5..48e27c04b90f 100644
--- a/common/cross-profiles/ppcle-musl.sh
+++ b/common/cross-profiles/ppcle-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpcle-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="powerpcle-linux-musl"
+XBPS_CROSS_ZIG_CPU="pwr8"
diff --git a/common/cross-profiles/ppcle.sh b/common/cross-profiles/ppcle.sh
index 3e5230b194ef..a59158233660 100644
--- a/common/cross-profiles/ppcle.sh
+++ b/common/cross-profiles/ppcle.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpcle-unknown-linux-gnu"
+XBPS_CROSS_ZIG_TARGET="powerpcle-linux-gnu"
+XBPS_CROSS_ZIG_CPU="pwr8"
diff --git a/common/cross-profiles/x86_64-musl.sh b/common/cross-profiles/x86_64-musl.sh
index a1c27c6f7933..38642a07f8a9 100644
--- a/common/cross-profiles/x86_64-musl.sh
+++ b/common/cross-profiles/x86_64-musl.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="x86_64-unknown-linux-musl"
+XBPS_CROSS_ZIG_TARGET="x86_64-linux-musl"
+XBPS_CROSS_ZIG_CPU="baseline"
diff --git a/common/cross-profiles/x86_64.sh b/common/cross-profiles/x86_64.sh
index 360dd2068fc2..bd966d0e01df 100644
--- a/common/cross-profiles/x86_64.sh
+++ b/common/cross-profiles/x86_64.sh
@@ -8,3 +8,5 @@ XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="x86_64-unknown-linux-gnu"
+XBPS_CROSS_ZIG_TARGET="x86_64-linux-gnu"
+XBPS_CROSS_ZIG_CPU="baseline"

From 93798e1bfef7f2a7c303b0a9ade7aee85bbe3bdb Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 17 Jun 2021 01:40:15 +0000
Subject: [PATCH 2814/4088] New package: rundird-0.2.0

---
 srcpkgs/rundird/files/rundird/run |  2 ++
 srcpkgs/rundird/template          | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 srcpkgs/rundird/files/rundird/run
 create mode 100644 srcpkgs/rundird/template

diff --git a/srcpkgs/rundird/files/rundird/run b/srcpkgs/rundird/files/rundird/run
new file mode 100644
index 000000000000..e4aae8c83b4b
--- /dev/null
+++ b/srcpkgs/rundird/files/rundird/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec rundird
diff --git a/srcpkgs/rundird/template b/srcpkgs/rundird/template
new file mode 100644
index 000000000000..8fa83b5e0dcc
--- /dev/null
+++ b/srcpkgs/rundird/template
@@ -0,0 +1,18 @@
+# Template file for 'rundird'
+pkgname=rundird
+version=0.2.0
+revision=1
+build_style=zig-build
+hostmakedepends="zig"
+makedepends="pam-devel"
+short_desc="Simple daemon + PAM module providing an XDG_RUNTIME_DIR"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/ifreund/rundird"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=1dea207f39388e8c2c275b8a9aada0166d1f587a806f2e5e4486d98259e23e4c
+
+post_install() {
+	vsv rundird
+	vdoc README.md
+}

From f3752058c1fcd291e1e5d171175eb4a027fc7fc4 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Wed, 3 Nov 2021 14:48:05 +0100
Subject: [PATCH 2815/4088] New package: river-0.1.0

---
 ...ble-PIE-for-river-riverctl-rivertile.patch | 42 +++++++++++++++++++
 srcpkgs/river/template                        | 23 ++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
 create mode 100644 srcpkgs/river/template

diff --git a/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch b/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
new file mode 100644
index 000000000000..ecc68302db09
--- /dev/null
+++ b/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
@@ -0,0 +1,42 @@
+From 759c1c7a915083f3da46960ff82fa2a3566a7065 Mon Sep 17 00:00:00 2001
+From: Isaac Freund <mail@isaacfreund.com>
+Date: Wed, 3 Nov 2021 14:21:35 +0100
+Subject: [PATCH] Enable PIE for river, riverctl, rivertile
+
+There is sadly not yet a standard way to do this exposed by the zig
+build system. See: https://github.com/ziglang/zig/issues/7201
+---
+ build.zig | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build.zig b/build.zig
+index d561f49..8ac9a4e 100644
+--- a/build.zig
++++ b/build.zig
+@@ -85,6 +85,7 @@ pub fn build(b: *zbs.Builder) !void {
+         const river = b.addExecutable("river", "river/main.zig");
+         river.setTarget(target);
+         river.setBuildMode(mode);
++        river.pie = true;
+         river.addBuildOption(bool, "xwayland", xwayland);
+         river.addBuildOption([:0]const u8, "version", full_version);
+ 
+@@ -97,6 +98,7 @@ pub fn build(b: *zbs.Builder) !void {
+         const riverctl = b.addExecutable("riverctl", "riverctl/main.zig");
+         riverctl.setTarget(target);
+         riverctl.setBuildMode(mode);
++        riverctl.pie = true;
+         riverctl.addBuildOption([:0]const u8, "version", full_version);
+ 
+         riverctl.step.dependOn(&scanner.step);
+@@ -114,6 +116,7 @@ pub fn build(b: *zbs.Builder) !void {
+         const rivertile = b.addExecutable("rivertile", "rivertile/main.zig");
+         rivertile.setTarget(target);
+         rivertile.setBuildMode(mode);
++        rivertile.pie = true;
+         rivertile.addBuildOption([:0]const u8, "version", full_version);
+ 
+         rivertile.step.dependOn(&scanner.step);
+-- 
+2.33.1
+
diff --git a/srcpkgs/river/template b/srcpkgs/river/template
new file mode 100644
index 000000000000..d30060422419
--- /dev/null
+++ b/srcpkgs/river/template
@@ -0,0 +1,23 @@
+# Template file for 'river'
+pkgname=river
+version=0.1.0
+revision=1
+build_style=zig-build
+configure_args="$(vopt_if xwayland -Dxwayland)"
+hostmakedepends="zig pkg-config wayland-devel scdoc git"
+makedepends="wlroots-devel"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
+short_desc="Dynamic tiling Wayland compositor"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/riverwm/river"
+distfiles="${homepage}/releases/download/v${version}/river-${version}.tar.gz"
+checksum=4153a5511a1008e87a2251fc4510a43d6f6085f41b040222506355ff6d4bd10f
+
+build_options="xwayland"
+build_options_default="xwayland"
+desc_option_xwayland="Enable Xwayland support"
+
+post_install() {
+	vsconf example/init
+}

From 85c220fae4dedb826facf7a3021da1c763934b97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 13 Nov 2021 09:48:39 -0500
Subject: [PATCH 2816/4088] python3-Jinja2: update to 3.0.3.

---
 srcpkgs/python3-Jinja2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index fd90860d5637..caea80866dcc 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.0.2
+version=3.0.3
 revision=1
 wrksrc="Jinja2-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45
+checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
 
 post_install() {
 	vlicense LICENSE.rst

From 1f6651e50740ed249e44cb014b74cfa86b3d6615 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 13 Nov 2021 09:49:53 -0500
Subject: [PATCH 2817/4088] python3-imageio: update to 2.10.4.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index bccb6961d20a..15f9606e4794 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.10.3
+version=2.10.4
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7314f74dab1919a38de10b0cfa27decf66ca600e19bdcd9ba2f95b4572bf36de
+checksum=86559b2981cc60fe5bdde1a6e0ac4711f4eeef4874eee1a4c6dd35743a4885c2
 
 post_install() {
 	vlicense LICENSE

From 2b7d161ebb66e649db08c1d0f2af7a12fa7ed375 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 13 Nov 2021 10:06:22 -0500
Subject: [PATCH 2818/4088] python3-more-itertools: update to 8.11.0.

---
 srcpkgs/python3-more-itertools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 7fd4b0d57728..a2a10f5cbb63 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
-version=8.10.0
-revision=2
+version=8.11.0
+revision=1
 wrksrc="more-itertools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/erikrose/more-itertools"
 distfiles="${PYPI_SITE}/m/more-itertools/more-itertools-${version}.tar.gz"
-checksum=1debcabeb1df793814859d64a81ad7cb10504c24349368ccf214c664c474f41f
+checksum=0a2fd25d343c08d7e7212071820e7e7ea2f41d8fb45d6bc8a00cd6ce3b7aab88
 
 post_install() {
 	vlicense LICENSE

From 0506c83c1f29ca95e538a2823c545981d871d38d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 13 Nov 2021 10:15:40 -0500
Subject: [PATCH 2819/4088] python3-quart: update to 0.16.0.

---
 srcpkgs/python3-quart/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index 743b7e1c9cc2..273bf8d66af5 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -1,23 +1,30 @@
 # Template file for 'python3-quart'
 pkgname=python3-quart
-version=0.15.1
-revision=2
+version=0.16.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+make_install_target="Quart-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-aiofiles python3-hypercorn python3-click python3-toml
  python3-blinker python3-itsdangerous python3-Jinja2 python3-Werkzeug"
-checkdepends="python3-pytest-asyncio python3-hypothesis python3-mock $depends"
+checkdepends="python3-pytest-asyncio python3-hypothesis python3-mock unzip $depends"
 short_desc="Python asyncio ASGI web framework with Flask API"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://gitlab.com/pgjones/quart"
 changelog="https://gitlab.com/pgjones/quart/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=d9fa92cfec967b8730ce75f90a454d0a687871960f5e334885e64bfae9d7cd3a
+checksum=a526dbb39e266b30f873d73f7c7e394cf7819a4de1444b892488f4cdd0b7e162
 
-pre_check() {
-	sed -e '/addopts/d' -i setup.cfg
+do_check() {
+	# Tests require dist-info on the package, which is only in the wheel.
+	# Pip can install the wheel in the build tree, but unzip is less evil.
+	mkdir -p test
+	unzip ${make_install_target} -d test
+
+	vsed -e '/addopts/d' -i pyproject.toml
+	PYTHONPATH=test python3 -m pytest
 }
 
 post_install() {

From 670b273c0b545017ae42fdb01cb7eebaa390927a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Nov 2021 18:38:47 +0100
Subject: [PATCH 2820/4088] apk-tools: update to 2.12.8.

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..79bbfd1dad91 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.8
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=d976d625d5ede5ccdd1bae4a56627c26a11f323475f85d7bc5cb29b04781f7b5
 CFLAGS="-Wno-error"
 
 do_install() {

From 3dd3ee1fb91863aa0f0bfd23abf18500d0321f21 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Nov 2021 18:40:38 +0100
Subject: [PATCH 2821/4088] xlbiff: update to 4.5.3.

---
 srcpkgs/xlbiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index 7dc9ba798055..2b0b9cfaa087 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
 # Template file for 'xlbiff'
 pkgname=xlbiff
-version=4.5.2
+version=4.5.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.edsantiago.com/xlbiff/"
 distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=f1da27a0cd526100d60f7087d6c88a90a0fef21412bcb7e536a85df0be381e20
+checksum=16ff629d278d52d049eae0e020740e765c8ab1252635876352e866823c58839d
 
 pre_configure() {
 	autoreconf -fi

From 6d8ab1ed9ce4cef55022f59bc3e4874c1c6d7f2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Nov 2021 18:42:24 +0100
Subject: [PATCH 2822/4088] s-nail: update to 14.9.23.

---
 srcpkgs/s-nail/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index cd63a895863b..2ba9e33f361c 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,7 +1,7 @@
 # Template file for 's-nail'
 pkgname=s-nail
-version=14.9.22
-revision=2
+version=14.9.23
+revision=1
 build_helper="qemu"
 hostmakedepends="perl"
 makedepends="libidn2-devel openssl-devel ncurses-devel"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, ISC"
 homepage="https://git.sdaoden.eu/cgit/s-nail.git"
 distfiles="https://www.sdaoden.eu/downloads/s-nail-${version}.tar.xz"
-checksum=e5dfb7d5bcc5d2d1126f2e826569ee0f149aac3f2a8a6b7c23985ffc3a1def0b
+checksum=2c717b22f4cd8719b82b6618640da6031382d2bf8eb51283bca2c6266957bca8
 
 provides="mail-${version}_${revision}"
 

From 03364404725f2b27ffbb8f8c077625b8774610bf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Nov 2021 18:43:30 +0100
Subject: [PATCH 2823/4088] opam: update to 2.1.1.

---
 srcpkgs/opam/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 6305e8019c11..6e63a805d798 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=2
+version=2.1.1
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=196d81e644e35e7f2fee54aa5de4fc91c374208bc441294b6047731ac8534126
 nocross=yes
 disable_parallel_build=yes
 

From f5cbe41f0d53d64dc09f29b0180a144a476e0ee2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Nov 2021 18:52:58 +0100
Subject: [PATCH 2824/4088] bpftrace: update to 0.14.0.

---
 srcpkgs/bpftrace/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..7e9f9598d7c0 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,18 +1,18 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
-version=0.13.0
-revision=3
+version=0.14.0
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
-hostmakedepends="pkg-config flex"
-makedepends="bcc-devel clang clang-tools-extra elfutils-devel llvm"
+hostmakedepends="flex pkg-config ruby-asciidoctor"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel llvm"
 short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+checksum=6a37f29c3ad3d6302218d2c010333222fa489068998da51c80aae6dc40cb5bc1
 nostrip=yes  # needs to read own symbol table
 
 post_install() {

From 36e2a691370b4d43547c89aea57cb62dd8a7f537 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Nov 2021 19:23:21 +0100
Subject: [PATCH 2825/4088] erlang: update to 24.1.5.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 29f3c7ffb4b3..5d2b40711fc8 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.1.4
+version=24.1.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=aa31ba689740dc446dfa5bb256474df5fb5e5459b981b4d2155afa91010ca66a
+checksum=3ca6768147653bca1b429a767377dee3351004b719099d34004633833dbfbc23
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From f609ea36f64668949e24a453819d7624011d0355 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 12 Nov 2021 13:25:09 +0100
Subject: [PATCH 2826/4088] yelp-tools: add a missing dependency

---
 srcpkgs/yelp-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 96b854281302..4395d70ab31b 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
 version=40.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
-depends="itstool libxslt yelp-xsl"
+depends="itstool libxslt yelp-xsl python3-lxml"
 short_desc="Tools for creating Yelp documentation"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 2403b6b1efb86419e129b4a81593df58b2be732e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 12 Nov 2021 13:23:33 +0100
Subject: [PATCH 2827/4088] viking: switch to gtk3

---
 srcpkgs/viking/patches/32bit-test.patch | 11 +++++++++++
 srcpkgs/viking/template                 | 16 ++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/viking/patches/32bit-test.patch

diff --git a/srcpkgs/viking/patches/32bit-test.patch b/srcpkgs/viking/patches/32bit-test.patch
new file mode 100644
index 000000000000..b9d4fbc6fa7a
--- /dev/null
+++ b/srcpkgs/viking/patches/32bit-test.patch
@@ -0,0 +1,11 @@
+--- a/test/check_parse_latlon.sh
++++ b/test/check_parse_latlon.sh
+@@ -46,7 +46,7 @@ check_success "S34.56 E008.56" "-34.56000 8.56000"
+ # DMM
+ check_success "N 34° 12.3456 W 123° 45.6789" "34.20576 -123.76131"
+ check_success "S 34° 12.3456 E 123° 45.6789" "-34.20576 123.76131"
+-check_success "S034° 12.3456 W003° 45.6789" "-34.20576 -3.76131"
++check_success "S034° 12.3456 W003° 45.6788" "-34.20576 -3.76131"
+ # DMS
+ check_success "S034° 12 34 W003° 45 54" "-34.20944 -3.76500"
+ # Not sure if 'invalid' minute/second values should be accepted
diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index 9cd2eff9e11c..45eb34de2bb6 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,17 +1,13 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.9
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-realtime-gps-tracking --disable-bluemarble
- --disable-bing --disable-terraserver --disable-spotmaps
- --disable-expedia --disable-mapnik --enable-magic --enable-bzip2
- --enable-mbtiles --with-libexif"
-hostmakedepends="docbook-xsl gdk-pixbuf-devel glib-devel itstool intltool libxslt pkg-config"
-makedepends="file-devel glib-devel gnome-doc-utils gtk+-devel
- libcurl-devel libexif-devel libgexiv2-devel sqlite-devel bzip2-devel
- geoclue2-devel liboauth-devel nettle-devel"
-checkdepends="python3-lxml yelp-tools"
+configure_args="--disable-mapnik"
+hostmakedepends="glib-devel pkg-config gettext intltool itstool libxslt docbook-xsl"
+makedepends="gtk+3-devel libcurl-devel geoclue2-devel sqlite-devel file-devel
+ libgexiv2-devel liboauth-devel gpsd-devel libzip-devel nettle-devel"
+checkdepends="yelp-tools"
 short_desc="Open/source GPS data editor and analyzer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 9011f64be40aa08e93d0adf335faa6c02e283d41 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Sat, 6 Nov 2021 18:58:02 +0200
Subject: [PATCH 2828/4088] python3-jsonschema: update to 4.2.1.

- Change build style to python3-pep517 because of Julian/jsonschema@112c809e.
- Remove python3-six dependency since py2 support was dropped
in Julian/jsonschema@027feac.
- Disable the test that requires pip.
- Remove unneeded python3-setuptools dependency.
---
 srcpkgs/python3-jsonschema/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index 3b365347c22e..82f45e037865 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
-version=3.2.0
-revision=2
+version=4.2.1
+revision=1
 wrksrc="jsonschema-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
-depends="python3-setuptools python3-six python3-attrs python3-pyrsistent"
+build_style=python3-pep517
+make_check_args="--deselect jsonschema/tests/test_cli.py::TestCLIIntegration::test_license"
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="python3-attrs python3-pyrsistent"
 checkdepends="python3-pytest python3-Twisted $depends"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -13,7 +14,7 @@ license="MIT"
 homepage="https://github.com/Julian/jsonschema"
 changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
+checksum=390713469ae64b8a58698bb3cbc3859abe6925b565a973f87323ef21b09a27a8
 
 post_install() {
 	vlicense COPYING LICENSE

From aac9aaacc04246bf946d752acb11d7c786cffea4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 Nov 2021 19:27:44 +0100
Subject: [PATCH 2829/4088] syncthing-gtk: switch to debian python3 fork

---
 srcpkgs/syncthing-gtk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 90e9f21cf4ae..39a9076bc82e 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -1,15 +1,15 @@
 # Template file for 'syncthing-gtk'
 pkgname=syncthing-gtk
 reverts="0.14.36_1"
-version=0.9.4.4
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="syncthing python-dateutil libnotify librsvg python-bcrypt
- python-cairo gtk+3 python-gobject"
-short_desc="GTK3 and python based GUI for Syncthing"
+version=0.9.4.4+ds+git20201209+c46fbd8
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt
+ python3-cairo gtk+3 python3-gobject"
+short_desc="GTK based GUI for Syncthing"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/syncthing/syncthing-gtk"
-distfiles="https://github.com/syncthing/syncthing-gtk/archive/v${version}.tar.gz"
-checksum=896ddaaba4ad0b8f090c5a381a28b3da759932314562cdd50ca288543b03ddcc
+homepage="https://salsa.debian.org/debian/syncthing-gtk/"
+distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz"
+checksum=850ac6fb937e71827b23011f5a7783110d982cd072a3e48810b266a904a853fb

From 07a9a073ef9c94919b9fc774a43df9018417b10a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 Nov 2021 19:38:56 +0100
Subject: [PATCH 2830/4088] python-bcrypt: drop package

---
 srcpkgs/python-bcrypt/template  | 25 -------------------------
 srcpkgs/python3-bcrypt          |  1 -
 srcpkgs/python3-bcrypt/template | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/python-bcrypt/template
 delete mode 120000 srcpkgs/python3-bcrypt
 create mode 100644 srcpkgs/python3-bcrypt/template

diff --git a/srcpkgs/python-bcrypt/template b/srcpkgs/python-bcrypt/template
deleted file mode 100644
index fdb27f491892..000000000000
--- a/srcpkgs/python-bcrypt/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-bcrypt'
-pkgname=python-bcrypt
-version=3.2.0
-revision=2
-wrksrc="bcrypt-${version}"
-build_style=python-module
-pycompile_module="bcrypt"
-hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
-makedepends="python-devel python3-devel python-cffi python3-cffi"
-depends="python-cffi python-six"
-short_desc="Modern password hashing for software and servers (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/pyca/bcrypt"
-distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz"
-checksum=5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29
-
-python3-bcrypt_package() {
-	pycompile_module="bcrypt"
-	depends="python3-cffi python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-bcrypt b/srcpkgs/python3-bcrypt
deleted file mode 120000
index 37f57fe961e8..000000000000
--- a/srcpkgs/python3-bcrypt
+++ /dev/null
@@ -1 +0,0 @@
-python-bcrypt
\ No newline at end of file
diff --git a/srcpkgs/python3-bcrypt/template b/srcpkgs/python3-bcrypt/template
new file mode 100644
index 000000000000..6f70ab52044d
--- /dev/null
+++ b/srcpkgs/python3-bcrypt/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-bcrypt'
+pkgname=python3-bcrypt
+version=3.2.0
+revision=3
+wrksrc="bcrypt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-cffi"
+makedepends="python3-devel"
+depends="python3-cffi python3-six"
+checkdepends="python3-pytest $depends"
+short_desc="Modern password hashing for software and servers"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/pyca/bcrypt"
+distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz"
+checksum=5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29

From bed5f18c32cb753f2a6a9a78d05ee9c99c9d300c Mon Sep 17 00:00:00 2001
From: Vapourium <vapourium@riseup.net>
Date: Tue, 19 Oct 2021 16:24:40 -0400
Subject: [PATCH 2831/4088] New package: tiramisu-2.0.20211107

---
 srcpkgs/tiramisu/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/tiramisu/template

diff --git a/srcpkgs/tiramisu/template b/srcpkgs/tiramisu/template
new file mode 100644
index 000000000000..10da9bdbf66f
--- /dev/null
+++ b/srcpkgs/tiramisu/template
@@ -0,0 +1,19 @@
+# Template file for 'tiramisu'
+pkgname=tiramisu
+version=2.0.20211107
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config vala"
+makedepends="libglib-devel"
+checkdepends="dbus"
+short_desc="Desktop notifications, the UNIX way"
+maintainer="Vapourium <vapourium@riseup.net>"
+license="MIT"
+homepage="https://github.com/Sweets/tiramisu"
+distfiles="https://github.com/Sweets/tiramisu/archive/refs/tags/${version}.tar.gz"
+checksum=966b74b95401d92592d42bfded1cc2c6925ddf6bc487ccb628df58ac459fc45b
+
+post_install() {
+	vlicense LICENSE
+}

From 85bb38338190038cde909c480f84a37a9fdf57ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Nov 2021 21:31:42 +0100
Subject: [PATCH 2832/4088] postgresql: update to 9.6.24.

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..d9fcad13bbf8 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,6 +1,6 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
+version=9.6.24
 revision=1
 build_style=gnu-configure
 make_build_target=world
@@ -18,7 +18,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=aeb7a196be3ebed1a7476ef565f39722187c108dd47da7489be9c4fcae982ace
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 

From 59de48b42ba9983c0c83bad02ffbfcb8bcdd93d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Nov 2021 21:31:43 +0100
Subject: [PATCH 2833/4088] postgresql12: update to 12.9.

---
 srcpkgs/postgresql12/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 1ea2e8299f1f..e9a288a702e2 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=2
+version=12.9
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=89fda2de33ed04a98548e43f3ee5f15b882be17505d631fe0dd1a540a2b56dce
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From 492136efe488650de84fb763c61f6906e8eede8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Nov 2021 21:31:44 +0100
Subject: [PATCH 2834/4088] postgresql13: update to 13.5.

---
 srcpkgs/postgresql13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 5c4d35639140..7d91058244c3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=2
+version=13.5
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From 02bc1f32f883ed2c82cf8a3d4372f97457288eb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Nov 2021 21:22:01 +0100
Subject: [PATCH 2835/4088] vscode: update to 1.62.2.

closes #34033

Allow ms-python.python to access the unstable extention api
---
 srcpkgs/vscode/patches/product.patch | 7 +++++--
 srcpkgs/vscode/template              | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index 2725320b4adb..e1874ba18545 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -2,7 +2,7 @@ diff --git a/product.json b/product.json
 index 14ef10628d3..a5b1df55002 100644
 --- a/product.json
 +++ b/product.json
-@@ -23,6 +23,9 @@
+@@ -23,15 +23,24 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
@@ -12,7 +12,10 @@ index 14ef10628d3..a5b1df55002 100644
  	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/dc1a6699060423b8c4d2ced736ad70195378fddf/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
-@@ -32,6 +35,11 @@
+ 		"ms-vscode.vscode-js-profile-table",
+ 		"ms-vscode.remotehub",
+ 		"ms-vscode.remotehub-insiders",
++		"ms-python.python",
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
  	],
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index b2ae3c6a0d69..a78b6dfba01d 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.62.1
+version=1.62.2
 revision=1
 _electronver=13.3.0
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=f4ff57429bebf15155511bb84884cc110733376cbbfe5a1bcac598984a6d7714
+checksum=90adb3a4260e824fc55c68c983ad623c6d9b562c6422b9aee0e3fd9db4ad84ae
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 805b79b7706608c397f9ce485615ea9bcd12bd87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:32 +0100
Subject: [PATCH 2836/4088] bluedevil: update to 5.23.3.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 138106077b14..3bef77e03a5b 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb161132ea7290d37f2267fc00ca2a11e259eaf6ced1f63761dfd45d52430f72
+checksum=1d616b4af1141ae3e184a4430bf80092ede05c2f0f68087605741ff34915d0d8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 14d6125d87cea3465ea5a94754234dd339562c66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:33 +0100
Subject: [PATCH 2837/4088] breeze-gtk: update to 5.23.3.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 713c3491215e..03af59a2808f 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=91156d7e5fa1afaa088f4c462eb9b8c7e04dabaf4cbaa226e93ef8facc17daab
+checksum=76bf9712d45b6f821b9174de283e2d2c3ed202ce375cd306d7d41ea9e8080373
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 6377e41b7e4da8fc60a3ac47226a35faae3f0a30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:46 +0100
Subject: [PATCH 2838/4088] breeze: update to 5.23.3.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8e382b55d480..19d023705db6 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4b0f10cd78d7136a33c9209f00cdbabbb7cd4ca614d5cacc99265dc7190756ac
+checksum=bb4af2a3221c5486bb90202213f2c662727d5a2946c228a90d872d5126f12494
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From bd43a1ca4a0d2561ef00f78decf33e39762650a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:48 +0100
Subject: [PATCH 2839/4088] kactivitymanagerd: update to 5.23.3.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 635e3dbbfb14..f4d32ec512a1 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b0897976f800398d1d30a741c05aae5b126b59b201528d674e33fda938af8bf8
+checksum=ab702c990b61967d117af3e0ea9cbf9928802ee37a1f2873f518a7b00b983f66

From 434137106ef942f15ef01778d585af5ebd944296 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:50 +0100
Subject: [PATCH 2840/4088] kde-cli-tools: update to 5.23.3.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index c7aa43f8bbd8..378aa796bb31 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=87f290593bd7e8b003ea5812ba5f73bc2153e4a42b3400a041ffd6f14ebaf0fe
+checksum=4069a881b04f065bb56d5eae8ac2499fe276071e9350e23d919d4e62cd521c39
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 0a9669df535054830f377e5a85f1a2fe9051c543 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:51 +0100
Subject: [PATCH 2841/4088] kde-gtk-config5: update to 5.23.3.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index e8ffd4b8bfa2..7ea95f9f1359 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.23.2
+version=5.23.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a609b498cd1715243d909826c41229c9b09783af1412d3754b5cd8f62da69c2f
+checksum=6bea99fa332317845e0d7345885265342a802a326cbcc1c3132c8d58c196828b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 3e5c4670af4fd4a9f7c0a99e2ead02ef61481609 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:53 +0100
Subject: [PATCH 2842/4088] kdecoration: update to 5.23.3.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 382d69495443..15539eb4bf34 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d328bb66614b953cd6b7db66d40352b18a932f0a79cf8cf10c875a276d7e665c
+checksum=8839ea0327236a7fe21b36d79bf77924e26a4c0b2ea8a20401742f41cbad928c
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 9f83ac8d1ec7acb86155731fcc9ef739728b4659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:54 +0100
Subject: [PATCH 2843/4088] kdeplasma-addons5: update to 5.23.3.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index cf6ee3b9e91b..825dfabfa653 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.23.2
+version=5.23.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=e6c4e223cea82b42eff96a17cbcabaac764c8d3c80c31d7c35587081eb840b4b
+checksum=bc0d4ab840e853a8839c2c8c405c03ace1d2d4d04a9300cca862cc20a4fb3c8d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 8764e1f4a4344860766abdf5edaa599a11cbd4d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:56 +0100
Subject: [PATCH 2844/4088] kgamma5: update to 5.23.3.

---
 srcpkgs/kgamma5/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index a3f1336319be..fc83d612caa8 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,18 +1,16 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
-makedepends="kdesignerplugin-devel kdelibs4support-devel kdoctools-devel"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-devel
+ kdoctools"
+makedepends="kdesignerplugin-devel kdelibs4support-devel kdoctools-devel
+ libXxf86vm-devel"
 short_desc="KDE gamma adjustiment app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=66898131de21dd498141996ef6b765a302f5b7c4cac1a7efccbcae6eb3611799
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel kdoctools"
-fi
+checksum=c5032a0576542d818200087279d70ac6c9f4b0a1623c6cf4e0b7782cf5659f1b

From 7b4cd6489fc615d3330de94fff934e6c9ac2169c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:57 +0100
Subject: [PATCH 2845/4088] khotkeys: update to 5.23.3.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 2699a209a078..7f207c2781d2 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b26a5fb9161a00854fe98688209b507e81b10c78c493274f8a524c60cb9a2dd
+checksum=066dffcc6f3980d10c6979a7fadb8e70b7ac54cb8b83016bab55d38047a692b1
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From e6375edeb6656ad601182a692b9e5bf541c91275 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:29:59 +0100
Subject: [PATCH 2846/4088] kinfocenter: update to 5.23.3.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index a8d63b79e34a..7c09046838b5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5db1219657322130d11b7499bb3bab20eb75d7ad6e386d52ccb2163417bed2d
+checksum=fb11f9ec45db2b7e609d7391b7a8f05f21a78eff28c8341e0bfa7dfef32bdf27
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 091dafe351115749c24cf59245c1093c52562a62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:01 +0100
Subject: [PATCH 2847/4088] kmenuedit: update to 5.23.3.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 07498539b7cd..0da0689972cf 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d40f12f191e3c80fad1f778760b62e3ec5284eb8299851187b2597adb2f22cb
+checksum=a5e02eff9bb2b9d6b7a49693a4030d4b177e192f69c330238be4f22fcf9bd300

From ae08cf9ed249ba26044f02c5432a71ca6e5c4b38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:02 +0100
Subject: [PATCH 2848/4088] kscreen: update to 5.23.3.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index a0473fd929a8..0b13d18616d0 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9b100ba19b51a51f4c4084f7c17f175f3f21beec6c662c6f1d75ed127df380f1
+checksum=1c2e0502a2133f84a1d154828c1c9a7cf3edaa93d9fb3fb419bcb7b098a798f4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From a6d11dca204bbfcb636a75af46e66b864e77636d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:04 +0100
Subject: [PATCH 2849/4088] kscreenlocker: update to 5.23.3.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 37f7b04c8355..506ce30ff9da 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e609dcdbf8191fea98facd9659b3681061f46b7d0bfc3b0a545eed7f5e91d8f9
+checksum=6464699a766a40187824b9eb2e78028c8249aa1c1f449e3e1ea3e0d167cc4c72
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 4bd34b4928b4c93bfcc2fe98b96d284b18c31996 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:05 +0100
Subject: [PATCH 2850/4088] ksshaskpass: update to 5.23.3.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a32675410b69..18c849dfbfbf 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3454fce2b83ecba09052348949f0a48493206a7fb7dc3c9380307b0bcf2f8bc5
+checksum=1d6efbaea8b504694176f7a28688d1309623bf5b97431a7cc50e6df60b649e35
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From d0aa63afeba68daa974e1618307fd44f721674c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:06 +0100
Subject: [PATCH 2851/4088] ksystemstats: update to 5.23.3.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 84a8f3746ec5..83b1e91cde06 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=24dae0ae39f9c52672c2754233de4ea721b7798930a05c215909ac92f1963154
+checksum=74c0bbaaa935710062793498b75f3eb1759d426c897cf079833d03444c60518e

From eaae5bdfb4157158f5d386f5ee3b0a56db66cb99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:08 +0100
Subject: [PATCH 2852/4088] kwallet-pam: update to 5.23.3.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 08d8c9fb8d16..db84cac98789 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dfece4e4e6313bec1cc6a00e34d46f0765b05e24549706ed9a78ea6f16bbad80
+checksum=a8cde66c8020a8d7cc7ad503627d7844aacfd79755c04e212c7696fbf599bd2b

From 84803fa153d3004552bbc9afd449de65724b0163 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:09 +0100
Subject: [PATCH 2853/4088] kwayland-integration: update to 5.23.3.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 8a4aaa32dc12..f1d2422e130f 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=748584ddb87b62e7e39edab041474af789f8e57814e29f859c3b592f57a19039
+checksum=e30f666ffe0c7e6633925790156bf723449a6d1724a4b6c6d842c0a8561ff505

From 8acbf18aa3631466d4eedfab0d5fabf3e163f5fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:10 +0100
Subject: [PATCH 2854/4088] kwayland-server: update to 5.23.3.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 65f21e75e9e7..47b0359b4769 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=32383464649e8e95cbe377551d0ab5fa593b74c7739bb9e601d9bf942a048c0d
+checksum=fd8d071b12b729d6da6014128e3304866d0d49ad4e78bc926b7e7c15d11150c2
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7760d7146bc61484d91e790480dd260febac40a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:13 +0100
Subject: [PATCH 2855/4088] kwin: update to 5.23.3.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index c18abb99134f..b8033a470d1c 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffba7dac42cbcab86392a9482f6b39f4bdc61ce153a236d9af1c4c3a521ef8ba
+checksum=7fb1daac298d1198f3c45b38d3b58219f72dbb7fcb11176478a9fd3cbedd8813
 
 build_options="pipewire"
 build_options_default="pipewire"

From 04af06033ef4c1b6f1e87f7c7ded997e3e196162 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:14 +0100
Subject: [PATCH 2856/4088] kwrited: update to 5.23.3.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 5429462b16e2..7b81849fc9e2 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a4bd2d821583a5dce053c45daf2f85d38a5048593d1b614609bb2cffdfc0eab3
+checksum=8498568bee3e2ea4006f7359a382bb4f1ad5a7359fe5dccdd100cf6695d7a604

From e07ffde4a0e0fff1bf0c6d176b4dd5dd68607f96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:15 +0100
Subject: [PATCH 2857/4088] layer-shell-qt: update to 5.23.3.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 1154dd976871..e496f8b4f283 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8fc29b2cd8c7f4ff2ce2fb9de495673e0778af2125e63aa1c1d295775e98895f
+checksum=4a84038847e95559ecd0258e715e5c7b51dd758ed8676d3b56e99c5414b8c797
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d7a9e6c0bc5939cade7de95724a68eb22b64e196 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:17 +0100
Subject: [PATCH 2858/4088] libkscreen: update to 5.23.3.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index bf6f15138aed..0b78c01ebac1 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4e9bcbebaf6fa8b7a7f9b860c08184120b53ab28c7c45320743406a078e214ea
+checksum=b8d57ee450b0bd95f879c8bb01a89aa993c10e60e152111a7df64c0b95de5f4d
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 118d7e36ddc29e22392eaa425622bb4a2184bfe0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:18 +0100
Subject: [PATCH 2859/4088] libksysguard: update to 5.23.3.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 38db6e17590a..85d134a92d0e 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f8fabf6af590e92146d1449e96a66ea7e5b7c249699ec0fe0e612f91c78ccbce
+checksum=40c17c3fb7c14665379b03d16a912c9f40c74f64f925b8a3210e480438584455
 
 build_options="webengine"
 

From ac2dd4735c46ff93a0cd8194f85b1302f06a2558 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:20 +0100
Subject: [PATCH 2860/4088] milou: update to 5.23.3.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 4de610d396a8..c03b8e937b47 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bfc501695a9a8583e0c66f3922fecf10b6ac6bf10007a8b4d0d9cbb59661505b
+checksum=0d588be998ff30614b3194169c41aa4cfcb256e511fba3a86309053c57aadb57
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 73c5a4a05ceeeba05e929cab3abd105e66c70180 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:22 +0100
Subject: [PATCH 2861/4088] oxygen: update to 5.23.3.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 340a0a0b15c2..8a0930f9a24a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=970559c7a07fb840be571491d14515d3c9b2c2106164df0f6a8affc6df8a4bcc
+checksum=1fb877d5abbc05183f30ad0b26dd1002386261f31c1d1fbfb6849eb79beae964

From 12da0ae2a76fcf8f87e3c9d88c2b57394c43885e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:23 +0100
Subject: [PATCH 2862/4088] plasma-browser-integration: update to 5.23.3.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 5e7b322a0112..786bad2750df 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=efd5956d826740f68e3f49d4bdfb464891bb59c3e3f0fbcf736814cc2446ee23
+checksum=27b9969c64652184bea2223be6c5e564a2ea17458eb8d6ac21c2e271b8c17a64
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 6f0d58622b76fb06ccc2df48472d8fa105496b8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:25 +0100
Subject: [PATCH 2863/4088] plasma-desktop: update to 5.23.3.

---
 srcpkgs/plasma-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index f344ca7ea0cd..72c78c2f5446 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.23.2.1
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -17,7 +17,7 @@ short_desc="KDE Plasma Desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8f69e465cf98413008514ead445a90ac2a49fcfecd6cda9842071020fb325934
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=43435a514eb66965e52af49aa033ebc813db42a10ad66cd5656f7466f14d4504
 replaces="user-manager>=0"
 python_version=3

From 6f11c93ded431bcdbc7113e6aa8ae3dfc2ace147 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:26 +0100
Subject: [PATCH 2864/4088] plasma-disks: update to 5.23.3.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index b9d9d6e44711..6480f8cd2f90 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7c8e8fde93f0ba4d860f7c4b814ac6daccceeae6ec38b1ec095b49b2cb081b5e
+checksum=ab00951001450d4347c0c17c523b77b4204df746df907d0554c6325fb5829de3

From 8ad3ba042c7b2bd4ef8f9d3d7ec3cfa3b02879f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:28 +0100
Subject: [PATCH 2865/4088] plasma-firewall: update to 5.23.3.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index a8a7ca2ba705..132848ccb8fb 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=df4a4431d4318a27cbc73ab471954d62f001ed78d76062fa5d1a5a75fa971fc0
+checksum=18734bd949d6a350b4a7d9f570573982f45ad2b6bfd63c48c0cf40edbb3e0b4f

From 49ec0de7f0a47056a6594799f3ff03969da29147 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:29 +0100
Subject: [PATCH 2866/4088] plasma-integration: update to 5.23.3.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 91d034b06b43..c4e9c3975f07 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8ef1d5c5580c39f0b5b09358e5b85d58daaa80e5d62afaad60113c8ddb4d084
+checksum=36c31a474bdbb1f7f37996236bcce4cac68251172cd68be9be4117ea0759a360

From 882ed8c9bb670d818851fed95879e838e38a8f49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:30 +0100
Subject: [PATCH 2867/4088] plasma-nm: update to 5.23.3.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index b9c7f41b68e9..cd3048598ea3 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a08be797fbf00585651d541f25c2b31966a659a603ddbf65218032566afbf05e
+checksum=eec18c4addba69313f1372f05bf9fc713960186f8e53905dc321af115ba5ea94
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 502101d9a33db87211515e694520a5ffec04001e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:32 +0100
Subject: [PATCH 2868/4088] plasma-pa: update to 5.23.3.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 77a4c07b4b12..6f8ff0380c9b 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=564ff9f88fa223cd2fbcfb87effd6e93d4fd9be715c1c09149f4a071b783c315
+checksum=13771e6d12d7033b96d5ae89fbbbb62d6e38a4b15e57226dc3c43a17c5daa355
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 847b97a057b32f617dd96631b4fede89125e3810 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:33 +0100
Subject: [PATCH 2869/4088] plasma-sdk: update to 5.23.3.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 509a3830e247..3dd2e1e0cb6d 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3ac08707454804e6a400897d5cd68e8570d88a07246fcc00aaf7f369fabe7810
+checksum=716dcf93d9339a0ec5c14e455f27cfe71974bb855e26840c34ad2b0db7796939
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From ea82c8c519a11b5f59eb0e1b9e3f8d6e06e32402 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:35 +0100
Subject: [PATCH 2870/4088] plasma-systemmonitor: update to 5.23.3.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 5dcd343c6dd4..3e6a484bb1f4 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=07bf1ad2231550ee431f1fd2eee96b35f1f87095e2e3b13d3c7d1a0209525b5b
+checksum=17fd59d0cff3c155cea48687cb1e566981d3bcec1f8a1557ea051dde66768fca

From 87bc53c230b36ef9dfeba04388fc0b5e43a3ff4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:36 +0100
Subject: [PATCH 2871/4088] plasma-thunderbolt: update to 5.23.3.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index 6947e65928b8..85a5ceca2773 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8c3399bc14c5a73eafc76edb8c2aa6907910bc6eaf2ea19476ca0ebc4054058e
+checksum=5bad78bc330a5111f326ee9d68f5bef5ce43743c8f82818024e2e968a8feed6f
 
 do_check() {
 	: # Requires running dbus and bolt services

From a6972b799f0633fbc09d3429ddcd2ce21ff327b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:37 +0100
Subject: [PATCH 2872/4088] plasma-vault: update to 5.23.3.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index a9ddaa62b3c8..5ad25e6d0247 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4e4300bdf38d340a1f7f79056143f9fe7c69bd0a65b593a969babbe1a7f53135
+checksum=a27a13fe0a2d316045e1063215e301b192defe5a93b04baaaa4a855f01c03f18
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 98d97f3a82dc12a2b88aca647fc6d2eaddf931ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:47 +0100
Subject: [PATCH 2873/4088] plasma-workspace-wallpapers: update to 5.23.3.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 84c6f2e96cfd..c92840b6334c 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e9052ec5323bfa3f2aea7634cfeece3f4ac61f9865cbb401ffb47e3441a84a01
+checksum=5a9432073012423531f311a2ba441c03242625b04dbd8a2b0f175afe3eeee4cf

From 1b8ebc4e758b0a923e279f7a5d3f6df04360c016 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:49 +0100
Subject: [PATCH 2874/4088] plasma-workspace: update to 5.23.3.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index c2c764ca9a33..4d34ae156675 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dbd261cecaafeb0b230ead6eaceedd4601f90c8f5844b811d6941a5d28933b72
+checksum=86802e3305bd91faef25c1876e333ad22ae751e556e8503945481b52ad52e257
 
 build_options="pipewire"
 build_options_default="pipewire"

From c0e5b4109c1e6b01cf0775affbe845beb2251b2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:51 +0100
Subject: [PATCH 2875/4088] polkit-kde-agent: update to 5.23.3.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 9b29570666ff..412297fc48ee 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.23.2
+version=5.23.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=4001b9ebfe4ef83847d1a1f187042fc12ae92a4851e7f153f512f2cba8f38dba
+checksum=79b8cc2f684ada6667085f604e642038191e9c01d2691e87c53de5227fc7bae4

From cf99f48af01c227d053caa6e6580134ddebc7753 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:52 +0100
Subject: [PATCH 2876/4088] powerdevil: update to 5.23.3.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 6af89df62a87..8bc8d336915d 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b1d7816c8214e3632effa602ee667c90b8a3e54ed71a0722a1b1eb871485d638
+checksum=eb57941e0381b6dc4a27c31d7210d895c250eaafcab43a66fe5443e29b108b41

From 02f60c7c223663ebafa07ff20240b4693b10b365 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:54 +0100
Subject: [PATCH 2877/4088] sddm-kcm: update to 5.23.3.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index fe1116cbbeee..07f044925104 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d0836035594ca006bc60d4410fbf1ca1224a15b8707b5281e2196e53bcc70977
+checksum=d9e25d97ec255097c4974f0c1ee4aaca3f12a0fcce09674567d229b89ad46969

From 39fd5e5fd2dd87dd24059397ced4281dc7f0b02d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:55 +0100
Subject: [PATCH 2878/4088] systemsettings: update to 5.23.3.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 1b9e3aff4804..f945dba5f2f9 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1169814a7a0d8a8c9d6117fd889787160141fc21b6ad1a3b2ee5720be412226f
+checksum=015ea04084b144821db7a5c7f4a4d029075bc7693dfec77679a3c9927c601b45

From 0c14fb442a1c3d254bb4fc6a4acad6667dd97c7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:30:57 +0100
Subject: [PATCH 2879/4088] xdg-desktop-portal-kde: update to 5.23.3.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index ba7f87b00518..1ebad4750404 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.23.2
+version=5.23.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ceb28535915d34e6a367d2b821a1482824f5c2aca5cbbca28b4cb6cdf412204a
+checksum=ffe6b1445901a62ef7bad576d33d0f43f80845eed104a012a9e907cad8a352a9

From 5503858e33cc395c553e5809f15b045546570b31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 19:33:44 +0100
Subject: [PATCH 2880/4088] plasma-wayland-protocols: update to 1.5.0.

---
 srcpkgs/plasma-wayland-protocols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 64e21f5389ff..823f18c43877 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -9,7 +9,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/libraries/plasma-wayland-protocols"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=38b0431d931a83393770abb8294206936b63b89ceee3f0c63f0f086f3d2b1ba9
+checksum=ccc9fc20d7a130edbfb233c33b1325740ac01b2640aa37a5c544edbfba18a833
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From 0390c63ac321acdfc03c1d01ebc4f5470eec4cbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Nov 2021 18:44:26 +0100
Subject: [PATCH 2881/4088] flatpak-builder: update to 1.2.0.

---
 srcpkgs/flatpak-builder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/flatpak-builder/template b/srcpkgs/flatpak-builder/template
index ac47d4dfb5e3..904cbbfb345d 100644
--- a/srcpkgs/flatpak-builder/template
+++ b/srcpkgs/flatpak-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'flatpak-builder'
 pkgname=flatpak-builder
-version=1.1.1
-revision=2
+version=1.2.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xmlto"
 makedepends="flatpak-devel json-glib-devel libcap-devel libsoup-devel
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/flatpak-builder"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=13c5ccc8765f4724ad286a8eff8aad191a417b73a03eab7c3ae53a2e9eb22140
+checksum=dfcb6a3ca38d61e0775b70a469ab505285e129361462df09004e6d4251c246a8
 # Tests expects a Debian derivate hosts to build a flatpak container from.
 make_check=no
 

From e85f024955cdcd44ece24cf951b4d062b4e86fd7 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Sat, 13 Nov 2021 15:03:26 +0000
Subject: [PATCH 2882/4088] pass-import: update to 3.2

---
 srcpkgs/pass-import/template | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 3f24c84a8f82..49a1a710f924 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,20 +1,17 @@
 # Template file for 'pass-import'
 pkgname=pass-import
-version=3.1
-revision=2
-build_style=gnu-makefile
-hostmakedepends="python3-setuptools python3-yaml"
-depends="pass>=1.7.0 python3-defusedxml python3-magic
- python3-cryptography python3-SecretStorage python3-pykeepass"
-checkdepends="pass python3-defusedxml python3-magic python3-cryptography
- python3-SecretStorage python3-pykeepass"
-short_desc="Pass extension for importing data from most existing password managers"
+version=3.2
+revision=1
+build_style=python3-module
+# This test requires gnome-keyring which requires running dbus
+make_check_args="--deselect=tests/imports/test_parse.py"
+hostmakedepends="python3-setuptools"
+depends="pass python3-defusedxml python3-magic python3-cryptography
+python3-SecretStorage python3-pykeepass python3-yaml"
+checkdepends="python3-pytest $depends"
+short_desc="Pass extension for importing data from most password managers"
 maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/roddhjav/pass-import"
 distfiles="https://github.com/roddhjav/pass-import/releases/download/v${version}/pass-import-${version}.tar.gz"
-checksum=659d2b503a18d57c9d63dee216d042d0e24f88576cdd0c7fc4b3426e40dbdbc2
-
-do_check() {
-	python3 setup.py test
-}
+checksum=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76

From 216cac9fc47f667c32a48396efe73bce3972c13f Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Sat, 13 Nov 2021 15:04:40 +0000
Subject: [PATCH 2883/4088] python3-pykeepass: update to 4.0.1

---
 srcpkgs/python3-pykeepass/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index b7097bd99e87..532f3a77a13c 100644
--- a/srcpkgs/python3-pykeepass/template
+++ b/srcpkgs/python3-pykeepass/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pykeepass'
 pkgname=python3-pykeepass
-version=3.2.1
-revision=3
+version=4.0.1
+revision=1
 wrksrc="pykeepass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/libkeepass/pykeepass"
 changelog="https://raw.githubusercontent.com/libkeepass/pykeepass/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/pykeepass/pykeepass-${version}.tar.gz"
-checksum=b3e07eb2dd3aeb1dfa1a2d2d17be77066ee560c1e770f1c72d7ea5608117d284
+distfiles="https://github.com/libkeepass/pykeepass/archive/refs/tags/${version}.tar.gz"
+checksum=ac5966ede4fae1a0d3ea1997468a14b893a8f8dab136b1c14425b3b2763e68e3

From 81eb77945cc2966b955947911a543180e3f28092 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 13 Nov 2021 23:07:54 +0100
Subject: [PATCH 2884/4088] bacon: broken on big endian

---
 srcpkgs/bacon/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/bacon/template b/srcpkgs/bacon/template
index ce136cf91f89..35bc099c6985 100644
--- a/srcpkgs/bacon/template
+++ b/srcpkgs/bacon/template
@@ -22,6 +22,10 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	LDFLAGS="-lfts"
 fi
 
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	broken="bacon.sh: line 776: 2242 Segmentation fault coproc COPROC "${g_BACONTOKEN}.exe"
+fi
+
 post_install() {
 	rm -f ${DESTDIR}/usr/share/bacon/LICENSE
 	vlicense LICENSE

From 0ad2a9d224b9714285ecf4f81593189917a880e3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 13 Nov 2021 23:09:04 +0100
Subject: [PATCH 2885/4088] bacon: fix broken typo

---
 srcpkgs/bacon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacon/template b/srcpkgs/bacon/template
index 35bc099c6985..7129c51e39a2 100644
--- a/srcpkgs/bacon/template
+++ b/srcpkgs/bacon/template
@@ -23,7 +23,7 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
-	broken="bacon.sh: line 776: 2242 Segmentation fault coproc COPROC "${g_BACONTOKEN}.exe"
+	broken="bacon.sh: line 776: 2242 Segmentation fault coproc COPROC ${g_BACONTOKEN}.exe"
 fi
 
 post_install() {

From d8edc07b59a9de55fc18d22b9f6389ddb2d0f81d Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Sat, 13 Nov 2021 14:29:15 -0700
Subject: [PATCH 2886/4088] mu4e: update to 1.6.10

---
 srcpkgs/mu4e/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
index 4c9d22d8bc97..3d804715d9db 100644
--- a/srcpkgs/mu4e/template
+++ b/srcpkgs/mu4e/template
@@ -1,6 +1,6 @@
 # Template file for 'mu4e'
 pkgname=mu4e
-version=1.6.9
+version=1.6.10
 revision=1
 wrksrc="mu-${version}"
 build_style=gnu-configure
@@ -11,8 +11,8 @@ short_desc="Maildir-utils indexer/searcher and associated Emacs client"
 maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}-signed/mu-${version}.tar.xz"
-checksum=8d99430a4f6942eb3122008bb897c4480cda64b30ff4575c32ded86d7edbaf58
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=0bc224aab2bfe40b5209af14e0982e637789292b7979872658d4498b29e900b6
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"
 

From 67943be6e500249d514378268b9398e60ea9267a Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sat, 13 Nov 2021 16:07:21 +0100
Subject: [PATCH 2887/4088] fuzzel: update to 1.6.5.

---
 srcpkgs/fuzzel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index a56253c9af30..0c8a6703e6f2 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.4
+version=1.6.5
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=69d519c2dbcd53dc6a8e45f81f1240a2ea3ac9f420fffca8fcfce59001d443d7
+checksum=b0f1af8a4b38f0cd93722d0ec35e422b5163ec3392e16467c1af8c8de94333a0
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 60856db47ca0c01599761438569e7682561b17eb Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sat, 13 Nov 2021 15:57:49 +0100
Subject: [PATCH 2888/4088] fcft: update to 2.5.0.

---
 srcpkgs/fcft/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 1abd925cf1d1..e39da0ee4dde 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,22 +1,24 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.6
+version=2.5.0
 revision=1
 wrksrc=$pkgname
 build_style=meson
-configure_args="-Dtext-shaping=$(vopt_if harfbuzz enabled disabled)"
+configure_args="-Drun-shaping=$(vopt_if textshaping enabled disabled)"
 hostmakedepends="pkg-config scdoc"
 makedepends="fontconfig-devel freetype-devel pixman-devel tllist
- $(vopt_if harfbuzz harfbuzz-devel)"
+ $(vopt_if textshaping harfbuzz-devel)
+ $(vopt_if textshaping libutf8proc-devel)"
 short_desc="Simple library for font loading and glyph rasterization"
-maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=58641cb4f5eb2301d34f0e92437b10e5a2ee27dba9e8da3f76d23393278520be
+checksum=58663c684f04154674c52551daa604618e0bb3db6c62492b06b13768fb4f4b3c
 
-build_options="harfbuzz"
-build_options_default="harfbuzz"
+build_options="textshaping"
+build_options_default="textshaping"
+desc_option_textshaping="Enable support for text run shaping"
 
 post_install() {
 	vlicense LICENSE

From 7929ff7afedd53035773d0294a54b8e1dd4c344f Mon Sep 17 00:00:00 2001
From: Lorenzo Beretta <vc.net.loreb@gmail.com>
Date: Fri, 5 Nov 2021 15:39:35 +0100
Subject: [PATCH 2889/4088] xiate: update to 21.05 and new home

This fixes https://github.com/void-linux/void-packages/issues/3549;
upstream is no longer using config.h, so we can simplify pre_configure.

Also use vsed instead of plain sed.
---
 srcpkgs/xiate/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xiate/template b/srcpkgs/xiate/template
index 742c53df8a8e..ec5db68ba5bf 100644
--- a/srcpkgs/xiate/template
+++ b/srcpkgs/xiate/template
@@ -1,7 +1,8 @@
 # Template file for 'xiate'
 pkgname=xiate
-version=18.05
+version=21.05
 revision=1
+wrksrc=xiate-v${version}
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="vte3-devel"
@@ -9,13 +10,11 @@ short_desc="Terminal emulator which uses VTE as a backend"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://www.uninformativ.de/projects/xiate/"
-distfiles="https://github.com/vain/xiate/archive/v${version}.tar.gz"
-checksum=2f7317cc71849cdbf31479be224f9ed20fce25d2fa8320885a5294ed2101411b
+distfiles="https://www.uninformativ.de/git/xiate/archives/xiate-v${version}.tar.gz"
+checksum=487dc53f48494e53a1db9aa36a1e04a594b207d7fcda84908e192bb4e706b7cb
 
 pre_configure() {
-	cp config.def.h config.h
-	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
-	sed -i 's;/usr/local;/usr;g' Makefile
+	vsed -i 's;/usr/local;/usr;g' Makefile
 }
 
 post_install() {

From 1d5c85ccc79a60d83e6931c4b17cd90376660c71 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Sat, 13 Nov 2021 15:05:31 -0600
Subject: [PATCH 2890/4088] gns3-server: update to 2.2.27.

---
 srcpkgs/gns3-server/patches/requirements.patch | 2 +-
 srcpkgs/gns3-server/template                   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 84ee86596b92..bf1fea9499b7 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -9,7 +9,7 @@ diff --git a/requirements.txt b/requirements.txt
  aiohttp-cors==0.7.0
  aiofiles==0.7.0
 -Jinja2==3.0.1
-+Jinja2>=2.0.0<3.0.0
++Jinja2>=3.0.1
 -sentry-sdk==1.3.1
  psutil==5.8.0
  async-timeout==3.0.1
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 81fbf1db472a..ada70f593a86 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,8 +1,10 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.26
-revision=2
+version=2.2.27
+revision=1
 build_style=python3-module
+# Skip tests/compute/docker/test_docker_vm.py::test_stop test that wasn't updated with the code https://github.com/GNS3/gns3-server/commit/b1a62dfd
+make_check_args="-k-test_stop"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl
  python3-Jinja2 python3-psutil python3-aiofiles
@@ -13,7 +15,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=6d89d91f74d2891de3c7ebec93880af662f835580d2f18a797794eb8e2350bc0
+checksum=ed45ab788ee976474289e9e73c5bbe78cab26ebfcdcc5d2eee086908d14d0c9f
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From e98abb11dd4e4469aebf6732608fbff7c46fbbf7 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Sat, 13 Nov 2021 15:06:10 -0600
Subject: [PATCH 2891/4088] gns3-gui: update to 2.2.27.

---
 srcpkgs/gns3-gui/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 8a6aabcc2157..fb0b5d198308 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,8 +1,10 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.26
-revision=2
+version=2.2.27
+revision=1
 build_style=python3-module
+# Skip tests/test_link.py::test_create_link test that wasn't updated with the code https://github.com/GNS3/gns3-gui/commit/545a9f53
+make_check_args="-k-test_create_link"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
  python3-PyQt5-svg python3-PyQt5-websockets xterm inetutils-telnet
@@ -13,7 +15,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=b97084e1024dfc23255fa0bdd1023a9b145ba610322a8363cd15d9153837333d
+checksum=c5afadd2932703c38fb6d479be6966af65787ddc6abcb3f9b7c0b3f5722e0fd5
 
 post_install() {
 	vinstall gns3-gui.desktop 644 usr/share/applications

From 02ac54a812888319bafaec71c77e9b79b980fe39 Mon Sep 17 00:00:00 2001
From: Kamil Smardzewski <roderyk197@gmail.com>
Date: Tue, 29 Jun 2021 14:19:54 +0200
Subject: [PATCH 2892/4088] rsyslog: update to 8.2110.0.

---
 srcpkgs/rsyslog/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 33c55076e9be..13cd94efac71 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,24 +1,26 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
-version=8.2010.0
-revision=4
+version=8.2110.0
+revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
  --enable-gssapi-krb5 --enable-mmsnmptrapd --enable-impstats --enable-omprog
  --enable-omstdout --enable-pmlastmsg --enable-pmcisconames --enable-pmsnare
  --enable-pmaixforwardedfrom --enable-omuxsock --disable-generate-man-pages
- --enable-elasticsearch --enable-testbench"
+ --enable-elasticsearch --enable-testbench --disable-libsystemd"
 hostmakedepends="pkg-config postgresql-libs-devel"
 makedepends="gnutls-devel libcurl-devel libestr-devel libfastjson-devel
- liblogging-devel libmariadbclient-devel mit-krb5-devel postgresql-libs-devel"
+ liblogging-devel libmariadbclient-devel mit-krb5-devel postgresql-libs-devel
+ libgcrypt-devel"
+checkdepends="gdb procps-ng faketime"
 short_desc="Enhanced multi-threaded syslog daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, Apache-2.0"
 homepage="https://www.rsyslog.com"
 changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog"
 distfiles="${homepage}/files/download/rsyslog/${pkgname}-${version}.tar.gz"
-checksum=19b232f765c4ba7a35b91ef1f5f9af775f6ff78ef56bb7737a2ce79ccbb32b98
+checksum=3f904ec137ca6412e8273f7896d962ecb589f7d0c589bdf16b1709ec27e24f31
 conf_files="/etc/rsyslog.conf"
 make_dirs="/etc/rsyslog.d 0755 root root"
 lib32disabled=yes

From 6dff82df57bfa9788eeb13a685977d82d4a2e728 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Sat, 6 Nov 2021 15:21:03 -0600
Subject: [PATCH 2893/4088] perl-rename: update to 1.11

Closes: #33930 [via git-merge-pr]
---
 srcpkgs/perl-rename/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-rename/template b/srcpkgs/perl-rename/template
index 2bfc0ad1cc24..4e5118ae4cca 100644
--- a/srcpkgs/perl-rename/template
+++ b/srcpkgs/perl-rename/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-rename'
 pkgname=perl-rename
-version=1.9
-revision=3
+version=1.11
+revision=1
 wrksrc="rename-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -10,9 +10,9 @@ depends="perl"
 short_desc="Renames multiple files using Perl regular expressions"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
-homepage="https://metacpan.org/release/PEDERST/rename-1.9"
+homepage="https://metacpan.org/release/PEDERST/rename-1.11"
 distfiles="${CPAN_SITE}/Palm/PEDERST/rename-${version}.tar.gz"
-checksum=17c5744f10d335a9d3674ed011ff26d3e840f25290c7f86c1d63d05771677ea0
+checksum=2f03f33d3a17d3a3599c83f514f0694fd833b606920132925e3fdbd8a1a3e44b
 
 do_install() {
 	vman blib/man1/rename.1p perl-rename.1p

From a87d59c257ba0d44147277880dd02034ca5d60f1 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 31 Oct 2021 23:27:44 +1100
Subject: [PATCH 2894/4088] ulogd: move logs to subdir, update logrotate file,
 add conf_files

---
 srcpkgs/ulogd/files/ulogd.logrotate | 6 +++---
 srcpkgs/ulogd/template              | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ulogd/files/ulogd.logrotate b/srcpkgs/ulogd/files/ulogd.logrotate
index c50479d92cfb..186a95eb42a3 100644
--- a/srcpkgs/ulogd/files/ulogd.logrotate
+++ b/srcpkgs/ulogd/files/ulogd.logrotate
@@ -1,8 +1,8 @@
-/var/log/ulog.log /var/log/ulog.pcap {
-    missingok
+/var/log/ulogd/*.log /var/log/ulogd/*.pcap {
     compress
+    missingok
+    notifempty
     sharedscripts
-    create 640 _ulogd adm
     postrotate
 	sv hup ulogd
     endscript
diff --git a/srcpkgs/ulogd/template b/srcpkgs/ulogd/template
index 55e9ae34a0e1..633a78c2cfd4 100644
--- a/srcpkgs/ulogd/template
+++ b/srcpkgs/ulogd/template
@@ -1,7 +1,7 @@
 # Template file for 'ulogd'
 pkgname=ulogd
 version=2.0.7
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin"
 hostmakedepends="pkg-config automake"
@@ -13,10 +13,14 @@ license="GPL-2.0-only"
 homepage="http://www.netfilter.org/projects/ulogd/"
 distfiles="${homepage}/files/${pkgname}-${version}.tar.bz2"
 checksum=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b
-CFLAGS="-D_GNU_SOURCE"
+conf_files="/etc/ulogd.conf /etc/logrotate.d/ulogd"
+make_dirs="/var/log/ulogd 2750 root adm"
 system_accounts="_ulogd"
 
+CFLAGS="-D_GNU_SOURCE"
+
 post_install() {
+	vsed -i -e "s:/var/log:/var/log/ulogd:g" ulogd.conf
 	vinstall ulogd.conf 644 etc
 	vinstall ${FILESDIR}/ulogd.logrotate 644 etc/logrotate.d ulogd
 	vsv ulogd

From 125f98a1ccb0055d0878e9d630100c77f9df4550 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 14 Nov 2021 08:21:05 +0100
Subject: [PATCH 2895/4088] linux5.4: update to 5.4.159.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 3aacd4b5d173..9025b35b8ad3 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.158
+version=5.4.159
 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=6e018fecdc8fc24553756e582d83b82d65b10a6b03ef36262a24911f839b8d59
+checksum=d718325f4eab325dce4f82b88418f68ba130864118229539541331e0a4478643
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From fb7dfbe91ed9b5fe284c9dc8b6e74d78fd00e040 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 14 Nov 2021 08:23:18 +0100
Subject: [PATCH 2896/4088] linux4.19: update to 4.19.217.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index def00f83a3b7..721de52fc67b 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.216
+version=4.19.217
 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=6d6cafaaacf319f546718198205ba75e3a2009f37f0e9764897b2f278bf74833
+checksum=8551110cc7184b1402a21b42e498088c5b0bb824a658c5fab173c12d9904a004
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From c6476e6628a50376dc0ef9ea6a2a1bd46c5b0824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 14 Nov 2021 04:26:41 -0300
Subject: [PATCH 2897/4088] gitea: update to 1.15.6.

---
 srcpkgs/gitea/patches/config.patch | 237 ++++++++++++++---------------
 srcpkgs/gitea/template             |   4 +-
 2 files changed, 118 insertions(+), 123 deletions(-)

diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch
index 77168cb3937d..1675e7369d11 100644
--- a/srcpkgs/gitea/patches/config.patch
+++ b/srcpkgs/gitea/patches/config.patch
@@ -1,132 +1,127 @@
---- a/custom/conf/app.example.ini	2021-04-22 15:48:34.959214467 +0300
-+++ b/custom/conf/app.example.ini	2021-04-22 15:48:25.414266118 +0300
-@@ -9,7 +9,7 @@
- ; App name that shows in every page title
- APP_NAME = Gitea: Git with a cup of tea
- ; Change it if you run locally
--RUN_USER = git
+--- a/custom/conf/app.example.ini
++++ b/custom/conf/app.example.ini
+@@ -15,7 +15,7 @@
+ APP_NAME = ; Gitea: Git with a cup of tea
+ ;;
+ ;; RUN_USER will automatically detect the current user - but you can set it here change it if you run locally
+-RUN_USER = ; git
 +RUN_USER = _gitea
- ; Application run mode, affects performance and debugging. Either "dev", "prod" or "test", default is "prod"
- RUN_MODE = prod
- 
-@@ -20,7 +20,7 @@
- 
- [repository]
- ; Root path for storing all repository data. It must be an absolute path. By default it is stored in a sub-directory of `APP_DATA_PATH`.
--ROOT =
-+ROOT = /var/lib/gitea/repositories
- ; The script type this server supports. Usually this is `bash`, but some users report that only `sh` is available.
- SCRIPT_TYPE = bash
- ; DETECTED_CHARSETS_ORDER tie-break order for detected charsets.
-@@ -87,13 +87,13 @@
- 
- [repository.local]
- ; Path for local repository copy. Defaults to `tmp/local-repo`
--LOCAL_COPY_PATH = tmp/local-repo
-+LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo
- 
- [repository.upload]
- ; Whether repository file uploads are enabled. Defaults to `true`
- ENABLED = true
- ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea restart)
--TEMP_PATH = data/tmp/uploads
-+TEMP_PATH = /var/lib/gitea/tmp/uploads
- ; Comma-separated list of allowed file extensions (`.zip`), mime types (`text/plain`) or wildcard type (`image/*`, `audio/*`, `video/*`). Empty value or `*/*` allows all types.
- ALLOWED_TYPES =
- ; Max size of each file in megabytes. Defaults to 3MB
-@@ -282,7 +282,7 @@
- REDIRECT_OTHER_PORT = false
- PORT_TO_REDIRECT = 80
- ; Permission for unix socket
--UNIX_SOCKET_PERMISSION = 666
+ ;;
+ ;; Application run mode, affects performance and debugging. Either "dev", "prod" or "test", default is "prod"
+ RUN_MODE = ; prod
+@@ -58,7 +58,7 @@ RUN_MODE = ; prod
+ ;PER_WRITE_PER_KB_TIMEOUT = 30s
+ ;;
+ ;; Permission for unix socket
+-;UNIX_SOCKET_PERMISSION = 666
 +UNIX_SOCKET_PERMISSION = 660
- ; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service.
- ; In most cases you do not need to change the default value.
- ; Alter it only if your SSH server node is not the same as HTTP node.
-@@ -303,7 +303,7 @@
- ; The port number the builtin SSH server should listen on
- SSH_LISTEN_PORT = %(SSH_PORT)s
- ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
--SSH_ROOT_PATH =
+ ;;
+ ;; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service.
+ ;; In most cases you do not need to change the default value.
+@@ -88,7 +88,7 @@ RUN_MODE = ; prod
+ ;SSH_LISTEN_PORT = %(SSH_PORT)s
+ ;;
+ ;; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
+-;SSH_ROOT_PATH =
 +SSH_ROOT_PATH = /var/lib/gitea
- ; Gitea will create a authorized_keys file by default when it is not using the internal ssh server
- ; If you intend to use the AuthorizedKeysCommand functionality then you should turn this off.
- SSH_CREATE_AUTHORIZED_KEYS_FILE = true
-@@ -368,7 +368,7 @@
- KEY_FILE = https/key.pem
- ; Root directory containing templates and static files.
- ; default is the path where Gitea is executed
--STATIC_ROOT_PATH =
+ ;;
+ ;; Gitea will create a authorized_keys file by default when it is not using the internal ssh server
+ ;; If you intend to use the AuthorizedKeysCommand functionality then you should turn this off.
+@@ -178,7 +178,7 @@ RUN_MODE = ; prod
+ ;;
+ ;; Root directory containing templates and static files.
+ ;; default is the path where Gitea is executed
+-;STATIC_ROOT_PATH =
 +STATIC_ROOT_PATH = /var/lib/gitea
- ; Default path for App data
- APP_DATA_PATH = data
- ; Enable gzip compression for runtime-generated content, static resources excluded
-@@ -385,7 +385,7 @@
- ; Enables git-lfs support. true or false, default is false.
- LFS_START_SERVER = false
- ; Where your lfs files reside, default is data/lfs.
--LFS_CONTENT_PATH = data/lfs
+ ;;
+ ;; Default path for App data
+ ;APP_DATA_PATH = data
+@@ -202,7 +202,7 @@ RUN_MODE = ; prod
+ ;LFS_START_SERVER = false
+ ;;
+ ;; Where your lfs files reside, default is data/lfs.
+-;LFS_CONTENT_PATH = data/lfs
 +LFS_CONTENT_PATH = /var/lib/gitea/lfs
- ; LFS authentication secret, change this yourself
+ ;;
+ ;; LFS authentication secret, change this yourself
  LFS_JWT_SECRET =
- ; LFS authentication validity period (in time.Duration), pushes taking longer than this may fail.
-@@ -415,7 +415,7 @@
- 
- [database]
- ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3".
+@@ -243,10 +243,10 @@ LFS_JWT_SECRET =
+ ;;
+ ;; MySQL Configuration
+ ;;
 -DB_TYPE = mysql
+-HOST = 127.0.0.1:3306 ; can use socket e.g. /var/run/mysqld/mysqld.sock
+-NAME = gitea
+-USER = root
++;DB_TYPE = mysql
++;HOST = 127.0.0.1:3306 ; can use socket e.g. /var/run/mysqld/mysqld.sock
++;NAME = gitea
++;USER = root
+ ;PASSWD = ;Use PASSWD = `your password` for quoting if you use special characters in the password.
+ ;SSL_MODE = false ; either "false" (default), "true", or "skip-verify"
+ ;CHARSET = utf8mb4 ;either "utf8" or "utf8mb4", default is "utf8mb4".
+@@ -269,8 +269,8 @@ USER = root
+ ;;
+ ;; SQLite Configuration
+ ;;
+-;DB_TYPE = sqlite3
+-;PATH= ; defaults to data/gitea.db
 +DB_TYPE = sqlite3
- HOST = 127.0.0.1:3306
- NAME = gitea
- USER = root
-@@ -432,7 +432,7 @@
- ; NOTICE: for "utf8mb4" you must use MySQL InnoDB > 5.6. Gitea is unable to check this.
- CHARSET = utf8mb4
- ; For "sqlite3" and "tidb", use an absolute path when you start gitea as service
--PATH = data/gitea.db
 +PATH = /var/lib/gitea/data/gitea.db
- ; For "sqlite3" only. Query timeout
- SQLITE_TIMEOUT = 500
- ; For iterate buffer, default is 50
-@@ -458,7 +458,7 @@
- ; Issue indexer name, available when ISSUE_INDEXER_TYPE is elasticsearch
- ISSUE_INDEXER_NAME = gitea_issues
- ; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve
--ISSUE_INDEXER_PATH = indexers/issues.bleve
-+ISSUE_INDEXER_PATH = /var/lib/gitea/indexers/issues.bleve
- ; Issue indexer queue, currently support: channel, levelqueue or redis, default is levelqueue
- ISSUE_INDEXER_QUEUE_TYPE = levelqueue
- ; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the path where the queue will be saved.
-@@ -806,7 +806,7 @@
- SAME_SITE=lax
- 
- [picture]
--AVATAR_UPLOAD_PATH = data/avatars
-+AVATAR_UPLOAD_PATH = /var/lib/gitea/data/avatars
- REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars
- ; How Gitea deals with missing repository avatars
- ; none = no avatar will be displayed; random = random avatar will be displayed; image = default image will be used
-@@ -871,7 +871,7 @@
- DEFAULT_UI_LOCATION =
- 
- [log]
--ROOT_PATH =
+ ;SQLITE_TIMEOUT = ; Query timeout defaults to: 500
+ ;;
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+@@ -431,7 +431,7 @@ TRUSTED_FACETS = ; e.g. http://localhost:3000/
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; Root path for the log files - defaults to %(GITEA_WORK_DIR)/log
+-;ROOT_PATH =
 +ROOT_PATH = /var/log/gitea
- ; Either "console", "file", "conn", "smtp" or "database", default is "console"
- ; Use comma to separate multiple modes, e.g. "console, file"
- MODE = console
-@@ -1181,14 +1181,6 @@
- LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pt-PT,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR
- NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,Português de Portugal,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어
+ ;;
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; Main Logger
+@@ -736,7 +736,7 @@ PATH =
+ ;[repository]
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; Root path for storing all repository data. It must be an absolute path. By default, it is stored in a sub-directory of `APP_DATA_PATH`.
+-;ROOT =
++ROOT = /var/lib/gitea/repositories
+ ;;
+ ;; The script type this server supports. Usually this is `bash`, but some users report that only `sh` is available.
+ ;SCRIPT_TYPE = bash
+@@ -834,7 +834,7 @@ PATH =
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;
+ ;; Path for local repository copy. Defaults to `tmp/local-repo`
+-;LOCAL_COPY_PATH = tmp/local-repo
++LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo
  
--[U2F]
--; NOTE: THE DEFAULT VALUES HERE WILL NEED TO BE CHANGED
--; Two Factor authentication with security keys
--; https://developers.yubico.com/U2F/App_ID.html
--;APP_ID = http://localhost:3000/
--; Comma separated list of trusted facets
--;TRUSTED_FACETS = http://localhost:3000/
--
- ; Extension mapping to highlight class
- ; e.g. .toml=ini
- [highlight.mapping]
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+@@ -846,7 +846,7 @@ PATH =
+ ;ENABLED = true
+ ;;
+ ;; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea restart)
+-;TEMP_PATH = data/tmp/uploads
++TEMP_PATH = /var/lib/gitea/uploads
+ ;;
+ ;; Comma-separated list of allowed file extensions (`.zip`), mime types (`text/plain`) or wildcard type (`image/*`, `audio/*`, `video/*`). Empty value or `*/*` allows all types.
+ ;ALLOWED_TYPES =
+@@ -1172,7 +1172,7 @@ PATH =
+ ;ISSUE_INDEXER_TYPE = bleve
+ ;;
+ ;; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve
+-;ISSUE_INDEXER_PATH = indexers/issues.bleve
++ISSUE_INDEXER_PATH = /var/lib/gitea/indexers/issues.bleve
+ ;;
+ ;; Issue indexer connection string, available when ISSUE_INDEXER_TYPE is elasticsearch
+ ;ISSUE_INDEXER_CONN_STR = http://elastic:changeme@localhost:9200
+@@ -1543,7 +1543,7 @@ PATH =
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;
+-;AVATAR_UPLOAD_PATH = data/avatars
++AVATAR_UPLOAD_PATH = /var/lib/gitea/data/avatars
+ ;REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars
+ ;;
+ ;; How Gitea deals with missing repository avatars
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index f375d2dcfa17..1e8fe628361f 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.14.2
+version=1.15.6
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
 distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=d04bca934feba35600aaf739c82b7cbe7d8b911a086d7ac54f0710b689a85ac3
+checksum=14c33f89003125cca6bf88d80736815c6d14cbc5311e1f6015607983357d727d
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From 91cb456ece135aba7ce1e7d8b598a9317de27d06 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Sun, 18 Apr 2021 15:09:09 -0700
Subject: [PATCH 2898/4088] clisp: update to 2.49.92.

---
 srcpkgs/clisp/patches/no-page.h.patch  | 12 ------------
 srcpkgs/clisp/patches/readline-7.patch | 11 -----------
 srcpkgs/clisp/template                 | 16 ++++++++++------
 3 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/clisp/patches/no-page.h.patch
 delete mode 100644 srcpkgs/clisp/patches/readline-7.patch

diff --git a/srcpkgs/clisp/patches/no-page.h.patch b/srcpkgs/clisp/patches/no-page.h.patch
deleted file mode 100644
index aafb98a31e7c..000000000000
--- a/srcpkgs/clisp/patches/no-page.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/unix.d
-+++ b/src/unix.d
-@@ -135,9 +135,6 @@
-   #ifdef UNIX_AUX
-     #include <sys/mmu.h> /* for SHMLBA */
-   #endif
--  #if defined(UNIX_LINUX) && !defined(UNIX_GNU)
--    #include <asm/page.h> /* for SHMLBA on Linux 2.0 */
--  #endif
- /* <sys/shm.h> declares shmget(), shmat(), shmdt(), shmctl() */
- #endif
- /* used by SPVW, STREAM */
diff --git a/srcpkgs/clisp/patches/readline-7.patch b/srcpkgs/clisp/patches/readline-7.patch
deleted file mode 100644
index 75adc511e7d4..000000000000
--- a/srcpkgs/clisp/patches/readline-7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modules/readline/readline.lisp	2016-09-20 22:23:51.876046496 +0200
-+++ b/modules/readline/readline.lisp	2016-09-20 22:24:11.070047486 +0200
-@@ -424,7 +424,7 @@
-    "The version of this incarnation of the readline library, e.g., 0x0402."))
- (def-c-var gnu-readline-p (:name "rl_gnu_readline_p") (:type int)
-   (:documentation "True if this is real GNU readline."))
--(def-c-var readline-state (:name "rl_readline_state") (:type int)
-+(def-c-var readline-state (:name "rl_readline_state") (:type ulong)
-   (:documentation "Flags word encapsulating the current readline state."))
- (def-c-var editing-mode (:name "rl_editing_mode") (:type int)
-   (:documentation "Says which editing mode readline is currently using.
diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template
index ee0941a3d581..3cdd2b347eb1 100644
--- a/srcpkgs/clisp/template
+++ b/srcpkgs/clisp/template
@@ -1,8 +1,8 @@
 # Template file for 'clisp'
 pkgname=clisp
-version=2.49
-revision=6
-# possibly works elsewhere but not in an ancient 2010 release
+version=2.49.92
+revision=1
+# possibly works elsewhere
 archs="x86_64* i686*"
 build_style=configure
 configure_args="--prefix=/usr --disable-mmap --disable-rpath
@@ -12,9 +12,9 @@ makedepends="libsigsegv-devel $(vopt_if readline readline-devel)"
 short_desc="ANSI Common Lisp Interpreter, Compiler and Debugger"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2.0-only"
-homepage="http://clisp.cons.org"
-distfiles="${SOURCEFORGE_SITE}/clisp/clisp-${version}.tar.bz2"
-checksum=8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890
+homepage="https://gitlab.com/gnu-clisp/clisp"
+distfiles="https://alpha.gnu.org/gnu/clisp/clisp-${version}.tar.bz2"
+checksum=bd443a94aa9b02da4c4abbcecfc04ffff1919c0a8b0e7e35649b86198cd6bb89
 nopie=yes
 nocross=yes
 lib32disabled=yes
@@ -31,6 +31,10 @@ if [ "$XBPS_TARGET_WORDSIZE" == 32 ]; then
 	CFLAGS+=" -falign-functions=4"
 fi
 
+pre_configure() {
+	export FORCE_UNSAFE_CONFIGURE=1
+}
+
 do_build() {
 	# Need to increase the Limit
 	ulimit -s 16384

From 9284219d05c8eb758be92c9a9a9cb5618485e93d Mon Sep 17 00:00:00 2001
From: David Chen <45245358+TheEgghead27@users.noreply.github.com>
Date: Sat, 13 Nov 2021 19:49:05 -0500
Subject: [PATCH 2899/4088] mopidy: update to 3.2.0.

---
 srcpkgs/mopidy/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/mopidy/template b/srcpkgs/mopidy/template
index b5ba4a154891..38b232696a91 100644
--- a/srcpkgs/mopidy/template
+++ b/srcpkgs/mopidy/template
@@ -1,19 +1,22 @@
 # Template file for 'mopidy'
 pkgname=mopidy
-version=3.0.1
-revision=4
+version=3.2.0
+revision=1
 wrksrc="Mopidy-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-Sphinx python3-sphinx_rtd_theme python3-pykka"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinx_rtd_theme
+ python3-pykka"
 depends="gst1-python3 gst-plugins-good1 gst-plugins-ugly1 gst-plugins-bad1
- python3-tornado python3-pykka python3-setuptools python3-requests python3-uritools"
+ python3-dbus python3-gobject python3-tornado python3-pykka python3-setuptools
+ python3-requests"
+checkdepends="${depends} python3-pytest python3-responses"
 short_desc="Music server for MPD, Spotify, SoundClound and others"
 maintainer="allan <mail@may.mooo.com>"
 license="Apache-2.0"
-homepage="http://www.mopidy.com"
+homepage="https://www.mopidy.com"
 changelog="https://github.com/mopidy/mopidy/raw/develop/docs/changelog.rst"
 distfiles="${PYPI_SITE}/M/Mopidy/Mopidy-${version}.tar.gz"
-checksum=7931ca61028e135834df1af22a01029b24f3c2455625f3da84a1a05b5c313ef3
+checksum=8e9d1aa91a3c40ac43945be58249a7ce27eb955bce9c9e4d07592e809ac37004
 
 conf_files="/etc/mopidy/*.conf"
 system_accounts="mopidy"

From b68aec7d33219490226712201bf3d82f7cc0df48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 13:50:16 +0100
Subject: [PATCH 2900/4088] wtype: fix patch whitespace

---
 srcpkgs/wtype/patches/fix_reallocarray.patch | 27 ++++++++------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/wtype/patches/fix_reallocarray.patch b/srcpkgs/wtype/patches/fix_reallocarray.patch
index 063ee3ef8c78..8fd7391ef1f6 100644
--- a/srcpkgs/wtype/patches/fix_reallocarray.patch
+++ b/srcpkgs/wtype/patches/fix_reallocarray.patch
@@ -6,8 +6,6 @@ Subject: [PATCH] Do not use reallocarray
 Not available in musl.
 
 Closes #20
-
-Signed-off-by: Reed Wade <reedwade@misterbanal.net>
 ---
  main.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
@@ -17,23 +15,20 @@ index cbdbb0f..cec1cc2 100644
 --- a/main.c
 +++ b/main.c
 @@ -1,6 +1,4 @@
-
+ 
 -#define _GNU_SOURCE
 -
  #include <fcntl.h>
  #include <locale.h>
  #include <stdbool.h>
 @@ -140,8 +138,8 @@ unsigned int get_key_code(struct wtype *wtype, wchar_t ch)
-                        return i;
-                }
-        }
--       wtype->keymap = reallocarray(
--               wtype->keymap, ++wtype->keymap_len, sizeof(wtype->keymap[0])
-+       wtype->keymap = realloc(
-+               wtype->keymap, ++wtype->keymap_len * sizeof(wtype->keymap[0])
-        );
-        wtype->keymap[wtype->keymap_len - 1] = ch;
-        return wtype->keymap_len - 1;
---
-2.29.2
-
+ 			return i;
+ 		}
+ 	}
+-	wtype->keymap = reallocarray(
+-		wtype->keymap, ++wtype->keymap_len, sizeof(wtype->keymap[0])
++	wtype->keymap = realloc(
++		wtype->keymap, ++wtype->keymap_len * sizeof(wtype->keymap[0])
+ 	);
+ 	wtype->keymap[wtype->keymap_len - 1] = ch;
+ 	return wtype->keymap_len - 1;

From 4219b6fa7fb483dd3a1a28f37f209a1a0449bf08 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 14 Nov 2021 14:54:16 +0100
Subject: [PATCH 2901/4088] ffcall: update to 2.4

Closes https://github.com/void-linux/void-packages/pull/32722
---
 srcpkgs/ffcall/files/ppc64-be.patch | 1310 +++++++++++++++------------
 srcpkgs/ffcall/template             |    5 +-
 2 files changed, 727 insertions(+), 588 deletions(-)

diff --git a/srcpkgs/ffcall/files/ppc64-be.patch b/srcpkgs/ffcall/files/ppc64-be.patch
index a6c1a252bdfb..7fa6ef2f7a59 100644
--- a/srcpkgs/ffcall/files/ppc64-be.patch
+++ b/srcpkgs/ffcall/files/ppc64-be.patch
@@ -1,193 +1,8 @@
-Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.patch
-
---- libffcall-2.2/avcall/avcall-powerpc64.c.old	2018-09-17 16:47:43.000000000 +0000
-+++ libffcall-2.2/avcall/avcall-powerpc64.c	2020-05-11 23:06:57.534813743 +0000
-@@ -181,111 +181,111 @@
-       /* In the ELFv2 ABI, gcc returns structs of size <= 16 in registers. */
-       if (l->rsize > 0 && l->rsize <= 16) {
-         void* raddr = l->raddr;
--        #if 0 /* Unoptimized */
-+        #if 1 /* Unoptimized */
-         if (l->rsize == 1) {
-           ((unsigned char *)raddr)[0] = (unsigned char)(iret);
-         } else
-         if (l->rsize == 2) {
--          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
--          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
-+          ((unsigned char *)raddr)[1] = (unsigned char)(iret);
-+          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>8);
-         } else
-         if (l->rsize == 3) {
--          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
-+          ((unsigned char *)raddr)[2] = (unsigned char)(iret);
-           ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
--          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
-+          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>16);
-         } else
-         if (l->rsize == 4) {
--          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
--          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
--          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
--          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
-+          ((unsigned char *)raddr)[3] = (unsigned char)(iret);
-+          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>8);
-+          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>16);
-+          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>24);
-         } else
-         if (l->rsize == 5) {
--          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
--          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
-+          ((unsigned char *)raddr)[4] = (unsigned char)(iret);
-+          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>8);
-           ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
--          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
--          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32);
-+          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>24);
-+          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>32);
-         } else
-         if (l->rsize == 6) {
--          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
--          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
--          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
--          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
--          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32);
--          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40);
-+          ((unsigned char *)raddr)[5] = (unsigned char)(iret);
-+          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>8);
-+          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>16);
-+          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>24);
-+          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>32);
-+          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>40);
-         } else
-         if (l->rsize == 7) {
--          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
--          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
--          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
-+          ((unsigned char *)raddr)[6] = (unsigned char)(iret);
-+          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>8);
-+          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>16);
-           ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
--          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32);
--          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40);
--          ((unsigned char *)raddr)[6] = (unsigned char)(iret>>48);
-+          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>32);
-+          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>40);
-+          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>48);
-         } else
-         if (l->rsize >= 8 && l->rsize <= 16) {
--          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
--          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
--          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
--          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
--          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32);
--          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40);
--          ((unsigned char *)raddr)[6] = (unsigned char)(iret>>48);
--          ((unsigned char *)raddr)[7] = (unsigned char)(iret>>56);
-+          ((unsigned char *)raddr)[7] = (unsigned char)(iret);
-+          ((unsigned char *)raddr)[6] = (unsigned char)(iret>>8);
-+          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>16);
-+          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>24);
-+          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>32);
-+          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>40);
-+          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>48);
-+          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>56);
-           if (l->rsize == 8) {
-           } else
-           if (l->rsize == 9) {
--            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
-+            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
-           } else
-           if (l->rsize == 10) {
--            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
--            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
-+            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
-+            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
-           } else
-           if (l->rsize == 11) {
--            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
--            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
--            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
-+            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
-+            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
-+            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
-           } else
-           if (l->rsize == 12) {
--            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
--            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
--            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
--            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
-+            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
-+            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
-+            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
-+            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
-           } else
-           if (l->rsize == 13) {
--            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
--            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
--            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
--            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
--            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32);
-+            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
-+            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
-+            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
-+            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
-+            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24);
-           } else
-           if (l->rsize == 14) {
--            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
--            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
--            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
--            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
--            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32);
--            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40);
-+            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
-+            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
-+            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
-+            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
-+            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24);
-+            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16);
-           } else
-           if (l->rsize == 15) {
--            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
--            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
--            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
--            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
--            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32);
--            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40);
--            ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>48);
-+            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
-+            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
-+            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
-+            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
-+            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24);
-+            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16);
-+            ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>8);
-           } else
-           if (l->rsize == 16) {
--            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
--            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
--            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
--            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
--            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32);
--            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40);
--            ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>48);
--            ((unsigned char *)raddr)[8+7] = (unsigned char)(iret2>>56);
-+            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
-+            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
-+            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
-+            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
-+            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24);
-+            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16);
-+            ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>8);
-+            ((unsigned char *)raddr)[8+7] = (unsigned char)(iret2);
-           }
-         }
-         #else /* Optimized: fewer conditional jumps, fewer memory accesses */
---- libffcall-2.2/avcall/avcall-powerpc64-elfv2-linux.S.old	2019-08-25 01:03:04.000000000 +0000
-+++ libffcall-2.2/avcall/avcall-powerpc64-elfv2-linux.S	2020-05-11 23:07:17.992574561 +0000
-@@ -1,44 +1,52 @@
+--- a/avcall/avcall-powerpc64-elfv2-linux.S
++++ b/avcall/avcall-powerpc64-elfv2-linux.S
+@@ -1,308 +1,326 @@
  	.file	"avcall-powerpc64.c"
--	.machine power4
+ 	.machine power4
  	.abiversion 2
 -	.section	".toc","aw"
  	.section	".text"
@@ -205,9 +20,11 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 +	addi 2,2,.TOC.-.LCF0@l
  	.localentry	avcall_call,.-avcall_call
  	mflr 0
++	std 29,-24(1)
  	std 30,-16(1)
  	std 31,-8(1)
 +	.cfi_register 65, 0
++	.cfi_offset 29, -24
 +	.cfi_offset 30, -16
 +	.cfi_offset 31, -8
  	mr 30,3
@@ -215,23 +32,18 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 -	stdu 1,-112(1)
 -	ld 3,48(3)
 -	ld 9,40(30)
-+	stdu 1,-128(1)
-+	.cfi_def_cfa_offset 128
++	stdu 1,-144(1)
++	.cfi_def_cfa_offset 144
 +	.cfi_offset 65, 16
++	ld 29,48(3)
++	ld 5,40(3)
  	mr 31,1
-+	.cfi_def_cfa_register 31
-+	ld 3,48(3)
- 	ld 10,0(1)
-+	ld 9,-28688(13)
-+	std 9,104(31)
-+	li 9,0
-+	ld 9,40(30)
-+	stdu 10,-2048(1)
- 	subf 9,3,9
+-	ld 10,0(1)
+-	subf 9,3,9
 -	stdu 10,-2064(1)
- 	sradi 9,9,3
- 	cmpwi 7,9,8
- 	ble 7,.L6
+-	sradi 9,9,3
+-	cmpwi 7,9,8
+-	ble 7,.L6
 -	addi 10,9,-9
 -	addi 8,1,96
 -	addi 9,3,56
@@ -240,117 +52,230 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 -	addi 10,10,8
 -	sldi 10,10,3
 -	add 10,3,10
-+	addi 8,9,-9
-+	addi 7,1,96
-+	addi 10,3,56
-+	rldic 8,8,3,29
-+	addi 9,7,-8
-+	add 7,7,8
- 	.p2align 4,,15
+-	.p2align 4,,15
++	.cfi_def_cfa_register 31
++	ld 9,0(1)
++	ld 10,-28688(13)
++	std 10,104(31)
++	li 10,0
++	subf 5,29,5
++	stdu 9,-2048(1)
++	sradi 5,5,3
++	cmpwi 0,5,8
++	ble 0,.L5
++	addi 5,5,-9
++	addi 3,1,96
++	addi 4,29,64
++	rldic 5,5,3,29
++	addi 5,5,8
++	bl memcpy
++	nop
  .L5:
 -	ldu 7,8(9)
 -	cmpld 7,10,9
 -	stdu 7,8(8)
-+	ldu 8,8(10)
-+	stdu 8,8(9)
-+	cmpld 7,7,9
- 	bne 7,.L5
- .L6:
+-	bne 7,.L5
+-.L6:
  	ld 10,64(30)
-@@ -114,191 +122,210 @@
+ 	addi 9,30,72
+ 	subf 9,9,10
+ 	sradi 9,9,3
++	cmpwi 0,9,0
+ 	extsw 9,9
+-	cmpwi 7,9,0
+-	ble 7,.L4
+-	cmpwi 7,9,1
+-	beq 7,.L7
+-	cmpwi 7,9,2
+-	beq 7,.L8
+-	cmpwi 7,9,3
+-	beq 7,.L9
+-	cmpwi 7,9,4
+-	beq 7,.L10
+-	cmpwi 7,9,5
+-	beq 7,.L11
+-	cmpwi 7,9,6
+-	beq 7,.L12
+-	cmpwi 7,9,7
+-	beq 7,.L13
+-	cmpwi 7,9,8
+-	beq 7,.L14
+-	cmpwi 7,9,9
+-	beq 7,.L15
+-	cmpwi 7,9,10
+-	beq 7,.L16
+-	cmpwi 7,9,11
+-	beq 7,.L17
+-	cmpwi 7,9,12
+-	beq 7,.L18
++	ble 0,.L4
++	cmpwi 0,9,1
++	beq 0,.L6
++	cmpwi 0,9,2
++	beq 0,.L7
++	cmpwi 0,9,3
++	beq 0,.L8
++	cmpwi 0,9,4
++	beq 0,.L9
++	cmpwi 0,9,5
++	beq 0,.L10
++	cmpwi 0,9,6
++	beq 0,.L11
++	cmpwi 0,9,7
++	beq 0,.L12
++	cmpwi 0,9,8
++	beq 0,.L13
++	cmpwi 0,9,9
++	beq 0,.L14
++	cmpwi 0,9,10
++	beq 0,.L15
++	cmpwi 0,9,11
++	beq 0,.L16
++	cmpwi 0,9,12
++	beq 0,.L17
+ 	lfd 13,168(30)
+-.L18:
+-	lfd 12,160(30)
+ .L17:
+-	lfd 11,152(30)
++	lfd 12,160(30)
+ .L16:
+-	lfd 10,144(30)
++	lfd 11,152(30)
+ .L15:
+-	lfd 9,136(30)
++	lfd 10,144(30)
+ .L14:
+-	lfd 8,128(30)
++	lfd 9,136(30)
+ .L13:
+-	lfd 7,120(30)
++	lfd 8,128(30)
+ .L12:
+-	lfd 6,112(30)
++	lfd 7,120(30)
+ .L11:
+-	lfd 5,104(30)
++	lfd 6,112(30)
+ .L10:
+-	lfd 4,96(30)
++	lfd 5,104(30)
+ .L9:
+-	lfd 3,88(30)
++	lfd 4,96(30)
+ .L8:
+-	lfd 2,80(30)
++	lfd 3,88(30)
+ .L7:
++	lfd 2,80(30)
++.L6:
+ 	lfd 1,72(30)
+ .L4:
+-	ld 11,8(30)
+-	ld 9,48(3)
+-	ld 10,56(3)
+-	ld 8,40(3)
+-	ld 7,32(3)
+-	ld 6,24(3)
+-	ld 5,16(3)
+-	ld 4,8(3)
+-	mtctr 11
+-	ld 3,0(3)
+-	mr 12,11
++	ld 12,8(30)
++	ld 9,48(29)
++	ld 10,56(29)
++	ld 8,40(29)
++	ld 7,32(29)
++	ld 6,24(29)
++	ld 5,16(29)
++	ld 4,8(29)
++	mtctr 12
++	ld 3,0(29)
+ 	std 2,24(1)
+ 	bctrl
  	ld 2,24(1)
  	lwz 9,24(30)
- 	cmplwi 7,9,1
+-	cmplwi 7,9,1
 -	beq 7,.L19
-+	beq 7,.L20
- 	cmpdi 7,9,0
--	beq 7,.L50
-+	beq 7,.L68
- 	cmplwi 7,9,2
+-	cmplwi 7,9,2
+-	beq 7,.L43
+-	cmplwi 7,9,3
+-	beq 7,.L43
+-	cmplwi 7,9,4
+-	beq 7,.L43
+-	cmplwi 7,9,5
+-	beq 7,.L44
+-	cmplwi 7,9,6
+-	beq 7,.L44
+-	cmplwi 7,9,7
 -	beq 7,.L45
-+	beq 7,.L62
- 	cmplwi 7,9,3
+-	cmplwi 7,9,8
 -	beq 7,.L45
-+	beq 7,.L62
- 	cmplwi 7,9,4
--	beq 7,.L45
-+	beq 7,.L62
- 	cmplwi 7,9,5
--	beq 7,.L46
-+	beq 7,.L63
- 	cmplwi 7,9,6
--	beq 7,.L46
-+	beq 7,.L63
- 	cmplwi 7,9,7
--	beq 7,.L47
-+	beq 7,.L64
- 	cmplwi 7,9,8
--	beq 7,.L47
-+	beq 7,.L64
- 	cmplwi 7,9,9
--	beq 7,.L50
-+	beq 7,.L68
- 	cmplwi 7,9,10
--	beq 7,.L50
-+	beq 7,.L68
- 	cmplwi 7,9,11
--	beq 7,.L50
-+	beq 7,.L68
- 	cmplwi 7,9,12
--	beq 7,.L50
-+	beq 7,.L68
- 	cmplwi 7,9,13
+-	cmplwi 7,9,9
+-	beq 7,.L49
+-	cmplwi 7,9,10
+-	beq 7,.L49
+-	cmplwi 7,9,11
+-	beq 7,.L49
+-	cmplwi 7,9,12
+-	beq 7,.L49
+-	cmplwi 7,9,13
+-	beq 7,.L51
+-	cmplwi 7,9,14
 -	beq 7,.L52
-+	beq 7,.L71
- 	cmplwi 7,9,14
--	beq 7,.L53
-+	beq 7,.L72
- 	cmplwi 7,9,15
--	beq 7,.L50
-+	beq 7,.L68
- 	cmplwi 7,9,16
+-	cmplwi 7,9,15
+-	beq 7,.L49
+-	cmplwi 7,9,16
 -	bne 7,.L19
-+	bne 7,.L20
++	cmplwi 0,9,1
++	beq 0,.L19
++	cmplwi 0,9,2
++	beq 0,.L58
++	cmplwi 0,9,3
++	beq 0,.L58
++	cmplwi 0,9,4
++	beq 0,.L58
++	cmplwi 0,9,5
++	beq 0,.L59
++	cmplwi 0,9,6
++	beq 0,.L59
++	cmplwi 0,9,7
++	beq 0,.L60
++	cmplwi 0,9,8
++	beq 0,.L60
++	cmplwi 0,9,9
++	beq 0,.L64
++	cmplwi 0,9,10
++	beq 0,.L64
++	cmplwi 0,9,11
++	beq 0,.L64
++	cmplwi 0,9,12
++	beq 0,.L64
++	cmplwi 0,9,13
++	beq 0,.L67
++	cmplwi 0,9,14
++	beq 0,.L68
++	cmplwi 0,9,15
++	beq 0,.L64
++	cmplwi 0,9,16
++	bne 0,.L19
  	lwz 9,0(30)
 -	rldicl. 10,9,55,63
--	beq 0,.L19
 +	andi. 9,9,0x200
-+	beq 0,.L20
+ 	beq 0,.L19
  	ld 10,32(30)
  	addi 9,10,-1
- 	cmpldi 7,9,15
+-	cmpldi 7,9,15
 -	bgt 7,.L19
 -	ld 8,16(30)
 -	cmpldi 7,10,8
 -	rldicl 9,8,0,61
 -	rldicr 8,8,0,60
 -	add 10,10,9
+-	bgt 7,.L34
+-	cmpldi 7,10,8
 -	bgt 7,.L35
-+	bgt 7,.L20
-+	cmpldi 7,10,1
-+	ld 9,16(30)
-+	rlwinm 8,3,0,0xff
-+	beq 7,.L69
-+	cmpldi 7,10,2
-+	beq 7,.L73
-+	cmpldi 7,10,3
-+	rldicl 8,3,48,56
-+	beq 7,.L74
-+	cmpldi 7,10,4
-+	beq 7,.L75
-+	cmpldi 7,10,5
-+	rldicl 8,3,32,56
-+	beq 7,.L76
-+	cmpldi 7,10,6
-+	rldicl 7,3,24,56
-+	beq 7,.L77
-+	cmpldi 7,10,7
-+	rldicl 6,3,16,56
-+	beq 7,.L78
-+	std 3,0(9)
-+	ld 10,32(30)
- 	cmpldi 7,10,8
--	bgt 7,.L36
 -	slwi 10,10,3
 -	li 7,2
 -	ld 6,0(8)
@@ -365,51 +290,77 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 -	and 9,10,9
 -	xor 9,9,6
 -	std 9,0(8)
--.L19:
--	addi 1,31,112
-+	beq 7,.L20
-+	cmpldi 7,10,9
-+	beq 7,.L79
-+	cmpldi 7,10,10
-+	beq 7,.L80
-+	cmpldi 7,10,11
-+	beq 7,.L81
-+	cmpldi 7,10,12
-+	beq 7,.L82
-+	cmpldi 7,10,13
-+	beq 7,.L83
-+	cmpldi 7,10,14
-+	beq 7,.L84
-+	cmpldi 7,10,15
-+	beq 7,.L85
-+	cmpldi 7,10,16
-+	bne 7,.L20
++	cmpldi 0,9,15
++	bgt 0,.L19
++	cmpldi 0,10,1
++	ld 9,16(30)
++	rlwinm 8,3,0,0xff
++	beq 0,.L65
++	cmpldi 0,10,2
++	beq 0,.L69
++	cmpldi 0,10,3
++	rldicl 8,3,48,56
++	beq 0,.L70
++	cmpldi 0,10,4
++	beq 0,.L71
++	cmpldi 0,10,5
++	rldicl 8,3,32,56
++	beq 0,.L72
++	cmpldi 0,10,6
++	rldicl 7,3,24,56
++	beq 0,.L73
++	cmpldi 0,10,7
++	rldicl 10,3,16,56
++	beq 0,.L74
++	std 3,0(9)
++	ld 10,32(30)
++	cmpldi 0,10,8
++	beq 0,.L19
++	cmpldi 0,10,9
++	beq 0,.L75
++	cmpldi 0,10,10
++	beq 0,.L76
++	cmpldi 0,10,11
++	beq 0,.L77
++	cmpldi 0,10,12
++	beq 0,.L78
++	cmpldi 0,10,13
++	beq 0,.L79
++	cmpldi 0,10,14
++	beq 0,.L80
++	cmpldi 0,10,15
++	beq 0,.L81
++	cmpldi 0,10,16
++	bne 0,.L19
 +	std 4,8(9)
 +	.p2align 4,,15
-+.L20:
+ .L19:
+-	addi 1,31,112
 +	ld 9,104(31)
 +	ld 10,-28688(13)
 +	xor. 9,9,10
 +	li 10,0
- 	li 3,0
-+	bne 0,.L86
-+	addi 1,31,128
++	bne 0,.L82
++	addi 1,31,144
 +	.cfi_remember_state
 +	.cfi_def_cfa 1, 0
+ 	li 3,0
  	ld 0,16(1)
++	ld 29,-24(1)
  	ld 30,-16(1)
  	ld 31,-8(1)
  	mtlr 0
 +	.cfi_restore 65
 +	.cfi_restore 31
 +	.cfi_restore 30
++	.cfi_restore 29
  	blr
  	.p2align 4,,15
--.L50:
-+.L68:
+-.L43:
++.L58:
 +	.cfi_restore_state
  	ld 9,16(30)
- 	std 3,0(9)
+ 	stb 3,0(9)
 -	addi 1,31,112
 -	li 3,0
 -	ld 0,16(1)
@@ -417,12 +368,15 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 -	ld 31,-8(1)
 -	mtlr 0
 -	blr
-+	b .L20
- 	.p2align 4,,15
 -.L45:
-+.L62:
+-	ld 9,16(30)
+-	stw 3,0(9)
+ 	b .L19
+ 	.p2align 4,,15
+-.L44:
++.L59:
  	ld 9,16(30)
- 	stb 3,0(9)
+ 	sth 3,0(9)
 -	addi 1,31,112
 -	li 3,0
 -	ld 0,16(1)
@@ -430,56 +384,33 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 -	ld 31,-8(1)
 -	mtlr 0
 -	blr
--.L46:
-+	b .L20
-+.L63:
+-	.p2align 4,,15
+-.L49:
++	b .L19
++.L60:
  	ld 9,16(30)
- 	sth 3,0(9)
--	b .L19
--.L47:
-+	b .L20
+-	std 3,0(9)
+-	addi 1,31,112
+-	li 3,0
+-	ld 0,16(1)
+-	ld 30,-16(1)
+-	ld 31,-8(1)
+-	mtlr 0
+-	blr
+-.L52:
++	stw 3,0(9)
++	b .L19
 +.L64:
  	ld 9,16(30)
- 	stw 3,0(9)
--	b .L19
--.L52:
-+	b .L20
-+.L71:
+-	stfd 1,0(9)
++	std 3,0(9)
+ 	b .L19
+-.L51:
++.L67:
  	ld 9,16(30)
  	stfs 1,0(9)
--	b .L19
--.L53:
-+	b .L20
-+.L72:
- 	ld 9,16(30)
- 	stfd 1,0(9)
--	b .L19
--.L36:
--	rldicl 9,9,0,32
--	slwi 10,10,3
--	ld 11,0(8)
--	ld 4,8(8)
--	li 7,2
--	mulli 6,9,-8
--	addi 10,10,-65
--	slwi 9,9,3
--	sld 10,7,10
--	sld 5,3,9
--	li 7,-1
--	addi 6,6,64
--	addi 10,10,-1
--	sld 7,7,9
--	srad 3,3,6
--	xor 6,5,11
--	xor 9,3,4
--	and 7,7,6
--	and 9,10,9
--	xor 10,7,11
--	xor 9,9,4
--	std 10,0(8)
--	std 9,8(8)
--	b .L19
--.L35:
+ 	b .L19
+-.L34:
 -	rldicl 9,9,0,32
 -	ld 11,0(8)
 -	li 6,-1
@@ -491,7 +422,7 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 -	and 7,6,7
 -	xor 7,7,11
 -	std 7,0(8)
--	ble 7,.L54
+-	ble 7,.L53
 -	mulli 9,9,-8
 -	ld 11,16(8)
 -	slwi 10,10,3
@@ -509,8 +440,40 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 -	std 9,8(8)
 -	xor 10,10,11
 -	std 10,16(8)
--	b .L19
--.L54:
++.L68:
++	ld 9,16(30)
++	stfd 1,0(9)
+ 	b .L19
+-.L35:
+-	rldicl 9,9,0,32
+-	slwi 10,10,3
+-	ld 11,0(8)
+-	ld 4,8(8)
+-	li 7,2
+-	mulli 6,9,-8
+-	addi 10,10,-65
+-	slwi 9,9,3
+-	sld 10,7,10
+-	sld 5,3,9
+-	li 7,-1
+-	addi 6,6,64
+-	addi 10,10,-1
+-	sld 7,7,9
+-	srad 3,3,6
+-	xor 6,5,11
+-	xor 9,3,4
+-	and 7,7,6
+-	and 9,10,9
+-	xor 10,7,11
+-	xor 9,9,4
+-	std 10,0(8)
+-	std 9,8(8)
++.L70:
++	sth 3,1(9)
++.L65:
++	stb 8,0(9)
+ 	b .L19
+-.L53:
 -	mulli 9,9,-4
 -	slwi 10,10,3
 -	ld 11,8(8)
@@ -527,273 +490,265 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
 -	and 9,10,9
 -	xor 9,9,11
 -	std 9,8(8)
--	b .L19
-+	b .L20
-+.L86:
++.L82:
 +	bl __stack_chk_fail
 +	nop
-+.L74:
-+	sth 3,1(9)
-+.L69:
++.L81:
++	srdi 6,4,32
++	sradi 7,4,24
++	sradi 8,4,16
++	sradi 10,4,8
++	stw 6,8(9)
++	stb 7,12(9)
++	stb 8,13(9)
++	stb 10,14(9)
++	b .L19
++.L72:
++	stw 3,1(9)
 +	stb 8,0(9)
-+	b .L20
-+.L85:
++	b .L19
++.L71:
++	stw 3,0(9)
++	b .L19
++.L69:
++	sth 3,0(9)
++	b .L19
++.L80:
 +	srdi 7,4,32
 +	sradi 8,4,24
 +	sradi 10,4,16
-+	sradi 4,4,8
 +	stw 7,8(9)
 +	stb 8,12(9)
 +	stb 10,13(9)
-+	stb 4,14(9)
-+	b .L20
-+.L76:
-+	stw 3,1(9)
-+	stb 8,0(9)
-+	b .L20
-+.L75:
-+	stw 3,0(9)
-+	b .L20
-+.L73:
-+	sth 3,0(9)
-+	b .L20
-+.L84:
++	b .L19
++.L79:
 +	srdi 8,4,32
 +	sradi 10,4,24
-+	sradi 4,4,16
 +	stw 8,8(9)
 +	stb 10,12(9)
-+	stb 4,13(9)
-+	b .L20
-+.L83:
-+	srdi 10,4,32
-+	sradi 4,4,24
-+	stw 10,8(9)
-+	stb 4,12(9)
-+	b .L20
-+.L82:
++	b .L19
++.L78:
 +	srdi 4,4,32
 +	stw 4,8(9)
-+	b .L20
-+.L81:
-+	srdi 10,4,48
-+	sradi 4,4,40
-+	sth 10,8(9)
-+	stb 4,10(9)
-+	b .L20
-+.L80:
++	b .L19
++.L77:
++	srdi 8,4,48
++	sradi 10,4,40
++	sth 8,8(9)
++	stb 10,10(9)
++	b .L19
++.L76:
 +	srdi 4,4,48
 +	sth 4,8(9)
-+	b .L20
-+.L79:
++	b .L19
++.L75:
 +	sradi 4,4,56
 +	stb 4,8(9)
-+	b .L20
-+.L78:
++	b .L19
++.L74:
 +	stw 3,3(9)
 +	stb 8,2(9)
 +	stb 7,1(9)
-+	stb 6,0(9)
-+	b .L20
-+.L77:
++	stb 10,0(9)
++	b .L19
++.L73:
 +	stw 3,2(9)
 +	stb 8,1(9)
 +	stb 7,0(9)
-+	b .L20
+ 	b .L19
  	.long 0
- 	.byte 0,0,0,1,128,2,0,0
+-	.byte 0,0,0,1,128,2,0,0
++	.byte 0,0,0,1,128,3,0,0
 +	.cfi_endproc
 +.LFE0:
  	.size	avcall_call,.-avcall_call
-+	.gnu_attribute 4, 9
  #if defined __linux__ || defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __DragonFly__
  	.section .note.GNU-stack,"",@progbits
- #endif
---- libffcall-2.2/vacall/vacall-powerpc64.c.old	2020-05-11 23:11:15.566571148 +0000
-+++ libffcall-2.2/vacall/vacall-powerpc64.c	2020-05-11 23:16:52.489693582 +0000
-@@ -140,111 +140,111 @@
-     if (list.flags & __VA_REGISTER_STRUCT_RETURN) {
+--- a/avcall/avcall-powerpc64.c
++++ b/avcall/avcall-powerpc64.c
+@@ -178,111 +178,111 @@ avcall_call(av_alist* list)
        /* In the ELFv2 ABI, gcc returns structs of size <= 16 in registers. */
-       if (list.rsize > 0 && list.rsize <= 16) {
+       if (l->rsize > 0 && l->rsize <= 16) {
+         void* raddr = l->raddr;
 -        #if 0 /* Unoptimized */
 +        #if 1 /* Unoptimized */
-         if (list.rsize == 1) {
-           iret =   (__vaword)((unsigned char *) list.raddr)[0];
+         if (l->rsize == 1) {
+           ((unsigned char *)raddr)[0] = (unsigned char)(iret);
          } else
-         if (list.rsize == 2) {
--          iret =  ((__vaword)((unsigned char *) list.raddr)[0])
--                | ((__vaword)((unsigned char *) list.raddr)[1] << 8);
-+          iret =  ((__vaword)((unsigned char *) list.raddr)[1])
-+                | ((__vaword)((unsigned char *) list.raddr)[0] << 8);
+         if (l->rsize == 2) {
+-          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
+-          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
++          ((unsigned char *)raddr)[1] = (unsigned char)(iret);
++          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>8);
          } else
-         if (list.rsize == 3) {
--          iret =  ((__vaword)((unsigned char *) list.raddr)[0])
-+          iret =  ((__vaword)((unsigned char *) list.raddr)[2])
-                 | ((__vaword)((unsigned char *) list.raddr)[1] << 8)
--                | ((__vaword)((unsigned char *) list.raddr)[2] << 16);
-+                | ((__vaword)((unsigned char *) list.raddr)[0] << 16);
+         if (l->rsize == 3) {
+-          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
++          ((unsigned char *)raddr)[2] = (unsigned char)(iret);
+           ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
+-          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
++          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>16);
          } else
-         if (list.rsize == 4) {
--          iret =  ((__vaword)((unsigned char *) list.raddr)[0])
--                | ((__vaword)((unsigned char *) list.raddr)[1] << 8)
--                | ((__vaword)((unsigned char *) list.raddr)[2] << 16)
--                | ((__vaword)((unsigned char *) list.raddr)[3] << 24);
-+          iret =  ((__vaword)((unsigned char *) list.raddr)[3])
-+                | ((__vaword)((unsigned char *) list.raddr)[2] << 8)
-+                | ((__vaword)((unsigned char *) list.raddr)[1] << 16)
-+                | ((__vaword)((unsigned char *) list.raddr)[0] << 24);
+         if (l->rsize == 4) {
+-          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
+-          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
+-          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
+-          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
++          ((unsigned char *)raddr)[3] = (unsigned char)(iret);
++          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>8);
++          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>16);
++          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>24);
          } else
-         if (list.rsize == 5) {
--          iret =  ((__vaword)((unsigned char *) list.raddr)[0])
--                | ((__vaword)((unsigned char *) list.raddr)[1] << 8)
-+          iret =  ((__vaword)((unsigned char *) list.raddr)[4])
-+                | ((__vaword)((unsigned char *) list.raddr)[3] << 8)
-                 | ((__vaword)((unsigned char *) list.raddr)[2] << 16)
--                | ((__vaword)((unsigned char *) list.raddr)[3] << 24)
--                | ((__vaword)((unsigned char *) list.raddr)[4] << 32);
-+                | ((__vaword)((unsigned char *) list.raddr)[1] << 24)
-+                | ((__vaword)((unsigned char *) list.raddr)[0] << 32);
+         if (l->rsize == 5) {
+-          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
+-          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
++          ((unsigned char *)raddr)[4] = (unsigned char)(iret);
++          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>8);
+           ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
+-          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
+-          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32);
++          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>24);
++          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>32);
          } else
-         if (list.rsize == 6) {
--          iret =  ((__vaword)((unsigned char *) list.raddr)[0])
--                | ((__vaword)((unsigned char *) list.raddr)[1] << 8)
--                | ((__vaword)((unsigned char *) list.raddr)[2] << 16)
--                | ((__vaword)((unsigned char *) list.raddr)[3] << 24)
--                | ((__vaword)((unsigned char *) list.raddr)[4] << 32)
--                | ((__vaword)((unsigned char *) list.raddr)[5] << 40);
-+          iret =  ((__vaword)((unsigned char *) list.raddr)[5])
-+                | ((__vaword)((unsigned char *) list.raddr)[4] << 8)
-+                | ((__vaword)((unsigned char *) list.raddr)[3] << 16)
-+                | ((__vaword)((unsigned char *) list.raddr)[2] << 24)
-+                | ((__vaword)((unsigned char *) list.raddr)[1] << 32)
-+                | ((__vaword)((unsigned char *) list.raddr)[0] << 40);
+         if (l->rsize == 6) {
+-          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
+-          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
+-          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
+-          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
+-          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32);
+-          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40);
++          ((unsigned char *)raddr)[5] = (unsigned char)(iret);
++          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>8);
++          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>16);
++          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>24);
++          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>32);
++          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>40);
          } else
-         if (list.rsize == 7) {
--          iret =  ((__vaword)((unsigned char *) list.raddr)[0])
--                | ((__vaword)((unsigned char *) list.raddr)[1] << 8)
--                | ((__vaword)((unsigned char *) list.raddr)[2] << 16)
-+          iret =  ((__vaword)((unsigned char *) list.raddr)[6])
-+                | ((__vaword)((unsigned char *) list.raddr)[5] << 8)
-+                | ((__vaword)((unsigned char *) list.raddr)[4] << 16)
-                 | ((__vaword)((unsigned char *) list.raddr)[3] << 24)
--                | ((__vaword)((unsigned char *) list.raddr)[4] << 32)
--                | ((__vaword)((unsigned char *) list.raddr)[5] << 40)
--                | ((__vaword)((unsigned char *) list.raddr)[6] << 48);
-+                | ((__vaword)((unsigned char *) list.raddr)[2] << 32)
-+                | ((__vaword)((unsigned char *) list.raddr)[1] << 40)
-+                | ((__vaword)((unsigned char *) list.raddr)[0] << 48);
+         if (l->rsize == 7) {
+-          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
+-          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
+-          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
++          ((unsigned char *)raddr)[6] = (unsigned char)(iret);
++          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>8);
++          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>16);
+           ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
+-          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32);
+-          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40);
+-          ((unsigned char *)raddr)[6] = (unsigned char)(iret>>48);
++          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>32);
++          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>40);
++          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>48);
          } else
-         if (list.rsize >= 8 && list.rsize <= 16) {
--          iret =  ((__vaword)((unsigned char *) list.raddr)[0])
--                | ((__vaword)((unsigned char *) list.raddr)[1] << 8)
--                | ((__vaword)((unsigned char *) list.raddr)[2] << 16)
--                | ((__vaword)((unsigned char *) list.raddr)[3] << 24)
--                | ((__vaword)((unsigned char *) list.raddr)[4] << 32)
--                | ((__vaword)((unsigned char *) list.raddr)[5] << 40)
--                | ((__vaword)((unsigned char *) list.raddr)[6] << 48)
--                | ((__vaword)((unsigned char *) list.raddr)[7] << 56);
-+          iret =  ((__vaword)((unsigned char *) list.raddr)[7])
-+                | ((__vaword)((unsigned char *) list.raddr)[6] << 8)
-+                | ((__vaword)((unsigned char *) list.raddr)[5] << 16)
-+                | ((__vaword)((unsigned char *) list.raddr)[4] << 24)
-+                | ((__vaword)((unsigned char *) list.raddr)[3] << 32)
-+                | ((__vaword)((unsigned char *) list.raddr)[2] << 40)
-+                | ((__vaword)((unsigned char *) list.raddr)[1] << 48)
-+                | ((__vaword)((unsigned char *) list.raddr)[0] << 56);
-           if (list.rsize == 8) {
+         if (l->rsize >= 8 && l->rsize <= 16) {
+-          ((unsigned char *)raddr)[0] = (unsigned char)(iret);
+-          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8);
+-          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16);
+-          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24);
+-          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32);
+-          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40);
+-          ((unsigned char *)raddr)[6] = (unsigned char)(iret>>48);
+-          ((unsigned char *)raddr)[7] = (unsigned char)(iret>>56);
++          ((unsigned char *)raddr)[7] = (unsigned char)(iret);
++          ((unsigned char *)raddr)[6] = (unsigned char)(iret>>8);
++          ((unsigned char *)raddr)[5] = (unsigned char)(iret>>16);
++          ((unsigned char *)raddr)[4] = (unsigned char)(iret>>24);
++          ((unsigned char *)raddr)[3] = (unsigned char)(iret>>32);
++          ((unsigned char *)raddr)[2] = (unsigned char)(iret>>40);
++          ((unsigned char *)raddr)[1] = (unsigned char)(iret>>48);
++          ((unsigned char *)raddr)[0] = (unsigned char)(iret>>56);
+           if (l->rsize == 8) {
            } else
-           if (list.rsize == 9) {
--            iret2 =   (__vaword)((unsigned char *) list.raddr)[8];
-+            iret2 =   (__vaword)((unsigned char *) list.raddr)[8] << 56;
+           if (l->rsize == 9) {
+-            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
++            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
            } else
-           if (list.rsize == 10) {
--            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8])
--                   | ((__vaword)((unsigned char *) list.raddr)[9] << 8);
-+            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8] << 56)
-+                   | ((__vaword)((unsigned char *) list.raddr)[9] << 48);
+           if (l->rsize == 10) {
+-            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
+-            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
++            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
++            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
            } else
-           if (list.rsize == 11) {
--            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8])
--                   | ((__vaword)((unsigned char *) list.raddr)[9] << 8)
--                   | ((__vaword)((unsigned char *) list.raddr)[10] << 16);
-+            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8] << 56)
-+                   | ((__vaword)((unsigned char *) list.raddr)[9] << 48)
-+                   | ((__vaword)((unsigned char *) list.raddr)[10] << 40);
+           if (l->rsize == 11) {
+-            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
+-            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
+-            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
++            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
++            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
++            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
            } else
-           if (list.rsize == 12) {
--            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8])
--                   | ((__vaword)((unsigned char *) list.raddr)[9] << 8)
--                   | ((__vaword)((unsigned char *) list.raddr)[10] << 16)
--                   | ((__vaword)((unsigned char *) list.raddr)[11] << 24);
-+            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8] << 56)
-+                   | ((__vaword)((unsigned char *) list.raddr)[9] << 48)
-+                   | ((__vaword)((unsigned char *) list.raddr)[10] << 40)
-+                   | ((__vaword)((unsigned char *) list.raddr)[11] << 32);
+           if (l->rsize == 12) {
+-            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
+-            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
+-            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
+-            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
++            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
++            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
++            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
++            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
            } else
-           if (list.rsize == 13) {
--            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8])
--                   | ((__vaword)((unsigned char *) list.raddr)[9] << 8)
--                   | ((__vaword)((unsigned char *) list.raddr)[10] << 16)
--                   | ((__vaword)((unsigned char *) list.raddr)[11] << 24)
--                   | ((__vaword)((unsigned char *) list.raddr)[12] << 32);
-+            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8] << 56)
-+                   | ((__vaword)((unsigned char *) list.raddr)[9] << 48)
-+                   | ((__vaword)((unsigned char *) list.raddr)[10] << 40)
-+                   | ((__vaword)((unsigned char *) list.raddr)[11] << 32)
-+                   | ((__vaword)((unsigned char *) list.raddr)[12] << 24);
+           if (l->rsize == 13) {
+-            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
+-            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
+-            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
+-            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
+-            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32);
++            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
++            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
++            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
++            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
++            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24);
            } else
-           if (list.rsize == 14) {
--            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8])
--                   | ((__vaword)((unsigned char *) list.raddr)[9] << 8)
--                   | ((__vaword)((unsigned char *) list.raddr)[10] << 16)
--                   | ((__vaword)((unsigned char *) list.raddr)[11] << 24)
--                   | ((__vaword)((unsigned char *) list.raddr)[12] << 32)
--                   | ((__vaword)((unsigned char *) list.raddr)[13] << 40);
-+            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8] << 56)
-+                   | ((__vaword)((unsigned char *) list.raddr)[9] << 48)
-+                   | ((__vaword)((unsigned char *) list.raddr)[10] << 40)
-+                   | ((__vaword)((unsigned char *) list.raddr)[11] << 32)
-+                   | ((__vaword)((unsigned char *) list.raddr)[12] << 24)
-+                   | ((__vaword)((unsigned char *) list.raddr)[13] << 16);
+           if (l->rsize == 14) {
+-            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
+-            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
+-            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
+-            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
+-            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32);
+-            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40);
++            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
++            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
++            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
++            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
++            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24);
++            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16);
            } else
-           if (list.rsize == 15) {
--            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8])
--                   | ((__vaword)((unsigned char *) list.raddr)[9] << 8)
--                   | ((__vaword)((unsigned char *) list.raddr)[10] << 16)
--                   | ((__vaword)((unsigned char *) list.raddr)[11] << 24)
--                   | ((__vaword)((unsigned char *) list.raddr)[12] << 32)
--                   | ((__vaword)((unsigned char *) list.raddr)[13] << 40)
--                   | ((__vaword)((unsigned char *) list.raddr)[14] << 48);
-+            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8] << 56)
-+                   | ((__vaword)((unsigned char *) list.raddr)[9] << 48)
-+                   | ((__vaword)((unsigned char *) list.raddr)[10] << 40)
-+                   | ((__vaword)((unsigned char *) list.raddr)[11] << 32)
-+                   | ((__vaword)((unsigned char *) list.raddr)[12] << 24)
-+                   | ((__vaword)((unsigned char *) list.raddr)[13] << 16)
-+                   | ((__vaword)((unsigned char *) list.raddr)[14] << 8);
+           if (l->rsize == 15) {
+-            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
+-            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
+-            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
+-            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
+-            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32);
+-            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40);
+-            ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>48);
++            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
++            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
++            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
++            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
++            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24);
++            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16);
++            ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>8);
            } else
-           if (list.rsize == 16) {
--            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8])
--                   | ((__vaword)((unsigned char *) list.raddr)[9] << 8)
--                   | ((__vaword)((unsigned char *) list.raddr)[10] << 16)
--                   | ((__vaword)((unsigned char *) list.raddr)[11] << 24)
--                   | ((__vaword)((unsigned char *) list.raddr)[12] << 32)
--                   | ((__vaword)((unsigned char *) list.raddr)[13] << 40)
--                   | ((__vaword)((unsigned char *) list.raddr)[14] << 48)
--                   | ((__vaword)((unsigned char *) list.raddr)[15] << 56);
-+            iret2 =  ((__vaword)((unsigned char *) list.raddr)[8] << 56)
-+                   | ((__vaword)((unsigned char *) list.raddr)[9] << 48)
-+                   | ((__vaword)((unsigned char *) list.raddr)[10] << 40)
-+                   | ((__vaword)((unsigned char *) list.raddr)[11] << 32)
-+                   | ((__vaword)((unsigned char *) list.raddr)[12] << 24)
-+                   | ((__vaword)((unsigned char *) list.raddr)[13] << 16)
-+                   | ((__vaword)((unsigned char *) list.raddr)[14] << 8)
-+                   | ((__vaword)((unsigned char *) list.raddr)[15]);
+           if (l->rsize == 16) {
+-            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2);
+-            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8);
+-            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16);
+-            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24);
+-            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32);
+-            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40);
+-            ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>48);
+-            ((unsigned char *)raddr)[8+7] = (unsigned char)(iret2>>56);
++            ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56);
++            ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48);
++            ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40);
++            ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32);
++            ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24);
++            ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16);
++            ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>8);
++            ((unsigned char *)raddr)[8+7] = (unsigned char)(iret2);
            }
          }
          #else /* Optimized: fewer conditional jumps, fewer memory accesses */
---- libffcall-2.2/vacall/vacall-powerpc64-elfv2-linux.S.old	2019-08-25 01:03:06.000000000 +0000
-+++ libffcall-2.2/vacall/vacall-powerpc64-elfv2-linux.S	2020-05-11 23:18:00.842212129 +0000
+--- a/vacall/vacall-powerpc64-elfv2-linux.S
++++ b/vacall/vacall-powerpc64-elfv2-linux.S
 @@ -1,9 +1,8 @@
  	.file	"vacall-powerpc64.c"
 -	.machine power4
@@ -870,7 +825,7 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
  	stfd 7,144(31)
  	stfd 8,152(31)
  	stfd 9,160(31)
-@@ -53,173 +62,232 @@
+@@ -53,173 +62,232 @@ vacall_receiver:
  	stfd 11,176(31)
  	stfd 12,184(31)
  	stfd 13,192(31)
@@ -1217,8 +1172,191 @@ Source: https://code.foxkit.us/adelie/packages/blob/master/user/libffcall/ppc64.
  #if defined __linux__ || defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __DragonFly__
  	.section .note.GNU-stack,"",@progbits
  #endif
---- libffcall-2.2/callback/vacall_r/vacall-powerpc64-elfv2-linux.S.old	2019-08-25 01:03:08.000000000 +0000
-+++ libffcall-2.2/callback/vacall_r/vacall-powerpc64-elfv2-linux.S	2020-05-11 23:26:54.443785997 +0000
+--- a/vacall/vacall-powerpc64.c
++++ b/vacall/vacall-powerpc64.c
+@@ -140,111 +140,111 @@ vacall_receiver (__vaword word1, __vaword word2, __vaword word3, __vaword word4,
+     if (list.flags & __VA_REGISTER_STRUCT_RETURN) {
+       /* In the ELFv2 ABI, gcc returns structs of size <= 16 in registers. */
+       if (list.rsize > 0 && list.rsize <= 16) {
+-        #if 0 /* Unoptimized */
++        #if 1 /* Unoptimized */
+         if (list.rsize == 1) {
+           iret =   (__varword)((unsigned char *) list.raddr)[0];
+         } else
+         if (list.rsize == 2) {
+-          iret =  ((__varword)((unsigned char *) list.raddr)[0])
+-                | ((__varword)((unsigned char *) list.raddr)[1] << 8);
++          iret =  ((__varword)((unsigned char *) list.raddr)[1])
++                | ((__varword)((unsigned char *) list.raddr)[0] << 8);
+         } else
+         if (list.rsize == 3) {
+-          iret =  ((__varword)((unsigned char *) list.raddr)[0])
++          iret =  ((__varword)((unsigned char *) list.raddr)[2])
+                 | ((__varword)((unsigned char *) list.raddr)[1] << 8)
+-                | ((__varword)((unsigned char *) list.raddr)[2] << 16);
++                | ((__varword)((unsigned char *) list.raddr)[0] << 16);
+         } else
+         if (list.rsize == 4) {
+-          iret =  ((__varword)((unsigned char *) list.raddr)[0])
+-                | ((__varword)((unsigned char *) list.raddr)[1] << 8)
+-                | ((__varword)((unsigned char *) list.raddr)[2] << 16)
+-                | ((__varword)((unsigned char *) list.raddr)[3] << 24);
++          iret =  ((__varword)((unsigned char *) list.raddr)[3])
++                | ((__varword)((unsigned char *) list.raddr)[2] << 8)
++                | ((__varword)((unsigned char *) list.raddr)[1] << 16)
++                | ((__varword)((unsigned char *) list.raddr)[0] << 24);
+         } else
+         if (list.rsize == 5) {
+-          iret =  ((__varword)((unsigned char *) list.raddr)[0])
+-                | ((__varword)((unsigned char *) list.raddr)[1] << 8)
++          iret =  ((__varword)((unsigned char *) list.raddr)[4])
++                | ((__varword)((unsigned char *) list.raddr)[3] << 8)
+                 | ((__varword)((unsigned char *) list.raddr)[2] << 16)
+-                | ((__varword)((unsigned char *) list.raddr)[3] << 24)
+-                | ((__varword)((unsigned char *) list.raddr)[4] << 32);
++                | ((__varword)((unsigned char *) list.raddr)[1] << 24)
++                | ((__varword)((unsigned char *) list.raddr)[0] << 32);
+         } else
+         if (list.rsize == 6) {
+-          iret =  ((__varword)((unsigned char *) list.raddr)[0])
+-                | ((__varword)((unsigned char *) list.raddr)[1] << 8)
+-                | ((__varword)((unsigned char *) list.raddr)[2] << 16)
+-                | ((__varword)((unsigned char *) list.raddr)[3] << 24)
+-                | ((__varword)((unsigned char *) list.raddr)[4] << 32)
+-                | ((__varword)((unsigned char *) list.raddr)[5] << 40);
++          iret =  ((__varword)((unsigned char *) list.raddr)[5])
++                | ((__varword)((unsigned char *) list.raddr)[4] << 8)
++                | ((__varword)((unsigned char *) list.raddr)[3] << 16)
++                | ((__varword)((unsigned char *) list.raddr)[2] << 24)
++                | ((__varword)((unsigned char *) list.raddr)[1] << 32)
++                | ((__varword)((unsigned char *) list.raddr)[0] << 40);
+         } else
+         if (list.rsize == 7) {
+-          iret =  ((__varword)((unsigned char *) list.raddr)[0])
+-                | ((__varword)((unsigned char *) list.raddr)[1] << 8)
+-                | ((__varword)((unsigned char *) list.raddr)[2] << 16)
++          iret =  ((__varword)((unsigned char *) list.raddr)[6])
++                | ((__varword)((unsigned char *) list.raddr)[5] << 8)
++                | ((__varword)((unsigned char *) list.raddr)[4] << 16)
+                 | ((__varword)((unsigned char *) list.raddr)[3] << 24)
+-                | ((__varword)((unsigned char *) list.raddr)[4] << 32)
+-                | ((__varword)((unsigned char *) list.raddr)[5] << 40)
+-                | ((__varword)((unsigned char *) list.raddr)[6] << 48);
++                | ((__varword)((unsigned char *) list.raddr)[2] << 32)
++                | ((__varword)((unsigned char *) list.raddr)[1] << 40)
++                | ((__varword)((unsigned char *) list.raddr)[0] << 48);
+         } else
+         if (list.rsize >= 8 && list.rsize <= 16) {
+-          iret =  ((__varword)((unsigned char *) list.raddr)[0])
+-                | ((__varword)((unsigned char *) list.raddr)[1] << 8)
+-                | ((__varword)((unsigned char *) list.raddr)[2] << 16)
+-                | ((__varword)((unsigned char *) list.raddr)[3] << 24)
+-                | ((__varword)((unsigned char *) list.raddr)[4] << 32)
+-                | ((__varword)((unsigned char *) list.raddr)[5] << 40)
+-                | ((__varword)((unsigned char *) list.raddr)[6] << 48)
+-                | ((__varword)((unsigned char *) list.raddr)[7] << 56);
++          iret =  ((__varword)((unsigned char *) list.raddr)[7])
++                | ((__varword)((unsigned char *) list.raddr)[6] << 8)
++                | ((__varword)((unsigned char *) list.raddr)[5] << 16)
++                | ((__varword)((unsigned char *) list.raddr)[4] << 24)
++                | ((__varword)((unsigned char *) list.raddr)[3] << 32)
++                | ((__varword)((unsigned char *) list.raddr)[2] << 40)
++                | ((__varword)((unsigned char *) list.raddr)[1] << 48)
++                | ((__varword)((unsigned char *) list.raddr)[0] << 56);
+           if (list.rsize == 8) {
+           } else
+           if (list.rsize == 9) {
+-            iret2 =   (__varword)((unsigned char *) list.raddr)[8];
++            iret2 =   (__varword)((unsigned char *) list.raddr)[8] << 56;
+           } else
+           if (list.rsize == 10) {
+-            iret2 =  ((__varword)((unsigned char *) list.raddr)[8])
+-                   | ((__varword)((unsigned char *) list.raddr)[9] << 8);
++            iret2 =  ((__varword)((unsigned char *) list.raddr)[8] << 56)
++                   | ((__varword)((unsigned char *) list.raddr)[9] << 48);
+           } else
+           if (list.rsize == 11) {
+-            iret2 =  ((__varword)((unsigned char *) list.raddr)[8])
+-                   | ((__varword)((unsigned char *) list.raddr)[9] << 8)
+-                   | ((__varword)((unsigned char *) list.raddr)[10] << 16);
++            iret2 =  ((__varword)((unsigned char *) list.raddr)[8] << 56)
++                   | ((__varword)((unsigned char *) list.raddr)[9] << 48)
++                   | ((__varword)((unsigned char *) list.raddr)[10] << 40);
+           } else
+           if (list.rsize == 12) {
+-            iret2 =  ((__varword)((unsigned char *) list.raddr)[8])
+-                   | ((__varword)((unsigned char *) list.raddr)[9] << 8)
+-                   | ((__varword)((unsigned char *) list.raddr)[10] << 16)
+-                   | ((__varword)((unsigned char *) list.raddr)[11] << 24);
++            iret2 =  ((__varword)((unsigned char *) list.raddr)[8] << 56)
++                   | ((__varword)((unsigned char *) list.raddr)[9] << 48)
++                   | ((__varword)((unsigned char *) list.raddr)[10] << 40)
++                   | ((__varword)((unsigned char *) list.raddr)[11] << 32);
+           } else
+           if (list.rsize == 13) {
+-            iret2 =  ((__varword)((unsigned char *) list.raddr)[8])
+-                   | ((__varword)((unsigned char *) list.raddr)[9] << 8)
+-                   | ((__varword)((unsigned char *) list.raddr)[10] << 16)
+-                   | ((__varword)((unsigned char *) list.raddr)[11] << 24)
+-                   | ((__varword)((unsigned char *) list.raddr)[12] << 32);
++            iret2 =  ((__varword)((unsigned char *) list.raddr)[8] << 56)
++                   | ((__varword)((unsigned char *) list.raddr)[9] << 48)
++                   | ((__varword)((unsigned char *) list.raddr)[10] << 40)
++                   | ((__varword)((unsigned char *) list.raddr)[11] << 32)
++                   | ((__varword)((unsigned char *) list.raddr)[12] << 24);
+           } else
+           if (list.rsize == 14) {
+-            iret2 =  ((__varword)((unsigned char *) list.raddr)[8])
+-                   | ((__varword)((unsigned char *) list.raddr)[9] << 8)
+-                   | ((__varword)((unsigned char *) list.raddr)[10] << 16)
+-                   | ((__varword)((unsigned char *) list.raddr)[11] << 24)
+-                   | ((__varword)((unsigned char *) list.raddr)[12] << 32)
+-                   | ((__varword)((unsigned char *) list.raddr)[13] << 40);
++            iret2 =  ((__varword)((unsigned char *) list.raddr)[8] << 56)
++                   | ((__varword)((unsigned char *) list.raddr)[9] << 48)
++                   | ((__varword)((unsigned char *) list.raddr)[10] << 40)
++                   | ((__varword)((unsigned char *) list.raddr)[11] << 32)
++                   | ((__varword)((unsigned char *) list.raddr)[12] << 24)
++                   | ((__varword)((unsigned char *) list.raddr)[13] << 16);
+           } else
+           if (list.rsize == 15) {
+-            iret2 =  ((__varword)((unsigned char *) list.raddr)[8])
+-                   | ((__varword)((unsigned char *) list.raddr)[9] << 8)
+-                   | ((__varword)((unsigned char *) list.raddr)[10] << 16)
+-                   | ((__varword)((unsigned char *) list.raddr)[11] << 24)
+-                   | ((__varword)((unsigned char *) list.raddr)[12] << 32)
+-                   | ((__varword)((unsigned char *) list.raddr)[13] << 40)
+-                   | ((__varword)((unsigned char *) list.raddr)[14] << 48);
++            iret2 =  ((__varword)((unsigned char *) list.raddr)[8] << 56)
++                   | ((__varword)((unsigned char *) list.raddr)[9] << 48)
++                   | ((__varword)((unsigned char *) list.raddr)[10] << 40)
++                   | ((__varword)((unsigned char *) list.raddr)[11] << 32)
++                   | ((__varword)((unsigned char *) list.raddr)[12] << 24)
++                   | ((__varword)((unsigned char *) list.raddr)[13] << 16)
++                   | ((__varword)((unsigned char *) list.raddr)[14] << 8);
+           } else
+           if (list.rsize == 16) {
+-            iret2 =  ((__varword)((unsigned char *) list.raddr)[8])
+-                   | ((__varword)((unsigned char *) list.raddr)[9] << 8)
+-                   | ((__varword)((unsigned char *) list.raddr)[10] << 16)
+-                   | ((__varword)((unsigned char *) list.raddr)[11] << 24)
+-                   | ((__varword)((unsigned char *) list.raddr)[12] << 32)
+-                   | ((__varword)((unsigned char *) list.raddr)[13] << 40)
+-                   | ((__varword)((unsigned char *) list.raddr)[14] << 48)
+-                   | ((__varword)((unsigned char *) list.raddr)[15] << 56);
++            iret2 =  ((__varword)((unsigned char *) list.raddr)[8] << 56)
++                   | ((__varword)((unsigned char *) list.raddr)[9] << 48)
++                   | ((__varword)((unsigned char *) list.raddr)[10] << 40)
++                   | ((__varword)((unsigned char *) list.raddr)[11] << 32)
++                   | ((__varword)((unsigned char *) list.raddr)[12] << 24)
++                   | ((__varword)((unsigned char *) list.raddr)[13] << 16)
++                   | ((__varword)((unsigned char *) list.raddr)[14] << 8)
++                   | ((__varword)((unsigned char *) list.raddr)[15]);
+           }
+         }
+         #else /* Optimized: fewer conditional jumps, fewer memory accesses */
+--- a/callback/vacall_r/vacall-powerpc64-elfv2-linux.S
++++ b/callback/vacall_r/vacall-powerpc64-elfv2-linux.S
 @@ -1,45 +1,56 @@
  	.file	"vacall-powerpc64.c"
 -	.machine power4
diff --git a/srcpkgs/ffcall/template b/srcpkgs/ffcall/template
index 60d5f398a6c6..95072122df57 100644
--- a/srcpkgs/ffcall/template
+++ b/srcpkgs/ffcall/template
@@ -1,6 +1,6 @@
 # Template file for 'ffcall'
 pkgname=ffcall
-version=2.2
+version=2.4
 revision=1
 wrksrc="libffcall-${version}"
 build_style=gnu-configure
@@ -9,7 +9,7 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnu.org/software/libffcall"
 distfiles="${GNU_SITE}/libffcall/libffcall-${version}.tar.gz"
-checksum=ebfa37f97b6c94fac24ecf3193f9fc829517cf81aee9ac2d191af993d73cb747
+checksum=8ef69921dbdc06bc5bb90513622637a7b83a71f31f5ba377be9d8fd8f57912c2
 
 # won't work with parallel_build so just turn it off (thanks to JuanRP for the Hint)
 disable_parallel_build=yes
@@ -41,6 +41,7 @@ do_install() {
 }
 
 ffcall-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 0169cb11f42cc1957e8f012c62777877f2ca984a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Nov 2021 21:51:41 +0100
Subject: [PATCH 2902/4088] electron13: update to 13.6.1.

---
 .../files/patches/chromium-python3.10.patch   |  19 +
 ...bFrameMain-mojo-pipe-not-reset-30630.patch |  25 -
 ...-origin-navigation-disposing-WebFram.patch | 442 ------------------
 ...lectron-exclude-content-test-patches.patch |   2 +-
 srcpkgs/electron13/template                   |  10 +-
 5 files changed, 25 insertions(+), 473 deletions(-)
 create mode 100644 srcpkgs/electron13/files/patches/chromium-python3.10.patch
 delete mode 100644 srcpkgs/electron13/files/patches/electron-0001-Revert-fix-WebFrameMain-mojo-pipe-not-reset-30630.patch
 delete mode 100644 srcpkgs/electron13/files/patches/electron-0002-Revert-fix-cross-origin-navigation-disposing-WebFram.patch

diff --git a/srcpkgs/electron13/files/patches/chromium-python3.10.patch b/srcpkgs/electron13/files/patches/chromium-python3.10.patch
new file mode 100644
index 000000000000..2661de968217
--- /dev/null
+++ b/srcpkgs/electron13/files/patches/chromium-python3.10.patch
@@ -0,0 +1,19 @@
+--- a/third_party/electron_node/configure	2021-02-22 19:33:12.000000000 +0100
++++ -	2021-11-11 22:27:24.897070513 +0100
+@@ -5,6 +5,7 @@
+ # as is the fact that the ] goes on a new line.
+ _=[ 'exec' '/bin/sh' '-c' '''
+ test ${FORCE_PYTHON2} && exec python2 "$0" "$@"  # workaround for gclient
++command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
+ command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
+ command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
+ command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
+@@ -21,7 +22,7 @@
+ from distutils.spawn import find_executable
+ 
+ print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
+-acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
++acceptable_pythons = ((3,10), (3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
+ if sys.version_info[:2] in acceptable_pythons:
+   import configure
+ else:
diff --git a/srcpkgs/electron13/files/patches/electron-0001-Revert-fix-WebFrameMain-mojo-pipe-not-reset-30630.patch b/srcpkgs/electron13/files/patches/electron-0001-Revert-fix-WebFrameMain-mojo-pipe-not-reset-30630.patch
deleted file mode 100644
index 4d2061604801..000000000000
--- a/srcpkgs/electron13/files/patches/electron-0001-Revert-fix-WebFrameMain-mojo-pipe-not-reset-30630.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2eed61fc21cb71082afd894c3bcd482b9ed78c0f Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 30 Aug 2021 23:02:20 +0200
-Subject: [PATCH 1/2] Revert "fix: WebFrameMain mojo pipe not reset (#30630)"
-
-This reverts commit 7fb719f261e14a857ea4dbc6cfa8ab697670427d.
----
- shell/browser/api/electron_api_web_frame_main.cc | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
-index 780a976..185cdc4 100644
---- a/shell/browser/api/electron_api_web_frame_main.cc
-+++ b/shell/browser/api/electron_api_web_frame_main.cc
-@@ -80,7 +80,6 @@ void WebFrameMain::UpdateRenderFrameHost(content::RenderFrameHost* rfh) {
-   // Should only be called when swapping frames.
-   DCHECK(render_frame_);
-   render_frame_ = rfh;
--  renderer_api_.reset();
- }
- 
- bool WebFrameMain::CheckRenderFrame() const {
--- 
-2.33.0
-
diff --git a/srcpkgs/electron13/files/patches/electron-0002-Revert-fix-cross-origin-navigation-disposing-WebFram.patch b/srcpkgs/electron13/files/patches/electron-0002-Revert-fix-cross-origin-navigation-disposing-WebFram.patch
deleted file mode 100644
index c8c2ddbdf3a0..000000000000
--- a/srcpkgs/electron13/files/patches/electron-0002-Revert-fix-cross-origin-navigation-disposing-WebFram.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-From d4f351228c8215eea316e74fca0a2d02cd7c19dc Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 30 Aug 2021 23:02:49 +0200
-Subject: [PATCH 2/2] Revert "fix: cross-origin navigation disposing
- WebFrameMain instances (#30598)"
-
-This reverts commit 18de6be607dce5126f18216eb972061be86e3db0.
----
- .../browser/api/electron_api_web_contents.cc  | 51 ++--------
- shell/browser/api/electron_api_web_contents.h |  5 +-
- .../api/electron_api_web_frame_main.cc        | 93 ++++++++++---------
- .../browser/api/electron_api_web_frame_main.h | 38 +++-----
- spec-main/api-web-frame-main-spec.ts          | 63 ++++++-------
- 5 files changed, 98 insertions(+), 152 deletions(-)
-
-diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
-index e2fc303..6211b08 100644
---- a/shell/browser/api/electron_api_web_contents.cc
-+++ b/shell/browser/api/electron_api_web_contents.cc
-@@ -1386,9 +1386,7 @@ void WebContents::HandleNewRenderFrame(
-   if (rwh_impl)
-     rwh_impl->disable_hidden_ = !background_throttling_;
- 
--  auto* web_frame = WebFrameMain::FromRenderFrameHost(render_frame_host);
--  if (web_frame)
--    web_frame->Connect();
-+  WebFrameMain::RenderFrameCreated(render_frame_host);
- }
- 
- void WebContents::RenderFrameCreated(
-@@ -1396,46 +1394,6 @@ void WebContents::RenderFrameCreated(
-   HandleNewRenderFrame(render_frame_host);
- }
- 
--void WebContents::RenderFrameDeleted(
--    content::RenderFrameHost* render_frame_host) {
--  // A RenderFrameHost can be deleted when:
--  // - A WebContents is removed and its containing frames are disposed.
--  // - An <iframe> is removed from the DOM.
--  // - Cross-origin navigation creates a new RFH in a separate process which
--  //   is swapped by content::RenderFrameHostManager.
--  //
--  // WebFrameMain::FromRenderFrameHost(rfh) will use the RFH's FrameTreeNode ID
--  // to find an existing instance of WebFrameMain. During a cross-origin
--  // navigation, the deleted RFH will be the old host which was swapped out. In
--  // this special case, we need to also ensure that WebFrameMain's internal RFH
--  // matches before marking it as disposed.
--  auto* web_frame = WebFrameMain::FromRenderFrameHost(render_frame_host);
--  if (web_frame && web_frame->render_frame_host() == render_frame_host)
--    web_frame->MarkRenderFrameDisposed();
--}
--
--void WebContents::RenderFrameHostChanged(content::RenderFrameHost* old_host,
--                                         content::RenderFrameHost* new_host) {
--  // During cross-origin navigation, a FrameTreeNode will swap out its RFH.
--  // If an instance of WebFrameMain exists, it will need to have its RFH
--  // swapped as well.
--  //
--  // |old_host| can be a nullptr in so we use |new_host| for looking up the
--  // WebFrameMain instance.
--  auto* web_frame =
--      WebFrameMain::FromFrameTreeNodeId(new_host->GetFrameTreeNodeId());
--  if (web_frame) {
--    CHECK_EQ(web_frame->render_frame_host(), old_host);
--    web_frame->UpdateRenderFrameHost(new_host);
--  }
--}
--
--void WebContents::FrameDeleted(int frame_tree_node_id) {
--  auto* web_frame = WebFrameMain::FromFrameTreeNodeId(frame_tree_node_id);
--  if (web_frame)
--    web_frame->Destroyed();
--}
--
- void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
-   // This event is necessary for tracking any states with respect to
-   // intermediate render view hosts aka speculative render view hosts. Currently
-@@ -1677,6 +1635,13 @@ void WebContents::UpdateDraggableRegions(
-     observer.OnDraggableRegionsUpdated(regions);
- }
- 
-+void WebContents::RenderFrameDeleted(
-+    content::RenderFrameHost* render_frame_host) {
-+  // A WebFrameMain can outlive its RenderFrameHost so we need to mark it as
-+  // disposed to prevent access to it.
-+  WebFrameMain::RenderFrameDeleted(render_frame_host);
-+}
-+
- void WebContents::DidStartNavigation(
-     content::NavigationHandle* navigation_handle) {
-   EmitNavigationEvent("did-start-navigation", navigation_handle);
-diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
-index 3ed91c9..3f87f8b 100644
---- a/shell/browser/api/electron_api_web_contents.h
-+++ b/shell/browser/api/electron_api_web_contents.h
-@@ -551,12 +551,9 @@ class WebContents : public gin::Wrappable<WebContents>,
-   void BeforeUnloadFired(bool proceed,
-                          const base::TimeTicks& proceed_time) override;
-   void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
--  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
--  void RenderFrameHostChanged(content::RenderFrameHost* old_host,
--                              content::RenderFrameHost* new_host) override;
--  void FrameDeleted(int frame_tree_node_id) override;
-   void RenderViewDeleted(content::RenderViewHost*) override;
-   void RenderProcessGone(base::TerminationStatus status) override;
-+  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
-   void DOMContentLoaded(content::RenderFrameHost* render_frame_host) override;
-   void DidFinishLoad(content::RenderFrameHost* render_frame_host,
-                      const GURL& validated_url) override;
-diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
-index 185cdc4..9ef45ea 100644
---- a/shell/browser/api/electron_api_web_frame_main.cc
-+++ b/shell/browser/api/electron_api_web_frame_main.cc
-@@ -9,8 +9,8 @@
- #include <utility>
- #include <vector>
- 
-+#include "base/lazy_instance.h"
- #include "base/logging.h"
--#include "base/no_destructor.h"
- #include "content/browser/renderer_host/frame_tree_node.h"  // nogncheck
- #include "content/public/browser/render_frame_host.h"
- #include "electron/shell/common/api/api.mojom.h"
-@@ -34,54 +34,36 @@ namespace electron {
- 
- namespace api {
- 
--typedef std::unordered_map<int, WebFrameMain*> WebFrameMainIdMap;
-+typedef std::unordered_map<content::RenderFrameHost*, WebFrameMain*>
-+    RenderFrameMap;
-+base::LazyInstance<RenderFrameMap>::DestructorAtExit g_render_frame_map =
-+    LAZY_INSTANCE_INITIALIZER;
- 
--WebFrameMainIdMap& GetWebFrameMainMap() {
--  static base::NoDestructor<WebFrameMainIdMap> instance;
--  return *instance;
--}
--
--// static
--WebFrameMain* WebFrameMain::FromFrameTreeNodeId(int frame_tree_node_id) {
--  WebFrameMainIdMap& frame_map = GetWebFrameMainMap();
--  auto iter = frame_map.find(frame_tree_node_id);
-+WebFrameMain* FromRenderFrameHost(content::RenderFrameHost* rfh) {
-+  auto frame_map = g_render_frame_map.Get();
-+  auto iter = frame_map.find(rfh);
-   auto* web_frame = iter == frame_map.end() ? nullptr : iter->second;
-   return web_frame;
- }
- 
--// static
--WebFrameMain* WebFrameMain::FromRenderFrameHost(content::RenderFrameHost* rfh) {
--  return rfh ? FromFrameTreeNodeId(rfh->GetFrameTreeNodeId()) : nullptr;
--}
--
- gin::WrapperInfo WebFrameMain::kWrapperInfo = {gin::kEmbedderNativeGin};
- 
--WebFrameMain::WebFrameMain(content::RenderFrameHost* rfh)
--    : frame_tree_node_id_(rfh->GetFrameTreeNodeId()), render_frame_(rfh) {
--  GetWebFrameMainMap().emplace(frame_tree_node_id_, this);
-+WebFrameMain::WebFrameMain(content::RenderFrameHost* rfh) : render_frame_(rfh) {
-+  g_render_frame_map.Get().emplace(rfh, this);
- }
- 
- WebFrameMain::~WebFrameMain() {
--  Destroyed();
--}
--
--void WebFrameMain::Destroyed() {
-   MarkRenderFrameDisposed();
--  GetWebFrameMainMap().erase(frame_tree_node_id_);
--  Unpin();
- }
- 
- void WebFrameMain::MarkRenderFrameDisposed() {
--  render_frame_ = nullptr;
-+  if (render_frame_disposed_)
-+    return;
-+  Unpin();
-+  g_render_frame_map.Get().erase(render_frame_);
-   render_frame_disposed_ = true;
- }
- 
--void WebFrameMain::UpdateRenderFrameHost(content::RenderFrameHost* rfh) {
--  // Should only be called when swapping frames.
--  DCHECK(render_frame_);
--  render_frame_ = rfh;
--}
--
- bool WebFrameMain::CheckRenderFrame() const {
-   if (render_frame_disposed_) {
-     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-@@ -209,7 +191,9 @@ void WebFrameMain::PostMessage(v8::Isolate* isolate,
- }
- 
- int WebFrameMain::FrameTreeNodeID() const {
--  return frame_tree_node_id_;
-+  if (!CheckRenderFrame())
-+    return -1;
-+  return render_frame_->GetFrameTreeNodeId();
- }
- 
- std::string WebFrameMain::Name() const {
-@@ -281,13 +265,6 @@ std::vector<content::RenderFrameHost*> WebFrameMain::FramesInSubtree() const {
-   return frame_hosts;
- }
- 
--void WebFrameMain::Connect() {
--  if (pending_receiver_) {
--    render_frame_->GetRemoteInterfaces()->GetInterface(
--        std::move(pending_receiver_));
--  }
--}
--
- // static
- gin::Handle<WebFrameMain> WebFrameMain::New(v8::Isolate* isolate) {
-   return gin::Handle<WebFrameMain>();
-@@ -310,6 +287,35 @@ gin::Handle<WebFrameMain> WebFrameMain::From(v8::Isolate* isolate,
-   return handle;
- }
- 
-+// static
-+gin::Handle<WebFrameMain> WebFrameMain::FromID(v8::Isolate* isolate,
-+                                               int render_process_id,
-+                                               int render_frame_id) {
-+  auto* rfh =
-+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-+  return From(isolate, rfh);
-+}
-+
-+// static
-+void WebFrameMain::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  auto* web_frame = FromRenderFrameHost(rfh);
-+  if (web_frame)
-+    web_frame->MarkRenderFrameDisposed();
-+}
-+
-+void WebFrameMain::RenderFrameCreated(content::RenderFrameHost* rfh) {
-+  auto* web_frame = FromRenderFrameHost(rfh);
-+  if (web_frame)
-+    web_frame->Connect();
-+}
-+
-+void WebFrameMain::Connect() {
-+  if (pending_receiver_) {
-+    render_frame_->GetRemoteInterfaces()->GetInterface(
-+        std::move(pending_receiver_));
-+  }
-+}
-+
- // static
- v8::Local<v8::ObjectTemplate> WebFrameMain::FillObjectTemplate(
-     v8::Isolate* isolate,
-@@ -352,10 +358,9 @@ v8::Local<v8::Value> FromID(gin_helper::ErrorThrower thrower,
-     return v8::Null(thrower.isolate());
-   }
- 
--  auto* rfh =
--      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
--
--  return WebFrameMain::From(thrower.isolate(), rfh).ToV8();
-+  return WebFrameMain::FromID(thrower.isolate(), render_process_id,
-+                              render_frame_id)
-+      .ToV8();
- }
- 
- void Initialize(v8::Local<v8::Object> exports,
-diff --git a/shell/browser/api/electron_api_web_frame_main.h b/shell/browser/api/electron_api_web_frame_main.h
-index 188f9c1..4d0dc98 100644
---- a/shell/browser/api/electron_api_web_frame_main.h
-+++ b/shell/browser/api/electron_api_web_frame_main.h
-@@ -34,8 +34,6 @@ namespace electron {
- 
- namespace api {
- 
--class WebContents;
--
- // Bindings for accessing frames from the main process.
- class WebFrameMain : public gin::Wrappable<WebFrameMain>,
-                      public gin_helper::Pinnable<WebFrameMain>,
-@@ -44,12 +42,23 @@ class WebFrameMain : public gin::Wrappable<WebFrameMain>,
-   // Create a new WebFrameMain and return the V8 wrapper of it.
-   static gin::Handle<WebFrameMain> New(v8::Isolate* isolate);
- 
-+  static gin::Handle<WebFrameMain> FromID(v8::Isolate* isolate,
-+                                          int render_process_id,
-+                                          int render_frame_id);
-   static gin::Handle<WebFrameMain> From(
-       v8::Isolate* isolate,
-       content::RenderFrameHost* render_frame_host);
--  static WebFrameMain* FromFrameTreeNodeId(int frame_tree_node_id);
--  static WebFrameMain* FromRenderFrameHost(
--      content::RenderFrameHost* render_frame_host);
-+
-+  // Called to mark any RenderFrameHost as disposed by any WebFrameMain that
-+  // may be holding a weak reference.
-+  static void RenderFrameDeleted(content::RenderFrameHost* rfh);
-+  static void RenderFrameCreated(content::RenderFrameHost* rfh);
-+
-+  // Mark RenderFrameHost as disposed and to no longer access it. This can
-+  // occur upon frame navigation.
-+  void MarkRenderFrameDisposed();
-+
-+  const mojo::Remote<mojom::ElectronRenderer>& GetRendererApi();
- 
-   // gin::Wrappable
-   static gin::WrapperInfo kWrapperInfo;
-@@ -58,28 +67,11 @@ class WebFrameMain : public gin::Wrappable<WebFrameMain>,
-       v8::Local<v8::ObjectTemplate>);
-   const char* GetTypeName() override;
- 
--  content::RenderFrameHost* render_frame_host() const { return render_frame_; }
--
-  protected:
-   explicit WebFrameMain(content::RenderFrameHost* render_frame);
-   ~WebFrameMain() override;
- 
-  private:
--  friend class WebContents;
--
--  // Called when FrameTreeNode is deleted.
--  void Destroyed();
--
--  // Mark RenderFrameHost as disposed and to no longer access it. This can
--  // happen when the WebFrameMain v8 handle is GC'd or when a FrameTreeNode
--  // is removed.
--  void MarkRenderFrameDisposed();
--
--  // Swap out the internal RFH when cross-origin navigation occurs.
--  void UpdateRenderFrameHost(content::RenderFrameHost* rfh);
--
--  const mojo::Remote<mojom::ElectronRenderer>& GetRendererApi();
--
-   // WebFrameMain can outlive its RenderFrameHost pointer so we need to check
-   // whether its been disposed of prior to accessing it.
-   bool CheckRenderFrame() const;
-@@ -114,8 +106,6 @@ class WebFrameMain : public gin::Wrappable<WebFrameMain>,
-   mojo::Remote<mojom::ElectronRenderer> renderer_api_;
-   mojo::PendingReceiver<mojom::ElectronRenderer> pending_receiver_;
- 
--  int frame_tree_node_id_;
--
-   content::RenderFrameHost* render_frame_ = nullptr;
- 
-   // Whether the RenderFrameHost has been removed and that it should no longer
-diff --git a/spec-main/api-web-frame-main-spec.ts b/spec-main/api-web-frame-main-spec.ts
-index 255fcaf..fa178f3 100644
---- a/spec-main/api-web-frame-main-spec.ts
-+++ b/spec-main/api-web-frame-main-spec.ts
-@@ -13,24 +13,6 @@ describe('webFrameMain module', () => {
- 
-   const fileUrl = (filename: string) => url.pathToFileURL(path.join(subframesPath, filename)).href;
- 
--  type Server = { server: http.Server, url: string }
--
--  /** Creates an HTTP server whose handler embeds the given iframe src. */
--  const createServer = () => new Promise<Server>(resolve => {
--    const server = http.createServer((req, res) => {
--      const params = new URLSearchParams(url.parse(req.url || '').search || '');
--      if (params.has('frameSrc')) {
--        res.end(`<iframe src="${params.get('frameSrc')}"></iframe>`);
--      } else {
--        res.end('');
--      }
--    });
--    server.listen(0, '127.0.0.1', () => {
--      const url = `http://127.0.0.1:${(server.address() as AddressInfo).port}/`;
--      resolve({ server, url });
--    });
--  });
--
-   afterEach(closeAllWindows);
- 
-   describe('WebFrame traversal APIs', () => {
-@@ -87,6 +69,24 @@ describe('webFrameMain module', () => {
-     });
- 
-     describe('cross-origin', () => {
-+      type Server = { server: http.Server, url: string }
-+
-+      /** Creates an HTTP server whose handler embeds the given iframe src. */
-+      const createServer = () => new Promise<Server>(resolve => {
-+        const server = http.createServer((req, res) => {
-+          const params = new URLSearchParams(url.parse(req.url || '').search || '');
-+          if (params.has('frameSrc')) {
-+            res.end(`<iframe src="${params.get('frameSrc')}"></iframe>`);
-+          } else {
-+            res.end('');
-+          }
-+        });
-+        server.listen(0, '127.0.0.1', () => {
-+          const url = `http://127.0.0.1:${(server.address() as AddressInfo).port}/`;
-+          resolve({ server, url });
-+        });
-+      });
-+
-       let serverA = null as unknown as Server;
-       let serverB = null as unknown as Server;
- 
-@@ -179,32 +179,21 @@ describe('webFrameMain module', () => {
-     });
-   });
- 
--  describe('RenderFrame lifespan', () => {
-+  describe('disposed WebFrames', () => {
-     let w: BrowserWindow;
-+    let webFrame: WebFrameMain;
- 
--    beforeEach(async () => {
-+    before(async () => {
-       w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
--    });
--
--    it('throws upon accessing properties when disposed', async () => {
-       await w.loadFile(path.join(subframesPath, 'frame-with-frame-container.html'));
--      const { mainFrame } = w.webContents;
-+      webFrame = w.webContents.mainFrame;
-       w.destroy();
-       // Wait for WebContents, and thus RenderFrameHost, to be destroyed.
-       await new Promise(resolve => setTimeout(resolve, 0));
--      expect(() => mainFrame.url).to.throw();
--    });
--
--    it('persists through cross-origin navigation', async () => {
--      const server = await createServer();
--      // 'localhost' is treated as a separate origin.
--      const crossOriginUrl = server.url.replace('127.0.0.1', 'localhost');
--      await w.loadURL(server.url);
--      const { mainFrame } = w.webContents;
--      expect(mainFrame.url).to.equal(server.url);
--      await w.loadURL(crossOriginUrl);
--      expect(w.webContents.mainFrame).to.equal(mainFrame);
--      expect(mainFrame.url).to.equal(crossOriginUrl);
-+    });
-+
-+    it('throws upon accessing properties', () => {
-+      expect(() => webFrame.url).to.throw();
-     });
-   });
- 
--- 
-2.33.0
-
diff --git a/srcpkgs/electron13/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron13/files/patches/electron-exclude-content-test-patches.patch
index 456223644278..066e59453f9c 100644
--- a/srcpkgs/electron13/files/patches/electron-exclude-content-test-patches.patch
+++ b/srcpkgs/electron13/files/patches/electron-exclude-content-test-patches.patch
@@ -4,7 +4,7 @@
    for patch_dir, repo in dirs.items():
      git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
        threeway=threeway is not None,
-+      exclude=['test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**'],
++      exclude=['third_party/blink/tools/blinkpy/presubmit/**', 'test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**'],
        committer_name="Electron Scripts", committer_email="scripts@electron")
  
  
diff --git a/srcpkgs/electron13/template b/srcpkgs/electron13/template
index d7fb0da9b2e7..8b1ce1e96eb8 100644
--- a/srcpkgs/electron13/template
+++ b/srcpkgs/electron13/template
@@ -1,9 +1,9 @@
 # Template file for 'electron13'
 pkgname=electron13
-version=13.3.0
+version=13.6.1
 revision=1
 _nodever=14.16.0
-_chromiumver=91.0.4472.69
+_chromiumver=91.0.4472.164
 archs="x86_64* i686* aarch64* ppc64le*"
 create_wrksrc=yes
 build_wrksrc="src"
@@ -23,7 +23,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
  minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
  re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
  $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel
- $(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel"
+ $(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel libxshmfence-devel"
 short_desc="Cross platform application framework based on web technologies"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
@@ -31,8 +31,8 @@ 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="1707f46439407ed0500e44d61c5171ce00f225d1478349472a0e45920d6a75a1
- 1f6843c636f4adee6b06c301193810cce103ee3e4582d4cbc31c915efc3d0c7b
+checksum="288b4d437982701117d3d8ed9324be4df8d82467e171e502af8f382bd5305e70
+ 84e56fa2ad96d910cab429c513eeaca7bfa94096fef057bd024be826ce8426bd
  bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a"
 
 case "$XBPS_TARGET_MACHINE" in

From 1d6f5a942e984d699553e4bcf398ebccc102b87e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Oct 2021 17:00:05 +0300
Subject: [PATCH 2903/4088] clipgrab: update to 3.9.7.

---
 srcpkgs/clipgrab/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index b234229ac805..2de5f24da9a5 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -1,6 +1,6 @@
 # Template file for 'clipgrab'
 pkgname=clipgrab
-version=3.9.6
+version=3.9.7
 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=d6b42ed8687d3ca49b0b4b6e4312f0161cf2dbcd33e286e96be797bc30730d6d
+checksum=f47f2b68977a332c8520263c59465018b278b5e28f2548907ea6eed47580548c
 
 do_install() {
 	vbin clipgrab

From b394d1830a0bdede9ba9a0f4e0c2475565951a92 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 11:49:26 +0200
Subject: [PATCH 2904/4088] notcurses: update to 2.4.9.

---
 common/shlibs              | 6 +++---
 srcpkgs/notcurses/template | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5f6154c610de..a0a3f4060abe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3946,9 +3946,9 @@ liburing.so.2 liburing-2.0_1
 libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
-libnotcurses.so.2 notcurses-2.0.4_1
-libnotcurses-core.so.2 notcurses-2.1.7_1
-libnotcurses++.so.2 notcurses-2.0.4_1
+libnotcurses.so.2 notcurses-2.4.9_1
+libnotcurses-core.so.2 notcurses-2.4.9_1
+libnotcurses++.so.2 notcurses-2.4.9_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 1a5fdae5d21d..c43cf269a988 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.4.8
+version=2.4.9
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=d06971005e4cf637cc90a694323c580791d1450a77b1700ae8deb453678d3243
+checksum=a2771ad1633e0158f8273fa8b30b5bce0f12e1205e863045f4ae186b6b52f537
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From b510bbbe03db015cb087ff9ca82ba5e72f4fb7a0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 11:49:35 +0200
Subject: [PATCH 2905/4088] growlight: update to 1.2.37.

---
 srcpkgs/growlight/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 40c5f2e94e36..923b5da9a1ce 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,7 +1,7 @@
 # Template file for 'growlight'
 pkgname=growlight
 version=1.2.37
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man pandoc)"

From 989e2178f8e3101e62287a335af49b907af487c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 14 Nov 2021 11:57:58 -0300
Subject: [PATCH 2906/4088] Manual.md: clarify default build target

---
 Manual.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Manual.md b/Manual.md
index b0afd6db1596..22d650b8c529 100644
--- a/Manual.md
+++ b/Manual.md
@@ -581,8 +581,9 @@ phase if `${build_style}` is set to `configure`, `gnu-configure` or
 `PREFIX=/usr DESTDIR=${DESTDIR}`.
 
 - `make_build_target` The build target. If `${build_style}` is set to `configure`, `gnu-configure`
-or `gnu-makefile`, this is the target passed to `${make_cmd}` in the build phase; when unset, it
-defaults to `all`. If `${build_style}` is `python3-pep517`, this is the path of the package
+or `gnu-makefile`, this is the target passed to `${make_cmd}` in the build phase;
+when unset the default target is used.
+If `${build_style}` is `python3-pep517`, this is the path of the package
 directory that should be built as a Python wheel; when unset, defaults to `.` (the current
 directory with respect to the build).
 

From be84f8674ff551c4e48e5cd8f7a3a082f281f673 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 14 Nov 2021 12:46:14 -0600
Subject: [PATCH 2907/4088] Amass: update to 3.15.0.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 082dac6aa9ce..71ee291c99e6 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.14.3
+version=3.15.0
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=ec9e05bd9aef561bbbfaf26ca1fb3b67ce598723e6309d486897ddc1c15eb123
+checksum=084ddbc8171e354abee3098458064fbcc9db059a25c4845dfc151803833df2dd
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From 9254922d83dcb82574dcce1406eefb1f19973bd7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 14 Nov 2021 12:48:49 -0600
Subject: [PATCH 2908/4088] python3-youtubesearch: update to 1.5.1.

---
 srcpkgs/python3-youtubesearch/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 54f0fc9a1db1..c284178a44a8 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.4.9
-revision=2
+version=1.5.1
+revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=51480372341f0c5706d30508fd63a7a009d91631eb495666040c3d0d8d65bd49
+checksum=485825a741ef5e7c327eaf65b27f7ffd7d10e218072a972012ff3301c2d7c488
 make_check=no # no tests defined
 
 post_install() {

From b18e214da3257cdf9003e7fd2cd0807f38306aae Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 14 Nov 2021 12:50:44 -0600
Subject: [PATCH 2909/4088] python3-ytmusicapi: update to 0.19.4.

---
 srcpkgs/python3-ytmusicapi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index d02f2cb65c31..e668fc15a94b 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=0.19.3
-revision=2
+version=0.19.4
+revision=1
 wrksrc="ytmusicapi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=87c0212c422a2c1b4b010a712c207c42619c65b8029405acf9af42ec9dff06c9
+checksum=e32ce1c2b6e5cb5aa14129b0724eb56e2246433b283340c2f8702b60df714e97
 
 post_install() {
 	vlicense LICENSE

From 73f10cca7c07b3aaf406ae10c1ff05677b0ba2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 14 Nov 2021 04:31:57 -0300
Subject: [PATCH 2910/4088] common/environment/build-style: remove nostrip from
 go.sh

Hasn't been necessary in Go for a long time [1], so we should take
advantage of that. For an example of the advantages, the 'micro' editor
went from 15MB to 11MB on disk.

[1] https://honnef.co/posts/2016/10/go-and-strip/
---
 common/environment/build-style/go.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 6bdf6529a8c9..afa9082c927a 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -16,7 +16,6 @@ else
 		export GCCGO="${XBPS_CROSS_TRIPLET}-gccgo"
 	fi
 fi
-nostrip=yes
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*) export GOARCH=arm64;;

From f0429302166d35b1b4817a6ea3b32535561be111 Mon Sep 17 00:00:00 2001
From: Firgen <filip.frgelec@disroot.org>
Date: Sat, 13 Nov 2021 19:56:08 +0100
Subject: [PATCH 2911/4088] dunst: update to 1.7.1.

---
 srcpkgs/dunst/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index 533c8e92bff0..1b80bf0d1987 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,6 +1,6 @@
 # Template file for 'dunst'
 pkgname=dunst
-version=1.6.1
+version=1.7.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
 homepage="https://dunst-project.org"
 changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
 distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=cc7d801575f75e92b18d46ee5d3df80aaf331c88b83ec6caabbecf8636310e13
+checksum=f61ed3280aee9ec2aac07c44cf3d147df8fe8a6d7b92b6e8ab04e546bff1adce
 
 build_options="wayland"
 build_options_default="wayland"

From 2cdb49f50f2c3a276267290f556c00ba93491716 Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 14 Nov 2021 15:15:02 +0100
Subject: [PATCH 2912/4088] clojure: update to 1.10.3.1029

---
 srcpkgs/clojure/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 153edf28d7a7..7fdaa6090b67 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.967
+version=1.10.3.1029
 revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=bba6952e164cd3d449794e226145c1a1b1725cca5dd8a7446b35926ea7235702
+checksum=422986f259608c049fcff7147222c713b5563a9f0c6e74e0a0dae4a076478091
 
 do_install() {
 	vmkdir /usr/lib/clojure

From 58f61c551edfea87e9b311b2e3da2dce16114e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 14 Nov 2021 11:55:10 +0100
Subject: [PATCH 2913/4088] visidata: update to 2.6.1.

---
 srcpkgs/visidata/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index 008275215bf0..f3e5385c2b15 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,7 +1,7 @@
 # Template file for 'visidata'
 pkgname=visidata
-version=2.6
-revision=2
+version=2.6.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-dateutil"
@@ -12,4 +12,4 @@ license="GPL-3.0-only"
 homepage="https://visidata.org/"
 changelog="https://raw.githubusercontent.com/saulpw/visidata/stable/CHANGELOG.md"
 distfiles="https://github.com/saulpw/visidata/archive/v${version}.tar.gz"
-checksum=65a204b0453070e4c18fa7fcd5f4c029b24bc87f696c2bcbb9103c3de4d8d8f6
+checksum=a48da174b50fe671cba8f72e020f3f33227c93da275981b2ac253a0233af5cff

From 0ac137fe13a43ead89fc5fce691460c1b0055d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 14 Nov 2021 11:49:17 +0100
Subject: [PATCH 2914/4088] mpd: update to 0.23.4.

---
 srcpkgs/mpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1ee87bc617be..144dfdf9ec43 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.2
+version=0.23.4
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=74ec75689746baaeab7c65d70019f96f70b31b658cb25cfd2ebcca03f65acddf
+checksum=2f359d30dd980f762d2bc324d916e48b731e8a4d456d01d120c61ad657e4c754
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From aa8003ba63a4026c13ba038e807809c4ade16e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 14 Nov 2021 11:32:35 +0100
Subject: [PATCH 2915/4088] scrcpy: update to 1.20.

---
 srcpkgs/scrcpy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 2d1f17b47f29..1fe5ac7102c6 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,6 +1,6 @@
 # Template file for 'scrcpy'
 pkgname=scrcpy
-version=1.19
+version=1.20
 revision=1
 build_style=meson
 configure_args="-Dcompile_server=false
@@ -14,8 +14,8 @@ license="Apache-2.0"
 homepage="https://github.com/Genymobile/scrcpy"
 distfiles="${homepage}/archive/v${version}.tar.gz
  ${homepage}/releases/download/v${version}/scrcpy-server-v${version}"
-checksum="40ac2059618f18a0e6f9cd0e40d3bff240ade98664bd619422f875bff7e8c70e
- 876f9322182e6aac6a58db1334f4225855ef3a17eaebc80aab6601d9d1ecb867"
+checksum="0c667e7de043a67a740be99d3f236a7aa4107ff62c408e7c462f4fe291f045a7
+ b20aee4951f99b060c4a44000ba94de973f9604758ef62beb253b371aad3df34"
 skip_extraction="scrcpy-server-v${version}"
 
 post_install() {

From acc2179c3df8aa4c312cde900eb96b82b8b90d64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 14 Nov 2021 22:33:20 +0100
Subject: [PATCH 2916/4088] openbsd-netcat: update to 1.218.

---
 srcpkgs/openbsd-netcat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..1310b6469a8a 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.218
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="a28a5d39abaf481747b1e78b4b50e96d0cdab0ffef289cba156dc11941c64857
+ efe4a9107b03e1cd02fa055d8c76fdebadee18ded4f50ec53613835f249bd325"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc

From 666b6a9f0294dfdf2083a2e8922700722f821976 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 13:55:57 +0100
Subject: [PATCH 2917/4088] wlclock: fix checksum

---
 srcpkgs/wlclock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wlclock/template b/srcpkgs/wlclock/template
index 65eb3325ade0..1038d991dcf9 100644
--- a/srcpkgs/wlclock/template
+++ b/srcpkgs/wlclock/template
@@ -11,4 +11,4 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://git.sr.ht/~leon_plickat/wlclock/"
 distfiles="https://git.sr.ht/~leon_plickat/wlclock/archive/v${version}.tar.gz"
-checksum=cdbc32eb1f68614a09e430eaa24578e4d58475ed8988871fce20a669898a48db
+checksum=e2f218e70378342c344e7afa43c4361e3308936a7afaf54a0cad9970267a4ff4

From 7b004c81ebbe5fcb97b4701fd36d57e497b05385 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 12:16:20 +0200
Subject: [PATCH 2918/4088] xfce4-whiskermenu-plugin: update to 2.6.2.

---
 srcpkgs/xfce4-whiskermenu-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index f0cc74b0794c..65538a6057dd 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.6.1
+version=2.6.2
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=854e02701183d7ef4d2069785e53f9c312de0681f78807ef36b016506262ec72
+checksum=6d20e22c18593aca5adecaf0a7a4f33a6bda233bdd92d3ca7b51c37d0baaf76e

From b217e66b2ba1b04fcb7206dbba68b8b08568c369 Mon Sep 17 00:00:00 2001
From: Dominik Schulz <mail@dschulz.eu>
Date: Sat, 13 Nov 2021 23:10:15 +0100
Subject: [PATCH 2919/4088] gopass: update to 1.13.0

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
---
 srcpkgs/gopass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index d853a9be8cfd..9067fc59d98e 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,6 +1,6 @@
 # Template file for 'gopass'
 pkgname=gopass
-version=1.12.8
+version=1.13.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://www.gopass.pw/"
 changelog="https://raw.githubusercontent.com/gopasspw/gopass/master/CHANGELOG.md"
 distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz"
-checksum=67561ea06756933dfd088e9e51d53e650d00d98980825c4b3fcd149025bacb71
+checksum=785ef96a0519a0d91a524036dc982f8e6ee00e6841a7b4faf4c504368cff7d31
 
 post_install() {
 	vlicense LICENSE

From 79e0ec80f041c671755de2f497692037647df67a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 12 Nov 2021 02:12:35 +0100
Subject: [PATCH 2920/4088] xorg-server-xwayland: update to 21.1.3.

---
 srcpkgs/xorg-server-xwayland/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index 9ffec73279f2..a6a62e8acc84 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=21.1.2
+version=21.1.3
 revision=1
 wrksrc="xserver-xwayland-$version"
 build_style=meson
@@ -10,14 +10,14 @@ configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
 hostmakedepends="pkg-config wayland-devel"
 makedepends="nettle-devel libepoxy-devel font-util libXfont2-devel pixman-devel
  libxkbfile-devel dbus-devel wayland-devel wayland-protocols libtirpc-devel
- MesaLib-devel libxcb-devel"
+ MesaLib-devel libxcb-devel libxshmfence-devel"
 depends="xorg-server-common"
 short_desc="Nested X server that runs as a wayland client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=fe0f5ef3274962f66251b168b0d5e122ad9c1069fa704c64595ce36d388b2a38
+checksum=fe9636403a54f76a23b7d5ea41242b080fd5ef37c6bf04eb1f413e76070bb48c
 make_check=no # needs xtest repository
 
 post_install() {

From 8dc910da08847fd011ef71effa40b9e291f253cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:51 +0100
Subject: [PATCH 2921/4088] swtpm: update to 0.7.0.

---
 srcpkgs/swtpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index 5e2b170c32b6..dd12bc9e41fd 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,6 +1,6 @@
 # Template file for 'swtpm'
 pkgname=swtpm
-version=0.6.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-gnutls ac_cv_path_TCSD="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://github.com/stefanberger/swtpm"
 distfiles="https://github.com/stefanberger/swtpm/archive/refs/tags/v${version}.tar.gz"
-checksum=114905d6a51af89baac9ac279bf6534761e01adcf9c9bb298f1c09c7d4b2599d
+checksum=bed41871ad42ec852c450f5764be36b6c16456b943b912351eca9c29ce382976
 # check expects that root directory is setup fully for swtpm with e.g. tss user created
 make_check=no
 ignore_elf_files="/usr/share/swtpm/swtpm-localca"

From c18c879e29dcf8b7810d9767875115ed79a4a131 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 15 Nov 2021 00:26:15 +0100
Subject: [PATCH 2922/4088] protobuf-c: always build protoc

closes #34084
---
 srcpkgs/protobuf-c/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template
index f2fb4d113f9c..d67c244dc644 100644
--- a/srcpkgs/protobuf-c/template
+++ b/srcpkgs/protobuf-c/template
@@ -1,7 +1,7 @@
 # Template file for 'protobuf-c'
 pkgname=protobuf-c
 version=1.3.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="$(vopt_enable protoc)"
 hostmakedepends="pkg-config protobuf"
@@ -13,12 +13,9 @@ homepage="https://github.com/protobuf-c/protobuf-c"
 distfiles="${homepage}/releases/download/v${version}/protobuf-c-${version}.tar.gz"
 checksum=22956606ef50c60de1fabc13a78fbc50830a0447d780467d3c519f84ad527e78
 
-# buildprocess calls compiler while building, disable it on cross build
 build_options="protoc"
+build_options_default="protoc"
 desc_option_protoc="Build protoc-c compiler"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="protoc"
-fi
 
 post_install() {
 	vlicense LICENSE

From 7ffb64f3612540a36da418f7b4b890434a33e0a1 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 14 Oct 2021 21:05:10 +0200
Subject: [PATCH 2923/4088] build-helper/qmake.sh: always quote build flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
 common/build-helper/qmake.sh | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/common/build-helper/qmake.sh b/common/build-helper/qmake.sh
index d2a38703b300..bdda2de2310a 100644
--- a/common/build-helper/qmake.sh
+++ b/common/build-helper/qmake.sh
@@ -66,14 +66,8 @@ _EOF
 	# makes sense together with the qmake build-helper
 	# and not to interfere with e.g. the qmake build-style
 	#
-	# XXX: Intentionally quote {C,CXX,LD}FLAGS here but not in native.
-	# - Cross Build:
 	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
 	#   + hardening flags will be picked up from environment variables
-	# - Native Build:
-	#   + hardening flags will be picked up first (Makefile, qt.conf?)
-	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
-	# Maybe there're better workaround, I don't know.
         cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
 #!/bin/sh
 exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
@@ -89,11 +83,11 @@ exec /usr/lib/qt5/bin/qmake \
 	PREFIX=/usr \
 	QT_INSTALL_PREFIX=/usr \
 	LIB=/usr/lib \
-	QMAKE_CC=$CC QMAKE_CXX=$CXX \
-	QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
-	QMAKE_CFLAGS+="${CFLAGS}" \
-	QMAKE_CXXFLAGS+="${CXXFLAGS}" \
-	QMAKE_LFLAGS+="${LDFLAGS}" \
+	QMAKE_CC="$CC" QMAKE_CXX="$CXX" \
+	QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \
+	QMAKE_CFLAGS+="\${CFLAGS}" \
+	QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
+	QMAKE_LFLAGS+="\${LDFLAGS}" \
 	CONFIG+=no_qt_rpath
 _EOF
 fi

From be1ea3cfd3bf79f6a440e235fba9996b4244ef48 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 14 Oct 2021 21:02:25 +0200
Subject: [PATCH 2924/4088] gmic: update to 2.9.9

Close: #33545
---
 srcpkgs/gmic-krita    |  1 +
 srcpkgs/gmic/template | 47 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/gmic-krita

diff --git a/srcpkgs/gmic-krita b/srcpkgs/gmic-krita
new file mode 120000
index 000000000000..433883885ce6
--- /dev/null
+++ b/srcpkgs/gmic-krita
@@ -0,0 +1 @@
+gmic
\ No newline at end of file
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 6d6f4ec13ba2..8c1fa6962d8d 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.8.0
+version=2.9.9
 revision=1
+_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -13,20 +14,39 @@ short_desc="GREYC's Magic for Image Computing (image processing framework)"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="CECILL-2.1"
 homepage="http://gmic.eu/"
-distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz"
-checksum=d1ca5c726f7570af3a6f0bca27eeb66ef1e6a1b6a17bdaeaf0d59be40b9cd075
+distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
+ https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
+checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
+ eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
 disable_parallel_build="yes"
 
+post_extract() {
+	mv ../zart-${_zart_hash} zart
+}
+
 post_patch() {
-	vsed -i -e "s,-I[\$](USR),-I$XBPS_CROSS_BASE/usr,g" Makefile
-	# Fix library names for openexr-2.4.0
-	vsed -i Makefile -e "s;-lIlmImf -lHalf;-lIlmImf-2_4 -lHalf-2_4;"
+	vsed -i Makefile -e "s,-I[\$](USR),-I$XBPS_CROSS_BASE/usr,g"
+	vsed -i Makefile -e "s/-Ofast/-O2/g"
+	# uses gimptool-2.0 to determine PLUGINDIR which fails in cross builds
+	vsed -i Makefile -e "s,^PLUGINDIR = .*,PLUGINDIR = /usr/lib/gimp/2\.0/plug-ins,g"
+	vsed -i ../gmic-qt/gmic_qt.pro -e "s/-Ofast/-O2/g"
 	# Not supported on ppc but we already compile for baselines
 	case "$XBPS_TARGET_MACHINE" in
 		ppc*) vsed -i Makefile -e 's;-mtune=generic;;' ;;
 	esac
 }
 
+do_build() {
+	make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+		CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
+		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
+		cli lib libc
+
+	for _target in gimp krita gmic_qt zart; do
+		make $_target
+	done
+}
+
 post_install() {
 	vlicense ../COPYING
 }
@@ -38,18 +58,31 @@ gmic-gimp_package() {
 		vmove usr/lib/gimp
 	}
 }
+
+gmic-krita_package() {
+	short_desc+=" - Krita plugin"
+	depends="krita ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/gmic_krita_qt
+	}
+}
+
 gmic-zart_package() {
 	short_desc+=" - ZArt tool"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/zart
+		vmove usr/share/applications/zart.desktop
+		vmove usr/share/icons/hicolor/48x48/apps/zart.png
+		vmove usr/share/icons/hicolor/scalable/apps/zart.svg
 	}
 }
+
 gmic-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }

From 908e5b87a3195ffa6d6ec64671792ced61e684aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Nov 2021 08:43:49 +0700
Subject: [PATCH 2925/4088] djview: don't mess with CFLAGS on --enable-debug

---
 .../djview/patches/keep-debug-symbol.patch    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/djview/patches/keep-debug-symbol.patch

diff --git a/srcpkgs/djview/patches/keep-debug-symbol.patch b/srcpkgs/djview/patches/keep-debug-symbol.patch
new file mode 100644
index 000000000000..54f7f39d0fd8
--- /dev/null
+++ b/srcpkgs/djview/patches/keep-debug-symbol.patch
@@ -0,0 +1,28 @@
+Index: djview4-4.12/config/acinclude.m4
+===================================================================
+--- djview4-4.12.orig/config/acinclude.m4
++++ djview4-4.12/config/acinclude.m4
+@@ -73,23 +73,6 @@ AC_DEFUN([AC_CXX_OPTIMIZE],[
+         [ac_debug=$enableval],[ac_debug=no])
+    OPTS=
+    AC_SUBST(OPTS)
+-   saved_CXXFLAGS="$CXXFLAGS"
+-   saved_CFLAGS="$CFLAGS"
+-   CXXFLAGS=
+-   CFLAGS=
+-   for opt in $saved_CXXFLAGS ; do
+-     case $opt in
+-       -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;;
+-       -O*) ;;
+-       *) CXXFLAGS="$CXXFLAGS $opt" ;;
+-     esac
+-   done
+-   for opt in $saved_CFLAGS ; do
+-     case $opt in
+-       -O*|-g*) ;;
+-       *) CFLAGS="$CFLAGS $opt" ;;
+-     esac
+-   done
+    if test x$ac_debug = xno ; then
+      OPTS=-DNDEBUG
+      AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"])

From 3ad249006f1b6862f043e84384e624bb2a7d75d2 Mon Sep 17 00:00:00 2001
From: Neel <neel@chot.ai>
Date: Sun, 14 Nov 2021 20:23:12 +0000
Subject: [PATCH 2926/4088] flameshot: update to 0.10.2

---
 srcpkgs/flameshot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..365fd20e0033 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=951c8170b7be2f12e4446f6367e8fa176eb3489fe24c0cef8dfda0bd180e61f9

From 3c6d9ce7a96e87b23257c988642e2461eb2f24f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 15 Nov 2021 14:44:31 +0100
Subject: [PATCH 2927/4088] libcbor: update to 0.9.0.

---
 common/shlibs            | 2 +-
 srcpkgs/libcbor/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a0a3f4060abe..a7908585fbbd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3886,7 +3886,7 @@ libmpir.so.23 mpir-3.0.0_1
 libmpirxx.so.8 mpir-3.0.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
-libcbor.so.0.8 libcbor-0.8.0_1
+libcbor.so.0.9 libcbor-0.9.0_1
 libfido2.so.1 libfido2-1.6.0_2
 libjanet.so.1.18 janet-1.18.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
diff --git a/srcpkgs/libcbor/template b/srcpkgs/libcbor/template
index 24f884e6d130..82b413e6202d 100644
--- a/srcpkgs/libcbor/template
+++ b/srcpkgs/libcbor/template
@@ -1,6 +1,6 @@
 # Template file for 'libcbor'
 pkgname=libcbor
-version=0.8.0
+version=0.9.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/PJK/libcbor"
 distfiles="https://github.com/PJK/libcbor/archive/v${version}.tar.gz"
-checksum=618097166ea4a54499646998ccaa949a5816e6a665cf1d6df383690895217c8b
+checksum=da81e4f9333e0086d4e2745183c7052f04ecc4dbcffcf910029df24f103c15d1
 
 post_install() {
 	vlicense LICENSE.md

From 90898d8dd63e951d4f69ed25c0dde6ab2ddc9bd6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 15 Nov 2021 14:44:54 +0100
Subject: [PATCH 2928/4088] libfido2: rebuild for libcbor-0.9.0_1.

---
 srcpkgs/libfido2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 79bfde463235..5f568344233e 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,7 +1,7 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.9.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"

From 7cb9e95fed17110e903257e631343708246a9b3d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 15 Nov 2021 14:46:23 +0100
Subject: [PATCH 2929/4088] python3-pipenv: update to 2021.11.15.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 2d4535a61dc3..01863718c2fd 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2021.11.9
+version=2021.11.15
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/pypa/pipenv"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=7662399162bc887ee86e96d0baa6984236228af9c1fd6594be0b18910225579d
+checksum=616766b1e8dfc24b2e7c6dfbbc8276b7d7ba07e778e5eb0f1b6e59fcd4532fd1
 conflicts="python-pipenv>=0"
 
 post_extract() {

From 202e13b5ad94c66a1e35355d558776471b9785b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 14 Nov 2021 11:13:31 -0300
Subject: [PATCH 2930/4088] sympow: add a patch to avoid printing warnings

Patch taken from sagemath, without it some sage doctests fail just
because of the extraneous output.

From the patch description:

The default "pkgdatafilesbindir" is something like /var/cache/sympow
that will never be writable by unprivileged users (and cannot safely
be made that way). There is already a fallback to $HOME in the code
that works perfectly well, but by default sympow emits a warning when
it realizes that it can't write to e.g. /var/cache/sympow on the first
try. Since that's completely expected, we hide the warnings behind an
additional level of verbosity (VERBOSE >= 2 instead of VERBOSE >= 1).
---
 ...023.6-no-pkgdatafilesbindir-warnings.patch | 45 +++++++++++++++++++
 srcpkgs/sympow/template                       |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sympow/patches/sympow-2.023.6-no-pkgdatafilesbindir-warnings.patch

diff --git a/srcpkgs/sympow/patches/sympow-2.023.6-no-pkgdatafilesbindir-warnings.patch b/srcpkgs/sympow/patches/sympow-2.023.6-no-pkgdatafilesbindir-warnings.patch
new file mode 100644
index 000000000000..e3cbe823def7
--- /dev/null
+++ b/srcpkgs/sympow/patches/sympow-2.023.6-no-pkgdatafilesbindir-warnings.patch
@@ -0,0 +1,45 @@
+From cf182287eb4219b03e57352072449885e10543f3 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 15 May 2020 16:49:49 -0400
+Subject: [PATCH 1/1] main.c: hide pkgdatafilesbindir warnings behind VERBOSE
+ >= 2.
+
+The default "pkgdatafilesbindir" is something like /var/cache/sympow
+that will never be writable by unprivileged users (and cannot safely
+be made that way). There is already a fallback to $HOME in the code
+that works perfectly well, but by default sympow emits a warning when
+it realizes that it can't write to e.g. /var/cache/sympow on the first
+try. Since that's completely expected, we hide the warnings behind an
+additional level of verbosity (VERBOSE >= 2 instead of VERBOSE >= 1).
+---
+ main.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/main.c b/main.c
+index 1d018df..fecd7d1 100644
+--- a/main.c
++++ b/main.c
+@@ -136,17 +136,17 @@ static void prepare_main(char *argv0)
+  asprintf(&pkgdatafilesbindir,"%s/datafiles/"ENDIANTUPLE,pkgcachedir);
+  if (stat(pkgdatafilesbindir,&infodb)) {mode_t mask=umask(0);
+   if (mkdir(pkgdatafilesbindir,(S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX)))
+-	{if (VERBOSE>=1) fprintf(stderr,"**WARNING** failed to create data bin package cache folder %s\n",pkgdatafilesbindir);
++	{if (VERBOSE>=2) fprintf(stderr,"**WARNING** failed to create data bin package cache folder %s\n",pkgdatafilesbindir);
+    free(pkgdatafilesbindir); pkgdatafilesbindir=NULL;}
+   else
+   {stat(pkgdatafilesbindir,&infodb); pkgdatamode= infodb.st_mode & ~MASK;}
+ 	umask(mask);}
+  else
+  {if (!S_ISDIR(infodb.st_mode))
+-  {if (VERBOSE>=1) fprintf(stderr,"**WARNING** %s exists but is not a directory\n",pkgdatafilesbindir);
++  {if (VERBOSE>=2) fprintf(stderr,"**WARNING** %s exists but is not a directory\n",pkgdatafilesbindir);
+    free(pkgdatafilesbindir); pkgdatafilesbindir=NULL;}
+   else if (access(pkgdatafilesbindir,(R_OK|W_OK|X_OK)))
+-  {if (VERBOSE>=1) fprintf(stderr,"**WARNING** %s yields insufficient permissions\n",pkgdatafilesbindir);
++  {if (VERBOSE>=2) fprintf(stderr,"**WARNING** %s yields insufficient permissions\n",pkgdatafilesbindir);
+    free(pkgdatafilesbindir); pkgdatafilesbindir=NULL;}
+ 	else {pkgdatamode= infodb.st_mode & ~MASK;}}
+  asprintf(&datafilesdir,"%s/datafiles",cachedir);
+-- 
+2.26.2
+
diff --git a/srcpkgs/sympow/template b/srcpkgs/sympow/template
index 0cbf01b30205..d484cf847f57 100644
--- a/srcpkgs/sympow/template
+++ b/srcpkgs/sympow/template
@@ -1,7 +1,7 @@
 # Template file for 'sympow'
 pkgname=sympow
 version=2.023.6
-revision=1
+revision=2
 wrksrc=${pkgname}-v${version}
 build_style=configure
 make_build_target=all

From c6aadb32acb7943c4baed8db3136d212e8b5c86a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Nov 2021 21:08:56 +0700
Subject: [PATCH 2931/4088] Manual: correct example for XBPS_CROSS_BASE

---
 Manual.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index 22d650b8c529..042f0e18ae5d 100644
--- a/Manual.md
+++ b/Manual.md
@@ -422,7 +422,7 @@ in this directory such as `${XBPS_BUILDDIR}/${wrksrc}`.
 
 - `XBPS_WRAPPERDIR` Full path to where xbps-src's wrappers for utilities are stored.
 
-- `XBPS_CROSS_BASE` Full path to where cross-compile dependencies are installed, varies according to the target architecture triplet. i.e `aarch64` -> `aarch64-unknown-linux-gnu`.
+- `XBPS_CROSS_BASE` Full path to where cross-compile dependencies are installed, varies according to the target architecture triplet. i.e `aarch64` -> `/usr/aarch64-linux-gnu`.
 
 - `XBPS_RUST_TARGET` The target architecture triplet used by `rustc` and `cargo`.
 

From 5f125d9693a8fafd696f2fb8556f428b812aa5de Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 15 Nov 2021 09:24:17 -0500
Subject: [PATCH 2932/4088] python3-websockets: update to 10.1.

---
 srcpkgs/python3-websockets/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template
index 843e39207072..d4ef32c2447f 100644
--- a/srcpkgs/python3-websockets/template
+++ b/srcpkgs/python3-websockets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-websockets'
 pkgname=python3-websockets
-version=10.0
-revision=2
+version=10.1
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,9 +11,11 @@ short_desc="Library for building WebSocket clients and servers in Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://websockets.readthedocs.io/en/stable/"
-changelog="https://websockets.readthedocs.io/en/stable/changelog.html"
+changelog="https://websockets.readthedocs.io/en/stable/project/changelog.html"
 distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz"
-checksum=c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002
+checksum=181d2b25de5a437b36aefedaf006ecb6fa3aa1328ec0236cdde15f32f9d3ff6d
+# Package ships no tests
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 2ce57dd28a42c097100217ea36139d487e2b21e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 15 Nov 2021 09:30:03 -0500
Subject: [PATCH 2933/4088] python3-more-itertools: add update file to skip
 GitHub-only releases

---
 srcpkgs/python3-more-itertools/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/python3-more-itertools/update

diff --git a/srcpkgs/python3-more-itertools/update b/srcpkgs/python3-more-itertools/update
new file mode 100644
index 000000000000..ec17d3a542e4
--- /dev/null
+++ b/srcpkgs/python3-more-itertools/update
@@ -0,0 +1,2 @@
+site="https://pypi.org/simple/more-itertools"
+pkgname="more-itertools"

From 763037f9881c3b5208a7aa075b262b8b74cb071f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 15 Nov 2021 10:48:02 -0500
Subject: [PATCH 2934/4088] buildah: update to 1.23.1.

---
 srcpkgs/buildah/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 213dba5df4e5..f3854fe931e7 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.23.0
+version=1.23.1
 revision=1
 build_style=go
 go_import_path=github.com/containers/buildah
@@ -16,7 +16,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/buildah"
 changelog="https://github.com/containers/buildah/blob/master/CHANGELOG.md"
 distfiles="https://github.com/containers/buildah/archive/refs/tags/v${version}.tar.gz"
-checksum=9c5c8df4ccfccd53e3170e18aea3255068547799d61dd36985273bb82563769c
+checksum=a19eac2762afb0f83b9d5eec3c00e6ecd95d8d8083da599e894c712d9fb6af26
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man

From 35d4e9f21e13ab9adb5d49fb54fb352751d4b091 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 15 Nov 2021 10:48:38 -0500
Subject: [PATCH 2935/4088] podman: update to 3.4.2.

---
 srcpkgs/podman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 38cdedc9d1ca..dd4b69d1ecb0 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.4.0
+version=3.4.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=558dcc8fbf72095aa1ec8abeb84ca2093dd0d51b77f0115ef855e640e2f03146
+checksum=b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 6924ac6e09970c54814c09a57844f8cc27ceaf3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 15 Nov 2021 17:09:59 -0300
Subject: [PATCH 2936/4088] giac: update to 1.7.0.39, adopt.

---
 srcpkgs/giac/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index b21a303f8e43..4ca28fa53647 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.7.0.37
+version=1.7.0.39
 revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
@@ -9,11 +9,11 @@ makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
  libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Free computer algebra system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=ff06d32808295061f3a7139edb8d6397036fce94da68e27afcf55e40f271f8d7
+checksum=234645e33284969fac5901e6172756ac925a6b93362fa24e86e647a82cfcad56
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

From 5b2f98ab2214798bfd4b17f4a371bc5c0a0b148f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 15 Nov 2021 22:42:17 -0600
Subject: [PATCH 2937/4088] python3-httpx: update to 0.21.0.

---
 srcpkgs/python3-httpx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template
index 78fdb5a3f70a..5c99c9208213 100644
--- a/srcpkgs/python3-httpx/template
+++ b/srcpkgs/python3-httpx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-httpx'
 pkgname=python3-httpx
-version=0.20.0
-revision=2
+version=0.21.0
+revision=1
 wrksrc="httpx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://www.python-httpx.org"
 changelog="https://raw.githubusercontent.com/encode/httpx/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/h/httpx/httpx-${version}.tar.gz"
-checksum=09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b
+checksum=5ae1d9deb30fe074596551b3ab98f94dfd9d7efe3ecd2d08662a5c29f6fba0e4
 # the pypi tarball doesn't contain tests
 # the tests need unpackaged dependencies trustme and uvicorn
 make_check=no

From bbed9f22c6c87b2d63a401f2002b2feff7f3e30b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Nov 2021 12:42:35 -0500
Subject: [PATCH 2938/4088] python3-txacme: remove package

ACMEv1 is no longer supported by Let's Encrypt as of June 2021 and
txacme has not yet added ACMEv2 support. synapse removed this module as
well for the same reasons.
---
 srcpkgs/python3-txacme/template   | 22 ----------------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-txacme/template

diff --git a/srcpkgs/python3-txacme/template b/srcpkgs/python3-txacme/template
deleted file mode 100644
index 530f438ed447..000000000000
--- a/srcpkgs/python3-txacme/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python3-txacme'
-pkgname=python3-txacme
-version=0.9.3
-revision=3
-wrksrc="txacme-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-attrs python3-acme python3-josepy python3-treq python3-Twisted
- python3-openssl python3-eliot python3-TxSNI python3-pem"
-short_desc="ACME protocol implementation for Twisted"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/txacme"
-distfiles="${PYPI_SITE}/t/txacme/txacme-${version}.tar.gz"
-checksum=bce2d0dfa8fa2cf3f2eb10526c89a8b4f77a021d9e182704e7776fff7bd8bceb
-
-post_install() {
-	vlicense LICENSE
-
-	# Outside of the namespace
-	rm -rf ${DESTDIR}/${py3_sitelib}/integration
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index abdaba87c465..8b9aa9d8bdff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=54
+revision=55
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -281,6 +281,7 @@ replaces="
  python3-pyside-phonon<=5.15.0_2
  python3-pyside<=5.15.0_2
  python3-shiboken<=5.15.0_3
+ python3-txacme<=0.9.3_3
  qimageblitz<=0.0.6_4
  qt-designer-devel<=4.8.7_29
  qt-designer-libs<=4.8.7_29

From 9cce7960018d185aa2f02949121aa016e13225d6 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 15 Nov 2021 14:12:21 +0000
Subject: [PATCH 2939/4088] StyLua: update to 0.11.2.

---
 srcpkgs/StyLua/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index 10ca2d6d6520..4c451b40c185 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.11.1
+version=0.11.2
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=af4149a5a5733624dda6bb220a9411eff147b07ecb7c263d5dbce90a483d1df1
+checksum=e870551aab62194b92fcb73607c7b7f6e4a41ad75a64e67f18e5ce0a6c608573
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

From bf7d59ced2cb8d955b158ef84dadf84191787e71 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 15 Nov 2021 16:25:25 +0100
Subject: [PATCH 2940/4088] dbeaver: update to 21.2.5.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 76964c2401c7..0c9b54ae723a 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.2.4
+version=21.2.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=a129f5369723039348502f7e6e9e1579bbe155f3886a5e8b7511c7bc737770e7
+checksum=55c5378a3ab3c02d27225dc7ad48d75619c3c84117f4d24e5ccaaa95979b4edd
 nopie=true
 
 do_build() {

From af3f32502f0588724f5696808fb282fa2b97056c Mon Sep 17 00:00:00 2001
From: Miko <65079739+mikoxyz@users.noreply.github.com>
Date: Mon, 15 Nov 2021 08:14:21 +0100
Subject: [PATCH 2941/4088] mdnsd: Conflicts with mDNSResponder

mdnsd and mDNSResponder both provide /usr/bin/mdnsd, so they should be
marked as conflicting.

Reported-by: MGlolenstine <not@applicable>
Signed-off-by: Miko <65079739+mikoxyz@users.noreply.github.com>
---
 srcpkgs/mdnsd/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mdnsd/template b/srcpkgs/mdnsd/template
index 53476d355366..71f97e7ebdf0 100644
--- a/srcpkgs/mdnsd/template
+++ b/srcpkgs/mdnsd/template
@@ -1,7 +1,7 @@
 # Template file for 'mdnsd'
 pkgname=mdnsd
 version=0.10
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config libtool"
 short_desc="Embeddable Multicast DNS Daemon"
@@ -13,6 +13,7 @@ checksum=2e1a77fc9ff36e993a39b10016fe38723784ca7e3141ca00e4d6f43545d2988c
 
 conf_files="
  /etc/mdns.d/ssh.service"
+conflicts="mDNSResponder"
 
 pre_configure() {
 	./autogen.sh

From 309160e6e02f191d9f0f5d24dbeeca85ac6fb45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 14 Nov 2021 22:04:55 -0300
Subject: [PATCH 2942/4088] igraph: update to 0.9.5.

---
 srcpkgs/igraph/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template
index 9ad070206203..bc7fbef4447f 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,6 +1,6 @@
 # Template file for 'igraph'
 pkgname=igraph
-version=0.9.4
+version=0.9.5
 revision=1
 build_style=cmake
 configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON"
@@ -10,8 +10,9 @@ short_desc="Graph library"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://igraph.org/c/"
+changelog="https://raw.githubusercontent.com/igraph/igraph/master/CHANGELOG.md"
 distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz"
-checksum=a3285cccf4f043c9ced2bc8d8d2609ff8398cb92ed49fdf86264ed91929137dd
+checksum=c4e3f67892e1e287865d799162406b3f94916ad6f2cc069a9239e36ca495a17a
 
 igraph-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From e1f003d7563233fe25e68a03c73cc161a6db4aed Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 6 Aug 2021 09:50:35 +0200
Subject: [PATCH 2943/4088] ETL: update to 1.4.2

---
 srcpkgs/ETL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ETL/template b/srcpkgs/ETL/template
index 2cc7ce21461e..0a395b6e296a 100644
--- a/srcpkgs/ETL/template
+++ b/srcpkgs/ETL/template
@@ -1,6 +1,6 @@
 # Template file for 'ETL'
 pkgname=ETL
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.synfig.org/"
 distfiles="https://github.com/synfig/synfig/releases/download/v${version}/ETL-${version}.tar.gz"
-checksum=ecb61942da60dca8e623af8ad03656897d10b03296e8907dd3c6c296390a074c
+checksum=e54192d284df16305ddfdfcc5bdfe93e139e6db5bc283dd4bab2413ebbead7c7

From acf2fad419f1f95ed185bf8b3ad4030c740b1f0e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 6 Aug 2021 09:50:58 +0200
Subject: [PATCH 2944/4088] synfig: update to 1.4.2

---
 srcpkgs/synfig/patches/cflags-cxxflags.patch | 29 ++++++++++++++++++++
 srcpkgs/synfig/template                      |  6 ++--
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/synfig/patches/cflags-cxxflags.patch

diff --git a/srcpkgs/synfig/patches/cflags-cxxflags.patch b/srcpkgs/synfig/patches/cflags-cxxflags.patch
new file mode 100644
index 000000000000..d0c1b2280fde
--- /dev/null
+++ b/srcpkgs/synfig/patches/cflags-cxxflags.patch
@@ -0,0 +1,29 @@
+Prevent synfig from filtering out the compiler’s '-g' option to produce debug
+information.
+
+--- a/configure	2021-07-28 17:11:56.000000000 +0200
++++ b/configure	2021-08-09 21:35:13.846748903 +0200
+@@ -19613,8 +19613,8 @@
+ 		;;
+ 		no|*)
+ 			debug_flags="-DNDEBUG"
+-			CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags"
+-			CFLAGS="`echo $CFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags"
++			CXXFLAGS="$CXXFLAGS $debug_flags"
++			CFLAGS="$CFLAGS $debug_flags"
+ 		;;
+ 	esac
+ 
+--- a/m4/subs.m4	2021-07-12 17:45:48.000000000 +0200
++++ b/m4/subs.m4	2021-08-09 21:39:39.014802968 +0200
+@@ -85,8 +85,8 @@
+ 		;;
+ 		no|*)
+ 			debug_flags="-DNDEBUG"
+-			CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags"
+-			CFLAGS="`echo $CFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags"
++			CXXFLAGS="$CXXFLAGS $debug_flags"
++			CFLAGS="$CFLAGS $debug_flags"
+ 		;;
+ 	esac
+ 
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index d36db2d1ea6e..87416c4a1731 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,11 +1,11 @@
 # Template file for 'synfig'
 pkgname=synfig
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"
-makedepends="ETL gettext-devel libxml++-devel mlt-devel
+makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
  libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
 depends="ImageMagick"
 short_desc="CLI 2D vector and timeline-based animation software"
@@ -13,7 +13,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.synfig.org/"
 distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfig-${version}.tar.gz"
-checksum=f90f1dcff1a409bbe2bfbb2cf42b7019cf735bec3223722db2feba6e198d1bc1
+checksum=e66688b908ab2f05f87cc5a364f958a1351f101ccab3b3ade33a926453002f4e
 
 CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
 

From 3d4c25c2d0a049fee81f10f545a6edc45cb51314 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 6 Aug 2021 09:51:27 +0200
Subject: [PATCH 2945/4088] synfigstudio: update to 1.4.2

---
 .../patches/cflags-cxxflags.patch             | 29 +++++++++++++++++++
 .../synfigstudio/patches/fix-test-crash.patch | 19 ++++++++++++
 srcpkgs/synfigstudio/template                 | 17 +++++------
 3 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/synfigstudio/patches/cflags-cxxflags.patch
 create mode 100644 srcpkgs/synfigstudio/patches/fix-test-crash.patch

diff --git a/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch b/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch
new file mode 100644
index 000000000000..d70d2a23f7f4
--- /dev/null
+++ b/srcpkgs/synfigstudio/patches/cflags-cxxflags.patch
@@ -0,0 +1,29 @@
+Prevent synfigstudio from filtering out the compiler’s '-g' option to produce debug
+information.
+
+--- synfigstudio-1.4.2.orig/configure
++++ synfigstudio-1.4.2/configure
+@@ -18015,8 +18015,8 @@ fi
+ 		;;
+ 		no|*)
+ 			debug_flags="-DNDEBUG"
+-			CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags"
+-			CFLAGS="`echo $CFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags"
++			CFLAGS="$CFLAGS -DNDEBUG"
++			CXXFLAGS="$CXXFLAGS -DNDEBUG"
+ 		;;
+ 	esac
+ 
+--- synfigstudio-1.4.2.orig/m4/subs.m4
++++ synfigstudio-1.4.2/m4/subs.m4
+@@ -83,8 +83,8 @@ AC_DEFUN([AC_ARG_DEBUG],
+ 		;;
+ 		no|*)
+ 			debug_flags="-DNDEBUG"
+-			CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags"
+-			CFLAGS="`echo $CFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags"
++			CXXFLAGS="$CXXFLAGS -DNDEBUG"
++			CFLAGS="$CFLAGS -DNDEBUG"
+ 		;;
+ 	esac
+ 
diff --git a/srcpkgs/synfigstudio/patches/fix-test-crash.patch b/srcpkgs/synfigstudio/patches/fix-test-crash.patch
new file mode 100644
index 000000000000..651b3bc245b8
--- /dev/null
+++ b/srcpkgs/synfigstudio/patches/fix-test-crash.patch
@@ -0,0 +1,19 @@
+Fix a crash when running tests. Source:
+https://github.com/synfig/synfig/pull/2265
+https://github.com/synfig/synfig/commit/61a290b1aaf58366149662ae0ad224127711aea8
+
+--- a/src/synfigapp/actions/layerduplicate.cpp	2021-07-12 17:45:50.000000000 +0200
++++ b/src/synfigapp/actions/layerduplicate.cpp	2021-08-15 11:52:47.878894610 +0200
+@@ -417,7 +417,11 @@
+ 
+ 		auto cloned_layer = layer_pair.second;
+ 
+-		for(auto iter=cloned_layer->dynamic_param_list().cbegin();iter!=cloned_layer->dynamic_param_list().cend();++iter)
++		// disconnect_dynamic_param/connect_dynamic_param can change dynamic_param_list() while iterating
++		// which makes iter invalid, so we create a copy of dynamic_param_list() first
++		auto param_list = cloned_layer->dynamic_param_list();
++
++		for (auto iter=param_list.cbegin();iter!=param_list.cend();++iter)
+ 		{
+ 			for (const auto& vn_pair : cloned_valuenode_map) {
+ 				if (iter->second == vn_pair.first) {
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 3e40a99fb28c..6c7e437732a0 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,24 +1,21 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
-hostmakedepends="pkg-config intltool gettext"
-makedepends="ETL synfig-devel gtkmm-devel libltdl-devel boost-devel"
+hostmakedepends="pkg-config intltool gettext synfig"
+makedepends="ETL synfig-devel boost-devel gtkmm-devel libltdl-devel
+ libmagick-devel"
 short_desc="Vector based 2D animation studio"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.synfig.org/"
+homepage="https://www.synfig.org/"
 distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfigstudio-${version}.tar.gz"
-checksum=af9a9b0064064907ae24a693b607dcba633a8a2cd45fa1357f61c035efd6020e
+checksum=4e86d4d8def6675fc92855a411795cc4062a1669cda82535d18b48a68b4d5497
 python_version=3
 CXXFLAGS="-Wno-deprecated-copy -DHAVE_LOCALE_H=1"
-
-if [ -n "$CROSS_BUILD" ]; then
-	# uses synfig to create some icons
-	hostmakedepends+=" synfig"
-fi
+export DATADIRNAME=share
 
 synfigstudio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b158824385caa7f7bf576e2c00015961cffb58cc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 16 Nov 2021 13:40:11 +0100
Subject: [PATCH 2946/4088] New package: python3-colored-traceback-0.3.0

---
 srcpkgs/python3-colored-traceback/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-colored-traceback/template

diff --git a/srcpkgs/python3-colored-traceback/template b/srcpkgs/python3-colored-traceback/template
new file mode 100644
index 000000000000..a19732803bcc
--- /dev/null
+++ b/srcpkgs/python3-colored-traceback/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-colored-traceback'
+pkgname=python3-colored-traceback
+version=0.3.0
+revision=1
+wrksrc="colored-traceback-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-colorama"
+short_desc="Automatically color Python's uncaught exception tracebacks"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="ISC"
+homepage="https://github.com/staticshock/colored-traceback.py"
+distfiles="${PYPI_SITE}/c/colored-traceback/colored-traceback-${version}.tar.gz
+ https://raw.githubusercontent.com/staticshock/colored-traceback.py/master/LICENSE"
+checksum="6da7ce2b1da869f6bb54c927b415b95727c4bb6d9a84c4615ea77d9872911b05
+ 503c2ed3f657baf4fa616376f5877014977f886e94880adecded395fa80f6f49"
+skip_extraction="LICENSE"
+
+post_install() {
+	cp "$XBPS_SRCDISTDIR/${pkgname}-${version}/LICENSE" .
+	vlicense LICENSE
+}

From 065b0cfab99dc51fad1feddd5806b794c7d8d602 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 16 Nov 2021 13:51:43 +0100
Subject: [PATCH 2947/4088] python3-pyelftools: update to 0.27.

Fixes running on Python 3.10.
Adopted.
---
 srcpkgs/python3-pyelftools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
index f201ac09bba0..b5d33f464190 100644
--- a/srcpkgs/python3-pyelftools/template
+++ b/srcpkgs/python3-pyelftools/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-pyelftools'
 pkgname=python3-pyelftools
-version=0.25
-revision=7
+version=0.27
+revision=1
 wrksrc="pyelftools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Python3 library for parsing ELF and DWARF"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/eliben/pyelftools"
 distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
-checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
+checksum=cde854e662774c5457d688ca41615f6594187ba7067af101232df889a6b7a66b
 alternatives="pyelftools:readelf.py:/usr/bin/readelf.py3"
 
 post_install() {

From b8c85c475bb8e85d2c47a8a5b96f8cd5def8c39b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 16 Nov 2021 13:52:00 +0100
Subject: [PATCH 2948/4088] python3-pwntools: update to 4.7.0.

---
 srcpkgs/python3-pwntools/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index 8c0e33fa2749..e57c1bed3007 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pwntools'
 pkgname=python3-pwntools
-version=4.6.0
-revision=2
+version=4.7.0
+revision=1
 wrksrc="pwntools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -9,14 +9,15 @@ makedepends="python3-devel"
 depends="capstone-python3 python3 python3-Mako python3-Pygments
  python3-dateutil python3-intervaltree python3-packaging python3-paramiko
  python3-psutil python3-pyelftools python3-pyserial python3-pysocks
- python3-requests python3-ropgadget python3-sortedcontainers"
+ python3-requests python3-ropgadget python3-sortedcontainers
+ python3-colored-traceback"
 make_install_args="--only-use-pwn-command"
 short_desc="CTF framework and exploit development library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
-checksum=1569e613e5e06ed473b60a3fc71376c4ad5bcf56216ea772c25ad0200347030c
+checksum=74388e28675e7a1929f763df5a1cec6a3d589641049b6cf476bb1c56ec50a88e
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From aebe154012e4ca5eea0c6cdad7555161eb59af0b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 14 Nov 2021 13:10:52 -0600
Subject: [PATCH 2949/4088] plantuml: update to 1.2021.14.

---
 srcpkgs/plantuml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..fff4ec18b203 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.14
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=468aeaaea0742d8312d0f2f709df140e599967d8284fc0555f842fd0a6fe6941
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh

From 98c0e80e29263598d3808b7e476645b0d2681b1e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 26 Aug 2021 16:52:32 -0400
Subject: [PATCH 2950/4088] New package: ite8291r3-ctl-0.3.

---
 srcpkgs/ite8291r3-ctl/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/ite8291r3-ctl/template

diff --git a/srcpkgs/ite8291r3-ctl/template b/srcpkgs/ite8291r3-ctl/template
new file mode 100644
index 000000000000..e147c6c12b34
--- /dev/null
+++ b/srcpkgs/ite8291r3-ctl/template
@@ -0,0 +1,14 @@
+# Template file for 'ite8291r3-ctl'
+pkgname=ite8291r3-ctl
+version=0.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-usb python3-xlib python3-Pillow"
+short_desc="Userspace driver for the ITE 8291 RGB keyboard backlight controller"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/pobrn/ite8291r3-ctl"
+distfiles="${PYPI_SITE}/i/ite8291r3-ctl/ite8291r3-ctl-${version}.tar.gz"
+checksum=d8645a478c552fde378f5a81fee32e1be6e8987698a8c40e6947234bd5be9532
+make_check=no # no tests available

From c2cfc2ea8d0d5fc96aad142fa36f3eaab2e8e4f8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 26 Sep 2021 15:47:29 +0200
Subject: [PATCH 2951/4088] chromium: update to 96.0.4664.45.

- enable aarch64* cross build
- use -fdebug-prefix-map for better ccache hits with -o debug
---
 .../musl-patches/xxx-ppc64le-support.patch    |   6 +-
 .../patches/chromium-95-harfbuzz-3.patch      |  31 -
 .../patches/chromium-95-quiche-include.patch  |  25 -
 .../chromium-96-CommandLine-include.patch     |  24 +
 .../chromium-96-CouponDB-include.patch        |  25 +
 ...m-96-DrmRenderNodePathFinder-include.patch |  24 +
 ...ium-96-RestrictedCookieManager-tuple.patch |  31 +
 srcpkgs/chromium/patches/cross-build.patch    |  65 ++
 .../patches/ozone-x11-fix-VA-API.patch        | 671 ------------------
 srcpkgs/chromium/patches/python3.10.patch     |  57 --
 srcpkgs/chromium/patches/sndio.patch          |   9 -
 ...-visibility-of-build-config-freetype.patch |  31 +
 .../patches/unbundled-cross-toolchain.patch   |  12 +
 .../patches/xxx-ppc64le-support.patch         |   6 +-
 srcpkgs/chromium/template                     | 138 +++-
 15 files changed, 322 insertions(+), 833 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-95-harfbuzz-3.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-95-quiche-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch
 create mode 100644 srcpkgs/chromium/patches/cross-build.patch
 delete mode 100644 srcpkgs/chromium/patches/ozone-x11-fix-VA-API.patch
 delete mode 100644 srcpkgs/chromium/patches/python3.10.patch
 create mode 100644 srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch
 create mode 100644 srcpkgs/chromium/patches/unbundled-cross-toolchain.patch

diff --git a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
index 681b1f011c31..a0f8d285fe81 100644
--- a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
@@ -61,9 +61,9 @@ index cdce9bf8..73d77dda 100644
  
  // The following platforms have an implementation of a hardware counter.
  #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
+-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
++    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || defined(__riscv) || \
+     defined(_M_IX86) || defined(_M_X64)
  #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
  #else
 --- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
diff --git a/srcpkgs/chromium/patches/chromium-95-harfbuzz-3.patch b/srcpkgs/chromium/patches/chromium-95-harfbuzz-3.patch
deleted file mode 100644
index 33fe9556aaf3..000000000000
--- a/srcpkgs/chromium/patches/chromium-95-harfbuzz-3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001
-From: Dominik Röttsches <drott@chromium.org>
-Date: Tue, 28 Sep 2021 15:31:50 +0000
-Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38 (80 commits)
-
-Fixed: 1252284
-Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252
-Commit-Queue: Dominik Röttsches <drott@chromium.org>
-Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
-Auto-Submit: Dominik Röttsches <drott@chromium.org>
-Reviewed-by: Calder Kitagawa <ckitagawa@chromium.org>
-Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#925776}
-
-(only components/paint_preview/common/subset_font.cc)
----
-
-diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
-index 45daea7b1..43a448e 100644
---- a/components/paint_preview/common/subset_font.cc
-+++ b/components/paint_preview/common/subset_font.cc
-@@ -79,7 +79,7 @@
-   // Retain all variation information for OpenType variation fonts. See:
-   // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
-   hb_set_t* skip_subset =
--      hb_subset_input_no_subset_tables_set(input.get());  // Owned by |input|.
-+      hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG);
-   hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r'));
-   hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r'));
-   hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));
diff --git a/srcpkgs/chromium/patches/chromium-95-quiche-include.patch b/srcpkgs/chromium/patches/chromium-95-quiche-include.patch
deleted file mode 100644
index 4bbd45cfc094..000000000000
--- a/srcpkgs/chromium/patches/chromium-95-quiche-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a9d986203bcfbaab84f270c1dc6c3abb4c450ee1 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 17 Sep 2021 14:57:33 +0000
-Subject: [PATCH] IWYU: add stddef.h for size_t in WindowManager
-
----
- net/third_party/quiche/src/http2/adapter/window_manager.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/net/third_party/quiche/src/http2/adapter/window_manager.h b/net/third_party/quiche/src/http2/adapter/window_manager.h
-index f15982d..5a7701e 100644
---- a/net/third_party/quiche/src/http2/adapter/window_manager.h
-+++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
-@@ -1,6 +1,8 @@
- #ifndef QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
- #define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
- 
-+#include <stddef.h>
-+
- #include <functional>
- 
- #include "common/platform/api/quiche_export.h"
--- 
-2.32.0
-
diff --git a/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch b/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch
new file mode 100644
index 000000000000..2d7b7e902376
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch
@@ -0,0 +1,24 @@
+From 39e6e77798d86033e5eb1fb2a2caf20a5bca2262 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 9 Oct 2021 08:27:04 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine
+
+---
+ base/command_line.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/base/command_line.h b/base/command_line.h
+index 706726a..ad02812 100644
+--- a/base/command_line.h
++++ b/base/command_line.h
+@@ -19,6 +19,7 @@
+ #include <stddef.h>
+ #include <functional>
+ #include <map>
++#include <memory>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.32.0
+
diff --git a/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch b/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch
new file mode 100644
index 000000000000..41acfb31b96e
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch
@@ -0,0 +1,25 @@
+From 3a7b8dd0fcceffcfd0ea7e3186d2850deed7a00b Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 6 Oct 2021 15:36:47 +0000
+Subject: [PATCH] IWYU: add vector for std::vector in CouponDB
+
+---
+ chrome/browser/commerce/coupons/coupon_db.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h
+index f0758f4..93e2dd3 100644
+--- a/chrome/browser/commerce/coupons/coupon_db.h
++++ b/chrome/browser/commerce/coupons/coupon_db.h
+@@ -5,6 +5,8 @@
+ #ifndef CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
+ #define CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
+ 
++#include <vector>
++
+ #include "base/callback_helpers.h"
+ #include "base/memory/weak_ptr.h"
+ #include "url/gurl.h"
+-- 
+2.32.0
+
diff --git a/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch b/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch
new file mode 100644
index 000000000000..fd44eb2c91a0
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch
@@ -0,0 +1,24 @@
+From 9e36b3c28935fb50d43ccef443be786a8e3f8a5f Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 9 Oct 2021 16:17:34 +0000
+Subject: [PATCH] IWYU: add string.h for memcmp in ui:: DrmRenderNodePathFinder
+
+---
+ ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
+index 06776a7..d5b7b71 100644
+--- a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
++++ b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
+@@ -5,6 +5,7 @@
+ #include "ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.h"
+ 
+ #include <fcntl.h>
++#include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-- 
+2.32.0
+
diff --git a/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch b/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch
new file mode 100644
index 000000000000..cbdca44b738d
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch
@@ -0,0 +1,31 @@
+From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Fri, 08 Oct 2021 06:32:55 +0000
+Subject: [PATCH] libstdc++: no implicit conversion from tuple created with std::tie to an std::pair in restricted cookie manager.
+
+Fix compilation error:
+    ../../services/network/restricted_cookie_manager.cc:164:30: error: no match for ‘operator[]’ (operand types are ‘network::CookieAccessesByURLAndSite’ {aka ‘std::map<std::pair<GURL, net::SiteForCookies>, std::unique_ptr<std::set<net::CookieWithAccessResult, network::CookieWithAccessResultComparer> > >’} and ‘std::tuple<const GURL&, const net::SiteForCookies&>’)
+
+There is no conversion from tuple to pair.
+
+Bug: 957519
+Change-Id: Idf29c7b21895ae28f45b35d6193ab4ac555945c8
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3211752
+Reviewed-by: Robbie McElrath <rmcelrath@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#929597}
+---
+
+diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
+index 425426f..c8c10c6 100644
+--- a/services/network/restricted_cookie_manager.cc
++++ b/services/network/restricted_cookie_manager.cc
+@@ -161,7 +161,7 @@
+     const GURL& url,
+     const net::SiteForCookies& site_for_cookies) {
+   std::unique_ptr<CookieAccesses>& entry =
+-      recent_cookie_accesses_[std::tie(url, site_for_cookies)];
++      recent_cookie_accesses_[std::make_pair(url, site_for_cookies)];
+   if (!entry) {
+     entry = std::make_unique<CookieAccesses>();
+   }
diff --git a/srcpkgs/chromium/patches/cross-build.patch b/srcpkgs/chromium/patches/cross-build.patch
new file mode 100644
index 000000000000..63b89395cb80
--- /dev/null
+++ b/srcpkgs/chromium/patches/cross-build.patch
@@ -0,0 +1,65 @@
+--- a/build/config/compiler/BUILD.gn.orig
++++ b/build/config/compiler/BUILD.gn
+@@ -58,6 +58,10 @@
+ }
+ 
+ declare_args() {
++  is_musl = false
++}
++
++declare_args() {
+   # Normally, Android builds are lightly optimized, even for debug builds, to
+   # keep binary size down. Setting this flag to true disables such optimization
+   android_full_debug = false
+@@ -880,8 +884,13 @@
+       }
+     } else if (current_cpu == "arm64") {
+       if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
+-        cflags += [ "--target=aarch64-linux-gnu" ]
+-        ldflags += [ "--target=aarch64-linux-gnu" ]
++        if (is_musl) {
++          cflags += [ "--target=aarch64-linux-musl" ]
++          ldflags += [ "--target=aarch64-linux-musl" ]
++        } else {
++          cflags += [ "--target=aarch64-linux-gnu" ]
++          ldflags += [ "--target=aarch64-linux-gnu" ]
++        }
+       }
+     } else if (current_cpu == "mipsel" && !is_nacl) {
+       ldflags += [ "-Wl,--hash-style=sysv" ]
+--- a/build/toolchain/linux/unbundle/BUILD.gn.orig
++++ b/build/toolchain/linux/unbundle/BUILD.gn
+@@ -39,3 +39,22 @@
+     current_os = host_os
+   }
+ }
++
++gcc_toolchain("v8_snapshot_cross") {
++  cc = getenv("BUILD_CC")
++  cxx = getenv("BUILD_CXX")
++  ar = getenv("BUILD_AR")
++  nm = getenv("BUILD_NM")
++  ld = cxx
++
++  extra_cflags = getenv("BUILD_CFLAGS")
++  extra_cppflags = getenv("BUILD_CPPFLAGS")
++  extra_cxxflags = getenv("BUILD_CXXFLAGS")
++  extra_ldflags = getenv("BUILD_LDFLAGS")
++
++  toolchain_args = {
++    current_cpu = host_cpu
++    current_os = host_os
++    v8_current_cpu = target_cpu
++  }
++}
+--- a/build/config/linux/pkg_config.gni.orig
++++ b/build/config/linux/pkg_config.gni
+@@ -91,7 +91,7 @@
+   assert(defined(invoker.packages),
+          "Variable |packages| must be defined to be a list in pkg_config.")
+   config(target_name) {
+-    if (host_toolchain == current_toolchain) {
++    if (current_cpu != target_cpu) {
+       args = host_pkg_config_args + invoker.packages
+     } else {
+       args = pkg_config_args + invoker.packages
diff --git a/srcpkgs/chromium/patches/ozone-x11-fix-VA-API.patch b/srcpkgs/chromium/patches/ozone-x11-fix-VA-API.patch
deleted file mode 100644
index 61d72bfb0137..000000000000
--- a/srcpkgs/chromium/patches/ozone-x11-fix-VA-API.patch
+++ /dev/null
@@ -1,671 +0,0 @@
-From a4de986102a45e29c3ef596f22704bdca244c26c Mon Sep 17 00:00:00 2001
-From: Maksim Sisov <msisov@igalia.com>
-Date: Fri, 17 Sep 2021 08:45:55 +0000
-Subject: [PATCH] ozone/x11: fix VA-API.
-
-This patch fixes VA-API usage with Ozone/X11 backend (which
-is our default backend now as X11 has been deprecated -
-crrev.com/c/3114071)).
-
-non-Ozone X11 is disabled now and Ozone is always used
-on Linux. However, VA-API implementation is not Ozone friendly
-yet and requires major refactoring. But given that VA-API
-implementation on Linux worked only with X11, it's fine for
-now to change USE_X11 and !IsUsingOzonePlatform to
-BUILDFLAG(OZONE_PLATFORM_X11) and fail VA-API initialization
-in VADisplayState::Initialize for Ozone/Linux other than
-non-X11 backends.
-
-Bug: 1121948
-Change-Id: If85d289235e6d358103d9fa2bbe0f741fb599a26
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3141878
-Commit-Queue: Maksim Sisov <msisov@igalia.com>
-Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
-Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
-Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
-Reviewed-by: Alexander Dunaev <adunaev@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#922466}
----
- media/BUILD.gn                                |  3 -
- media/gpu/BUILD.gn                            |  5 +-
- media/gpu/args.gni                            | 13 +++-
- media/gpu/vaapi/BUILD.gn                      |  8 +-
- media/gpu/vaapi/va_stub_header.fragment       |  6 +-
- media/gpu/vaapi/vaapi_picture_factory.cc      | 72 ++++++++----------
- .../vaapi_picture_native_pixmap_angle.cc      |  2 -
- media/gpu/vaapi/vaapi_picture_tfp.cc          |  2 -
- .../vaapi/vaapi_video_decode_accelerator.cc   |  9 +--
- ...vaapi_video_decode_accelerator_unittest.cc | 11 +--
- media/gpu/vaapi/vaapi_wrapper.cc              | 76 +++++++++----------
- media/gpu/vaapi/vaapi_wrapper.h               |  8 +-
- ui/ozone/platform/x11/ozone_platform_x11.cc   |  3 +
- ui/ozone/public/ozone_platform.h              | 10 +++
- 14 files changed, 108 insertions(+), 120 deletions(-)
-
-diff --git a/media/BUILD.gn b/media/BUILD.gn
-index dbee1d4338..d5c158c08f 100644
---- a/media/BUILD.gn
-+++ b/media/BUILD.gn
-@@ -130,9 +130,6 @@ component("media") {
-     public_deps += [ "//media/base/mac" ]
-   }
- 
--  if (use_x11) {
--    deps += [ "//ui/base/x" ]
--  }
-   if (use_ozone) {
-     deps += [ "//ui/ozone" ]
-   }
-diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
-index c7499485ac..3fedc78948 100644
---- a/media/gpu/BUILD.gn
-+++ b/media/gpu/BUILD.gn
-@@ -20,6 +20,7 @@ buildflag_header("buildflags") {
-     "USE_VAAPI_IMAGE_CODECS=$use_vaapi_image_codecs",
-     "USE_V4L2_CODEC=$use_v4l2_codec",
-     "USE_LIBV4L2=$use_v4lplugin",
-+    "USE_VAAPI_X11=$use_vaapi_x11",
-   ]
- }
- 
-@@ -215,9 +216,7 @@ component("gpu") {
-       "windows/supported_profile_helpers.cc",
-       "windows/supported_profile_helpers.h",
-     ]
--    configs += [
--      "//third_party/khronos:khronos_headers",
--    ]
-+    configs += [ "//third_party/khronos:khronos_headers" ]
-     public_deps += [ "//media/base/win:media_foundation_util" ]
-     deps += [
-       "//gpu/ipc/common:common",
-diff --git a/media/gpu/args.gni b/media/gpu/args.gni
-index 4004937949..2f53843918 100644
---- a/media/gpu/args.gni
-+++ b/media/gpu/args.gni
-@@ -3,7 +3,15 @@
- # found in the LICENSE file.
- 
- import("//build/config/chromeos/ui_mode.gni")
--import("//build/config/ui.gni")
-+import("//build/config/ozone.gni")
-+
-+declare_args() {
-+  # Indicates if X11 VA-API-based hardware acceleration is to be used.
-+  # See also the comment near the |use_vaapi| arg.
-+  use_vaapi_x11 =
-+      is_linux && ozone_platform_x11 && !is_chromecast && !is_chromeos_lacros &&
-+      (target_cpu == "x86" || target_cpu == "x64")
-+}
- 
- declare_args() {
-   # Indicates if V4L plugin is used.
-@@ -21,8 +29,7 @@ declare_args() {
-   # is typically the case on x86-based ChromeOS devices.
-   # VA-API should also be compiled by default on x11-using linux devices
-   # using x86/x64.
--  use_vaapi =
--      is_linux && use_x11 && (target_cpu == "x86" || target_cpu == "x64")
-+  use_vaapi = use_vaapi_x11
- 
-   # Indicates if ChromeOS protected media support exists. This is used
-   # to enable the CDM daemon in Chrome OS as well as support for
-diff --git a/media/gpu/vaapi/BUILD.gn b/media/gpu/vaapi/BUILD.gn
-index b11d2c60fa..0c2520dd6b 100644
---- a/media/gpu/vaapi/BUILD.gn
-+++ b/media/gpu/vaapi/BUILD.gn
-@@ -17,7 +17,7 @@ assert(use_vaapi)
- generate_stubs("libva_stubs") {
-   extra_header = "va_stub_header.fragment"
-   sigs = [ "va.sigs" ]
--  if (use_x11) {
-+  if (use_vaapi_x11) {
-     sigs += [ "va_x11.sigs" ]
-   }
-   if (is_chromeos_ash) {
-@@ -131,14 +131,14 @@ source_set("vaapi") {
-     ]
-   }
- 
--  if (use_x11 || use_ozone || use_egl) {
-+  if (use_ozone || use_egl) {
-     sources += [
-       "vaapi_picture_native_pixmap.cc",
-       "vaapi_picture_native_pixmap.h",
-     ]
-   }
- 
--  if (use_x11) {
-+  if (use_vaapi_x11) {
-     deps += [ "//ui/gfx/x" ]
-     sources += [
-       "vaapi_picture_native_pixmap_angle.cc",
-@@ -197,7 +197,7 @@ source_set("common") {
-     deps += [ "//ui/ozone" ]
-   }
- 
--  if (use_x11) {
-+  if (use_vaapi_x11) {
-     deps += [ "//ui/gfx/x" ]
-   }
- 
-diff --git a/media/gpu/vaapi/va_stub_header.fragment b/media/gpu/vaapi/va_stub_header.fragment
-index bed198484d..e8c46c5e81 100644
---- a/media/gpu/vaapi/va_stub_header.fragment
-+++ b/media/gpu/vaapi/va_stub_header.fragment
-@@ -1,12 +1,14 @@
- // The extra include header needed in the generated stub file for defining
- // various libva types.
- 
-+#include "media/gpu/buildflags.h"
-+
- extern "C" {
- 
- #include <va/va_drm.h>
- #include <va/va.h>
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
- #include <va/va_x11.h>
--#endif
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
- 
- }
-diff --git a/media/gpu/vaapi/vaapi_picture_factory.cc b/media/gpu/vaapi/vaapi_picture_factory.cc
-index 719035b87c..9c7d7387d2 100644
---- a/media/gpu/vaapi/vaapi_picture_factory.cc
-+++ b/media/gpu/vaapi/vaapi_picture_factory.cc
-@@ -10,13 +10,13 @@
- #include "ui/base/ui_base_features.h"
- #include "ui/gl/gl_bindings.h"
- 
--#if defined(USE_X11)
--#include "media/gpu/vaapi/vaapi_picture_native_pixmap_angle.h"
--#include "media/gpu/vaapi/vaapi_picture_tfp.h"
--#endif
- #if defined(USE_OZONE)
- #include "media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.h"
--#endif
-+#endif  // defined(USE_OZONE)
-+#if BUILDFLAG(USE_VAAPI_X11)
-+#include "media/gpu/vaapi/vaapi_picture_native_pixmap_angle.h"
-+#include "media/gpu/vaapi/vaapi_picture_tfp.h"
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
- #if defined(USE_EGL)
- #include "media/gpu/vaapi/vaapi_picture_native_pixmap_egl.h"
- #endif
-@@ -46,15 +46,13 @@ VaapiPictureFactory::VaapiPictureFactory() {
-   vaapi_impl_pairs_.insert(
-       std::make_pair(gl::kGLImplementationEGLGLES2,
-                      VaapiPictureFactory::kVaapiImplementationDrm));
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
-   vaapi_impl_pairs_.insert(
-       std::make_pair(gl::kGLImplementationEGLANGLE,
-                      VaapiPictureFactory::kVaapiImplementationAngle));
--  if (!features::IsUsingOzonePlatform()) {
--    vaapi_impl_pairs_.insert(
--        std::make_pair(gl::kGLImplementationDesktopGL,
--                       VaapiPictureFactory::kVaapiImplementationX11));
--  }
-+  vaapi_impl_pairs_.insert(
-+      std::make_pair(gl::kGLImplementationDesktopGL,
-+                     VaapiPictureFactory::kVaapiImplementationX11));
- #endif
- 
-   DeterminePictureCreationAndDownloadingMechanism();
-@@ -96,19 +94,19 @@ VaapiPictureFactory::GetVaapiImplementation(gl::GLImplementation gl_impl) {
- }
- 
- uint32_t VaapiPictureFactory::GetGLTextureTarget() {
--#if defined(USE_OZONE)
--  if (features::IsUsingOzonePlatform())
--    return GL_TEXTURE_EXTERNAL_OES;
--#endif
-+#if BUILDFLAG(USE_VAAPI_X11)
-   return GL_TEXTURE_2D;
-+#else
-+  return GL_TEXTURE_EXTERNAL_OES;
-+#endif
- }
- 
- gfx::BufferFormat VaapiPictureFactory::GetBufferFormat() {
--#if defined(USE_OZONE)
--  if (features::IsUsingOzonePlatform())
--    return gfx::BufferFormat::YUV_420_BIPLANAR;
--#endif
-+#if BUILDFLAG(USE_VAAPI_X11)
-   return gfx::BufferFormat::RGBX_8888;
-+#else
-+  return gfx::BufferFormat::YUV_420_BIPLANAR;
-+#endif
- }
- 
- void VaapiPictureFactory::DeterminePictureCreationAndDownloadingMechanism() {
-@@ -116,51 +114,43 @@ void VaapiPictureFactory::DeterminePictureCreationAndDownloadingMechanism() {
- #if defined(USE_OZONE)
-     // We can be called without GL initialized, which is valid if we use Ozone.
-     case kVaapiImplementationNone:
--      if (features::IsUsingOzonePlatform()) {
--        create_picture_cb_ = base::BindRepeating(
--            &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapOzone>);
--        needs_vpp_for_downloading_ = true;
--      }
--
--      // This is reached by unit tests which don't require create_picture_cb_
--      // to be initialized or called.
-+      create_picture_cb_ = base::BindRepeating(
-+          &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapOzone>);
-+      needs_vpp_for_downloading_ = true;
-       break;
- #endif  // defined(USE_OZONE)
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
-     case kVaapiImplementationX11:
--      DCHECK(!features::IsUsingOzonePlatform());
-       create_picture_cb_ =
-           base::BindRepeating(&CreateVaapiPictureNativeImpl<VaapiTFPPicture>);
-       // Neither VaapiTFPPicture or VaapiPictureNativePixmapAngle needs the VPP.
-       needs_vpp_for_downloading_ = false;
-       break;
-     case kVaapiImplementationAngle:
--      DCHECK(!features::IsUsingOzonePlatform());
-       create_picture_cb_ = base::BindRepeating(
-           &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapAngle>);
-       // Neither VaapiTFPPicture or VaapiPictureNativePixmapAngle needs the VPP.
-       needs_vpp_for_downloading_ = false;
-       break;
--#endif  // defined(USE_X11)
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
-     case kVaapiImplementationDrm:
- #if defined(USE_OZONE)
--      if (features::IsUsingOzonePlatform()) {
--        create_picture_cb_ = base::BindRepeating(
--            &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapOzone>);
--        needs_vpp_for_downloading_ = true;
--        break;
--      }
--#endif  // defined(USE_OZONE)
--#if defined(USE_EGL)
-+      create_picture_cb_ = base::BindRepeating(
-+          &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapOzone>);
-+      needs_vpp_for_downloading_ = true;
-+      break;
-+#elif defined(USE_EGL)
-       create_picture_cb_ = base::BindRepeating(
-           &CreateVaapiPictureNativeImpl<VaapiPictureNativePixmapEgl>);
-       needs_vpp_for_downloading_ = true;
-       break;
--#endif  // defined(USE_EGL)
-+#else
-       // ozone or egl must be used to use the DRM implementation.
--      NOTREACHED();
-+      FALLTHROUGH;
-+#endif
-     default:
-       NOTREACHED();
-+      break;
-   }
- }
- 
-diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
-index 9de0c93b44..e5b9908490 100644
---- a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
-+++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
-@@ -6,7 +6,6 @@
- 
- #include "media/gpu/vaapi/va_surface.h"
- #include "media/gpu/vaapi/vaapi_wrapper.h"
--#include "ui/base/ui_base_features.h"
- #include "ui/gfx/x/connection.h"
- #include "ui/gfx/x/future.h"
- #include "ui/gfx/x/xproto.h"
-@@ -92,7 +91,6 @@ Status VaapiPictureNativePixmapAngle::Allocate(gfx::BufferFormat format) {
-   if (!make_context_current_cb_ || !make_context_current_cb_.Run())
-     return StatusCode::kVaapiBadContext;
- 
--  DCHECK(!features::IsUsingOzonePlatform());
-   auto image =
-       base::MakeRefCounted<gl::GLImageEGLPixmap>(visible_size_, format);
-   if (!image)
-diff --git a/media/gpu/vaapi/vaapi_picture_tfp.cc b/media/gpu/vaapi/vaapi_picture_tfp.cc
-index 3f7e221d8a..11914e3640 100644
---- a/media/gpu/vaapi/vaapi_picture_tfp.cc
-+++ b/media/gpu/vaapi/vaapi_picture_tfp.cc
-@@ -6,7 +6,6 @@
- 
- #include "media/gpu/vaapi/va_surface.h"
- #include "media/gpu/vaapi/vaapi_wrapper.h"
--#include "ui/base/ui_base_features.h"
- #include "ui/gfx/x/connection.h"
- #include "ui/gfx/x/future.h"
- #include "ui/gl/gl_bindings.h"
-@@ -37,7 +36,6 @@ VaapiTFPPicture::VaapiTFPPicture(
-       connection_(x11::Connection::Get()),
-       x_pixmap_(x11::Pixmap::None) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--  DCHECK(!features::IsUsingOzonePlatform());
-   DCHECK(texture_id);
-   DCHECK(client_texture_id);
- }
-diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-index 7514fe4fdd..e4cd7c8d89 100644
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -184,12 +184,6 @@ bool VaapiVideoDecodeAccelerator::Initialize(const Config& config,
-                                              Client* client) {
-   DCHECK(task_runner_->BelongsToCurrentThread());
- 
--#if defined(USE_X11)
--  // TODO(crbug/1116701): implement decode acceleration when running with Ozone.
--  if (features::IsUsingOzonePlatform())
--    return false;
--#endif
--
-   vaapi_picture_factory_ = std::make_unique<VaapiPictureFactory>();
- 
-   if (config.is_encrypted()) {
-@@ -1213,12 +1207,11 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
- 
- VaapiVideoDecodeAccelerator::BufferAllocationMode
- VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
-   // The IMPORT mode is used for Android on Chrome OS, so this doesn't apply
-   // here.
-   DCHECK_NE(output_mode_, VideoDecodeAccelerator::Config::OutputMode::IMPORT);
-   // TODO(crbug/1116701): get video decode acceleration working with ozone.
--  DCHECK(!features::IsUsingOzonePlatform());
-   // For H.264 on older devices, another +1 is experimentally needed for
-   // high-to-high resolution changes.
-   // TODO(mcasas): Figure out why and why only H264, see crbug.com/912295 and
-diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
-index 5b9a543386..826bb103b1 100644
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
-@@ -17,7 +17,6 @@
- #include "media/gpu/vaapi/vaapi_wrapper.h"
- #include "testing/gmock/include/gmock/gmock.h"
- #include "testing/gtest/include/gtest/gtest.h"
--#include "ui/base/ui_base_features.h"
- 
- using base::test::RunClosure;
- using ::testing::_;
-@@ -416,12 +415,10 @@ TEST_P(VaapiVideoDecodeAcceleratorTest, SupportedPlatforms) {
-             mock_vaapi_picture_factory_->GetVaapiImplementation(
-                 gl::kGLImplementationEGLGLES2));
- 
--#if defined(USE_X11)
--  if (!features::IsUsingOzonePlatform()) {
--    EXPECT_EQ(VaapiPictureFactory::kVaapiImplementationX11,
--              mock_vaapi_picture_factory_->GetVaapiImplementation(
--                  gl::kGLImplementationDesktopGL));
--  }
-+#if BUILDFLAG(USE_VAAPI_X11)
-+  EXPECT_EQ(VaapiPictureFactory::kVaapiImplementationX11,
-+            mock_vaapi_picture_factory_->GetVaapiImplementation(
-+                gl::kGLImplementationDesktopGL));
- #endif
- }
- 
-diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
-index 754d258848..e528b0f84d 100644
---- a/media/gpu/vaapi/vaapi_wrapper.cc
-+++ b/media/gpu/vaapi/vaapi_wrapper.cc
-@@ -65,7 +65,7 @@
- #include "ui/gl/gl_bindings.h"
- #include "ui/gl/gl_implementation.h"
- 
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
- typedef XID Drawable;
- 
- extern "C" {
-@@ -73,7 +73,7 @@ extern "C" {
- }
- 
- #include "ui/gfx/x/connection.h"  // nogncheck
--#endif
-+#endif                            // BUILDFLAG(USE_VAAPI_X11)
- 
- #if defined(USE_OZONE)
- #include "ui/ozone/public/ozone_platform.h"
-@@ -87,14 +87,14 @@ using media_gpu_vaapi::kModuleVa_prot;
- 
- using media_gpu_vaapi::kModuleVa;
- using media_gpu_vaapi::kModuleVa_drm;
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
- using media_gpu_vaapi::kModuleVa_x11;
--#endif
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
- using media_gpu_vaapi::InitializeStubs;
- using media_gpu_vaapi::IsVaInitialized;
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
- using media_gpu_vaapi::IsVa_x11Initialized;
--#endif
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
- using media_gpu_vaapi::IsVa_drmInitialized;
- using media_gpu_vaapi::StubPathMap;
- 
-@@ -559,10 +559,20 @@ VADisplayState::VADisplayState()
- bool VADisplayState::Initialize() {
-   base::AutoLock auto_lock(va_lock_);
- 
-+#if defined(USE_OZONE) && defined(OS_LINUX)
-+  // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on
-+  // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi
-+  // for more details. This will also require revisiting everything that's
-+  // guarded by USE_VAAPI_X11. For example, if USE_VAAPI_X11 is true, but the
-+  // user chooses the Wayland backend for Ozone at runtime, then many things (if
-+  // not all) that we do for X11 won't apply.
-+  if (!ui::OzonePlatform::GetInstance()->GetPlatformProperties().supports_vaapi)
-+    return false;
-+#endif
-+
-   bool libraries_initialized = IsVaInitialized() && IsVa_drmInitialized();
--#if defined(USE_X11)
--  if (!features::IsUsingOzonePlatform())
--    libraries_initialized = libraries_initialized && IsVa_x11Initialized();
-+#if BUILDFLAG(USE_VAAPI_X11)
-+  libraries_initialized = libraries_initialized && IsVa_x11Initialized();
- #endif
-   if (!libraries_initialized)
-     return false;
-@@ -577,34 +587,25 @@ bool VADisplayState::Initialize() {
-   return success;
- }
- 
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
- 
- absl::optional<VADisplay> GetVADisplayStateX11(const base::ScopedFD& drm_fd) {
--  bool use_drm_as_fallback = false;
-   switch (gl::GetGLImplementation()) {
-     case gl::kGLImplementationEGLGLES2:
-       return vaGetDisplayDRM(drm_fd.get());
- 
-     case gl::kGLImplementationNone:
--      use_drm_as_fallback = true;
--      FALLTHROUGH;
- 
-     case gl::kGLImplementationDesktopGL: {
--      if (!features::IsUsingOzonePlatform()) {
--        VADisplay display =
--            vaGetDisplay(x11::Connection::Get()->GetXlibDisplay());
--        if (vaDisplayIsValid(display))
--          return display;
--        return vaGetDisplayDRM(drm_fd.get());
--      }
--      break;
-+      VADisplay display =
-+          vaGetDisplay(x11::Connection::Get()->GetXlibDisplay());
-+      if (vaDisplayIsValid(display))
-+        return display;
-+      return vaGetDisplayDRM(drm_fd.get());
-     }
- 
--    case gl::kGLImplementationEGLANGLE: {
--      if (!features::IsUsingOzonePlatform())
--        return vaGetDisplay(x11::Connection::Get()->GetXlibDisplay());
--      break;
--    }
-+    case gl::kGLImplementationEGLANGLE:
-+      return vaGetDisplay(x11::Connection::Get()->GetXlibDisplay());
- 
-     default:
-       LOG(WARNING) << "VAAPI video acceleration not available for "
-@@ -612,10 +613,6 @@ absl::optional<VADisplay> GetVADisplayStateX11(const base::ScopedFD& drm_fd) {
-                           gl::GetGLImplementationParts());
-       return absl::nullopt;
-   }
--
--  if (use_drm_as_fallback)
--    return vaGetDisplayDRM(drm_fd.get());
--  return absl::nullopt;
- }
- 
- #else
-@@ -633,11 +630,11 @@ absl::optional<VADisplay> GetVADisplayState(const base::ScopedFD& drm_fd) {
-   }
- }
- 
--#endif  // defined(USE_X11)
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
- 
- bool VADisplayState::InitializeVaDisplay_Locked() {
-   absl::optional<VADisplay> display =
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
-       GetVADisplayStateX11(drm_fd_);
- #else
-       GetVADisplayState(drm_fd_);
-@@ -702,10 +699,9 @@ bool VADisplayState::InitializeOnce() {
-   if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
-     return false;
- 
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
-   if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE &&
-       implementation_type_ == VAImplementation::kIntelIHD) {
--    DCHECK(!features::IsUsingOzonePlatform());
-     constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
-     // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
-     // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
-@@ -722,7 +718,7 @@ bool VADisplayState::InitializeOnce() {
-     if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
-       return false;
-   }
--#endif  // USE_X11
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
- 
-   return true;
- }
-@@ -2452,11 +2448,10 @@ bool VaapiWrapper::MapAndCopyAndExecute(
-   return Execute_Locked(va_surface_id, va_buffer_ids);
- }
- 
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
- bool VaapiWrapper::PutSurfaceIntoPixmap(VASurfaceID va_surface_id,
-                                         x11::Pixmap x_pixmap,
-                                         gfx::Size dest_size) {
--  DCHECK(!features::IsUsingOzonePlatform());
-   base::AutoLock auto_lock(*va_lock_);
- 
-   VAStatus va_res = vaSyncSurface(va_display_, va_surface_id);
-@@ -2470,7 +2465,7 @@ bool VaapiWrapper::PutSurfaceIntoPixmap(VASurfaceID va_surface_id,
-   VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVAPutSurface, false);
-   return true;
- }
--#endif  // USE_X11
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
- 
- std::unique_ptr<ScopedVAImage> VaapiWrapper::CreateVaImage(
-     VASurfaceID va_surface_id,
-@@ -2844,9 +2839,8 @@ void VaapiWrapper::PreSandboxInitialization() {
- 
-   paths[kModuleVa].push_back(std::string("libva.so.") + va_suffix);
-   paths[kModuleVa_drm].push_back(std::string("libva-drm.so.") + va_suffix);
--#if defined(USE_X11)
--  if (!features::IsUsingOzonePlatform())
--    paths[kModuleVa_x11].push_back(std::string("libva-x11.so.") + va_suffix);
-+#if BUILDFLAG(USE_VAAPI_X11)
-+  paths[kModuleVa_x11].push_back(std::string("libva-x11.so.") + va_suffix);
- #endif
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   paths[kModuleVa_prot].push_back(std::string("libva.so.") + va_suffix);
-diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h
-index 0e3da53624..88ffcd0799 100644
---- a/media/gpu/vaapi/vaapi_wrapper.h
-+++ b/media/gpu/vaapi/vaapi_wrapper.h
-@@ -36,9 +36,9 @@
- #include "third_party/abseil-cpp/absl/types/optional.h"
- #include "ui/gfx/geometry/size.h"
- 
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
- #include "ui/gfx/x/xproto.h"  // nogncheck
--#endif  // USE_X11
-+#endif                        // BUILDFLAG(USE_VAAPI_X11)
- 
- namespace gfx {
- enum class BufferFormat;
-@@ -426,13 +426,13 @@ class MEDIA_GPU_EXPORT VaapiWrapper
-       const std::vector<std::pair<VABufferID, VABufferDescriptor>>& va_buffers)
-       WARN_UNUSED_RESULT;
- 
--#if defined(USE_X11)
-+#if BUILDFLAG(USE_VAAPI_X11)
-   // Put data from |va_surface_id| into |x_pixmap| of size
-   // |dest_size|, converting/scaling to it.
-   bool PutSurfaceIntoPixmap(VASurfaceID va_surface_id,
-                             x11::Pixmap x_pixmap,
-                             gfx::Size dest_size) WARN_UNUSED_RESULT;
--#endif  // USE_X11
-+#endif  // BUILDFLAG(USE_VAAPI_X11)
- 
-   // Creates a ScopedVAImage from a VASurface |va_surface_id| and map it into
-   // memory with the given |format| and |size|. If |format| is not equal to the
-diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
-index 8889828e0f..963dc7a0cd 100644
---- a/ui/ozone/platform/x11/ozone_platform_x11.cc
-+++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
-@@ -208,6 +208,9 @@ class OzonePlatformX11 : public OzonePlatform,
-       properties->supports_global_application_menus = true;
-       properties->app_modal_dialogs_use_event_blocker = true;
-       properties->fetch_buffer_formats_for_gmb_on_gpu = true;
-+#if defined(OS_LINUX)
-+      properties->supports_vaapi = true;
-+#endif
- 
-       initialised = true;
-     }
-diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
-index df95f07486..2d7f44bbfa 100644
---- a/ui/ozone/public/ozone_platform.h
-+++ b/ui/ozone/public/ozone_platform.h
-@@ -15,6 +15,7 @@
- #include "base/macros.h"
- #include "base/message_loop/message_pump_type.h"
- #include "base/single_thread_task_runner.h"
-+#include "build/build_config.h"
- #include "mojo/public/cpp/bindings/binder_map.h"
- #include "ui/gfx/buffer_types.h"
- #include "ui/gfx/native_widget_types.h"
-@@ -154,6 +155,15 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
-     // Determines whether buffer formats should be fetched on GPU and passed
-     // back via gpu extra info.
-     bool fetch_buffer_formats_for_gmb_on_gpu = false;
-+
-+#if defined(OS_LINUX)
-+    // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on
-+    // Linux. At the moment, VA-API Linux implementation supports only X11
-+    // backend. This implementation must be refactored to support Ozone
-+    // properly. As a temporary solution, VA-API on Linux checks if vaapi is
-+    // supported (which implicitly means that it is Ozone/X11).
-+    bool supports_vaapi = false;
-+#endif
-   };
- 
-   // Groups platform properties that can only be known at run time.
diff --git a/srcpkgs/chromium/patches/python3.10.patch b/srcpkgs/chromium/patches/python3.10.patch
deleted file mode 100644
index 9ce6ee71202e..000000000000
--- a/srcpkgs/chromium/patches/python3.10.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur ./third_party/jinja2.orig/runtime.py ./third_party/jinja2/runtime.py
---- a/third_party/jinja2.orig/runtime.py	2021-09-24 00:26:35.000000000 -0400
-+++ b/third_party/jinja2/runtime.py	2021-10-13 11:51:16.493986556 -0400
-@@ -315,7 +315,7 @@
- 
- # register the context as mapping if possible
- try:
--    from collections import Mapping
-+    from collections.abc import Mapping
-     Mapping.register(Context)
- except ImportError:
-     pass
-diff -ur ./third_party/jinja2.orig/sandbox.py ./third_party/jinja2/sandbox.py
---- a/third_party/jinja2.orig/sandbox.py	2021-09-24 00:26:35.000000000 -0400
-+++ b/third_party/jinja2/sandbox.py	2021-10-13 11:50:51.513980399 -0400
-@@ -14,7 +14,7 @@
- """
- import types
- import operator
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.environment import Environment
- from jinja2.exceptions import SecurityError
- from jinja2._compat import string_types, PY2
-@@ -79,7 +79,7 @@
-     pass
- 
- #: register Python 2.6 abstract base classes
--from collections import MutableSet, MutableMapping, MutableSequence
-+from collections.abc import MutableSet, MutableMapping, MutableSequence
- _mutable_set_types += (MutableSet,)
- _mutable_mapping_types += (MutableMapping,)
- _mutable_sequence_types += (MutableSequence,)
-diff -ur ./third_party/jinja2.orig/tests.py ./third_party/jinja2/tests.py
---- a/third_party/jinja2.orig/tests.py	2021-09-24 00:26:35.000000000 -0400
-+++ b/third_party/jinja2/tests.py	2021-10-13 11:51:51.693995227 -0400
-@@ -10,7 +10,7 @@
- """
- import operator
- import re
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.runtime import Undefined
- from jinja2._compat import text_type, string_types, integer_types
- import decimal
-diff -ur ./third_party/jinja2.orig/utils.py ./third_party/jinja2/utils.py
---- a/third_party/jinja2.orig/utils.py	2021-09-24 00:26:35.000000000 -0400
-+++ b/third_party/jinja2/utils.py	2021-10-13 11:51:34.969991106 -0400
-@@ -482,7 +482,7 @@
- 
- # register the LRU cache as mutable mapping if possible
- try:
--    from collections import MutableMapping
-+    from collections.abc import MutableMapping
-     MutableMapping.register(LRUCache)
- except ImportError:
-     pass
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index 67fb8fca62d0..bac8a63bc24f 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -47,15 +47,6 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc c
  
  namespace media {
  
-@@ -26,7 +31,8 @@
-   kPulse,
-   kAlsa,
-   kCras,
--  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
-+  kSndio,
-+  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
- };
- 
  std::unique_ptr<media::AudioManager> CreateAudioManager(
 @@ -39,6 +45,16 @@
                                                audio_log_factory);
diff --git a/srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch b/srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch
new file mode 100644
index 000000000000..d10023bc0267
--- /dev/null
+++ b/srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch
@@ -0,0 +1,31 @@
+From 271e45339b7b969e98ccef7837cb1b15480b07fc Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Nov 2021 18:58:34 +0000
+Subject: [PATCH] unbundle: fix visibility of //build/config/freetype
+
+For system freetype //build/linux:freetype_from_pkgconfig is restricted
+to //third_party:freetype_harfbuzz and //third_party/harfbuzz-ng:harfbuzz_source.
+However //build/config/freetype:freetype is accessing it too.
+
+Bug: None
+Change-Id: Ic4a37b01e4ae221372a9220cbad04c598b844c21
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3259304
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#938388}
+---
+ build/linux/BUILD.gn | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn
+index 54314c7687..cd49e3d524 100644
+--- a/build/linux/BUILD.gn
++++ b/build/linux/BUILD.gn
+@@ -23,6 +23,7 @@ if (use_system_freetype) {
+   # the system, use with caution,for details see build/config/freetype/BUILD.gn.
+   pkg_config("freetype_from_pkgconfig") {
+     visibility = [
++      "//build/config/freetype:freetype",
+       "//third_party:freetype_harfbuzz",
+       "//third_party/harfbuzz-ng:harfbuzz_source",
+     ]
diff --git a/srcpkgs/chromium/patches/unbundled-cross-toolchain.patch b/srcpkgs/chromium/patches/unbundled-cross-toolchain.patch
new file mode 100644
index 000000000000..c3f2294ac4b2
--- /dev/null
+++ b/srcpkgs/chromium/patches/unbundled-cross-toolchain.patch
@@ -0,0 +1,12 @@
+--- a/build/toolchain/linux/unbundle/BUILD.gn.orig
++++ b/build/toolchain/linux/unbundle/BUILD.gn
+@@ -35,7 +35,7 @@
+   extra_ldflags = getenv("BUILD_LDFLAGS")
+ 
+   toolchain_args = {
+-    current_cpu = current_cpu
+-    current_os = current_os
++    current_cpu = host_cpu
++    current_os = host_os
+   }
+ }
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index d109aeb5b95c..06109237b794 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -2125,8 +2125,8 @@ diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h b/
 index d4ab936ee..1d22fc59c 100644
 --- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
 +++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
-   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+@@ -315,6 +315,43 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
+   MinidumpContextMIPS64 context_;
  };
  
 +class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
@@ -2164,8 +2164,6 @@ index d4ab936ee..1d22fc59c 100644
 +
 + private:
 +  MinidumpContextPPC64 context_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
 +};
 +
  }  // namespace crashpad
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index dfe427489f8f..ff6eb803adeb 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=95.0.4638.54
+version=96.0.4664.45
 revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,8 +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=3eef88d745e6ddaeaf507358f1510482d6f399cf335061bb1226a5f7120061fd
-nocross=yes
+checksum=488c6ad983ebf7781cb4d704f70496e8aa2165611b46656d7aa62f269c760407
 
 lib32disabled=yes
 
@@ -24,8 +23,8 @@ desc_option_pulseaudio="Enable support for PulseAudio"
 desc_option_sndio="Enable support for sndio"
 desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
 
-hostmakedepends="$(vopt_if clang "clang lld llvm12") python pkgconf perl gperf bison ninja nodejs hwids
- libatomic-devel libevent-devel libglib-devel $(vopt_if js_optimize openjdk)"
+hostmakedepends="$(vopt_if clang "clang lld llvm12") python python3 pkgconf perl gperf bison ninja nodejs hwids
+ libatomic-devel libevent-devel libglib-devel $(vopt_if js_optimize openjdk) wayland-devel libepoxy-devel"
 makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
  libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
  libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
@@ -34,8 +33,9 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
  libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
  libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
  minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
- re2-devel fontconfig-devel freetype-devel opus-devel
+ re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
  ffmpeg-devel libva-devel python-setuptools xcb-proto libcurl-devel
+ libxshmfence-devel
  $(vopt_if pipewire pipewire-devel) $(vopt_if sndio sndio-devel)"
 depends="libexif hwids desktop-file-utils hicolor-icon-theme xdg-utils"
 
@@ -43,6 +43,26 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc64*-musl) makedepends+=" libucontext-devel" ;;
 esac
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" libX11-devel libxcb-devel pciutils-devel libXext-devel libglvnd-devel
+	 libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel harfbuzz-devel
+	 libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
+	 $(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
+	 libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
+	 mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="chromium (v8) can only be cross compiled if word size matches"
+fi
+
+if [ "$CROSS_BUILD" ]; then
+	case "${XBPS_TARGET_MACHINE}" in
+		aarch64*) ;;
+		*) nocross="chromium can not be cross compiled for this architecture" ;;
+	esac
+fi
+
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		for f in "${FILESDIR}"/musl-patches/*.patch; do
@@ -71,20 +91,57 @@ post_patch() {
 	vsed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
 		tools/generate_shim_headers/generate_shim_headers.py
 }
-do_configure() {
-	local system="" conf=()
-	export -n CFLAGS CXXFLAGS LDFLAGS
 
+_setup_clang() {
+	local gcc_version=$(gcc -dumpversion)
+	local clang_version=$(clang -dumpversion)
+	export CC=clang
+	export CXX=clang++
+	export AR=llvm-ar
+	export NM=llvm-nm
+	export CFLAGS="-Wno-unknown-warning-option"
+	export CXXFLAGS="-Wno-unknown-warning-option"
+	export LDFLAGS=""
+	export BUILD_CC=clang
+	export BUILD_CXX=clang++
+	export BUILD_AR=llvm-ar
+	export BUILD_NM=llvm-nm
+	export BUILD_CFLAGS="-Wno-unknown-warning-option"
+	export BUILD_CXXFLAGS="-Wno-unknown-warning-option"
+	if [ "$CROSS_BUILD" ]; then
+		CFLAGS+=" --gcc-toolchain=/usr"
+		CFLAGS+=" --sysroot=${XBPS_CROSS_BASE}"
+		CFLAGS+=" -nostdinc"
+		CFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
+		CFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
+		CXXFLAGS+=" --gcc-toolchain=/usr"
+		CXXFLAGS+=" --sysroot=${XBPS_CROSS_BASE}"
+		CXXFLAGS+=" -nostdinc++"
+		CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}"
+		CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/${XBPS_CROSS_TRIPLET}"
+		CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/backward"
+		CXXFLAGS+=" -nostdinc"
+		CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
+		CXXFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
+		LDFLAGS+=" --gcc-toolchain=/usr --sysroot=${XBPS_CROSS_BASE}"
+	fi
+}
+
+_setup_toolchain() {
 	if [ "$build_option_clang" ]; then
-		export CC=clang
-		export CXX=clang++
+		_setup_clang
 	fi
+	CXXFLAGS+=" -fdebug-prefix-map=$wrksrc=."
+	CFLAGS+=" -fdebug-prefix-map=$wrksrc=."
+}
 
-	export LDFLAGS="-pthread"
+do_configure() {
+	local system="" conf=()
 
 	# compile gn early, so it can be used to generate gni stuff
 	AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \
-	tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
+		CFLAGS=$CFLAGS_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD LDFLAGS=$LDFLAGS_FOR_BUILD \
+		tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
 
 	# we need to generate ppc64 stuff for libvpx as it's not shipped
 	# this has to be done before unbundling, but after gn is built
@@ -154,8 +211,8 @@ do_configure() {
 		'enable_nacl_nonsfi=false'
 
 		'use_sysroot=false'
-		'custom_toolchain="//build/toolchain/linux/unbundle:default"'
-		'host_toolchain="//build/toolchain/linux/unbundle:default"'
+
+		'host_pkg_config="/usr/bin/pkg-config"'
 
 		"is_clang=$(vopt_if clang true false)"
 		"use_lld=$(vopt_if clang true false)"
@@ -181,6 +238,7 @@ do_configure() {
 		'enable_hangout_services_extension=true'
 
 		'use_system_harfbuzz=true'
+		'use_system_wayland_scanner=true'
 
 		'use_cups=true'
 
@@ -220,11 +278,28 @@ do_configure() {
 		'chrome_pgo_phase=0'
 	)
 
+	if [ "$CROSS_BUILD" ]; then
+		conf+=(
+			'custom_toolchain="//build/toolchain/linux/unbundle:default"'
+			'host_toolchain="//build/toolchain/linux/unbundle:host"'
+			'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:v8_snapshot_cross"'
+		)
+	else
+		conf+=(
+			'custom_toolchain="//build/toolchain/linux/unbundle:default"'
+			'host_toolchain="//build/toolchain/linux/unbundle:default"'
+		)
+	fi
+
 	# this does not work on ppc64 yet
 	case "$XBPS_TARGET_MACHINE" in
 		ppc64*) conf+=( "enable_jxl_decoder=false" );;
 	esac
 
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		conf+=( 'is_musl=true' )
+	fi
+
 	case "${XBPS_TARGET_MACHINE}" in
 		x86_64*) conf+=( 'target_cpu="x64"' ) ;;
 		i686*) conf+=( 'target_cpu="x86"' ) ;;
@@ -233,35 +308,32 @@ do_configure() {
 		ppc64*) conf+=( 'target_cpu="ppc64"' ) ;;
 	esac
 
-	if [ "$build_option_clang" ]; then
-		export CC=clang
-		export CXX=clang++
-		export AR=llvm-ar
-		export NM=llvm-nm
-		export CFLAGS="-Wno-unknown-warning-option"
-		export CXXFLAGS="-Wno-unknown-warning-option"
+	if [ "$CROSS_BUILD" ]; then
+		case "${XBPS_MACHINE}" in
+			x86_64*) conf+=( 'host_cpu="x64"' ) ;;
+			i686*) conf+=( 'host_cpu="x86"' ) ;;
+			arm*) conf+=( 'host_cpu="arm"' ) ;;
+			aarch64*) conf+=( 'host_cpu="arm64"' ) ;;
+			ppc64*) conf+=( 'host_cpu="ppc64"' ) ;;
+		esac
 	fi
-
+	_setup_toolchain
 	out/Release/gn gen out/Release --args="${conf[*]}"
 }
-do_build() {
-	if [ "$build_option_clang" ]; then
-		export CC=clang
-		export CXX=clang++
-		export AR=llvm-ar
-		export NM=llvm-nm
-		export CFLAGS="-Wno-unknown-warning-option"
-		export CXXFLAGS="-Wno-unknown-warning-option"
-	fi
 
-	ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot chrome_crashpad_handler
+do_build() {
+	_setup_toolchain
+	ninja -C out/Release ${makejobs} chrome chromedriver chrome_crashpad_handler
 }
+
 do_install() {
 	vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname}
 	vinstall out/Release/chrome_crashpad_handler 755 usr/lib/${pkgname} chrome_crashpad_handler
 	vinstall out/Release/chromedriver 755 usr/lib/${pkgname} chromedriver
 	vinstall out/Release/libEGL.so 755 usr/lib/${pkgname} libEGL.so
 	vinstall out/Release/libGLESv2.so 755 usr/lib/${pkgname} libGLESv2.so
+	vinstall out/Release/libvk_swiftshader.so 755 usr/lib/${pkgname} libvk_swiftshader.so
+	vinstall out/Release/vk_swiftshader_icd.json 755 usr/lib/${pkgname} vk_swiftshader_icd.json
 
 	vcopy "out/Release/*.bin" usr/lib/chromium
 	vcopy "out/Release/*.pak" usr/lib/chromium

From 7bc6572001795ba4431fbd15b7230fa87dbf6e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 17 Nov 2021 07:05:54 +0700
Subject: [PATCH 2952/4088] chroot-git: update to 2.34.0.

---
 srcpkgs/chroot-git/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 3a65c9c0617b..f7de7866263a 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.1
-revision=2
+version=2.34.0
+revision=1
 bootstrap=yes
 wrksrc="git-${version}"
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
+checksum=fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
@@ -26,7 +26,6 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +34,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	# firstword (uname -m)
 	HOST_CPU = ${XBPS_TARGET_MACHINE%-musl}
 	SKIP_DASHED_BUILT_INS = Yes

From abeeeeacd53495cdaa60db5018c54fcb0efb8774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 17 Nov 2021 07:01:54 +0700
Subject: [PATCH 2953/4088] git: update to 2.34.0.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 80222b740753..7ca728c73ba6 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.1
+version=2.34.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
+checksum=fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From d213a1dfcdc50d5a0e6dee36d46f0cd0d3a6f1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 17 Nov 2021 07:19:09 +0700
Subject: [PATCH 2954/4088] deluge: create deluged's configuration dir

Close #34103
---
 srcpkgs/deluge/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index c4a4b18fa633..180e473235fd 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=14
+revision=15
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
@@ -19,7 +19,11 @@ checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"
 
-make_dirs="/var/lib/deluge 0755 deluge deluge"
+make_dirs="
+ /var/lib/deluge 0755 deluge deluge
+ /var/lib/deluge/.config 0755 deluge deluge
+ /var/lib/deluge/.config/deluge 0755 deluge deluge
+ "
 
 post_install() {
 	vsv deluged

From 14f9462041f85e0485d0e0d5e62a5117861055d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 17 Nov 2021 08:23:40 +0700
Subject: [PATCH 2955/4088] git: fix build race

---
 ...001-Makefile-fix-parallel-build-race.patch | 33 +++++++++++++++++++
 ...001-Makefile-fix-parallel-build-race.patch | 33 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 srcpkgs/chroot-git/patches/0001-Makefile-fix-parallel-build-race.patch
 create mode 100644 srcpkgs/git/patches/0001-Makefile-fix-parallel-build-race.patch

diff --git a/srcpkgs/chroot-git/patches/0001-Makefile-fix-parallel-build-race.patch b/srcpkgs/chroot-git/patches/0001-Makefile-fix-parallel-build-race.patch
new file mode 100644
index 000000000000..9c75f813c304
--- /dev/null
+++ b/srcpkgs/chroot-git/patches/0001-Makefile-fix-parallel-build-race.patch
@@ -0,0 +1,33 @@
+From 7d82342089a80b19e54ac8997d5765a33951499f Mon Sep 17 00:00:00 2001
+Message-Id: <7d82342089a80b19e54ac8997d5765a33951499f.1637112066.git.congdanhqx@gmail.com>
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Wed, 17 Nov 2021 08:19:22 +0700
+Subject: [PATCH] Makefile: fix parallel build race
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* builtin/bugreport.c includes hook-list.h, hence generated files from
+it must depend on hook-list.h
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 241dc322c0..413503b488 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2222,6 +2222,7 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
+ 
+ help.sp help.s help.o: command-list.h
+ hook.sp hook.s hook.o: hook-list.h
++builtin/bugreport.sp builtin/bugreport.s builtin/bugreport.o: hook-list.h
+ 
+ builtin/help.sp builtin/help.s builtin/help.o: config-list.h hook-list.h GIT-PREFIX
+ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
+-- 
+2.34.0.rc1
+
diff --git a/srcpkgs/git/patches/0001-Makefile-fix-parallel-build-race.patch b/srcpkgs/git/patches/0001-Makefile-fix-parallel-build-race.patch
new file mode 100644
index 000000000000..9c75f813c304
--- /dev/null
+++ b/srcpkgs/git/patches/0001-Makefile-fix-parallel-build-race.patch
@@ -0,0 +1,33 @@
+From 7d82342089a80b19e54ac8997d5765a33951499f Mon Sep 17 00:00:00 2001
+Message-Id: <7d82342089a80b19e54ac8997d5765a33951499f.1637112066.git.congdanhqx@gmail.com>
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Wed, 17 Nov 2021 08:19:22 +0700
+Subject: [PATCH] Makefile: fix parallel build race
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* builtin/bugreport.c includes hook-list.h, hence generated files from
+it must depend on hook-list.h
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 241dc322c0..413503b488 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2222,6 +2222,7 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
+ 
+ help.sp help.s help.o: command-list.h
+ hook.sp hook.s hook.o: hook-list.h
++builtin/bugreport.sp builtin/bugreport.s builtin/bugreport.o: hook-list.h
+ 
+ builtin/help.sp builtin/help.s builtin/help.o: config-list.h hook-list.h GIT-PREFIX
+ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
+-- 
+2.34.0.rc1
+

From 741fc4cc980772e9d4992e5b6f5f2c07a7689f1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 11 Nov 2021 09:40:02 +0100
Subject: [PATCH 2956/4088] libnftnl: add libmnl as a dep to the devel subpkg

pkgconfig complains about this otherwise.
See: /usr/lib/pkgconfig/libnftnl.pc

> Requires.private: libmnl
---
 srcpkgs/libnftnl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnftnl/template b/srcpkgs/libnftnl/template
index 083a1a4b90c4..ba09afddd91e 100644
--- a/srcpkgs/libnftnl/template
+++ b/srcpkgs/libnftnl/template
@@ -1,7 +1,7 @@
 # Template file for 'libnftnl'
 pkgname=libnftnl
 version=1.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libmnl-devel"
@@ -13,7 +13,7 @@ distfiles="https://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${vers
 checksum=90b01fddfe9be8c3245c3ba5ff5a4424a8df708828f92b2b361976b658c074f5
 
 libnftnl-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From af96c99bbec4d2e5bd9f30342aaf5a9ba0ba66c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 17 Nov 2021 10:49:26 +0100
Subject: [PATCH 2957/4088] k9s: update to 0.25.2.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..8785e10e8e4f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.25.2
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ 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=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=a2b73c9a34950db5ff7b6f4fed0cc961becd652a17acc9e5d5f00c816ccb0a39
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From c42fe8388cd8e4fd7ddb25044f13245bab5c9481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 17 Nov 2021 16:08:55 +0100
Subject: [PATCH 2958/4088] exiftool: update to 12.36.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 07f263997adc..f92eee5d4f03 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.35
+version=12.36
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=93610630577d26b23c77100e0d3da96dffedd298119fe74710a9c486ab3fe971
+checksum=e95a8548a6cca3e8495b86a5652cb522fb8c06fe6a9ae15b6a59b92f3a3c7ca7

From 9382334a5580f04d0079e5bb1a7bbfa7351370f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 17 Nov 2021 15:50:56 +0100
Subject: [PATCH 2959/4088] qpdf: update to 10.4.0.

---
 srcpkgs/qpdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 55f9eb480eee..c7e41af8642f 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.3.2
+version=10.4.0
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=8f1f42d1c36f62cf5bb4d2511e80e4fc0125093adc7fc444bc96cb7e79e71402
+checksum=346ccd5156b4fc73b958ad0b95278283c7b1b6e7864fecdf25e41df7fb918de9
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a080d9a4899ee3c661e950124f87e01844716817 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 17 Nov 2021 10:51:51 +0100
Subject: [PATCH 2960/4088] praat: update to 6.2

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index d079df57cdee..8c5f3d681c33 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.56
+version=6.2
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=474056adcc85642645de335a9286375826195559dcc425396bb21d6afc5a05b6
+checksum=7ad4238aaedb044dda83b08d972971e996c4af939b5ea6d18bf674ab5164e26d
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From b6bcc0e5916b605e2d754aea7c3a4a3a88c29ec1 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 17 Nov 2021 07:47:49 +0100
Subject: [PATCH 2961/4088] slack-desktop: update to 4.22.0

---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index c395fc8c6fc1..9b2814fa375c 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.21.1
+version=4.22.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=58ee2bf34f94a60c7bbafe856267461bf5056b57c6330033cc4aba275edeb756
+checksum=d12026d979673aa5cdc14f6a484776a72bedf7fec5acb2ddeb7414733b7d044d
 restricted=yes
 repository="nonfree"
 nopie=yes

From 821f674a812e5bbb273a1cde2d4d3a821aa4edb9 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitz@disroot.org>
Date: Mon, 8 Nov 2021 17:38:21 +0200
Subject: [PATCH 2962/4088] anki: fix type errors and profile saving.

Also, disable useless auto update dialog on start.
---
 srcpkgs/anki/patches/disable_popup.patch    | 10 +++++
 srcpkgs/anki/patches/fix_float.patch        | 42 +++++++++++++++++++++
 srcpkgs/anki/patches/fix_profile_save.patch | 15 ++++++++
 srcpkgs/anki/template                       |  2 +-
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/anki/patches/disable_popup.patch
 create mode 100644 srcpkgs/anki/patches/fix_float.patch
 create mode 100644 srcpkgs/anki/patches/fix_profile_save.patch

diff --git a/srcpkgs/anki/patches/disable_popup.patch b/srcpkgs/anki/patches/disable_popup.patch
new file mode 100644
index 000000000000..8b7a041fc656
--- /dev/null
+++ b/srcpkgs/anki/patches/disable_popup.patch
@@ -0,0 +1,10 @@
+--- a/aqt/update.py
++++ b/aqt/update.py
+@@ -31,6 +31,7 @@ class LatestVersionFinder(QThread):
+         return d
+ 
+     def run(self):
++        return
+         if not self.config['updates']:
+             return
+         d = self._data()
diff --git a/srcpkgs/anki/patches/fix_float.patch b/srcpkgs/anki/patches/fix_float.patch
new file mode 100644
index 000000000000..333d76c8efd7
--- /dev/null
+++ b/srcpkgs/anki/patches/fix_float.patch
@@ -0,0 +1,42 @@
+--- a/aqt/deckconf.py
++++ b/aqt/deckconf.py
+@@ -172,7 +172,7 @@ class DeckConf(QDialog):
+         f.lrnGradInt.setValue(c['ints'][0])
+         f.lrnEasyInt.setValue(c['ints'][1])
+         f.lrnEasyInt.setValue(c['ints'][1])
+-        f.lrnFactor.setValue(c['initialFactor']/10.0)
++        f.lrnFactor.setValue(c['initialFactor']//10)
+         f.newOrder.setCurrentIndex(c['order'])
+         f.newPerDay.setValue(c['perDay'])
+         f.bury.setChecked(c.get("bury", True))
+@@ -180,7 +180,7 @@ class DeckConf(QDialog):
+         # rev
+         c = self.conf['rev']
+         f.revPerDay.setValue(c['perDay'])
+-        f.easyBonus.setValue(c['ease4']*100)
++        f.easyBonus.setValue(int(c['ease4'])*100)
+         f.fi1.setValue(c['ivlFct']*100)
+         f.maxIvl.setValue(c['maxIvl'])
+         f.revplim.setText(self.parentLimText('rev'))
+@@ -192,7 +192,7 @@ class DeckConf(QDialog):
+         # lapse
+         c = self.conf['lapse']
+         f.lapSteps.setText(self.listToUser(c['delays']))
+-        f.lapMult.setValue(c['mult']*100)
++        f.lapMult.setValue(int(c['mult'])*100)
+         f.lapMinInt.setValue(c['minInt'])
+         f.leechThreshold.setValue(c['leechFails'])
+         f.leechAction.setCurrentIndex(c['leechAction'])
+--- a/aqt/preferences.py
++++ b/aqt/preferences.py
+@@ -77,8 +77,8 @@ class Preferences(QDialog):
+             f.hwAccel.setVisible(False)
+         else:
+             f.hwAccel.setChecked(self.mw.pm.glMode() != "software")
+-        f.lrnCutoff.setValue(qc['collapseTime']/60.0)
+-        f.timeLimit.setValue(qc['timeLim']/60.0)
++        f.lrnCutoff.setValue(qc['collapseTime']//60)
++        f.timeLimit.setValue(qc['timeLim']//60)
+         f.showEstimates.setChecked(qc['estTimes'])
+         f.showProgress.setChecked(qc['dueCounts'])
+         f.nightMode.setChecked(qc.get("nightMode", False))
diff --git a/srcpkgs/anki/patches/fix_profile_save.patch b/srcpkgs/anki/patches/fix_profile_save.patch
new file mode 100644
index 000000000000..9d72a1a20e82
--- /dev/null
+++ b/srcpkgs/anki/patches/fix_profile_save.patch
@@ -0,0 +1,15 @@
+Fixes crash related to saving profile data on exit.
+--- a/aqt/profiles.py
++++ b/aqt/profiles.py
+@@ -160,7 +160,10 @@ a flash drive.""" % self.base)
+         return up.load()
+ 
+     def _pickle(self, obj):
+-        return pickle.dumps(obj, protocol=0)
++        for key, val in obj.items():
++            if isinstance(val, QByteArray):
++                obj[key] = bytes(val)  # type: ignore
++        return pickle.dumps(obj, protocol=4)
+ 
+     def load(self, name):
+         assert name != "_global"
diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template
index f2a476844717..3cb3155760ea 100644
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@@ -1,7 +1,7 @@
 # Template file for 'anki'
 pkgname=anki
 version=2.1.15
-revision=5
+revision=6
 build_style=gnu-makefile
 depends="python3-PyQt5-webengine python3-requests python3-SQLAlchemy
  python3-PyAudio python3-mpv python3-Markdown python3-send2trash

From 79a9369c621d70fbc64cc97bc543daa358c25d1b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Nov 2021 16:08:40 +0100
Subject: [PATCH 2963/4088] miller: update to 5.10.3.

---
 srcpkgs/miller/template | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index 5dcaa49fe196..5ccd2d9fe77b 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,26 +1,15 @@
 # Template file for 'miller'
 pkgname=miller
-version=5.10.2
+version=5.10.3
 revision=1
 build_style=gnu-configure
-hostmakedepends="asciidoc automake flex libtool"
 short_desc="Tool like sed/awk/cut/join/sort for name-indexed data such as CSV"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://johnkerl.org/miller/"
 changelog="https://github.com/johnkerl/miller/releases"
-distfiles="https://github.com/johnkerl/${pkgname}/archive/v${version}.tar.gz"
-checksum=b6026479ee7315656d7ec228d0084f86d4cecc5b8b00d5400f5fb3600af65eb3
-
-pre_configure() {
-	# Disable debugging and profiling versions, broken on musl.
-	echo 'noinst_PROGRAMS=' >> c/Makefile.am
-	autoreconf -fi
-}
-
-pre_build() {
-	make -C c/parsing lemon CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS -fPIC"
-}
+distfiles="https://github.com/johnkerl/miller/releases/download/v${version}/miller-${version}.tar.gz"
+checksum=bbab4555c2bc207297554b0593599ea2cd030a48ad1350d00e003620e8d3c0ea
 
 post_install() {
 	vlicense LICENSE.txt

From e8048e79f6b417443ea898c72840fbf996e3a45c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Nov 2021 16:15:43 +0100
Subject: [PATCH 2964/4088] bcc: update to 0.23.0.

---
 srcpkgs/bcc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 60c9b746d3fe..3671a774b822 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.22.0
-revision=2
+version=0.23.0
+revision=1
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
 distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
-checksum=9d195db7fe617cdde03e2af7cfd1ac07751aaf0e7e966aaa19237db8fe91fd40
+checksum=1a8ad163756926bcc590766682caacdcfdac1b13f54976ab3f25acd5544b15ec
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From d6c9899abb5e7d603e3f18547e9b1842f692a023 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Nov 2021 16:16:13 +0100
Subject: [PATCH 2965/4088] skaffold: update to 1.35.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 815e232c5447..c5b8a858474c 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.34.0
+version=1.35.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=ab83edd467871ea2ad246180aa8a63ca06c560b59aee6aebd087b83ec226adce
+checksum=0ce75ba329f027c9075cfddddd8a96ca08523c772733f999e236a7913b59ea14

From f6d1293829212bfc4f3e074e9905fff672997dbd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Nov 2021 16:16:40 +0100
Subject: [PATCH 2966/4088] python3-boto3: update to 1.20.7.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index ded314aba0b6..bf8d65a2fff2 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.19.9
+version=1.20.7
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=7845b16b023410f9b8e2e7ef1e9bfb72f384de4e675f4166ffb5463dfc5d8a0b
+checksum=f956984ebd98b1fa63ce98445b388f1f9533e9396b0d1944fcb06c3eedd69941
 
 post_install() {
 	vlicense LICENSE

From 4b67ea4a74d64c1d5a23e485d131708ed7bf5875 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Nov 2021 16:19:24 +0100
Subject: [PATCH 2967/4088] swi-prolog: update to 8.4.1.

---
 srcpkgs/swi-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index d9e2f0f8a985..6cce4033f0c6 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,6 +1,6 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
-version=8.4.0
+version=8.4.1
 revision=1
 wrksrc="swipl-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="http://www.swi-prolog.org/"
 changelog="http://www.swi-prolog.org/ChangeLog?branch=stable"
 distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
-checksum=bff0396f827af3d3351eed0582a99cbcd0a66d14a2f5bbf4aeef22332714709f
+checksum=30bb6542b7767e47b94bd92e8e8a7d7a8a000061044046edf45fc864841b69c4
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 0cd4221ef9ea234772cded17c3b34ef2535719a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Nov 2021 16:21:02 +0100
Subject: [PATCH 2968/4088] python3-pyinfra: update to 1.5.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 1b80c9d1a381..a1b34afe347c 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.18
+version=1.5
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=4b69c99d59b0744ad48534cb08bd15c8f4a34d16f45d2ae95117f6edb7f5551b
+checksum=3918fbe08ff29cb7f540bf024aea2f74612a5859405816c1809f6d9916dfbd96
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From ea7fd0c2c0d8db9940fda1229c95b79d9ed2e352 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 23:18:08 +0100
Subject: [PATCH 2969/4088] xarcan: add missing build dep on libxshmfence-devel

---
 srcpkgs/xarcan/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 222f434d0bc0..64f74efd209d 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -8,7 +8,7 @@ configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
  libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
- xorgproto"
+ xorgproto libxshmfence-devel"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="MIT, BSD-3-Clause"

From fc6791482ce5c61cce07fe6ab155f3152ca0a357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 17 Nov 2021 18:19:01 -0300
Subject: [PATCH 2970/4088] flintlib: update to 2.8.4.

---
 srcpkgs/flintlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index a14a69fb8fa4..cebf8e300812 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -1,6 +1,6 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=2.8.3
+version=2.8.4
 revision=1
 wrksrc="flint-${version}"
 build_style=configure
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flintlib.org"
 changelog="https://raw.githubusercontent.com/wbhart/flint2/trunk/NEWS"
 distfiles="https://flintlib.org/flint-${version}.tar.gz"
-checksum=2c3c2dbfb82242c835be44341d893ca69384d4d0b9448a3aac874e16c623cd59
+checksum=61df92ea8c8e9dc692d46c71d7f50aaa09a33d4ba08d02a1784730a445e5e4be
 
 build_options="ntl"
 desc_option_ntl="enable NTL support"

From cb4b309aa51d8102d7ad8a67f10ef4f3d2aec731 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Nov 2021 20:30:55 +0200
Subject: [PATCH 2971/4088] goodvibes: update to 0.7.2.

---
 srcpkgs/goodvibes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 38ff5434a8e0..1a73cd225234 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,6 +1,6 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.7.1
+version=0.7.2
 revision=1
 wrksrc="goodvibes-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ license="GPL-3.0-only"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/-/raw/master/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=5549e1601a6486eb7d705d4dcdd80827a2abaaa01c5c04f8438e26c24d4478b0
+checksum=5f96ba7b8654f331181c8ee0e697d042a195406712a547e7954159e5d66795ba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"

From 3d3f4d5c9b3cbafd68fcdbd27ee7ea8ac23320de Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Wed, 17 Nov 2021 18:23:36 +0100
Subject: [PATCH 2972/4088] cpuid: update to 20211114.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index a3f8e0038a3b..15269984b076 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20211031
+version=20211114
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.etallen.com/cpuid.html"
 distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=765d3336eb2e6f99765322e5f0f4e38c493c1c3c991e44c18ed73f9295585d8f
+checksum=7107dc8cc68f3fb3613244e44af7b4c91fa6cd14aec373e0c2e743545203e1b7

From e24600c01068608eed60b8f5507b6958c8527f4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 17 Nov 2021 23:49:15 -0300
Subject: [PATCH 2973/4088] go1.12-bootstrap: remove outdated musl workaround.

Since 091ab0b612d039891f4d549f9f054567bcef3627, we have /lib64 as a
symlink to /usr/lib on 64-bit systems, so patching the ELF file to
change its interpreter is no longer necessary.
---
 srcpkgs/go1.12-bootstrap/template | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 2b3c298cb926..9d6c3b4b3cb4 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'go1.12-bootstrap'
 pkgname=go1.12-bootstrap
 version=1.12.17
-revision=1
+revision=2
 archs="x86_64* i686* armv[67]l* aarch64* ppc64le*"
 wrksrc="go"
 short_desc="Go 1.12 (bootstrap compiler)"
@@ -15,7 +15,6 @@ lib32disabled=yes
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"
-	hostmakedepends+=" patchelf"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
@@ -43,18 +42,6 @@ esac
 
 distfiles="https://dl.google.com/go/go${version}.linux-${_dist_arch}.tar.gz"
 
-post_build() {
-	[ "$XBPS_TARGET_LIBC" != "musl" ] && return 0
-
-	# we don't have lib64 compatibility path on musl 64-bit systems
-	# use patchelf to replace /lib64/<dynlinker> with /lib/<dynlinker>
-
-	local _interp=$(patchelf --print-interpreter ${wrksrc}/bin/go)
-
-	patchelf --set-interpreter ${_interp/lib64\//lib\/} ${wrksrc}/bin/go
-	patchelf --set-interpreter ${_interp/lib64\//lib\/} ${wrksrc}/bin/godoc
-}
-
 do_install() {
 	vmkdir usr/lib/go1.12
 	vcopy bin usr/lib/go1.12

From c59e7ab464f56e1f2f4a8a144da099e1f30ee113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 21 May 2021 02:13:23 -0300
Subject: [PATCH 2974/4088] python3-mechanize: update to 0.4.7.

---
 srcpkgs/python3-mechanize/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
index b23d78fd5bd1..5c9df2b45c96 100644
--- a/srcpkgs/python3-mechanize/template
+++ b/srcpkgs/python3-mechanize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mechanize'
 pkgname=python3-mechanize
-version=0.4.3
-revision=7
+version=0.4.7
+revision=1
 wrksrc="mechanize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,8 +11,9 @@ short_desc="Stateful programmatic web browsing (Python3)"
 maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/python-mechanize/mechanize"
+changelog="https://raw.githubusercontent.com/python-mechanize/mechanize/master/ChangeLog"
 distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
+checksum=993da15561d335d9a6423d17c790e62dcfe92d7de620b3244fbd7a8efc422404
 
 post_install() {
 	vlicense LICENSE

From 55854d8921f7620069679449886805356609cca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 21 May 2021 02:14:28 -0300
Subject: [PATCH 2975/4088] python3-magic: update to 0.4.24.

Add and fix tests with backported commit.
---
 ...e7ceac0e80e03adc75c858bb378c0427331a.patch | 24 +++++++++++++++++++
 srcpkgs/python3-magic/template                | 17 ++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-magic/patches/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch

diff --git a/srcpkgs/python3-magic/patches/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch b/srcpkgs/python3-magic/patches/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch
new file mode 100644
index 000000000000..ba4abc0796f7
--- /dev/null
+++ b/srcpkgs/python3-magic/patches/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch
@@ -0,0 +1,24 @@
+From 0ae7e7ceac0e80e03adc75c858bb378c0427331a Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Fri, 22 Oct 2021 09:47:32 +0200
+Subject: [PATCH] Support file 5.41.
+
+In https://github.com/file/file/commit/7d9b0f0d853957ad88dae0f440fecd58d2740ca7,
+the MIME was changed for Python bytecode.
+---
+ test/test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test.py b/test/test.py
+index 0c4621c..e443b84 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -90,7 +90,7 @@ def test_mime_types(self):
+         try:
+             m = magic.Magic(mime=True)
+             self.assert_values(m, {
+-                'magic._pyc_': ('application/octet-stream', 'text/x-bytecode.python'),
++                'magic._pyc_': ('application/octet-stream', 'text/x-bytecode.python', 'application/x-bytecode.python'),
+                 'test.pdf': 'application/pdf',
+                 'test.gz': ('application/gzip', 'application/x-gzip'),
+                 'test.snappy.parquet': 'application/octet-stream',
diff --git a/srcpkgs/python3-magic/template b/srcpkgs/python3-magic/template
index 89ac640e7a4e..e47aea1a704d 100644
--- a/srcpkgs/python3-magic/template
+++ b/srcpkgs/python3-magic/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-magic'
 pkgname=python3-magic
-version=0.4.18
-revision=5
+version=0.4.24
+revision=1
 wrksrc=python-magic-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,8 +10,19 @@ short_desc="File type identification using libmagic (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ahupp/python-magic"
+changelog="https://raw.githubusercontent.com/ahupp/python-magic/master/CHANGELOG"
 distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz"
-checksum=b787e8056c115f37e2af11e0b98dc67d5fc182ed5ed827a62f95e3a7f0ed4be4
+checksum=48b70b62caa8b911c8c79a1d06ab618037f00d09ac891b7490d0d890ff6e0632
+
+do_check() {
+	cd test/
+	# based on test/run.py but that requires python2 and other ugly things
+	(
+		export LC_ALL=en_US.UTF-8 PYTHONPATH=..
+		python3 test.py
+		python3 libmagic_test.py
+	)
+}
 
 post_install() {
 	vlicense LICENSE

From bd0fc9fd06b012bb46c008e346fb22e989aa7d03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 18 Nov 2021 14:50:27 +0100
Subject: [PATCH 2976/4088] linux5.10: update to 5.10.80.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 9a418cd80646..4ddc5683305c 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.79
+version=5.10.80
 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=e49955e16a2ee26d0b3ca1521912daba5ab8f7a6b2c9e5f538bb0ae7b837a8ad
+checksum=477ce8f7624263e4346c0fc25ffc334af06bcac4d6bebdd5a7fe4681557fdb39
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 8f0342ff23851cc9753e47c49317e22745d771b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 18 Nov 2021 16:33:09 +0100
Subject: [PATCH 2977/4088] croc: update to 9.5.0.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index e90c0fc8fce5..97c133d01082 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.4.2
+version=9.5.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=73d3abb058af18329ffdea4bb77d484b5f8ede9c11010d44781f3e891aa675e0
+checksum=0e250ecebc72753991a3442e48f9caadfae2467430a81595b79b5443e2ff523b
 
 post_install() {
 	vlicense LICENSE

From 94b70113afd05586917cc820a1e492f18e2aca48 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Nov 2021 20:42:58 +0200
Subject: [PATCH 2978/4088] spdx-licenses-list: update to 3.15.

Also:
- update common/travis/license.lst.
---
 common/travis/license.lst           | 4 ++++
 srcpkgs/spdx-licenses-list/template | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..4102eab159ea 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -140,6 +140,7 @@ CLISP-exception-2.0
 CNRI-Jython
 CNRI-Python-GPL-Compatible
 CNRI-Python
+COIL-1.0
 CPAL-1.0
 CPL-1.0
 CPOL-1.02
@@ -147,6 +148,7 @@ CUA-OPL-1.0
 Caldera
 ClArtistic
 Classpath-exception-2.0
+Community-Spec-1.0
 Condor-1.1
 Crossword
 CrystalStacker
@@ -171,6 +173,7 @@ EUPL-1.2
 Entessa
 ErlPL-1.1
 Eurosym
+FDK-AAC
 FLTK-exception
 FSFAP
 FSFUL
@@ -264,6 +267,7 @@ LiLiQ-Rplus-1.1
 Libpng
 Libtool-exception
 Linux-OpenIB
+Linux-man-pages-copyleft
 Linux-syscall-note
 MIT-0
 MIT-CMU
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..1ffdac0791a1 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,7 +2,7 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.15
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=728d7ad11ce13e81cb2346b6fda7168dbdc9d3c5592e8142ae910b70b6cb79b7
 
 do_install() {
 	vmkdir usr/share/spdx

From d6081c73c1fedb95fa20bcd89a3301cb430d8f50 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Nov 2021 23:48:15 +0200
Subject: [PATCH 2979/4088] fdk-aac: change license to its spdx identifier.

---
 srcpkgs/fdk-aac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fdk-aac/template b/srcpkgs/fdk-aac/template
index e24461ed53e1..7e7df5209a3b 100644
--- a/srcpkgs/fdk-aac/template
+++ b/srcpkgs/fdk-aac/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 short_desc="Fraunhofer FDK AAC codec library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom:Fraunhofer FDK AAC Codec license"
+license="FDK-AAC"
 homepage="http://www.iis.fraunhofer.de/en/ff/amm/impl/fdkaaccodec.html"
 distfiles="${SOURCEFORGE_SITE}/opencore-amr/${pkgname}-${version}.tar.gz"
 checksum=c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f

From 5ba335339d9f3e1c22b6ddccac96f0db052f7e6a Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Thu, 18 Nov 2021 13:46:00 -0500
Subject: [PATCH 2980/4088] vis: add missing build dep on ncurses-devel

---
 srcpkgs/vis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vis/template b/srcpkgs/vis/template
index 054bd7f98eb2..e33ff9591487 100644
--- a/srcpkgs/vis/template
+++ b/srcpkgs/vis/template
@@ -4,7 +4,7 @@ version=0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="acl-devel libtermkey-devel lua53-devel"
+makedepends="acl-devel libtermkey-devel lua53-devel ncurses-devel"
 depends="lua53-lpeg"
 short_desc="Vi-like editor based on Plan 9's structural regular expressions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 8a55fa69a3963797b477c285da13b67808a292a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 18 Nov 2021 23:02:21 +0100
Subject: [PATCH 2981/4088] wordgrinder: add missing build dep on ncurses-devel

---
 srcpkgs/wordgrinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wordgrinder/template b/srcpkgs/wordgrinder/template
index f742e039123b..65142723bd3d 100644
--- a/srcpkgs/wordgrinder/template
+++ b/srcpkgs/wordgrinder/template
@@ -3,7 +3,7 @@ pkgname=wordgrinder
 version=0.8
 revision=1
 hostmakedepends="pkg-config ninja lua53"
-makedepends="libXft-devel lua53-devel"
+makedepends="libXft-devel lua53-devel ncurses-devel"
 short_desc="Terminal-based word processor"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 2cd95b04711cd297121a5db1d29bd5c9314eb0b5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 18 Nov 2021 23:05:31 +0100
Subject: [PATCH 2982/4088] linux5.15: update to 5.15.3.

---
 srcpkgs/linux5.15/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index e877db055390..68ae0f465428 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.2
-revision=2
+version=5.15.3
+revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 42a0a582319be3cda01979970dbcd1c2cbe847d34b18f509bf4d27cc1a48dd34"
+ 3eac9835eb12f011c1bf15fe4bc933fab7a4d67b7a09d20a638ed162b6b17466"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 593aa8cfa5f4ace37f42fe4691d56b11fa9024ea Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Tue, 16 Nov 2021 17:22:22 +0000
Subject: [PATCH 2983/4088] valgrind: update to 3.18.1.

---
 srcpkgs/valgrind/patches/str_tester.patch     | 22 ++++++++++++
 .../patches/tc20_verifywrap_musl.patch        | 11 ++++++
 srcpkgs/valgrind/patches/test_statx.patch     | 18 ++++++++++
 srcpkgs/valgrind/patches/throw.patch          | 34 +++++++++++++++++++
 srcpkgs/valgrind/template                     |  8 ++---
 5 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/valgrind/patches/str_tester.patch
 create mode 100644 srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
 create mode 100644 srcpkgs/valgrind/patches/test_statx.patch
 create mode 100644 srcpkgs/valgrind/patches/throw.patch

diff --git a/srcpkgs/valgrind/patches/str_tester.patch b/srcpkgs/valgrind/patches/str_tester.patch
new file mode 100644
index 000000000000..cbf64a95e02b
--- /dev/null
+++ b/srcpkgs/valgrind/patches/str_tester.patch
@@ -0,0 +1,22 @@
+rawmemchar is not available on musl, guard it with defined(__GLIBC__)
+
+--- a/memcheck/tests/str_tester.c	2021-10-10 14:17:32.000000000 +0000
++++ b/memcheck/tests/str_tester.c	2021-11-16 19:37:26.950006442 +0000
+@@ -504,7 +504,7 @@
+ #endif
+ 
+ // DDD: better done by testing for the function.
+-#if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
++#if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
+ static void
+ test_rawmemchr (void)
+ {
+@@ -1451,7 +1451,7 @@
+   test_strchrnul ();
+ # endif
+ 
+-# if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
++# if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
+   /* rawmemchr.  */
+   test_rawmemchr ();
+ # endif
diff --git a/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch b/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
new file mode 100644
index 000000000000..ad12ba01302b
--- /dev/null
+++ b/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
@@ -0,0 +1,11 @@
+--- a/helgrind/tests/tc20_verifywrap.c	2021-11-16 21:01:30.020008847 +0000
++++ b/helgrind/tests/tc20_verifywrap.c	2021-11-16 21:02:22.140008872 +0000
+@@ -20,7 +20,7 @@
+ 
+ #if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 
+-#if defined(__sun__)
++#if defined(__sun__) || !defined(__GLIBC__)
+ /* Fake __GLIBC_PREREQ on Solaris. Pretend glibc >= 2.4. */
+ # define __GLIBC_PREREQ
+ #else
diff --git a/srcpkgs/valgrind/patches/test_statx.patch b/srcpkgs/valgrind/patches/test_statx.patch
new file mode 100644
index 000000000000..7deb78fc9793
--- /dev/null
+++ b/srcpkgs/valgrind/patches/test_statx.patch
@@ -0,0 +1,18 @@
+--- a/memcheck/tests/linux/sys-statx.c	2021-01-21 15:09:33.000000000 +0000
++++ b/memcheck/tests/linux/sys-statx.c	2021-11-16 20:26:33.970007848 +0000
+@@ -7,11 +7,15 @@
+ #include <assert.h>
+ #include <string.h>
+ #include <sys/syscall.h>
++#if defined(__GLIBC__)
+ #if __GLIBC_PREREQ(2,28)
+ /* struct statx provided in sys/stat.h */
+ #else
+ #include <linux/stat.h>
+ #endif
++#else
++#include <linux/stat.h>
++#endif
+ #include <errno.h>
+ 
+ int check_stat2;
diff --git a/srcpkgs/valgrind/patches/throw.patch b/srcpkgs/valgrind/patches/throw.patch
new file mode 100644
index 000000000000..2bd195d86109
--- /dev/null
+++ b/srcpkgs/valgrind/patches/throw.patch
@@ -0,0 +1,34 @@
+--- a/memcheck/tests/arm64-linux/scalar.h	2021-01-21 15:09:33.000000000 +0000
++++ b/memcheck/tests/arm64-linux/scalar.h	2021-11-16 20:56:18.980008699 +0000
+@@ -14,7 +14,13 @@
+ 
+ // Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
+ // declare this ourselves.
+-extern long int syscall (long int __sysno, ...) __THROW;
++#ifdef __THROW
++#define THROW __THROW
++#else
++#define THROW
++#endif
++extern long int syscall (long int __sysno, ...) THROW;
++#undef THROW
+ 
+ // Thorough syscall scalar arg checking.  Also serves as thorough checking
+ // for (very) basic syscall use.  Generally not trying to do anything
+--- a/memcheck/tests/x86-linux/scalar.h	2021-01-21 15:09:33.000000000 +0000
++++ b/memcheck/tests/x86-linux/scalar.h	2021-11-16 20:55:24.890008673 +0000
+@@ -14,7 +14,13 @@
+ 
+ // Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
+ // declare this ourselves.
+-extern long int syscall (long int __sysno, ...) __THROW;
++#ifdef __THROW
++#define THROW __THROW
++#else
++#define THROW
++#endif
++extern long int syscall (long int __sysno, ...) THROW;
++#undef THROW
+ 
+ // Thorough syscall scalar arg checking.  Also serves as thorough checking
+ // for (very) basic syscall use.  Generally not trying to do anything
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 71f90795aa96..0f4a2c4ba1f8 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,6 +1,6 @@
 # Template file for 'valgrind'
 pkgname=valgrind
-version=3.16.1
+version=3.18.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-tls --without-mpicc --enable-lto=yes"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://valgrind.org/"
 distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca
+checksum=00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5
 
 CFLAGS="-fno-stack-protector"
 CXXFLAGS="-fno-stack-protector"
@@ -41,10 +41,6 @@ if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
 	configure_args+=" ac_cv_host=armv7l-unknown-linux-gnueabihf"
 fi
 
-pre_configure() {
-	autoreconf -fi
-}
-
 valgrind-devel_package() {
 	depends="valgrind>=${version}_${revision}"
 	short_desc+=" - development files"

From a87fdfa7ffb74f99bff265e30502a9db2c8a1751 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Thu, 18 Nov 2021 18:52:05 -0600
Subject: [PATCH 2984/4088] nomad: update to 1.2.0.

---
 srcpkgs/nomad/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..8d848a076990 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.2.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=bee0c3e04eb4ce34b8ac22ff27fcb421a9dccec5
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,11 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) go_build_tags+=" nonvidia" ;;
-esac
+checksum=fb76938823ccf23f7afca39d177fa7385c69128e729f98cdeb6cd53a75c908df
 
 post_install() {
 	vlicense LICENSE

From 94af7bca6bda0e742ae56b13956cbae4aa05e419 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Tue, 10 Aug 2021 11:44:06 +0200
Subject: [PATCH 2985/4088] New package: lc0-0.28.0

---
 srcpkgs/lc0/template | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/lc0/template

diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template
new file mode 100644
index 000000000000..ba2e8dd8bb74
--- /dev/null
+++ b/srcpkgs/lc0/template
@@ -0,0 +1,35 @@
+# Template file for 'lc0'
+pkgname=lc0
+version=0.28.0
+revision=1
+build_style=meson
+configure_args="-Dgtest=false"
+_lczero_commit=5680c5fad9f3b52288d67f738b272fd09de5ee0b
+hostmakedepends="pkg-config"
+makedepends="protobuf-devel zlib-devel eigen $(vopt_if openblas openblas-devel)
+ $(vopt_if opencl ocl-icd-devel)"
+short_desc="UCI chess engine designed to play via neural network"
+maintainer="shtayerc <david.murko@mailbox.org>"
+license="GPL-3.0-only"
+homepage="https://lczero.org"
+distfiles="https://github.com/LeelaChessZero/lc0/archive/v${version}.tar.gz
+ https://github.com/LeelaChessZero/lczero-common/archive/${_lczero_commit}.tar.gz"
+checksum="81f857a4c2e45ac161d499957f9fe5060479242f527dacff548d52cd0c573caa
+ def7b572df6c3e8f5307afa8abb242d51c0e8d200b12dd56466fff11b9bc4cf8"
+
+build_options="openblas opencl"
+build_options_default="openblas"
+vopt_conflict openblas opencl
+
+if [ "$CROSS_BUILD" ] && [ "$build_option_openblas" ]; then
+	configure_args+=" -Dopenblas_include=${XBPS_CROSS_BASE}/usr/include/openblas/"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+post_extract() {
+	rmdir libs/lczero-common
+	mv ../lczero-common-${_lczero_commit} libs/lczero-common
+}

From dbf8363495ed9403954607c4698ba18489f9c31f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 15 Nov 2021 10:39:54 +0100
Subject: [PATCH 2986/4088] google-chrome: update to 96.0.4664.45

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index c9b36309f4f5..214616168a10 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=95.0.4638.69
+version=96.0.4664.45
 revision=1
 _channel=stable
 archs="x86_64"
@@ -19,7 +19,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=57aa747fee7c3b3c060382719c2cafe8b4ee9deea65ce0ad7dfbd1a645a81dca
+checksum=4f34e7235d3ecbc2b1d0e3aa4237d377a4c124c0b74b8810d850c9d03c898614
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 5007e2fb481b3b7e9fdd41fdc73be248df385db6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 18 Nov 2021 16:12:57 +0400
Subject: [PATCH 2987/4088] mate-screensaver: update to 1.26.1.

---
 srcpkgs/mate-screensaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-screensaver/template b/srcpkgs/mate-screensaver/template
index 252934fdf1d1..3cd82ad46c38 100644
--- a/srcpkgs/mate-screensaver/template
+++ b/srcpkgs/mate-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'mate-screensaver'
 pkgname=mate-screensaver
-version=1.26.0
+version=1.26.1
 revision=1
 build_style=gnu-configure
 configure_args="--without-console-kit --without-systemd --with-elogind"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 changelog="https://raw.githubusercontent.com/mate-desktop/mate-screensaver/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41514032206da2a62105ead90fdce95639d5ea234d1e67d533fd4c5b56feaf76
+checksum=4fbdb21ea4a59ea8de33ea9bf776d869753e49295604664c30e220e09659b8bc
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}

From 1ede302d1ab6cad6a117cf48fc2121e2da67b8be Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 18 Nov 2021 16:19:32 +0400
Subject: [PATCH 2988/4088] python3-regex: update to 2021.11.10.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 0309559185a3..4eb4903760e6 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.11.2
+version=2021.11.10
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=5e85dcfc5d0f374955015ae12c08365b565c6f1eaf36dd182476a4d8e5a1cdb7
+checksum=f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From c116183965f7d1a3bdc8f993f3080eb09cdae5ed Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Thu, 18 Nov 2021 20:26:05 -0600
Subject: [PATCH 2989/4088] consul: update to 1.10.4.

---
 srcpkgs/consul/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..6895b791818a 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.10.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=7bbad6fe560ab27f51dd6c5cd16f28418082424c
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3da1fb589586af4d68b2e924ccdb9f4aad644826aae452c31744c658eb66e4
 
 post_install() {
 	vlicense LICENSE

From 15c4f13656a442eb69a8cd5b08748e355fe4c620 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 19 Nov 2021 09:26:14 +0400
Subject: [PATCH 2990/4088] mozo: update to 1.26.1.

---
 srcpkgs/mozo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template
index 1c578504c085..64408791fc19 100644
--- a/srcpkgs/mozo/template
+++ b/srcpkgs/mozo/template
@@ -1,6 +1,6 @@
 # Template file for 'mozo'
 pkgname=mozo
-version=1.26.0
+version=1.26.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,4 +12,4 @@ license="LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
 changelog="https://raw.githubusercontent.com/mate-desktop/mozo/master/NEWS"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mozo-${version}.tar.xz"
-checksum=4642cbf985fa0d72e205ad7f6abfb7d008e3117e2c5e331340f2bc6466c3ddc2
+checksum=0f24429a3b037bd0688ec4c391d9d8781e42b23ef345f5e50af1e72c5ef2fa39

From d9e480d15f5ea5497fe420cd7de05aeff25537e7 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 19 Nov 2021 09:32:50 +0400
Subject: [PATCH 2991/4088] unrar: update to 6.1.2.

---
 srcpkgs/unrar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index 1e55e1fe01f8..45beac0964dd 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,6 +1,6 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=6.0.7
+version=6.1.2
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
@@ -8,7 +8,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518
+checksum=3e96421f568e438af6dcdaef717c48eb93b825d97058ebcb173b9bfc57807be3
 repository=nonfree
 
 do_build() {

From fa4ec6d82d2763f2a6c8c583e83cfd45a423b4ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 19 Nov 2021 16:10:44 +0100
Subject: [PATCH 2992/4088] libnftnl: update to 1.2.1.

---
 srcpkgs/libnftnl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libnftnl/template b/srcpkgs/libnftnl/template
index ba09afddd91e..2d164024ae84 100644
--- a/srcpkgs/libnftnl/template
+++ b/srcpkgs/libnftnl/template
@@ -1,7 +1,7 @@
 # Template file for 'libnftnl'
 pkgname=libnftnl
-version=1.2.0
-revision=2
+version=1.2.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libmnl-devel"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.netfilter.org/projects/libnftnl/"
 distfiles="https://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=90b01fddfe9be8c3245c3ba5ff5a4424a8df708828f92b2b361976b658c074f5
+checksum=7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c
 
 libnftnl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} $makedepends"

From a53a0b96a499a12bd8c9b4923826c0335a7094e0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 19 Nov 2021 16:17:42 +0100
Subject: [PATCH 2993/4088] nftables: update to 1.0.1.

---
 srcpkgs/nftables/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template
index 78e4f3811b0c..e9851b5d3342 100644
--- a/srcpkgs/nftables/template
+++ b/srcpkgs/nftables/template
@@ -1,9 +1,10 @@
 # Template file for 'nftables'
 pkgname=nftables
-version=1.0.0
-revision=2
+version=1.0.1
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3"
+configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3
+ --with-cli=readline"
 hostmakedepends="python3 asciidoc docbook2x flex pkg-config"
 makedepends="gmp-devel jansson-devel libmnl-devel libnftnl-devel readline-devel"
 short_desc="Netfilter nftables userspace tools"
@@ -11,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://netfilter.org/projects/nftables/"
 distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=58bf547daf967a2b88ecb4f425f126006ebde22711db806b25c1d6cf84fe45f4
+checksum=3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423
 
 post_install() {
 	vsv nftables

From e7d8f580462ce621a0450de7d774c97278dab813 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 19 Nov 2021 16:19:20 +0100
Subject: [PATCH 2994/4088] stress-ng: update to 0.13.07.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 34d7278c9cda..d7d2a027eaec 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.06
+version=0.13.07
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=5b11df6495831e2e6a7eebf06aa83cc895cf013e08a9dc706ed1fdfba9a3052f
+checksum=f7c0a0d0f49c39ff9b1a45919741e60e770c7873851028f46b4bbefd1e8a4e74

From a2dfc2dcbdcae3b015b9c8501b631d1108b0d908 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 19 Nov 2021 16:30:57 +0100
Subject: [PATCH 2995/4088] erlang: update to 24.1.6.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 5d2b40711fc8..cd7340ad4bcb 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.1.5
+version=24.1.6
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=3ca6768147653bca1b429a767377dee3351004b719099d34004633833dbfbc23
+checksum=1b0db74f01f0072299347b794b51d170bf1b71a8f9b6c0aac404ed2c440611ad
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 5932a1c5250b30212ac42482340347a33c3cc65d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:03:52 -0500
Subject: [PATCH 2996/4088] cura-fdm-materials: update to 4.12.0.

---
 srcpkgs/cura-fdm-materials/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index f813f00af5c7..2383b2c697a3 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-fdm-materials'
 pkgname=cura-fdm-materials
 reverts="2019.08.21_1"
-version=4.11.0
+version=4.12.0
 revision=1
 wrksrc="fdm_materials-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="CC0-1.0"
 homepage="https://github.com/Ultimaker/fdm_materials"
 distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=ae339f08ffb5bf14f2dadf4e2c374acec3c0a82c7e9b323cf1e50f081dde274f
+checksum=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
 
 post_install() {
 	vlicense LICENSE

From e63f2c4918a007f3c47bd475587b9a65724d8cf5 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:02 -0500
Subject: [PATCH 2997/4088] python3-shapely: update to 1.8.0.

---
 srcpkgs/python3-shapely/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 5f977079abfc..47632cbc41f8 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-shapely'
 pkgname=python3-shapely
-reverts="1.7a1_1 1.7a1_2 1.7a1_3"
-version=1.7.1
-revision=3
+version=1.8.0
+revision=1
 wrksrc="Shapely-${version}"
 build_style=python3-module
 build_helper=numpy
@@ -14,7 +13,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/Toblerity/Shapely"
 distfiles="https://github.com/Toblerity/Shapely/archive/${version}.tar.gz"
-checksum=8a39f78a5bb21bc7a0f6e3aa9d78291fad53a433346ffa2474076698da47f24c
+checksum=492d4207b20541e3d0f31c238e07d2f55fe5e00afcfd12390bf55737901fce91
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then

From fa7f2eea35e737d0de84fb0b6391caea904cb1fa Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:23 -0500
Subject: [PATCH 2998/4088] libArcus: update to 4.12.1.

---
 srcpkgs/libArcus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 0b491f9d017c..4d6bd9dd9875 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.0
+version=4.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
+checksum=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7b40ce6eef275139e7a8c5e075eb00c53c71e4bc Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:27 -0500
Subject: [PATCH 2999/4088] Uranium: update to 4.12.1.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 5c7cfd3f50de..672b02276623 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.0
+version=4.12.1
 revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Uranium"
 distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
+checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 6135562b5e41b632166a4f7ae0eccdea1bc71280 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:32 -0500
Subject: [PATCH 3000/4088] cura-engine: update to 4.12.1.

---
 srcpkgs/cura-engine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 771901b0f02c..a018b654d08f 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,6 +1,6 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.12.0
+version=4.12.1
 revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
+checksum=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
 
 post_install() {
 	vlicense LICENSE

From 9a89de72f29ad485af4705ae57737f12228303d1 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:49 -0500
Subject: [PATCH 3001/4088] python3-pynest2d: update to 4.12.1.

---
 srcpkgs/python3-pynest2d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 82d86b23d1e5..3997bdb0ec4a 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pynest2d'
 pkgname=python3-pynest2d
-version=4.12.0
+version=4.12.1
 revision=1
 wrksrc="pynest2d-${version}"
 build_style=cmake
@@ -14,4 +14,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/pynest2d"
 distfiles="https://github.com/Ultimaker/pynest2d/archive/${version}.tar.gz"
-checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4
+checksum=d6cd634f0a9ea81c86e5fe1579cd7db8ce293171eb430e6a08d3d5b6523083f5

From 4da8d35b71f432680b9dc153ec71d25f655bdfc7 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:57 -0500
Subject: [PATCH 3002/4088] libSavitar: update to 4.12.1.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 7e77ae1487a8..3870dcc222be 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.0
+version=4.12.1
 revision=1
 build_style=cmake
 hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libSavitar"
 distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
+checksum=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From bd2d9f0e05423025fe5d95fc8a7c16952a6d6ba2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:08:00 -0500
Subject: [PATCH 3003/4088] cura: update to 4.12.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch | 13 +++++++++++++
 srcpkgs/cura/template                          |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
new file mode 100644
index 000000000000..32174f8bc313
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_multiply_models.patch
@@ -0,0 +1,13 @@
+diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py
+index c29a0648d..dad67ba16 100644
+--- a/cura/Arranging/Nest2DArrange.py
++++ b/cura/Arranging/Nest2DArrange.py
+@@ -91,7 +91,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
+ 
+         if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2:  # numpy array has to be explicitly checked against None
+             for point in hull_polygon.getPoints():
+-                converted_points.append(Point(point[0] * factor, point[1] * factor))
++                converted_points.append(Point(int(point[0] * factor), int(point[1] * factor)))
+             item = Item(converted_points)
+             item.markAsFixedInBin(0)
+             node_items.append(item)
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 53bd19afc3b8..aa06dcd98b85 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.0
+version=4.12.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -18,4 +18,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38
+checksum=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72

From 8cfb1d14ffce17e824732e5f03c3d243f3cbee73 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 20 Nov 2021 00:38:25 +0100
Subject: [PATCH 3004/4088] minikube: update to 1.24.0.

---
 srcpkgs/minikube/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index 760bede0d8be..952773221fe6 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,6 +1,6 @@
 # Template file for 'minikube'
 pkgname=minikube
-version=1.23.0
+version=1.24.0
 revision=1
 archs="x86_64* i686* aarch64*"
 build_style=go
@@ -16,7 +16,7 @@ license="Apache-2.0"
 homepage="https://github.com/kubernetes/minikube"
 changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELOG.md"
 distfiles="https://github.com/kubernetes/minikube/archive/v$version.tar.gz"
-checksum=c40e43a4944cf434e03d2ce520c330bdca209fb08428601e1d453ea124a9c2b3
+checksum=df8e273468163341ff28721c8774a380df9b9d5a8e45eb3cbbcb485552d1a1c2
 
 pre_build() {
 	local storage_provisioner_tag= iso_version=

From 0b933210f742eb847352952f66effcf972a93ae4 Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Fri, 19 Nov 2021 06:28:44 -0500
Subject: [PATCH 3005/4088] python3-rich: update to 10.14.0.

---
 srcpkgs/python3-rich/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 36e177ff4629..79e4226fd0c1 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.13.0
+version=10.14.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=d80fc76f34d819c481a48f73ec9ac396bed3bd6a16ecd57f9e0654cd89a8fb56
+checksum=8bfe4546d56b4131298d3a9e571a0742de342f1593770bd0d4707299f772a0af
 
 post_install() {
 	vlicense LICENSE

From e6df9ae64fe8cc03639012f3b96ecca1d8f5c655 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 19 Nov 2021 11:25:53 +0100
Subject: [PATCH 3006/4088] vscode: update to 1.62.3

---
 srcpkgs/vscode/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index a78b6dfba01d..1933b2194164 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,8 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.62.2
+version=1.62.3
 revision=1
-_electronver=13.3.0
+_electronver=13.6.1
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
 makedepends="libxkbfile-devel libsecret-devel electron13"
 depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=90adb3a4260e824fc55c68c983ad623c6d9b562c6422b9aee0e3fd9db4ad84ae
+checksum=87638a1b26f58225d3cae953f5a5036139ef3529a43caee50c4c18def801ce22
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 0ecd723d548459685d5ca80251ffd6103ad731b0 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 19 Nov 2021 15:22:43 +0100
Subject: [PATCH 3007/4088] kotlin-bin: update to 1.6.0.

---
 srcpkgs/kotlin-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index 5e66c3abf3af..7d257eca0872 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'kotlin-bin'
 pkgname=kotlin-bin
-version=1.5.31
+version=1.6.0
 revision=1
 archs="x86_64"
 wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="Apache-2.0"
 homepage="https://kotlinlang.org/"
 distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=661111286f3e5ac06aaf3a9403d869d9a96a176b62b141814be626a47249fe9e
+checksum=174c92e12a54c0901fd9f0badacf1514c28b5197a95654e4dab1775293dde1dc
 nostrip=yes
 replaces="kotlin>=0"
 

From 5a29d9bf8fe2883849d2e4dadab38150730efd8a Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 19 Nov 2021 15:28:15 +0100
Subject: [PATCH 3008/4088] gnome-flashback: update to 3.42.0.

---
 srcpkgs/gnome-flashback/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 03a4f9fa5519..94395e5d41e4 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-flashback'
 pkgname=gnome-flashback
-version=3.40.0
+version=3.42.0
 revision=1
 build_helper=gir
 build_style=gnu-configure
@@ -10,7 +10,7 @@ makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
  pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel
  libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel
  gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel
- gsettings-desktop-schemas-devel"
+ gsettings-desktop-schemas-devel libXxf86vm-devel"
 depends="gnome-bluetooth gnome-session gnome-settings-daemon
  gnome-panel gnome-themes-extra metacity"
 short_desc="GNOME 3 session with similar user experience to the GNOME 2.x series"
@@ -18,7 +18,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e03f33100f1982019c2e59bbdcd664549ec5caa0ef2d99e2c0e1272cea08bb3b
+checksum=d4271dc07ac73b271e4b4edc81f31f64f5731aa6d448e7a15d7d933976dcdd4b
 
 post_extract() {
 	vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \

From 912de78b7dc03fee1ab814f4fddcabc2a57a15de Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Thu, 18 Nov 2021 23:45:09 -0500
Subject: [PATCH 3009/4088] racket: update to 8.3.

---
 srcpkgs/racket/patches/musl-fixes.patch | 26 -------------------------
 srcpkgs/racket/template                 |  4 ++--
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/racket/patches/musl-fixes.patch

diff --git a/srcpkgs/racket/patches/musl-fixes.patch b/srcpkgs/racket/patches/musl-fixes.patch
deleted file mode 100644
index 32eaad0c54c8..000000000000
--- a/srcpkgs/racket/patches/musl-fixes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch fixes error:
-
-    env XFORM_USE_PRECOMP=xsrc/precomp.h ../racketcgc  -cqu ./xform.rkt --setup . --depends --cpp "gcc -E -I./.. -I./../include -I./../../rktio -I../../rktio -Os -fomit-frame-pointer -pthread  -DUSE_SENORA_GC   -DMZ_USES_SHARED_LIB "  --keep-lines -o xsrc/future.c ./../src/future.c
-    Error [GCING] 234 in ./../src/bool.c: Function mz_long_double_eqv declared __xform_nongcing__, but includes a function call at __FLOAT_BITS.
-    Error [GCING] 270 in ./../src/bool.c: Function double_eqv declared __xform_nongcing__, but includes a function call at __FLOAT_BITS.
-    xform: Errors converting
-      context...:
-       src/racket/gc2/xform-collects/compiler/priva...:8:2: xform
-       src/racket/gc2/xform-collects/xform/xform-mo...: [running body]
-       src/racket/gc2/xform.rkt: [running body]
-
-Resources:
-  * https://github.com/racket/racket/issues/1638
-  * https://github.com/NixOS/nixpkgs/pull/31017
-  * https://github.com/racket/racket/pull/1886
-
---- a/collects/compiler/private/xform.rkt
---- a/collects/compiler/private/xform.rkt
-@@ -924,6 +924,7 @@
-                |GetStdHandle| |__CFStringMakeConstantString|
-                _vswprintf_c
- 	       malloc strdup
-+	       __FLOAT_BITS __DOUBLE_BITS ; musl
-                
-                scheme_make_small_bignum scheme_make_small_rational scheme_make_small_complex))
-         (define non-functions-table
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index f5dea34e4dcd..fa837398b7c9 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,6 +1,6 @@
 # Template file for 'racket'
 pkgname=racket
-version=8.2
+version=8.3
 revision=1
 build_wrksrc=src
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3.0-only, MIT"
 homepage="http://racket-lang.org/"
 distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=a0f3cf72938e7ae0f4f3eab70360812a2ec4e40efe327f1b449feb447b4f7482
+checksum=33dd0c20846c7c5fdf84af2dc250f765104ed33b5091be152a9f68f1e2541457
 nostrip=yes
 nocross=yes
 

From bd917bfc68af66443f9daf09e9f2e6a3423faca2 Mon Sep 17 00:00:00 2001
From: David Chen <45245358+TheEgghead27@users.noreply.github.com>
Date: Sun, 14 Nov 2021 19:38:06 -0500
Subject: [PATCH 3010/4088] kcolorchooser: update to 21.08.3.

---
 srcpkgs/kcolorchooser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template
index c7689a11a868..e8d0909564bb 100644
--- a/srcpkgs/kcolorchooser/template
+++ b/srcpkgs/kcolorchooser/template
@@ -1,6 +1,6 @@
 # Template file for 'kcolorchooser'
 pkgname=kcolorchooser
-version=21.08.0
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons gettext"
@@ -10,7 +10,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://kde.org/applications/en/graphics/org.kde.kcolorchooser"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcolorchooser-${version}.tar.xz"
-checksum=27ac1a698ac98a4c78d102f6fa74cb8fb8909f891867c457f5863b6b949bfad2
+checksum=ff612332c8eb8e7956734b25ced2962324e2a6c113c396e024ffc1ef32a1db1d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From 09d82916be59202809f00bff6c5bde0ad797e1eb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Nov 2021 08:06:17 -0500
Subject: [PATCH 3011/4088] python3-flit_core: update to 3.5.0.

---
 srcpkgs/python3-flit_core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index 7dc2741a99e2..d204e25f9e05 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.4.0
+version=3.5.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=390288b27d89a084a32fc40020ad953e14bc215c5a01e6eb6ab8c9bdbcc57283
+checksum=7b55f406ee5c1505f463cd9a186c73d2ccaf7d44618ca59ae643e0dce27cadf7
 
 post_install() {
 	vlicense ../LICENSE

From c0b4ccf6c53a7b1d65465857f201fbe9b86daea1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Nov 2021 08:12:48 -0500
Subject: [PATCH 3012/4088] python3-hypothesis: update to 6.25.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index a35747335158..c8a3a248e4ec 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.24.0
+version=6.25.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=da6ec0437786b16662c7d68dcdccfaf75cebf980aa0f03429f96424962f851cb
+checksum=c54cc1cce9daefbc42316912b2f37a47abed07be48d60ccd0d7e6cbba8fd4bf3
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 542ea3cf1f23ce024f00034a0e221be431d6fc60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Nov 2021 08:17:24 -0500
Subject: [PATCH 3013/4088] python3-imageio: update to 2.11.1.

---
 srcpkgs/python3-imageio/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 15f9606e4794..441b8f567e4f 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.10.4
+version=2.11.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -9,13 +9,14 @@ make_check_args="--ignore=tests/test_pillow.py
  --ignore=tests/test_ffmpeg.py --ignore=tests/test_ffmpeg_info.py"
 hostmakedepends="python3-setuptools"
 depends="python3-numpy python3-Pillow"
-checkdepends="python3-pytest python3-psutil git libglvnd freeimage $depends"
+checkdepends="python3-pytest python3-tifffile python3-psutil
+ git libglvnd freeimage $depends"
 short_desc="Python library for reading and writing image data"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=86559b2981cc60fe5bdde1a6e0ac4711f4eeef4874eee1a4c6dd35743a4885c2
+checksum=5ab8ec9aad5c3e2338ea459ae92a4a1b53749cb7d5ffb00aefd2451a863dda7b
 
 post_install() {
 	vlicense LICENSE

From f00991a11ab0b5f82f5a099b7b46a0281c2f5223 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Nov 2021 08:24:21 -0500
Subject: [PATCH 3014/4088] python3-matplotlib: update to 3.5.0.

---
 srcpkgs/python3-matplotlib/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index bed2c06ca9a6..15cdcfff70e5 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
-revision=2
+version=3.5.0
+revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"
-hostmakedepends="pkg-config python3-setuptools python3-certifi python3-numpy"
+hostmakedepends="pkg-config python3-setuptools_scm python3-certifi python3-numpy"
 makedepends="python3-devel freetype-devel libpng-devel libqhull-devel"
 depends="python3-certifi python3-cycler python3-kiwisolver
  python3-numpy python3-Pillow python3-parsing python3-dateutil"
@@ -14,13 +14,17 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=fc46f0eb54d9d51ddf0637e383afce2fdb6e352d894a81993b25d8df41eddaaf
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
 
+post_patch() {
+	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
+}
+
 pre_build() {
-	cat <<-EOF > setup.cfg
+	cat <<-EOF > mplsetup.cfg
 	[libs]
 	system_freetype = true
 	system_qhull = true

From 539c1b30a9b20e38c74f16e1dc8c9781763a4d57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Nov 2021 08:24:50 -0500
Subject: [PATCH 3015/4088] python3-packaging: update to 21.3.

---
 srcpkgs/python3-packaging/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-packaging/template b/srcpkgs/python3-packaging/template
index d29713e53865..01c0440e1403 100644
--- a/srcpkgs/python3-packaging/template
+++ b/srcpkgs/python3-packaging/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-packaging'
 pkgname=python3-packaging
-version=21.2
+version=21.3
 revision=1
 wrksrc="packaging-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, BSD-2-Clause"
 homepage="https://github.com/pypa/packaging"
 distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966
+checksum=dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb
 
 do_check() {
 	: provides no tests

From ebec8ff7dc7a753e36d914812216fdcaece533b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Nov 2021 08:25:17 -0500
Subject: [PATCH 3016/4088] python3-quart: update to 0.16.1.

---
 srcpkgs/python3-quart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index 273bf8d66af5..ff88c6014813 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-quart'
 pkgname=python3-quart
-version=0.16.0
+version=0.16.1
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-pep517
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://gitlab.com/pgjones/quart"
 changelog="https://gitlab.com/pgjones/quart/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=a526dbb39e266b30f873d73f7c7e394cf7819a4de1444b892488f4cdd0b7e162
+checksum=7a2b31a1d31906228175fb867d487165dcf05094da531106faabbaf6d7d3bfe1
 
 do_check() {
 	# Tests require dist-info on the package, which is only in the wheel.

From 8a9d2f118490b243301699ec5496afd952db1f5b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 19 Nov 2021 00:48:38 +0100
Subject: [PATCH 3017/4088] beignet: fix build

---
 srcpkgs/beignet/patches/llvm11.patch | 10 +---------
 srcpkgs/beignet/template             |  3 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/beignet/patches/llvm11.patch b/srcpkgs/beignet/patches/llvm11.patch
index 7bd82e580711..2c3a4278943c 100644
--- a/srcpkgs/beignet/patches/llvm11.patch
+++ b/srcpkgs/beignet/patches/llvm11.patch
@@ -757,15 +757,7 @@ There were a few changes required for LLVM 11:
    // Find the safe iterator we can point to. If reorder happens, we need to
 --- a/backend/src/llvm/llvm_passes.cpp	2020-11-09 16:48:20.823866112 +0100
 +++ b/backend/src/llvm/llvm_passes.cpp	2020-11-09 18:48:55.997006837 +0100
-@@ -87,14 +87,14 @@
-   }
-
-   int32_t getPadding(int32_t offset, int32_t align) {
--    return (align - (offset % align)) % align;
-+    return (align - (offset % align)) % align;
-   }
-
-   uint32_t getAlignmentByte(const ir::Unit &unit, Type* Ty)
+@@ -95,7 +95,7 @@
    {
      switch (Ty->getTypeID()) {
        case Type::VoidTyID: NOT_SUPPORTED;
diff --git a/srcpkgs/beignet/template b/srcpkgs/beignet/template
index 29a1ef99dbda..dce6bbb7ae24 100644
--- a/srcpkgs/beignet/template
+++ b/srcpkgs/beignet/template
@@ -6,7 +6,8 @@ archs="i686* x86_64*"
 wrksrc="Beignet-${version}-Source"
 build_style=cmake
 hostmakedepends="clang llvm pkg-config"
-makedepends="MesaLib-devel libedit-devel libffi-devel ocl-icd-devel zlib-devel"
+makedepends="MesaLib-devel libedit-devel libffi-devel ocl-icd-devel zlib-devel
+ libXfixes-devel"
 depends="ocl-icd"
 short_desc="Beignet GPGPU System for Intel GPUs"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6e38759fe084a26082a505ea68a3875f5f1fd2fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 18:16:36 +0100
Subject: [PATCH 3018/4088] iagno: fix build with recent vala

---
 .../iagno/patches/dont-write-gtkchild.patch   | 134 ++++++++++++++++++
 srcpkgs/iagno/template                        |   3 +-
 2 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/iagno/patches/dont-write-gtkchild.patch

diff --git a/srcpkgs/iagno/patches/dont-write-gtkchild.patch b/srcpkgs/iagno/patches/dont-write-gtkchild.patch
new file mode 100644
index 000000000000..8ed465166d43
--- /dev/null
+++ b/srcpkgs/iagno/patches/dont-write-gtkchild.patch
@@ -0,0 +1,134 @@
+From 508c0f94e5f182e50ff61be6e04f72574dee97cb Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 13:50:27 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/overlayed-list.vala | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala
+index ef5db6f..209b044 100644
+--- a/src/overlayed-list.vala
++++ b/src/overlayed-list.vala
+@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+     internal void set_window_size (AdaptativeWidget.WindowSize new_size)
+     {
+         if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
+-            set_horizontal (ref main_context, ref edit_mode_box);
++            set_horizontal (ref main_context, edit_mode_box);
+         else
+-            set_vertical (ref main_context, ref edit_mode_box);
++            set_vertical (ref main_context, edit_mode_box);
+     }
+-    private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
++    private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
+     {
+         main_context.remove_class ("vertical");
+         edit_mode_box.halign = Align.END;
+@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+         edit_mode_box.width_request = 160;
+         main_context.add_class ("horizontal");
+     }
+-    private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
++    private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
+     {
+         main_context.remove_class ("horizontal");
+         edit_mode_box.halign = Align.CENTER;
+@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool next_match ()
+     {
+-        return _next_match (ref main_list_box);
++        return _next_match (main_list_box);
+     }
+-    private static inline bool _next_match (ref ListBox main_list_box)
++    private static inline bool _next_match (ListBox main_list_box)
+     {
+         ListBoxRow? row = main_list_box.get_selected_row ();    // TODO multiple rows and focus-only lists
+         if (row == null)
+@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+         if (row == null)
+         {
+-            _scroll_bottom (ref main_list_box);
++            _scroll_bottom (main_list_box);
+             return false;
+         }
+         main_list_box.select_row ((!) row);
+@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool previous_match ()
+     {
+-        return _previous_match (ref main_list_box);
++        return _previous_match (main_list_box);
+     }
+-    private static inline bool _previous_match (ref ListBox main_list_box)
++    private static inline bool _previous_match (ListBox main_list_box)
+     {
+         uint n_items = main_list_box.get_children ().length ();  // FIXME OverlayedList.n_items is unreliable
+         if (n_items == 0)
+@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected int [] get_selected_rows_indices ()
+     {
+-        return _get_selected_rows_indices (ref main_list_box);
++        return _get_selected_rows_indices (main_list_box);
+     }
+-    private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
++    private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
+     {
+         int [] indices = new int [0];
+         main_list_box.selected_foreach ((_list_box, selected_row) => {
+@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected void scroll_top ()
+     {
+-        _scroll_top (ref main_list_box);
++        _scroll_top (main_list_box);
+     }
+-    private static inline void _scroll_top (ref ListBox main_list_box)
++    private static inline void _scroll_top (ListBox main_list_box)
+     {
+         Adjustment adjustment = main_list_box.get_adjustment ();
+         adjustment.set_value (adjustment.get_lower ());
+@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected void scroll_bottom ()
+     {
+-        _scroll_bottom (ref main_list_box);
++        _scroll_bottom (main_list_box);
+     }
+-    private static inline void _scroll_bottom (ref ListBox main_list_box)
++    private static inline void _scroll_bottom (ListBox main_list_box)
+     {
+         Adjustment adjustment = main_list_box.get_adjustment ();
+         adjustment.set_value (adjustment.get_upper ());
+@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool handle_copy_text (out string copy_text)
+     {
+-        return _handle_copy_text (out copy_text, ref main_list_box);
++        return _handle_copy_text (out copy_text, main_list_box);
+     }
+-    private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
++    private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
+     {
+         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+         OverlayedListRow row;
+@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal SelectionState get_selection_state ()
+     {
+-        return _get_selection_state (ref main_list_box, ref main_list_store);
++        return _get_selection_state (main_list_box, ref main_list_store);
+     }
+-    private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
++    private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
+     {
+         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+         uint n_selected_rows = selected_rows.length ();
+-- 
+GitLab
+
diff --git a/srcpkgs/iagno/template b/srcpkgs/iagno/template
index c70fb8250785..38d196e000cb 100644
--- a/srcpkgs/iagno/template
+++ b/srcpkgs/iagno/template
@@ -3,8 +3,9 @@ pkgname=iagno
 version=3.38.1
 revision=1
 build_style=meson
+build_helper=qemu
 hostmakedepends="gettext glib-devel gdk-pixbuf itstool pkg-config vala"
-makedepends="gsound-devel libcanberra-devel librsvg-devel"
+makedepends="gsound-devel libcanberra-devel librsvg-devel libglib-devel"
 short_desc="GNOME Reversi (Othello) game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 44493a7a7280270a494f57b7b6051475186d6dc3 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Thu, 18 Nov 2021 10:28:02 +0100
Subject: [PATCH 3019/4088] nyxt: update to 2.2.3

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
---
 srcpkgs/nyxt/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index 474015478310..dd46e0c2cbe8 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,8 +1,8 @@
 # Template file for 'nyxt'
 pkgname=nyxt
-version=2.0.0
-revision=2
-wrksrc=nyxt
+version=2.2.3
+revision=1
+create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
 hostmakedepends="sbcl git"
@@ -12,8 +12,8 @@ short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://nyxt.atlas.engineer/"
-distfiles="https://nyxt.atlas.engineer/static/release/nyxt-linux-${version}.tar.gz"
-checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz"
+checksum=f611a0cee412b64f4bf93228aa975621734ace797153580c58c61616c7db02d8
 # Disable check because ASDF/USER::PROVE is not installed
 make_check=no
 nostrip=yes

From 8ab3f1bd951a9d4a48ea6771fa7f259ba0c1aa92 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 19 Nov 2021 10:41:25 +0100
Subject: [PATCH 3020/4088] pipe-viewer: update to 0.1.7.

Also add yt-dlp as a dependency.
Although not strictly required, it is more reliable than
the native parser and it is used by default if installed.
---
 srcpkgs/pipe-viewer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 3b8fe02ea609..0c09e2f89db4 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,12 +1,12 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.1.5
+version=0.1.7
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
 hostmakedepends="perl-Module-Build"
 depends="perl-Data-Dump perl-JSON perl-LWP-Protocol-https perl-Term-ReadLine-Gnu
- perl-Unicode-LineBreak perl-JSON-XS perl-HTML-Parser"
+ perl-Unicode-LineBreak perl-JSON-XS perl-HTML-Parser yt-dlp"
 checkdepends="perl-Test-Pod"
 short_desc="Search and play videos from YouTube without an API key"
 maintainer="Roberto Ricci <ricci@disroot.org>"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/pipe-viewer"
 changelog="https://github.com/trizen/pipe-viewer/releases"
 distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz"
-checksum=2b2aaabeba4335e661c9dba0abad3ee7d30a5028446f252100db6e5d3bea90d5
+checksum=f4a17a836503698c6f921f41e018fdae921949d6b9be3ebd1ba500c313474dd0
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 362b54adeb1051c5a985f6d95d5deaddc3d693e8 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 19 Nov 2021 12:20:12 +0400
Subject: [PATCH 3021/4088] python3-html5-parser: update to 0.4.10.

---
 srcpkgs/python3-html5-parser/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
index ab976093b6c2..8eeb03ca7337 100644
--- a/srcpkgs/python3-html5-parser/template
+++ b/srcpkgs/python3-html5-parser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-html5-parser'
 pkgname=python3-html5-parser
-version=0.4.9
-revision=5
+version=0.4.10
+revision=1
 wrksrc="html5-parser-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"
@@ -13,4 +13,4 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="Apache-2.0"
 homepage="https://html5-parser.readthedocs.io/"
 distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
-checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
+checksum=f9294418c0da95c2d5facc19d3dc32941093a6b8e3b3e4b36cc7b5a1697fbca4

From dad0bde1f0638b65c54b7d609c09cf627a9ad433 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 19 Nov 2021 12:20:32 +0400
Subject: [PATCH 3022/4088] calibre: update to 5.32.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index f018b3035a8d..fcf45f5bb183 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.31.1
+version=5.32.0
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=dcb1845ae1e6b39e238bd1964b22e5f1c15621106a1d8d497ff08d3c93b2c2b5
+checksum=3571efc1cc773e453b459096a38b141fd0c7784fb9611505a1f9a55648f47e5e
 lib32disabled=yes
 nocross=yes
 

From 67adea13f9b77a6d27f11f5641b55a1d0d8d929b Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Thu, 18 Nov 2021 11:38:10 +0530
Subject: [PATCH 3023/4088] RyzenAdj: update to 0.8.2

---
 .../RyzenAdj/patches/heap-corruption.patch    | 36 -------------------
 srcpkgs/RyzenAdj/template                     |  6 ++--
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/RyzenAdj/patches/heap-corruption.patch

diff --git a/srcpkgs/RyzenAdj/patches/heap-corruption.patch b/srcpkgs/RyzenAdj/patches/heap-corruption.patch
deleted file mode 100644
index 6b8fc81267f0..000000000000
--- a/srcpkgs/RyzenAdj/patches/heap-corruption.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6efee1997c468150f472941f0f183fc054b436a4 Mon Sep 17 00:00:00 2001
-From: unknown <Falcosc@users.noreply.github.com>
-Date: Sat, 27 Feb 2021 01:26:18 +0100
-Subject: [PATCH] fix Heap corruption
-
----
- lib/nb_smu_ops.c | 2 +-
- lib/ryzenadj.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/nb_smu_ops.c b/lib/nb_smu_ops.c
-index 965264c..2c31b48 100644
---- a/lib/nb_smu_ops.c
-+++ b/lib/nb_smu_ops.c
-@@ -45,7 +45,7 @@ smu_t get_smu(nb_t nb, int smu_type) {
- 	uint32_t rep; /* REP of test message */
- 	smu_service_args_t arg = {0, 0, 0, 0, 0, 0}; /* Test message shuld have no arguments */
- 
--	smu = (smu_t)malloc((sizeof(smu_t)));
-+	smu = (smu_t)malloc((sizeof(*smu)));
- 	smu->nb = nb;
- 	/* Fill SMU information */
- 	switch(smu_type){
-diff --git a/lib/ryzenadj.h b/lib/ryzenadj.h
-index 6f18ade..90c94ee 100644
---- a/lib/ryzenadj.h
-+++ b/lib/ryzenadj.h
-@@ -10,7 +10,7 @@ extern "C" {
- 
- #define RYZENADJ_REVISION_VER 0
- #define RYZENADJ_MAJOR_VER 7
--#define RYZENADJ_MINIOR_VER 0
-+#define RYZENADJ_MINIOR_VER 1
- 
- enum ryzen_family {
-         FAM_UNKNOWN = -1,
diff --git a/srcpkgs/RyzenAdj/template b/srcpkgs/RyzenAdj/template
index ccea4932b6f2..4b65f819a3de 100644
--- a/srcpkgs/RyzenAdj/template
+++ b/srcpkgs/RyzenAdj/template
@@ -1,7 +1,7 @@
 # Template file for 'RyzenAdj'
 pkgname=RyzenAdj
-version=0.7.0
-revision=2
+version=0.8.2
+revision=1
 archs="x86_64*"
 build_style=cmake
 makedepends="pciutils-devel"
@@ -10,7 +10,7 @@ maintainer="maciozo <maciozo@maciozo.com>"
 license="LGPL-3.0-only"
 homepage="https://github.com/FlyGoat/RyzenAdj"
 distfiles="https://github.com/FlyGoat/RyzenAdj/archive/v${version}.tar.gz"
-checksum=fff8a08e657ba35f919bd564fbe2e15e7c615ac6e2a357ffcc3472069e8081f6
+checksum=fc4f60700afb781aca510e7522befb9db8d717d059781a3f7fcf9c16dec00987
 
 do_install() {
 	vbin build/ryzenadj

From 6215feb45ef6debf0ea9c9b0692ea563a9a0ee22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Thu, 18 Nov 2021 19:10:07 +0100
Subject: [PATCH 3024/4088] spotify: update to 1.1.72

---
 srcpkgs/spotify/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index f3c66031dd21..185d59ecdb5c 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.68
-revision=2
-_ver="${version}.632.g2b11de83_amd64"
+version=1.1.72
+revision=1
+_ver="${version}.439.gc253025e_amd64"
 _filename="spotify-client_${_ver}.deb"
 archs="x86_64"
 create_wrksrc=yes
@@ -14,7 +14,7 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
 distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/${_filename}"
-checksum=72a3ab2cd491ff5cdb8d54fce3edc301a24c49961c447c53e018f50f4f47c92c
+checksum=c211a16b6ed6627c4b7d8ca6997376f8345dca638938696933c5495405ce9e16
 _license_checksum=4465d0bba5deb87866184b04ba76604cd93561c0dc9cd21cacdf5b0295bdae3a
 repository=nonfree
 restricted=yes

From cd6506a18d9b2d5017e2c23465f2bcb6188cf8f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 14 Nov 2021 21:49:54 -0300
Subject: [PATCH 3025/4088] planarity: add update file

---
 srcpkgs/planarity/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/planarity/update

diff --git a/srcpkgs/planarity/update b/srcpkgs/planarity/update
new file mode 100644
index 000000000000..315139e84f6e
--- /dev/null
+++ b/srcpkgs/planarity/update
@@ -0,0 +1 @@
+site=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases

From d7f36fbca95d71c6c4d8a4353490eeede421b385 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 17 Nov 2021 19:02:13 +0100
Subject: [PATCH 3026/4088] ETL: ignore devel version in update check

---
 srcpkgs/ETL/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/ETL/update

diff --git a/srcpkgs/ETL/update b/srcpkgs/ETL/update
new file mode 100644
index 000000000000..40eaa0cf8e72
--- /dev/null
+++ b/srcpkgs/ETL/update
@@ -0,0 +1 @@
+ignore="1.5.*"

From 59ab24582f6c02b603741930e4ab3c6899309bf2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 17 Nov 2021 19:02:57 +0100
Subject: [PATCH 3027/4088] synfig: ignore devel version in update check

---
 srcpkgs/synfig/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/synfig/update

diff --git a/srcpkgs/synfig/update b/srcpkgs/synfig/update
new file mode 100644
index 000000000000..40eaa0cf8e72
--- /dev/null
+++ b/srcpkgs/synfig/update
@@ -0,0 +1 @@
+ignore="1.5.*"

From b45c4ef4dfc2f78d6b95ff852a957e390332ce42 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 17 Nov 2021 19:03:13 +0100
Subject: [PATCH 3028/4088] synfigstudio: ignore devel version in update check

---
 srcpkgs/synfigstudio/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/update b/srcpkgs/synfigstudio/update
index be062e166ee5..40eaa0cf8e72 100644
--- a/srcpkgs/synfigstudio/update
+++ b/srcpkgs/synfigstudio/update
@@ -1 +1 @@
-ignore="1.3.*"
+ignore="1.5.*"

From 6f09036ca003032bc0509ec8dcfcc6898adccb04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 20 Nov 2021 16:52:13 +0100
Subject: [PATCH 3029/4088] skaffold: update to 1.35.1.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index c5b8a858474c..c71b685704ab 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.35.0
+version=1.35.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=0ce75ba329f027c9075cfddddd8a96ca08523c772733f999e236a7913b59ea14
+checksum=121936ed92f85f87a0d8697787a5fab721241490618e3fd63ffda575d64be03c

From b8fe83cb3676514097120917438eb2b2d8ace57a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 7 Oct 2021 14:57:08 +0300
Subject: [PATCH 3030/4088] pan: update to 0.148.

Also:
- add changelog.
---
 srcpkgs/pan/template | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/pan/template b/srcpkgs/pan/template
index 3c7d76534e75..fddfb24f78e0 100644
--- a/srcpkgs/pan/template
+++ b/srcpkgs/pan/template
@@ -1,15 +1,29 @@
 # Template file for 'pan'
 pkgname=pan
-version=0.146
+version=0.148
 revision=1
+wrksrc="pan-v${version}"
 build_style=gnu-configure
-configure_args="--with-gnutls --with-gtk3 --with-gmime30 --enable-libnotify --enable-gkr"
-hostmakedepends="gettext pkg-config yelp-tools"
-makedepends="gmime3-devel gnutls-devel gtk+3-devel libsecret-devel gtkspell3-devel libnotify-devel"
+configure_args="--with-gnutls --with-gtk3 --enable-libnotify --enable-gkr"
+hostmakedepends="gettext pkg-config yelp-tools autoconf gettext-devel-tools automake libtool"
+makedepends="gmime3-devel gnutls-devel gtk+3-devel gtk+-devel libsecret-devel gtkspell3-devel libnotify-devel
+ glib-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Usenet newsreader that's good at both text and binaries"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GFDL-1.1-or-later, GPL-2.0-only"
 homepage="http://pan.rebelbase.com"
-distfiles="http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"
-checksum=a52c28664652ddbd1639faf99cdb93969c3dd3e0e0ddb9a1b24711ab8f684f9d
+changelog="https://gitlab.gnome.org/GNOME/pan/-/raw/master/NEWS"
+distfiles="https://gitlab.gnome.org/GNOME/pan/-/archive/v${version}/pan-v${version}.tar.bz2"
+checksum=09de1b59407c5c037b01edb11a4611ca702ae250f0d1f30456a103a5f5eb2e85
+
+if [ -n "$CROSS_BUILD" ]; then
+		hostmakedepends+=" gdk-pixbuf-devel"
+fi
+
+pre_configure() {
+	vsed -e 's/enchant/enchant-2/g' -i configure.ac
+	vsed -e 's|enchant/enchant.h|enchant-2/enchant.h|' -i pan/gui/group-prefs-dialog.cc
+	export ACLOCAL='aclocal -I ${XBPS_CROSS_BASE}/usr/share/aclocal'
+	NOCONFIGURE=1 ./autogen.sh
+}

From a07508ef00ca4b850ba58a0bd06288f8a021513c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Nov 2021 13:58:41 -0500
Subject: [PATCH 3031/4088] fonttools: update to 4.28.1.

---
 srcpkgs/fonttools/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index a0237d4fe6e0..168f08a0284f 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,18 +1,20 @@
 # Template file for 'fonttools'
 pkgname=fonttools
-version=4.18.2
-revision=2
+version=4.28.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3"
 short_desc="Library to manipulate font files from Python"
 maintainer="svenper <svenper@tuta.io>"
 license="MIT, OFL-1.1, BSD-3-Clause"
 homepage="https://github.com/fonttools/fonttools"
 distfiles="https://github.com/fonttools/fonttools/archive/${version}.tar.gz"
-checksum=db0a38a17061c65ae3d9e5a86d52e8fa2ecf4d474548d808d338a7f72cf08cff
+checksum=972be7e3d573cfda4880cd4534ba7695d6c3c4186aab22cee50d3863e25fb4c9
 replaces="python-fonttools>=0 python3-fonttools>=0"
 provides="python-fonttools-${version}_${revision} python3-fonttools-${version}_${revision}"
+# Tests have unpackaged dependencies
+make_check=no
 
 post_install() {
 	vlicense LICENSE
@@ -22,5 +24,5 @@ post_install() {
 python3-fonttools_package() {
 	depends="fonttools>=${version}_${revision}"
 	build_style=meta
-	short_desc+=" (transitional dummy package Python 3)"
+	short_desc+=" (transitional dummy package)"
 }

From c7e6d006dbbee4ee44b5f889ac45d8aa524f2b30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Nov 2021 14:24:16 -0500
Subject: [PATCH 3032/4088] python3-matplotlib: fix dependencies

---
 srcpkgs/python3-matplotlib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 15cdcfff70e5..d6a4b78ea754 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
 version=3.5.0
-revision=1
+revision=2
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"
 hostmakedepends="pkg-config python3-setuptools_scm python3-certifi python3-numpy"
 makedepends="python3-devel freetype-devel libpng-devel libqhull-devel"
-depends="python3-certifi python3-cycler python3-kiwisolver
- python3-numpy python3-Pillow python3-parsing python3-dateutil"
+depends="python3-cycler fonttools python3-kiwisolver python3-numpy
+ python3-packaging python3-Pillow python3-parsing python3-dateutil"
 short_desc="Python3 2D/3D plotting library"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"

From 98d4d92ee842b91f9c487bb08bd5c30fdcab26c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Nov 2021 21:06:44 +0100
Subject: [PATCH 3033/4088] diffoscope: update to 193.

---
 srcpkgs/diffoscope/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3b740e30b456..596f402323fe 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,7 +1,7 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=185
-revision=2
+version=193
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-magic python3-libarchive-c python3-setuptools
@@ -14,4 +14,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=e3ea374717ef8a9609eed48ec95fd3f5184ca795248751a2d45cb88b3992e908
+checksum=d836ddf24ccb4ffabd798ea1b7fcb66b87e55d5e8ff08286620bb7c64e1d829f

From ca9a80c1fc03763c46e3bb9a3639a9cc70b26a31 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 20 Nov 2021 18:22:45 +0200
Subject: [PATCH 3034/4088] python3-Flask-HTTPAuth: update to 4.5.0, orphan.

Also:
- disable tests.
---
 srcpkgs/python3-Flask-HTTPAuth/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-Flask-HTTPAuth/template b/srcpkgs/python3-Flask-HTTPAuth/template
index 8245bda8dcec..22dfe8a31856 100644
--- a/srcpkgs/python3-Flask-HTTPAuth/template
+++ b/srcpkgs/python3-Flask-HTTPAuth/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-Flask-HTTPAuth'
 pkgname=python3-Flask-HTTPAuth
-version=4.4.0
-revision=2
+version=4.5.0
+revision=1
 wrksrc=Flask-HTTPAuth-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Flask"
-checkdepends="${depends}"
 short_desc="Basic, Digest and Token HTTP authentication for Flask routes"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/miguelgrinberg/Flask-HTTPAuth"
 distfiles="${PYPI_SITE}/f/flask-httpauth/Flask-HTTPAuth-${version}.tar.gz"
-checksum=bcaaa7a35a3cba0b2eafd4f113b3016bf70eb78087456d96484c3c18928b813a
+checksum=395040fda2854df800d15e84bc4a81a5f32f1d4a5e91eee554936f36f330aa29
+make_check=no # needs packages not in repo (asgiref)
 
 post_install() {
 	vlicense LICENSE

From 8befc15fb3e88308314e893e13a774c01ff2dd08 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 20 Nov 2021 22:05:02 +0200
Subject: [PATCH 3035/4088] xfce4-sensors-plugin: update to 1.4.2.

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..c78567f8c734 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=da90f12e6ae995bcd1c81be35479a7a9d32308c65ecd64e568ba8c9592d39fcb
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling

From 5f341554e6d8ced11a2f7921d37af2de402d25ae Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 20 Nov 2021 21:53:34 +0200
Subject: [PATCH 3036/4088] xfce4-whiskermenu-plugin: update to 2.7.0.

---
 srcpkgs/xfce4-whiskermenu-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 65538a6057dd..52cd59a87e05 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.6.2
+version=2.7.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=6d20e22c18593aca5adecaf0a7a4f33a6bda233bdd92d3ca7b51c37d0baaf76e
+checksum=f044056c5325e878873a3a574a65f7c8d3dce2666a0b8345b1eca35bef29dc11

From bcc30dbdd0787d56228e3a144b888ed9b9d071e9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 20 Nov 2021 21:38:49 +0200
Subject: [PATCH 3037/4088] anydesk: eula checksum change.

---
 srcpkgs/anydesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 631eb3452181..ba95d8775fe1 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -16,7 +16,7 @@ restricted=yes
 distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
 checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
 
-_eula_digest=c2c506dd3fe335365e10814d4b1a2cde227898ce0ddda25c2246a2e18b4ac576
+_eula_digest=cf42c51d94d40c5890b103a1b2c5b62b5faad7af1e14933cab98dea8066175e8
 
 post_extract() {
 	$XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms

From 28aa24c075dc1b1cdbfade07942cca9bedc85c20 Mon Sep 17 00:00:00 2001
From: thran <63065906+lordfeck@users.noreply.github.com>
Date: Sat, 19 Dec 2020 16:41:14 +0000
Subject: [PATCH 3038/4088] New package: wmix-3.5

---
 srcpkgs/wmix/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/wmix/template

diff --git a/srcpkgs/wmix/template b/srcpkgs/wmix/template
new file mode 100644
index 000000000000..c7689ca0db93
--- /dev/null
+++ b/srcpkgs/wmix/template
@@ -0,0 +1,12 @@
+# Template file for 'wmix'
+pkgname=wmix
+version=3.5
+revision=1
+build_style=gnu-configure
+makedepends="alsa-lib-devel libXpm-devel libXrandr-devel"
+short_desc="Featureful WindowMaker dockapp mixer for OSS or ALSA"
+maintainer="lordfeck <bs+dev@thran.uk>"
+license="GPL-2.0-only"
+homepage="https://www.dockapps.net/wmix"
+distfiles="https://www.dockapps.net/download/${pkgname}-${version}.tar.gz"
+checksum=58d2572bddb958268b6008eed0760765f9dbdbbd1650ebb146cd0e4287003eee

From 056a65fd43b15a929fd19d05b22659f9fd47590e Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Wed, 13 Jan 2021 22:07:34 +1100
Subject: [PATCH 3039/4088] grabc: update to 1.0.2

---
 srcpkgs/grabc/template | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/grabc/template b/srcpkgs/grabc/template
index 382767654b50..6e7e55663e68 100644
--- a/srcpkgs/grabc/template
+++ b/srcpkgs/grabc/template
@@ -1,20 +1,26 @@
 # Template file for 'grabc'
 pkgname=grabc
-version=1.1
+reverts=1.1_1
+version=1.0.2
 revision=1
-wrksrc="${pkgname}${version}"
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
 build_style=gnu-makefile
 makedepends="libX11-devel"
 short_desc="Identify color of a pixel on the screen"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2"
+license="MIT"
 homepage="http://www.muquit.com/muquit/software/grabc/grabc.html"
-distfiles="http://www.muquit.com/muquit/software/grabc/grabc${version}.tar.gz"
-checksum=f0492a8ea33b46a16bdb94644420f54724e31c4436e4cd77937a30b2de3bb00e
+# Remove the license file on next version bump as it will be included.
+distfiles="https://github.com/muquit/grabc/archive/v${version}.tar.gz
+ https://raw.githubusercontent.com/muquit/grabc/b9e4316/LICENSE.txt"
+checksum="a3e4d2e5b11ef63e8928a630418fc8dfe1327585adc48aef8d0f13b2d78d5ea0
+ 9691605fc9d14f0924faf49367189f9c5bc50e4872987b637b18db77960b1536"
 
 pre_build() {
-	sed -i -e 's|$(LIBS)|$(LDFLAGS) -lX11|' Makefile
+	vsed -e 's|/usr/local|/usr|' -i Makefile
 }
-do_install() {
-	vbin grabc
+
+post_install() {
+	vlicense ../LICENSE.txt
 }

From 9d0aa047f23508147f7d61e62efcffcacebae790 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:13 +0100
Subject: [PATCH 3040/4088] Bear: update to 3.0.17.

---
 srcpkgs/Bear/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 9d8686d5af35..039bafb83aae 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,6 +1,6 @@
 # Template file for 'Bear'
 pkgname=Bear
-version=3.0.16
+version=3.0.17
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/rizsotto/Bear"
 changelog="https://raw.githubusercontent.com/rizsotto/Bear/master/ChangeLog.md"
 distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=877ee5e89e8445f74df95f2f3896597f04b86a4e5d0dbbca07ac71027dcb362d
+checksum=107f94e045d930e88f5f5b4b484c8df1bf4834722943525765c271e0b5b34b78
 conflicts="interception-tools>=0" # /usr/bin/intercept
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then

From fdd6a03f358a2865feead484f9024c033efb84ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:35 +0100
Subject: [PATCH 3041/4088] attica: update to 5.88.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 311bb161e6d8..4372e26d6798 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b8a1a8427b721221a975eb5f078864246cdcbbfd97ca4e48d17280c72bcd4e72
+checksum=8dabc5073bddaf8bc85a4f13a1638d6da4bc6ea5f49845800e4433c1da606f08
 
 do_check() {
 	cd build

From 3b26499e70c302fb87455f61a630efe6fdde8321 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:37 +0100
Subject: [PATCH 3042/4088] baloo5: update to 5.88.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index ea9c3085f85f..e6b75e4ff1e1 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.87.0
+version=5.88.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=8b6b55a300acb33d51ebda930c53fea2c393032d897d4c084d016b3a8d85a540
+checksum=09018da3a01c21e9a8369841fa033737e1b93b56f2b2837663e657ff076abc3d
 
 do_check() {
 	cd build

From 8d34d52c2af4328eeadad73093c071e9686fe5fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:39 +0100
Subject: [PATCH 3043/4088] bluez-qt5: update to 5.88.0.

---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index aa78fa25442a..01d47baa2538 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.87.0
+version=5.88.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=9fa942a16768bea53bbdaa6563ca0a7f04cee1820318e04c04abbdd6621e13ea
+checksum=3f8c0dbc2a8264e77a218a77893d9584b957dd7905de77e6eda0f9fb112ae509
 
 do_check() {
 	cd build

From 366cdee56d3432ac773b96301978159144791a96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:41 +0100
Subject: [PATCH 3044/4088] breeze-icons: update to 5.88.0.

---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index aa3fc924de21..fac4e6a90d8d 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10154828dfa90bc157e32092b91022aea3c01e92aba7c320a261816532b1c7a5
+checksum=99659ef3775a537fa51b0a9e942bbe1b7a5a6f9d911adf2ca2d3e9638f0884b4
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From 8c5b5585abff82d0314bb45de3469baf83c92380 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:42 +0100
Subject: [PATCH 3045/4088] extra-cmake-modules: update to 5.88.0.

---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 5979c837715c..2a555532fc05 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=541ca70d8e270614d19d8fd9e55f97b55fa1dc78d6538c6f6757be372ef8bcab
+checksum=33bd83908daa531654455b77fc121b598f757aadf8ba01dbacfda8b8fb050319
 python_version=3
 
 do_check() {

From 69089d0b18e3265c4eeabfb5c24d281615feedee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:44 +0100
Subject: [PATCH 3046/4088] frameworkintegration: update to 5.88.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index e0dc0749c593..df95b49e228d 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b0290d739b0d27f07a0aaa1c267a2b37614aa9847fec7c4cc4b21e11fee6fad
+checksum=423b05d84364956cac1eaa01669aa25db6a78ad46f8557eb2766e326d7bf4191
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 7aaa78a7b0d5649b65babae8c7af4173a77e3d01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:45 +0100
Subject: [PATCH 3047/4088] kactivities5-stats: update to 5.88.0.

---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 2a55999870c4..98b1c55b80ec 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.87.0
+version=5.88.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=0604179842ab3a44018335769bf6b8981c1d1d40a176ad6db694f1c7ddfaf2d8
+checksum=2625a634bf5b5fdfe0ecf6d80777516b196503842f6657141c9bfd7a5c15119e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From f46442c82977bf539277918909aaacc56297caab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:47 +0100
Subject: [PATCH 3048/4088] kactivities5: update to 5.88.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 84c839d3dbc9..b183e01c13ac 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.87.0
+version=5.88.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e956e96a103f82ae62c62acc4ada41e116098781c7314bac65bc81d3d37bd6fa
+checksum=ceec595cf5ff6de06a05fa54f0549a257e74afbfcc712b54a6018be7edb89822
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 1ce68bb3c7cd72e29d466c455911ffdc34637eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:50 +0100
Subject: [PATCH 3049/4088] kapidox: update to 5.88.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 2791ebc2c660..36a4d5d91a58 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4aee0c6676b5607153e4b1011448d5ff991c4769563552274fdc584a6252d447
+checksum=f9bdcb7482c6c4481553da1ff39f3a05a51830e033e1ae06d606d6e6b94ee6e3
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From f36d4d56453000d882bd2b11358295e0d5baa992 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:52 +0100
Subject: [PATCH 3050/4088] karchive: update to 5.88.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 4a89961ed108..ba5361717a08 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=103f2e8a60b50683ed626d3c9c29c99ced3c55d20a9f5d1cfd0a576e7dc61c35
+checksum=4b9979a3f0c1acb9822e0bea4b84e84970b9ca0a0e4daf914a35fe079f4ceae3
 
 karchive-devel_package() {
 	short_desc+=" - development"

From a37697a2d2c623eee30d2f8499b35d274347245c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:53 +0100
Subject: [PATCH 3051/4088] kauth: update to 5.88.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 95a754df190d..f727f6fdfef7 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f1d1c00af4d6ac139b34073bb5c308de9f5f81d5bb75a3a3ffc05ab10f2278bd
+checksum=0539e6eb5c94da0309f2fbf1503444f2f8cc916ea8899ea05ce4170565d6f995
 
 do_check() {
 	cd build

From 744f7ef3dfd399898f04a0aae1d337dc0b8e4ce0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:55 +0100
Subject: [PATCH 3052/4088] kbookmarks: update to 5.88.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 30191bc9990c..c280d343acad 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dd268cb6d437cf74e46468561db465b32dac4e9c93a17113e83be1a62fd09c4e
+checksum=82b0f2248a28417531edac66c14b1f1f75245b3887baa3663e0ebe707362428c
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 38bf9c68a7e422ad508bdeb64fe8ea8f6b1c87e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:56 +0100
Subject: [PATCH 3053/4088] kcalendarcore: update to 5.88.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 258d0c686f4c..111ca0fd46fd 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=166054f2a4975263e83f00110d4345c53ce82bc63b9789618231b9dc1be0e245
+checksum=5e13d34179f5e315cf5301286340e52b3dc78d4f48927b7f2f0bbf453f03cc43
 replaces="kcalcore>=0"
 
 do_check() {

From f5530ab415332a4dff1550be03d5be7cc5480f99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:58 +0100
Subject: [PATCH 3054/4088] kcmutils: update to 5.88.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 82c8d6c5bc82..7beca26370e2 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=30cccaf9a5e6f7505b3f5628d274bb8d07c46d42da758616e670cdfa848bec26
+checksum=008a2348c35b29f9257c99d0e68343a168e799adcf83eaa13ca6324db47e193f
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 3b809e490288247432b15a5881d9ee8c6db9b121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:36:59 +0100
Subject: [PATCH 3055/4088] kcodecs: update to 5.88.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 807d2fd16e14..7ee75205f151 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0752156e85320731776f727ff171b2308e0f0c511efc4f2158dd763ed75368b9
+checksum=d16b6c87b2daf27f1845d61307666b0f451658322ac2ed469966d7560af917e9
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 68c4bd92bf1c8f536f5a6b46f513e1e0a4d00daf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:01 +0100
Subject: [PATCH 3056/4088] kcompletion: update to 5.88.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0661ff0c978d..567d33d00ec3 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7780670b0a1e62975a01d8b30f6bdefd820b6cd7543e29852f8e19fedad38995
+checksum=b64c7a2720675599385c0faedae27d5255694e6d6637455b2740d49d3a813938
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From e8156556fabef6d7e988d7cb635f67aced425717 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:02 +0100
Subject: [PATCH 3057/4088] kconfig: update to 5.88.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index c6c6d29b5716..aac64c6a62a4 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345bf5a68de968c3301aec16e1ec6eebd1c575a891464784aa0e177771e917d1
+checksum=3414e40306c294e28a376e73b5e871ddf2cfc06b751396244dcc585aecd402ac
 
 do_check() {
 	cd build

From bd0a7a9ad5625a18afd9164d4d81df7d18fe3e2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:04 +0100
Subject: [PATCH 3058/4088] kconfigwidgets: update to 5.88.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index c5bc4cb235f1..63cd07ca4579 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04b5e518e25ba967d15d705a6170d16ccc34d918c9135f1117551d7429b6a3a2
+checksum=7995523bee2c89867287a26994859ceb7d2a5be80e7bce80c186d6339bf18ad4
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From c4afe38e43b7ebd77de84dfb687c393889402932 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:05 +0100
Subject: [PATCH 3059/4088] kcontacts: update to 5.88.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 916ac01f74bb..972a20c3199e 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9bd17db7b520df1f3a45f26e40312cdf18158e66f610d656cfe214dd768efe0b
+checksum=c5b975c2d935d38807634eb176d872fa45d6bca05136777714f5e729a50e42a0
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 70ffd357a48b0ccc6825cd49be600585daaf2ffa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:07 +0100
Subject: [PATCH 3060/4088] kcoreaddons: update to 5.88.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index fdf957957345..1c7492dbb80e 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d29fe93b58fec0edb3387d5bf5290366e64a5975df44c1b062cc4e29cfbfeda6
+checksum=7af6221846d7552bb99c04c2fac2d9f9c247e6cdd13cb3e37e9694fa0b8f2c51
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From e0bb87d675c8cf9cc7b37d12c9740a6dd7a8029c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:08 +0100
Subject: [PATCH 3061/4088] kcrash: update to 5.88.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index a73a34ae0c5e..be5801fef749 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5908d771dcd1387941424369ca3ae974de91910a37987d8ab69458bc8b6d88d0
+checksum=9effa892a1ab726f3ddb3c025e600c2fa02496925fcb37a525d4ac5713199e3e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 404b552d2526f610117aa99e0369e075cf6cb486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:09 +0100
Subject: [PATCH 3062/4088] kdav: update to 5.88.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index eb71a3475129..2d250f3a589f 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bfccf61a54c7ddf10448ce735ac414ad26c5c39c1f762b0a7f85e2db38786169
+checksum=7cf87774f0d1b9437b113ba0e2495d253d5cd73769c2b2e160a7d3859e3ff2c7
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 54e15a7bc5e43247a42b34d5bb341437ad6eb3ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:11 +0100
Subject: [PATCH 3063/4088] kdbusaddons: update to 5.88.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 8021ab7930a0..42fd436c6962 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d75ca847fef7f324f97e7b3cdb45f7fa3cc2c36bd44ca35062589534d5ceb593
+checksum=5ada2a78a778f9356e259876b649d9799936a096d2d0056fccccb406a3e532de
 
 do_check() {
 	cd build

From 74fbc06eb439637ca8be2b632d2548a5118450ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:12 +0100
Subject: [PATCH 3064/4088] kdeclarative: update to 5.88.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 9267372d08a8..c4535b335972 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6792f8ee5e255159d302ba8257b91e52a4ac5815fb7413fd73788f893555a47f
+checksum=b506b44b9f50768de9b145980a41de943c2b375defc7e5a97fbb9fc2a441e3a9
 
 do_check() {
 	cd build

From 5cd30fe69de2b558b48b9ad1e112237d676dd382 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:14 +0100
Subject: [PATCH 3065/4088] kded: update to 5.88.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 8d65bb958d88..af9860df018f 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=256bcaee8101bd3c9ec239bc3853fd8f7d5a98383858e509809a572a5a0bbca1
+checksum=cc240053ad396821a8b7174f44ce41a9db793ad3c6dda4ad8d84fd4994b794e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 26391f1d1ebeee7410dca588b2ccb51bfdd7e4ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:16 +0100
Subject: [PATCH 3066/4088] kdelibs4support: update to 5.88.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index 2c8e92d25029..627b82075b37 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4e0ad7ecfafb1663b1eaa0e37068da0bb52d958687b5a1ac6f309fd49c397c9e
+checksum=e680c437cb94cda65d54eea228bd3a652b45031c0ba2e1a7b0ee4810be298245
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From ca4ad7c1f35c7bc475eacdd25f0e5c593229ef7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:18 +0100
Subject: [PATCH 3067/4088] kdesignerplugin: update to 5.88.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 377717bcc1eb..91907b77ba07 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a92af15be904629fc98c21fa31f132d3697f62df33af5e37f3ac70f3369e2c8b
+checksum=d90c6245209d52e891755fcf8a35ce40d9de3b9c315c3f4bef8b556270b0154b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 75144f3cd58095b065281bcb1ec4e6482d173931 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:19 +0100
Subject: [PATCH 3068/4088] kdesu: update to 5.88.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 2b540003d685..03470592c462 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=795a4f2a8b7b530dfcd40021d506d0e4e6acd05acf1a7c08704102b0181c6b15
+checksum=4505e560c6e5504a29f42baaa910b3efee401c4d8b7ed0fc1e2a6e2d776e25fd
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 23e8141372c8c70a3da73521d4dc4a741a5b1fe9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:21 +0100
Subject: [PATCH 3069/4088] kdewebkit: update to 5.88.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 33e1b4ca728f..3c09a417e5d0 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=9bfd758cdb443eb15c46b7990d5dcef690c75b3c83c19c99dfe23a6b9446a7a8
+checksum=99949eb3198aada509032ce06aac31588e9230ebfcc19297178e15a127d5369e
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 86279d7f780aca8a3a4e5e01ab10d2001557d53a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:24 +0100
Subject: [PATCH 3070/4088] kdnssd: update to 5.88.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index e2ec00ba808f..6f71e18dd8fc 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dc3693968a0e699617fa2191add6114e39a3a01e9b6dcb90ff6a878acb8948e7
+checksum=6d312cef416baba20c6f1d5eac426e7c6c87d1b3f7fe07b3c7d26c8ee54e15fa
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 7281931fc3a6cb034ab70c4fac4c8b5e41c18f1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:26 +0100
Subject: [PATCH 3071/4088] kdoctools: update to 5.88.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index ebcabd8e61e0..7b69758d963a 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa0e84b1298f2d85ac31cf3fdc4282b463f43a68483795de3098ec5a76e4a555
+checksum=14b00acc8129395cb7e523a7cb55ec6ddb479166c96693b7b13eefe285ec9030
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From 136ffa20e69e87794a9d13d13a5d2f7d134c42c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:28 +0100
Subject: [PATCH 3072/4088] kemoticons: update to 5.88.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 90b95dbe0b19..cb38a80ba169 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=befc25576de12ebf7a167f754bf962a504f7049a22c60c40aab6a70e34375045
+checksum=0ed955801d4185aaadfebaf54bcb263d701d10bc89b3dccbf689bb516caf34cd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 21c43a18eb6b365fd341f458e3776c492c46fc02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:30 +0100
Subject: [PATCH 3073/4088] kfilemetadata5: update to 5.88.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index eafb144b2aa5..012fde9c6212 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.87.0
+version=5.88.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=51703dab11c7847180ce1d0ca62d3bc7ed3dba3992a4ef3ec2081596ef7f04da
+checksum=727013fda110a5423d1aabefc6d24a642a3d561ff33babed04e46d8b0c97838b
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 1369ca4c848c443af9f18659d3f181e9335f23e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:32 +0100
Subject: [PATCH 3074/4088] kglobalaccel: update to 5.88.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 339c46f0cdae..4d2b78f09bec 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=502e7f16eed132837e87c469cbdda474cd0d396075e6c519557b526f70af66f2
+checksum=4ab6ada0a11d6634712c5e70e42d6c9e9998013a2800fdf2b73135085eb9433f
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From f42dc30c02d7c4a7b74e31e284a3a05af02f93ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:34 +0100
Subject: [PATCH 3075/4088] kguiaddons: update to 5.88.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 7ec31b64b3b7..e22ced9b643b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90067fd81f6f25b0c5a1284c993fd04ea7212e33cf678744076935e484e808cd
+checksum=5a9dba0bd5845468d5f3d2ed847ec43f2511a416bf374e001b84058fcbe02f63
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From a59cb56e1f68c3eac84c03e314793b8899b57ca2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:35 +0100
Subject: [PATCH 3076/4088] kholidays: update to 5.88.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 7783a6a7b1e5..4f729b1a2930 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f5bfb0cd8668ceab5494bc72ee59a4e2a97ab735813ba1b70b34735ee70e45b1
+checksum=8a97a884a60bcd5bc091a833aeb40ca0c5e203389abd44e3076c1c1553bc803b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From b01d2670008e6ac6b40d19ee14d247dc94200267 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:37 +0100
Subject: [PATCH 3077/4088] khtml: update to 5.88.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 09e209e8046e..77471fd7b953 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ced877bde898192bf96694c0c8598197d29931782ed8f2409f1165c2bffdb7cb
+checksum=5e5d0b57a7300ae48a6137e2ec8e9942959eb7e4eec9d936cc06961733e73fae
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 4e15d5fc55aad919878066ed41f3023d20ef8d45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:38 +0100
Subject: [PATCH 3078/4088] ki18n: update to 5.88.0.

---
 common/shlibs          | 1 +
 srcpkgs/ki18n/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a7908585fbbd..f4112f44c2ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2425,6 +2425,7 @@ libunibilium.so.4 unibilium-2.0.0_1
 libtermkey.so.1 libtermkey-0.17_1
 libicu4lua.so.0 icu4lua-0.2B_1
 libKF5I18n.so.5 ki18n-5.26.0_1
+libKF5I18nLocaleData.so.5 ki18n-5.88.0_1
 libglog.so.0 glog-0.3.4_1
 libzita-convolver.so.4 zita-convolver-4.0.3_1
 libzita-alsa-pcmi.so.0 zita-alsa-pcmi-0.2.0_1
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 6503d8c0493f..98c1cce6b63f 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=115e79ec5cc4825a1f9f6783f6e6da0d56d02feddc89f51ce9e7c205199c250d
+checksum=ca204e531e0f6bbe5971a6f04a021a46ed06fbbee89a387f4a1bc86698496488
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 3d2f932de9318868ed8c9a8803a82162b95795e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:41 +0100
Subject: [PATCH 3079/4088] kiconthemes: update to 5.88.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 2e5f19bb7b6c..1051aa42266c 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=471ac6e36661d95d6ae966bb0357478dad2ae876b1f5e092e71d9a36fc589011
+checksum=f7ab45cb8d7b9a148ec21b64881142b7c04608e6d36f1fa1964e721d8d30e939
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From fc51788ccf04e7d31c636b31f329e8e95cdd3232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:44 +0100
Subject: [PATCH 3080/4088] kidletime: update to 5.88.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 0c4a1f4e3c0e..6609182db3ba 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1707318cc5b3b88558607fdb9e81d8dc0f817fa50ebd41e9ac8db014053017d4
+checksum=baa36125b6b4b18dbe9004431365635e63f9c9491806ca6560ebb47d7f5962c3
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From d2183621039cb3dd7fd870e389b5ef710b56a790 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:45 +0100
Subject: [PATCH 3081/4088] kimageformats: update to 5.88.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 6c24357528f3..a27cf120a578 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af6efb6232b8de670691f1983c26e385a64c9f5339d67ae004e97f6864c19830
+checksum=eee708f338fa55a5780acb6cb01dced092446f3d4f66b9e001d61fbfe2b588b5

From 779e7718c4c955c71befcbd14a2c8ffecb600fac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:46 +0100
Subject: [PATCH 3082/4088] kinit: update to 5.88.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 75863a15a2db..500739d721bd 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba07d4bd871d0ed0e758fb8d74f68e08e1a68aae71312c105e4fe908b7d76510
+checksum=106448c5b7f2859243cd22c2f04790de78707f6d2926682f3ea39ec4c0b650c2
 
 kinit-devel_package() {
 	short_desc+=" - development"

From e0662f0d7a93c273184e382c157da650cb4672bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:48 +0100
Subject: [PATCH 3083/4088] kio: update to 5.88.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 6911c8d6ed42..3522d44168d0 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b91ed59de09c3b69c1eb50e6df2e087d912bda06a5d394763aa6e2e936cebc6b
+checksum=ffd4aa4277ce545a50ee01783eeb92ca060094fc582c1affd8186c9df0d4a66c
 
 do_check() {
 	cd build

From efc3766875c88f09df84d693b8e0624d5bcd1942 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:50 +0100
Subject: [PATCH 3084/4088] kirigami2: update to 5.88.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 850779f941c5..2d710c4654d7 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=f1876cc3d0774ea3a6f44f177ea5d86742f952eab4d2ac4498a1b5b0ac0572f3
+checksum=190608bc49b75f38c3db81538a5f522e391c21b97398e615222449eefbf577fa
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 7974530b1c1b69ce0d5edb8c17ee7e727ddfe3c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:51 +0100
Subject: [PATCH 3085/4088] kitemmodels: update to 5.88.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index f1f1da35f174..00eeceae0423 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=22f139281ba32a15d3721168dc08e496d80f9894182967ac455873bbdc45a7e3
+checksum=60f4e112f6862f7e0536e625ce53ec67c77c873d9802ef92f485b5d752b383fe
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 78aae6a0a985be6dea9a6306059d3f3d105acd9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:53 +0100
Subject: [PATCH 3086/4088] kitemviews: update to 5.88.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index da5e3632bdfa..86db1a6f3fcf 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f51463ae83f40df23d86037c5cda11caa862651178d796ca02e0de6ad482fdb
+checksum=276a27bd556e977d31666846736382f75429a0632a20a01406257dcfcfce70cb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From 18f4d75659ecde2e12aafe257569903823f5c119 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:54 +0100
Subject: [PATCH 3087/4088] kjobwidgets: update to 5.88.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 2676389cc98f..425260905020 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e56b845f6b609255420f6558d58b844dff68a35d67b67d78b98919f67c230f68
+checksum=5131391391372d71ee4d2a832c45fa5e2d2c8a02c0df61078451551b50b8ba26
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From ef60d9db803b20a305f41961b892300b077074d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:55 +0100
Subject: [PATCH 3088/4088] kjs: update to 5.88.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index f1df50e28152..acf0d49a5ac1 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=e879d3f1df4facb42abc87c0fa5a8958d4ea63962d2ff19caf56cc319f841cc6
+checksum=ac1094b7ca3a6a88e09428a4c4d09c8af7f487dc2c3c82440abf59867bd87b12
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 9f23155e77707a85d67fc232f1e1a9032353462a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:57 +0100
Subject: [PATCH 3089/4088] kjsembed: update to 5.88.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 18c65e10a9c6..0de2631599d7 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=fb45291488b2701401d6af0bcd9c85664fcf3d21c7b83f28c4a26f34cf300b49
+checksum=1700da37c2ef365aec02f6d4dee08173d0746ede911ca5a50b9f51960363af2e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 91ad1052e1a4c4f943c6ae6cb5a9b3c72a3ce854 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:37:58 +0100
Subject: [PATCH 3090/4088] kmediaplayer: update to 5.88.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index aa5ae2daf50b..aa143a28cd79 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=08dc7bd0da35fa6612bbdb8f9f1dc83550a6112370a77563da48564ef0593557
+checksum=891510510de20afcd604bf825718748ac9b5a4d075d8e68257ee36e857a43b54
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 6cf5484b3f21c7f188b0a478a96e1e541cc9dcc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:00 +0100
Subject: [PATCH 3091/4088] knewstuff: update to 5.88.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index ff9d5e5581ba..69c70282d80b 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98f483edc5ac72cf70b40e9b9c571482d258f114ce0a75e47866d09147a6d176
+checksum=f73689a88bf5042075baefd1b5bbfa10e58997c98aeccd36cb9292e6efc076f9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 30d4c1e6fd3a3caa8530ba9052af4f8cde3c7f91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:01 +0100
Subject: [PATCH 3092/4088] knotifications: update to 5.88.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 744fc9c4fa85..8216de88b192 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=830583877f13dfd8c7fc512151ab23b7a34fa0a8229e144b1bff5b1a2253f90f
+checksum=f4822b18a9315eaf06b705b89538b28546cacf1938689d0a3d6d6974b9f90522
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 300ce89c50633c3d21da272f723cf73ffb98f46b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:03 +0100
Subject: [PATCH 3093/4088] knotifyconfig: update to 5.88.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 989cf70a5746..909bff9b7cf7 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f03d30525b7fcdcf81071f647cef66c9306ede76ead6e546edb108f3e4f7a549
+checksum=0033f594d93c7a23a4203dedaf3ab0b07e840862f85fe240b0b5171f4f39706c
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 87b0ed0397fc119c7df6e8624ea65f5986c9a5f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:04 +0100
Subject: [PATCH 3094/4088] kpackage: update to 5.88.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 5a0c1833861a..376cf7197482 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5eb749573a5ab5e2489d7409a11a616629f97f6e5e98cfea0164d6ee5790b0b6
+checksum=9d4c8e5c44c14b0b020c8c71c6da64c78761ee01766874efed5f3077b86600ff
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 9850951beaf590bcfadf396691b93ebe31b28651 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:05 +0100
Subject: [PATCH 3095/4088] kparts: update to 5.88.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index de1567c81806..2b8f4bb161c7 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f12dd7de3aa7a7130240e2e29354bb3738fe559989a61638b876c3a9f3f6b24a
+checksum=74ef0eff2b87ec65256691f9124a89b4010a83541b93b6325020541ecabcfbbd
 
 do_check() {
 	: # test can not find packages assets?!

From b88e6497d33a22369512bc426be3789ceb1ada8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:07 +0100
Subject: [PATCH 3096/4088] kpeople: update to 5.88.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 8af9b62ab559..21e071342d48 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2aa8a2304fcc30595736c4e810467777e5bbce3e301af4439669ffecbbb35800
+checksum=ceafb9690010c7c4a075aefc96cc721cf976cfedc3e4822a1bca5ff2916c6cdd
 
 do_check() {
 	cd build

From 45af8544eddba6c4ba46a96940ab1945ccae0358 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:08 +0100
Subject: [PATCH 3097/4088] kplotting: update to 5.88.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 9095a8374d17..a8cf3374d345 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bfd3feafc5a2ea0e68df8feca1d2ad8ce17f509e2189a904fad036da33cee6da
+checksum=b7b5438bfcf113e13977861644e29871552ec337a100b99d9eba9e5cf6a42a41
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 7e6326a76fe598e98430960fa881cb03ada1fdae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:10 +0100
Subject: [PATCH 3098/4088] kpty: update to 5.88.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 45ad74fc7a0d..a2703ad7120c 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=918acfe51a0b895a64d858c84eb16a659c2a76f92c731a5dbdeb813a8aa4a2e1
+checksum=ca2a37fbe0c54ba9e7ff0e7e7c20d86621735ce85f093f79929d51e191d4c061
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 7669c139861ed07cb00d61ce76cb4fa15c5b6ddb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:11 +0100
Subject: [PATCH 3099/4088] kquickcharts: update to 5.88.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index d65b81fa6cea..87c3c16a529a 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=6833af044f9150fba61ac09fa5cd2d67860f9c7c6ed0625d8dee2618398da4b7
+checksum=5c04438fda04767f4fddbb28dd3e4db3bae1d4777a6b8e6dc73edfd4bbd87f88
 
 do_check() {
 	cd build

From 141be31fb62a1af4e7b920f88e3abd5483aeaaea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:12 +0100
Subject: [PATCH 3100/4088] kross: update to 5.88.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 4015c0fb4e82..a98a276de4f6 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d0dd2d2a065245e2deef1d4ae6d5da0191f2ff66ecc8fd8a27060cb28ea1deda
+checksum=c889a3f8ceef51f8ad188e8cc98d7aae110268d23ff4ade8d7ef779bb90f5e6d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 527096c09b8c178a5903184c1d4740e1dde50a25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:14 +0100
Subject: [PATCH 3101/4088] krunner: update to 5.88.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 9c61999b1775..0eefc27e9852 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3aac094456fc3da851f58842604a28bebafaf4ef05359aa102e3f6e4a272f879
+checksum=bae4bab2de20caf0ad6f87d32d5d9c7e807342986571cdffeea3259acdccb35c
 
 do_check() {
 	cd build

From 7211a46624396b3056eb1023831f8a994264b633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:15 +0100
Subject: [PATCH 3102/4088] kservice: update to 5.88.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index a8e0b367a03a..19a696a4bb32 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b657640c4d93bb18af16b3053f7e7532e89021ba079de079f21cffc521666e28
+checksum=841e572bd74f267375dca5dc5c7561162a12bca2c76b11a6860ea14fe2416aa9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From c80431de9a038aeb62de700b1746d88b5a12409a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:17 +0100
Subject: [PATCH 3103/4088] ksolid: update to 5.88.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 5d36eeb018c1..b59d9c62838f 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.87.0
+version=5.88.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=2a63b8a5866ee206337c1c7c6dfd62fe110dd9e6cf0197521a4992eb3361ac7e
+checksum=cf850337434f6844750bda625fb769615202cda0c047b4bc9dbc44634f556fea
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 5d14e9c8159d429255434fc1509221b4a180b44a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:18 +0100
Subject: [PATCH 3104/4088] ktexteditor: update to 5.88.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 94d3a8058b65..0e5546ef5e7a 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2f1f552f57c33dc213320d61c8b5e8470aa75e08aaf80c563773dcfd85e3b68d
+checksum=25bf3c6e50ccb744d29cf4cf704ef499143a00f66ce9f98464b68ae68f9af3c5
 
 do_check() {
 	cd build

From 3b567a92f1fefbb543c8c91539570eb839e5325c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:20 +0100
Subject: [PATCH 3105/4088] ktextwidgets: update to 5.88.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 9a4c34885e83..a5ed0634f2a8 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d9a5d3049ec1aab8a74fb1f83f998566195544024f33a92f45d938c911c7f511
+checksum=33660e1e3e59f194250873ca59e6c8be375fc114b8c9ba44bd1dd7a97990d719
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 709ddde57dfaa11bbac0159cf2b0739e54cb0a46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:21 +0100
Subject: [PATCH 3106/4088] kunitconversion: update to 5.88.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 626aac2a36b8..791e13ee3cdf 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90fc2f3b69fd6705454e83bfc5451b1059f33bddca1749e29113641b81debeac
+checksum=6cd307174e96702a051d96328527e3890f24874ae7a58195257ea9689a097e16
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From f99e01aac3a8ed893bcfe1738b523e15ac6da862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:23 +0100
Subject: [PATCH 3107/4088] kwallet: update to 5.88.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 58998bdbc360..a551e4ca3966 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59f13a6c9e0933e3e54c62a77717aa182be573f890a09e34369043e3208f58a8
+checksum=4ea69018f85f44472e77a76a6f5af180e60702f7e72a8e34f792d55729e255b8
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 4473ee4332124f1370e3e488948a3135e520507a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:24 +0100
Subject: [PATCH 3108/4088] kwayland: update to 5.88.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index fb34fbf5803c..fa634bc74750 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac3aab3018e0910213c44a2ad219fd551d3ad2cbb1010adc20720db6f3a5990e
+checksum=5015f330eca73ded1f0f38046832925848e2de15c0f4490667c97c61d7a0463b
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 2428cae652d1a486aa1ceb4a807d205602da5b30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:26 +0100
Subject: [PATCH 3109/4088] kwidgetsaddons: update to 5.88.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 730a231f7900..82d869495cbe 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2b119b3f886131009d24e139a313fb27c2ed3f681534d9297ade40153b4dfb01
+checksum=07f11f4b62abe1299e3a9e45c8e09a0a01125164a0df7df58148393f6bbba311
 
 do_check() {
 	cd build

From ae4786e7c5371b2ecacc722a8c641d4562f7e770 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:28 +0100
Subject: [PATCH 3110/4088] kwindowsystem: update to 5.88.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index f17c6ebbde7f..0894b9424ea7 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=424962f23bd03188ef2bb5854e77cac90b6b70632fcc1ccbed86bc72b9bab567
+checksum=80d3984f9ef8077df0fa94ce0be0131b58dffb25965529c5d9f4f8a56ca40cc1
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From b6acdf4df3a60cece8e6bdbb5c71df32d6b6efb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:29 +0100
Subject: [PATCH 3111/4088] kxmlgui: update to 5.88.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 8193262f893e..e996a75e24f0 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b1185b12fe79efac59fe17398d6640c61e571575ca0d25ea80f15d2d33d0daf2
+checksum=623c5a73369c0f1bd7b143de72addae33bfcd03fa4ab5ea5d9b3ac6d9be0a117
 
 do_check() {
 	cd build

From c47b7bca65136cc0cd437003dc95e8d261aa9759 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:31 +0100
Subject: [PATCH 3112/4088] kxmlrpcclient: update to 5.88.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 94753a1f6a15..7b80a6f6a0a4 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a7298f56d5b3997b3765116ec1e3f09e315b21ca004c0d03e0c3894289fe850e
+checksum=679af4618fdb2f24f00de779f4430124bf8e0d8c7f447d05ede037806048800a
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 3a1804045a27af1ed4ef437216fbfd6c72564e7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:32 +0100
Subject: [PATCH 3113/4088] modemmanager-qt5: update to 5.88.0.

---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index fa633204a812..887b1486dddd 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.87.0
+version=5.88.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=33834799edfb33f015a884830b56014830fc34229fee36e27c2335084546e9a9
+checksum=f4e630d15e2eb524e89d73a51d9d73467f946bae42aaae8dd20a46e36f8c9bbc
 
 do_check() {
 	cd build

From 49bd110cec1da080f7a9bf4702383385fd4174c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:38:34 +0100
Subject: [PATCH 3114/4088] networkmanager-qt5: update to 5.88.0.

---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index f4dbf9aeea45..b29f07e46dba 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.87.0
+version=5.88.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=bed4f9300adda630311721b50a5f306b55ac4ac720132675f0d955842aeb9a28
+checksum=8690c8922896e29a2b8c48a3312801bd25a164c0d5bb79f2ab0fc16eb2cf5281
 
 do_check() {
 	cd build

From ec2ad9b536f1e511a0396603266870e3aedb170b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:09 +0100
Subject: [PATCH 3115/4088] oxygen-icons5: update to 5.88.0.

---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 2a435f96ec18..f250c0d271f7 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d50c6615f03e22fd1551137430fddcd38b6942aaf77570c765814e6baad8fd56
+checksum=b7e36ea83cf840dbbc7a0a9fe0528b64d96c764e0485ed5d6e0c5cbb3072f12f
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 2a7d60e1cbd4dfae6657770e600bb8c787ebe277 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:11 +0100
Subject: [PATCH 3116/4088] plasma-framework: update to 5.88.0.

---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index cdc267b104ee..9a31303929a5 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b2ad68437b22647d4c29813176b9e1a199e78b1d49f64959b36a325cf22fcf8
+checksum=9640040242aaacd1017b993e23426449ee71ba7b54ac5ce7e042e5d5aca301a8
 
 do_check() {
 	cd build

From 5e3c76e2e07e4500c113eb7662040d9fa95f2892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:12 +0100
Subject: [PATCH 3117/4088] prison: update to 5.88.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index a8366261631f..923a15c601d1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=07694637a1463882b4108fa6c8283324b35ffe471c27cfaa25fb0cf589b7686d
+checksum=37a16df7ac823f7e97a7e1e9ef48a794879bf81cccb126809b24e25091343f7a
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 6d013497ead6d049c64505308746bc6a4ac1d4a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:14 +0100
Subject: [PATCH 3118/4088] purpose: update to 5.88.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 618128e2ca10..deff36771be4 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4dc3c6984216fbfd00f4754832e75cc51a90f426ce7d39611137f451a1a8b735
+checksum=374506aff7b54cbd3cec87c0d8782bf896f573548b3b689224e2bd8b38b148a2
 
 do_check() {
 	cd build

From 36f6e53d209cc679adca66ee6ef4b5b14606f1e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:15 +0100
Subject: [PATCH 3119/4088] qqc2-desktop-style: update to 5.88.0.

---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index e8a0aa3cf21e..2158afc78782 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=07ab65d080f7f3a6d9076d90b72e9dfb3f3a6caa4e01472a1d261ef7cacb240a
+checksum=a2f4afa088a81b6e9367c08c341e721d4a92832ff26b0889ae3566f37247445f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 898461bd322802cc9573bc1360cb8ba44695ef11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:17 +0100
Subject: [PATCH 3120/4088] sonnet: update to 5.88.0.

---
 srcpkgs/sonnet/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 1822741cf867..d7948a1810cd 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,21 +1,22 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
-hostmakedepends="kcoreaddons extra-cmake-modules"
-makedepends="qt5-devel qt5-tools-devel aspell-devel hunspell-devel"
+hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
+ qt5-tools-devel"
+makedepends="qt5-devel qt5-tools-devel aspell-devel hunspell-devel
+ qt5-declarative-devel"
 short_desc="KDE Multi-language spell checker"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ad6fe55c06eeed600511be34a374aa46e1cb1e5fea8007255468fa1679289b1
+checksum=8f99640923b500affd549c4990a9a5ee526b704bfab446e41588963ecade0869
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
-	configure_args+=" -DPARSETRIGRAMS_EXECUTABLE=/usr/bin/parsetrigrams"
+	hostmakedepends+=" sonnet"
 fi
 
 sonnet-devel_package() {

From ae79d10e89c8e3f03834ad82b829edf87570fbaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:18 +0100
Subject: [PATCH 3121/4088] syndication: update to 5.88.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index cd9069184b6f..3e53316076e1 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=7a21f7c335425421695fcb290a3f5037d8b4c9b946377b7200f3e357f5407af5
+checksum=09008afd3add5f57942d21d50328ffcd013aff9ea942d6b188069bc6a1ae9638
 
 syndication-devel_package() {
 	short_desc+=" - development"

From c552a8d8c77c293966dea838c4c5be4d0d77293f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:20 +0100
Subject: [PATCH 3122/4088] syntax-highlighting: update to 5.88.0.

---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 8c9a261f250d..5c8491f4a35f 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26625bea8cd015520c74375ce9e5a23e13daf5bd6cf4502adb9f4fd9f0a81c91
+checksum=53d7a97d479543bba4bd6f214b973a88a5316e1b04b01f68a4e2210467fc5f0d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 1466f73d855d69093c0bb60294e43307798cec4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Nov 2021 15:39:21 +0100
Subject: [PATCH 3123/4088] threadweaver: update to 5.88.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index d9d9649c912f..ab0df6bc7786 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.87.0
+version=5.88.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=904db85af3f4cf5a7b0125264926d83405489feec66cacf675c67019c5fe17bf
+checksum=b2f3079158a52c8e49ea0989e18a509dc9693f6a26f0739b133bee0f4b02df1f
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 45eaea7f603e20b6957d612c7e7966400da38402 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Nov 2021 00:18:13 +0100
Subject: [PATCH 3124/4088] Rocket.Chat-Desktop: update to 3.6.0.

---
 srcpkgs/Rocket.Chat-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index 4af2672dc7a8..a01959934521 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.5.7
+version=3.6.0
 revision=1
 _electron_ver=13
 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=0b7fc8b711bcabee8b4c6871ee56245e8e16e0f327fd3503720ae67c2ef044fe
+checksum=1b867f55c32f24124f5aaf6ce3dcd805a5aab29c63582a4b5a8730420af5cc1d
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 5824c4681a4dd4c9d80b636b88728e9e47b27f6b Mon Sep 17 00:00:00 2001
From: LupertEverett <86886753+LupertEverett@users.noreply.github.com>
Date: Fri, 19 Nov 2021 21:03:54 +0300
Subject: [PATCH 3125/4088] latte-dock: update to 0.10.4.

latte-dock: update to 0.10.4
---
 srcpkgs/latte-dock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/latte-dock/template b/srcpkgs/latte-dock/template
index 93594e18107a..2a225a3b8d87 100644
--- a/srcpkgs/latte-dock/template
+++ b/srcpkgs/latte-dock/template
@@ -1,6 +1,6 @@
 # Template file for 'latte-dock'
 pkgname=latte-dock
-version=0.10.2
+version=0.10.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DENABLE_MAKE_UNIQUE=OFF
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/latte-dock/"
 changelog="https://invent.kde.org/plasma/latte-dock/-/blob/master/CHANGELOG.md"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=29e2ce45894c4ec011c38471900e0c2141b441a3ff6333e102bd157eef8f276a
+checksum=5d1a29f8c35c6de09c6e72f62ccd62ebb42f32e756dc28d66043cb913fea6c63

From bd4c5c6224667ab97d1222477fa279fa07e47d5d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Fri, 19 Nov 2021 18:41:22 +0100
Subject: [PATCH 3126/4088] monitoring-plugins: build with check_snmp

---
 srcpkgs/monitoring-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 473f40cccbfb..e6117e8fe6f0 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,10 +1,10 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
-hostmakedepends="fping openssh postfix procps-ng smbclient"
+hostmakedepends="fping openssh postfix procps-ng smbclient net-snmp"
 makedepends="libldap-devel libmariadbclient-devel postgresql-libs-devel
  zlib-devel"
 depends="iputils procps-ng"

From 2bf04cf2e77b01366ac45c7d7f3266509c012648 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 21 Nov 2021 08:03:58 +0100
Subject: [PATCH 3127/4088] linux5.4: update to 5.4.160.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 9025b35b8ad3..1dd3e5b6e54d 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.159
+version=5.4.160
 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=d718325f4eab325dce4f82b88418f68ba130864118229539541331e0a4478643
+checksum=d4b080290e9c6c5c250be6849eeb0d956f253a40bfcd4e4b41f750421eb50458
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 02b0810daf3070e93c30c0301cbce39ed14e3918 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 21 Nov 2021 08:06:09 +0100
Subject: [PATCH 3128/4088] gscan2pdf: update to 2.12.4.

---
 srcpkgs/gscan2pdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index 4a2e7fe17a7f..96e5b715eb5e 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.12.3
+version=2.12.4
 revision=1
 build_style=perl-module
 hostmakedepends="perl gettext"
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="http://gscan2pdf.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=b5d5d372823b0e7ac1b17b57474af4ee1cf49437008d925a77ea38c30c4770e9
+checksum=52b06dd1091293b20fe26658168c4534943542671be7709e9af9587ecc6367fb
 nocross=yes
 
 do_check() {

From 9c197b7837ed5f7e14311d1c2402e121ff07ea40 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 21 Nov 2021 09:36:51 +0100
Subject: [PATCH 3129/4088] wine: update to 6.22.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 520be713ea0b..7b1ca3143002 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-6.21/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-6.21/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-6.22/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-6.22/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 9fb95cc03b0e..e836d0ed7d7d 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-6.21/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-6.21/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-6.22/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-6.22/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index d2b914e11155..73baa5c79e70 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.21
+version=6.22
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="f7b67572b52a7150f3dcc43318b40cf10425171319edf6368a60274642e079ce
- df986de7d6ce6536c18bba4dbeab05e2bd199cfa73e3194fd6c805cdc6d51dfd"
+checksum="826042a181a9879732a3dacbbf8167605f305291bfcfaaf5eaa0ec9525d764ef
+ a74fd4343dca709918830b7393cb1f4e0ae29fce731c55f702905f126a9dced7"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 08b97bc8881225b8bf1ac8ac2fc74f356523a7a2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 21 Nov 2021 09:38:07 +0100
Subject: [PATCH 3130/4088] wine-mono: update to 7.0.0.

---
 srcpkgs/wine-mono/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index ee63a0002eb7..dba68fcb999f 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,14 +1,14 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.4.0
+version=7.0.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=db8b85f3b910590f61adbfa0005a995d613e299a1cc73d00553d70dc81010e36
+checksum=b37e6fc9e590e582243dc25d72a5fcc330c3a7970dfdc98a7a81d23845ba8900
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 1eac0074c9fb10d3306fabef007247d40fad74c7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Nov 2021 15:59:46 +0100
Subject: [PATCH 3131/4088] linux5.15: update to 5.15.4.

Config changes:
 AMD_PMC n -> m
 EFI_VARS y -> n

Closes #34117.
Closes #34149.
---
 srcpkgs/linux5.15/files/i386-dotconfig   | 2 +-
 srcpkgs/linux5.15/files/x86_64-dotconfig | 6 +++---
 srcpkgs/linux5.15/template               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index fd370c349152..95f9f21f866e 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -2126,7 +2126,7 @@ CONFIG_SYSFB=y
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=y
+# CONFIG_EFI_VARS is not set
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 2f828640fa45..226bb4207f00 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.2 Kernel Configuration
+# Linux/x86_64 5.15.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2191,7 +2191,7 @@ CONFIG_SYSFB=y
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=y
+# CONFIG_EFI_VARS is not set
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -8262,7 +8262,7 @@ CONFIG_GIGABYTE_WMI=m
 CONFIG_ACERHDF=m
 # CONFIG_ACER_WIRELESS is not set
 CONFIG_ACER_WMI=m
-# CONFIG_AMD_PMC is not set
+CONFIG_AMD_PMC=m
 CONFIG_ADV_SWBUTTON=m
 CONFIG_APPLE_GMUX=m
 CONFIG_ASUS_LAPTOP=m
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 68ae0f465428..40c310a7daa8 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 3eac9835eb12f011c1bf15fe4bc933fab7a4d67b7a09d20a638ed162b6b17466"
+ c33801f2d4ae027b5cb6ba49ff7daacc1ac25243cefcc0a4e6e358f5d36dca5b"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b59bd4cdd3ebff111eac4963f2a6fe20bc2cfdba Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 21 Nov 2021 16:01:01 +0100
Subject: [PATCH 3132/4088] inadyn: update to 2.9.0.

---
 srcpkgs/inadyn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 7b395277e93b..22da48b6a43e 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,7 +1,7 @@
 # Template file for 'inadyn'
 pkgname=inadyn
-version=2.8.1
-revision=2
+version=2.9.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://troglobit.com/inadyn.html"
 changelog="https://github.com/troglobit/inadyn/raw/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"
-checksum=1185a9fb165bfc5f5b5f66f0dd8a695c9bd78d4b20cd162273eeea77f2d2e685
+checksum=2e2eb9e3ef76e314e147aeb2aec80018e09af6b6357b46dda5b2a52ce9da738e
 
 system_accounts="inadyn"
 inadyn_homedir="/var/empty"

From 185369201f18ecacfce1f5e673d95e718d5e6180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 20 Nov 2021 20:06:15 -0300
Subject: [PATCH 3133/4088] New package: brial-1.2.10

---
 common/shlibs          |  2 ++
 srcpkgs/brial-devel    |  1 +
 srcpkgs/brial/template | 27 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/brial-devel
 create mode 100644 srcpkgs/brial/template

diff --git a/common/shlibs b/common/shlibs
index f4112f44c2ec..1c53abdfb7ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4061,5 +4061,7 @@ libfactory-4.2.1.so singular-4.2.1_1
 libpolys-4.2.1.so singular-4.2.1_1
 libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
+libbrial.so.3 brial-1.2.10_1
+libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
diff --git a/srcpkgs/brial-devel b/srcpkgs/brial-devel
new file mode 120000
index 000000000000..dde7d1199888
--- /dev/null
+++ b/srcpkgs/brial-devel
@@ -0,0 +1 @@
+brial
\ No newline at end of file
diff --git a/srcpkgs/brial/template b/srcpkgs/brial/template
new file mode 100644
index 000000000000..18fdb463e8df
--- /dev/null
+++ b/srcpkgs/brial/template
@@ -0,0 +1,27 @@
+# Template file for 'brial'
+pkgname=brial
+version=1.2.10
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="boost-devel m4ri-devel"
+short_desc="BRiAl (Boolean Ring Algebra) is the successor to PolyBoRi"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/BRiAl/BRiAl"
+distfiles="https://github.com/BRiAl/BRiAl/releases/download/$version/brial-$version.tar.bz2"
+checksum=dd10ab9e0d74e046ec4d84eecbde9de026a2305246ee088883cbae5744b4f18d
+
+if [ -n "$CROSS_BUILD" ]; then
+	configure_args+=" --with-boost-unit-test-framework=no"
+fi
+
+brial-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 5f08314b4bedc8669c4b74cd1cf235f19dd37f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 20 Nov 2021 20:27:08 -0300
Subject: [PATCH 3134/4088] New package: cliquer-1.22

---
 common/shlibs            |  1 +
 srcpkgs/cliquer-devel    |  1 +
 srcpkgs/cliquer/template | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/cliquer-devel
 create mode 100644 srcpkgs/cliquer/template

diff --git a/common/shlibs b/common/shlibs
index 1c53abdfb7ae..7191478a89d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4056,6 +4056,7 @@ libcholmod.so.3 SuiteSparse-5.10.1_1
 libumfpack.so.5 SuiteSparse-5.10.1_1
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
+libcliquer.so.1 cliquer-1.22_1
 libSingular-4.2.1.so singular-4.2.1_1
 libfactory-4.2.1.so singular-4.2.1_1
 libpolys-4.2.1.so singular-4.2.1_1
diff --git a/srcpkgs/cliquer-devel b/srcpkgs/cliquer-devel
new file mode 120000
index 000000000000..c4935e7fa4d4
--- /dev/null
+++ b/srcpkgs/cliquer-devel
@@ -0,0 +1 @@
+cliquer
\ No newline at end of file
diff --git a/srcpkgs/cliquer/template b/srcpkgs/cliquer/template
new file mode 100644
index 000000000000..2aa22312aec0
--- /dev/null
+++ b/srcpkgs/cliquer/template
@@ -0,0 +1,21 @@
+# Template file for 'cliquer'
+pkgname=cliquer
+version=1.22
+revision=1
+build_style=gnu-configure
+short_desc="C routines for finding cliques in an arbitrary weighted graph"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://users.aalto.fi/~pat/cliquer.html"
+distfiles="https://github.com/dimpase/autocliquer/releases/download/v$version/cliquer-$version.tar.gz"
+checksum=6ff79e1e9983ebabbca3dd276a8a310cbdeb48c7adf95f37abd83129b566340e
+
+cliquer-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 38a71ce03e001d1f2e7eef272445512e7be8b7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 11:09:57 -0300
Subject: [PATCH 3135/4088] New package: libbraiding-1.1

---
 common/shlibs                |  1 +
 srcpkgs/libbraiding-devel    |  1 +
 srcpkgs/libbraiding/template | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/libbraiding-devel
 create mode 100644 srcpkgs/libbraiding/template

diff --git a/common/shlibs b/common/shlibs
index 7191478a89d5..5a152423f443 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4047,6 +4047,7 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libbraiding.so.0 libbraiding-1.1_1
 libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libavif.so.13 libavif-0.9.3_1
diff --git a/srcpkgs/libbraiding-devel b/srcpkgs/libbraiding-devel
new file mode 120000
index 000000000000..987bf7b229be
--- /dev/null
+++ b/srcpkgs/libbraiding-devel
@@ -0,0 +1 @@
+libbraiding
\ No newline at end of file
diff --git a/srcpkgs/libbraiding/template b/srcpkgs/libbraiding/template
new file mode 100644
index 000000000000..33808a2a8a01
--- /dev/null
+++ b/srcpkgs/libbraiding/template
@@ -0,0 +1,21 @@
+# Template file for 'libbraiding'
+pkgname=libbraiding
+version=1.1
+revision=1
+build_style=gnu-configure
+short_desc="Library to compute several properties of braids"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/miguelmarco/libbraiding/"
+distfiles="https://github.com/miguelmarco/libbraiding/releases/download/$version/libbraiding-$version.tar.gz"
+checksum=f436998c8639b4ae6073a4d16a024f7278abbd305961c901347accd6b70c4a53
+
+libbraiding-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 3e5ac0d08833470fbf5e6dc1243c4925f95238db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 11:28:57 -0300
Subject: [PATCH 3136/4088] New package: libhomfly-1.02r6

---
 common/shlibs              |  1 +
 srcpkgs/libhomfly-devel    |  1 +
 srcpkgs/libhomfly/template | 26 ++++++++++++++++++++++++++
 srcpkgs/libhomfly/update   |  1 +
 4 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libhomfly-devel
 create mode 100644 srcpkgs/libhomfly/template
 create mode 100644 srcpkgs/libhomfly/update

diff --git a/common/shlibs b/common/shlibs
index 5a152423f443..00d8a6cb0dd4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4040,6 +4040,7 @@ libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
 libbasu.so.0 basu-0.2.0_1
+libhomfly.so.0 libhomfly-1.02r6_1
 libXcomp.so.3 nx-libs-3.5.99.24_1
 libXcompshad.so.3 nx-libs-3.5.99.24_1
 libNX_X11.so.6 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/libhomfly-devel b/srcpkgs/libhomfly-devel
new file mode 120000
index 000000000000..5996d0c9fa5b
--- /dev/null
+++ b/srcpkgs/libhomfly-devel
@@ -0,0 +1 @@
+libhomfly
\ No newline at end of file
diff --git a/srcpkgs/libhomfly/template b/srcpkgs/libhomfly/template
new file mode 100644
index 000000000000..d134edd652d3
--- /dev/null
+++ b/srcpkgs/libhomfly/template
@@ -0,0 +1,26 @@
+# Template file for 'libhomfly'
+pkgname=libhomfly
+version=1.02r6
+revision=1
+build_style=gnu-configure
+makedepends="gc-devel"
+short_desc="Library to compute the homfly polynomial of knots and links"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="custom:unlicense"
+homepage="https://github.com/miguelmarco/libhomfly/"
+distfiles="https://github.com/miguelmarco/libhomfly/releases/download/${version}/libhomfly-${version}.tar.gz"
+checksum=f990d991d29a590c54b09eff68bc209c4cf2b8b12d945351688d2db8a0d30979
+
+post_install() {
+	vlicense LICENSE
+}
+
+libhomfly-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libhomfly/update b/srcpkgs/libhomfly/update
new file mode 100644
index 000000000000..78d17e336190
--- /dev/null
+++ b/srcpkgs/libhomfly/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d.r]+(?=\.tar\.gz")'

From cbcc918c8042ef75637521cde8864c9372f148b6 Mon Sep 17 00:00:00 2001
From: flupe <lucas@escot.me>
Date: Sun, 3 Oct 2021 23:37:05 +0200
Subject: [PATCH 3137/4088] New package: soju-0.3.0

---
 srcpkgs/soju/files/README.voidlinux |  8 ++++++++
 srcpkgs/soju/files/config           |  2 ++
 srcpkgs/soju/files/soju/run         |  3 +++
 srcpkgs/soju/template               | 28 ++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/soju/files/README.voidlinux
 create mode 100644 srcpkgs/soju/files/config
 create mode 100755 srcpkgs/soju/files/soju/run
 create mode 100644 srcpkgs/soju/template

diff --git a/srcpkgs/soju/files/README.voidlinux b/srcpkgs/soju/files/README.voidlinux
new file mode 100644
index 000000000000..2d93e22a3903
--- /dev/null
+++ b/srcpkgs/soju/files/README.voidlinux
@@ -0,0 +1,8 @@
+The system service /etc/sv/soju runs soju as system user _soju.
+
+By default, the database will be stored in /var/db/soju/ and logs will be in
+/var/log/soju/. Both directories are owned by user _soju.
+
+To initialize the database, make sure you run sojuctl as the _soju user:
+
+$ sudo -u _soju sojuctl -config /etc/soju/config create-user <username> -admin
diff --git a/srcpkgs/soju/files/config b/srcpkgs/soju/files/config
new file mode 100644
index 000000000000..55781d839402
--- /dev/null
+++ b/srcpkgs/soju/files/config
@@ -0,0 +1,2 @@
+db sqlite3 /var/db/soju/main.db
+log fs /var/log/soju/
diff --git a/srcpkgs/soju/files/soju/run b/srcpkgs/soju/files/soju/run
new file mode 100755
index 000000000000..3b00ad02fb07
--- /dev/null
+++ b/srcpkgs/soju/files/soju/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec chpst -u _soju soju ${OPTS:- -config /etc/soju/config}
diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
new file mode 100644
index 000000000000..9d3eddfea050
--- /dev/null
+++ b/srcpkgs/soju/template
@@ -0,0 +1,28 @@
+# Template file for 'soju'
+pkgname=soju
+version=0.3.0
+revision=1
+build_style=go
+go_import_path="git.sr.ht/~emersion/soju"
+go_package="./cmd/soju ./cmd/sojuctl"
+hostmakedepends="scdoc"
+short_desc="User-friendly IRC bouncer"
+maintainer="flupe <lucas@escot.me>"
+license="AGPL-3.0-or-later"
+homepage="https://soju.im"
+changelog="https://git.sr.ht/~emersion/soju/refs/v${version}"
+distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz"
+checksum=c1b77e87e42eb12bdc57a8c308b0d0f2b3dd367a2a8f9093a3983fa692c6aa01
+conf_files="/etc/soju/config"
+system_accounts="_soju"
+make_dirs="/var/db/soju 0750 _soju _soju
+ /var/log/soju 0750 _soju _soju"
+
+post_install() {
+	scdoc <doc/soju.1.scd >doc/soju.1
+	vman doc/soju.1
+	vlicense LICENSE
+	vinstall $FILESDIR/config 644 etc/soju
+	vdoc $FILESDIR/README.voidlinux
+	vsv soju
+}

From 828d646c93532aca95cd56a4e6113608bdb32e5d Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Sat, 2 Oct 2021 16:03:26 +0200
Subject: [PATCH 3138/4088] New package: perl-Text-Template-1.60

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
---
 srcpkgs/perl-Text-Template/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/perl-Text-Template/template

diff --git a/srcpkgs/perl-Text-Template/template b/srcpkgs/perl-Text-Template/template
new file mode 100644
index 000000000000..0c31bf12249d
--- /dev/null
+++ b/srcpkgs/perl-Text-Template/template
@@ -0,0 +1,16 @@
+# Template file for 'perl-Text-Template'
+pkgname=perl-Text-Template
+version=1.60
+revision=1
+wrksrc="${pkgname/perl-/}-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl"
+checkdepends="perl-Test-Warnings"
+short_desc="Expand template text with embedded Perl"
+maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Text-Template"
+distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
+checksum=d9d57fb3f432b4f100e6ceb06c8363bbaee0ad85d53d728f6ba15a330248501c

From a2a1181aef387078a590c5efecfc493eb32c9918 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 21 Nov 2021 14:47:06 +0200
Subject: [PATCH 3139/4088] opera: update to 81.0.4196.54.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index b9f6a3690181..9f2f2f5c0d01 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=81.0.4196.37
+version=81.0.4196.54
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
-checksum=f392415487f4678d762bfb4759694ec1e90ce94ae3fd0b46b41c9b91583d246d
+checksum=78912ec6fe1adfc54d8f8cfd41787c320930736c7511c939823d102cab5ea60b
 repository="nonfree"
 nostrip=yes
 

From bee66f3074eacbe044f473e057d8cfb0f0096b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 20 Nov 2021 18:57:31 -0300
Subject: [PATCH 3140/4088] ecl: enable tests

The tests for ecl were not running as make check failed to find the
binary (according to upstream one should install it before running
tests, but properly setting some variables makes it work).

OTOH, there's a bunch of tests that fail. Out of 18098 tests there are
around 10 that fail on x86_64 and i686 (the number varies as some
failures are kind of random). On x86_64-musl there are about 30 more
failures but they all seem to be the same (something to do with the
value of acosh(-infinity)).

It's also the case that failures in the test suite will NOT stop make
with an error, so packaging with -Q is not broken.

it is left for the future to fix the failing tests and patch make check
so it actually fails the build.

Not revbumping b/c this does not change anything in the installed files.
---
 srcpkgs/ecl/patches/fix-tests.patch | 15 +++++++++++++++
 srcpkgs/ecl/template                | 17 ++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ecl/patches/fix-tests.patch

diff --git a/srcpkgs/ecl/patches/fix-tests.patch b/srcpkgs/ecl/patches/fix-tests.patch
new file mode 100644
index 000000000000..1705be9681d6
--- /dev/null
+++ b/srcpkgs/ecl/patches/fix-tests.patch
@@ -0,0 +1,15 @@
+The test config finds the build directory by looking for the file
+'BUILD-STAMP'. However, the build system creates 'build-stamp' instead
+so it will never be found on a case-sensitive filesystem.
+
+--- a/src/tests/config.lsp.in	2021-02-01 09:59:46.000000000 -0300
++++ b/src/tests/config.lsp.in	2021-11-20 18:12:39.318173405 -0300
+@@ -41,7 +41,7 @@
+   (loop with root = (si::get-library-pathname)
+         with lib-name = (format nil "../lib/ecl-~A/" (lisp-implementation-version))
+         for base in (list root (merge-pathnames lib-name root))
+-        when (or (probe-file (merge-pathnames "./BUILD-STAMP" base))
++        when (or (probe-file (merge-pathnames "./build-stamp" base))
+                  (probe-file (merge-pathnames "./COPYING" base)))
+         do (return base)))
+ 
diff --git a/srcpkgs/ecl/template b/srcpkgs/ecl/template
index 2f13da4003f4..dcfb6ff48a36 100644
--- a/srcpkgs/ecl/template
+++ b/srcpkgs/ecl/template
@@ -7,7 +7,7 @@ configure_args="--enable-gmp=system --enable-boehm=system
  --enable-libatomic=system --with-dffi=system"
 hostmakedepends="pkg-config"
 makedepends="gc-devel libatomic_ops-devel gmp-devel libffi-devel"
-depends=$makedepends
+depends="$makedepends"
 short_desc="Common-Lisp interpreter as described in the X3J13 Ansi specification"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-2.1-or-later"
@@ -20,3 +20,18 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ecl"
 	configure_args+=" --with-cross-config=${XBPS_SRCPKGDIR}/ecl/files/cross_config"
 fi
+
+pre_check() {
+	# These settings enable `make check` to run using the compiled ecl.
+	# A few tests fail: out of 18098 tests there are ~10 that fail on
+	# glibc and an additional ~30 fail on musl (the numbers vary as
+	# some failures seem random.)
+	#
+	# The build finishes since `make check` does NOT fail; it is left
+	# for the future to fix the failing tests and patch make check so
+	# it actually fails the build.
+	export ECLDIR=$wrksrc/build/
+	export LD_LIBRARY_PATH=$wrksrc/build/
+	export TEST_IMAGE=$wrksrc/build/bin/ecl
+	make_check_args="ECL=$TEST_IMAGE"
+}

From e882c6ebc5747a64dbec99a23bfa4277f96f2e55 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Fri, 19 Nov 2021 18:43:14 +0100
Subject: [PATCH 3141/4088] routinator: update to 0.10.2

Also add /etc/routinator/routinator.conf to conf_files so it does not
get overwritten in future updates.
---
 srcpkgs/routinator/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index 4d9239c844a4..6d776a5ffb60 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -1,6 +1,6 @@
 # Template file for 'routinator'
 pkgname=routinator
-version=0.7.1
+version=0.10.2
 revision=1
 build_style=cargo
 depends="rsync"
@@ -9,7 +9,8 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="BSD-3-Clause"
 homepage="https://rpki.readthedocs.io/"
 distfiles="https://github.com/NLnetLabs/routinator/archive/v${version}.tar.gz"
-checksum=a84589789bdc76322deb29c78d6b14391c859967a4ae8f766a79d6b7a1fd16b2
+conf_files="/etc/routinator/routinator.conf"
+checksum=b85e03447eaffc3ec0df78eeeb5ad87aaaeabc0974d87ea5d516e04c3e1bbbb3
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 62566e1fb178c44d834ab93663de7869466e7a83 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Sun, 21 Nov 2021 08:38:12 +0100
Subject: [PATCH 3142/4088] python3-libtmux: update to 0.10.2

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
---
 srcpkgs/python3-libtmux/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-libtmux/template b/srcpkgs/python3-libtmux/template
index 44d935083354..8ebb2ffda3cd 100644
--- a/srcpkgs/python3-libtmux/template
+++ b/srcpkgs/python3-libtmux/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-libtmux'
 pkgname=python3-libtmux
-version=0.8.5
-revision=5
+version=0.10.2
+revision=1
 wrksrc="libtmux-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="MIT"
 homepage="https://github.com/tmux-python/libtmux"
 distfiles="${PYPI_SITE}/l/libtmux/libtmux-${version}.tar.gz"
-checksum=1d35b9f8451944d31c5ed22ed9e6c8e18034adcc75718fcc5b27fbd9621543e1
+checksum=a0e958b85ec14cdaabecfa738a0dd51846f05e5c5e9d6749a2bf5160b9f7e1d2
 # Disable check which uses pip to pull external python packages
 make_check=no
 

From 97c1c7c49dc2cc384dbca512fa58446df1da9c66 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Sun, 21 Nov 2021 08:38:39 +0100
Subject: [PATCH 3143/4088] python3-tmuxp: update to 1.9.3

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
---
 srcpkgs/python3-tmuxp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-tmuxp/template b/srcpkgs/python3-tmuxp/template
index 9dd029e4d1ca..c8cbdd3a374e 100644
--- a/srcpkgs/python3-tmuxp/template
+++ b/srcpkgs/python3-tmuxp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tmuxp'
 pkgname=python3-tmuxp
-version=1.7.2
-revision=4
+version=1.9.3
+revision=1
 wrksrc="tmuxp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="MIT"
 homepage="https://github.com/tmux-python/tmuxp/"
 distfiles="${PYPI_SITE}/t/tmuxp/tmuxp-${version}.tar.gz"
-checksum=14296b62db260420d4600dcd805408ea908b3a78d4ea0a6a403d092fdbf6d075
+checksum=91a73dceda6c6fb700d25e9d21380ab8af4ca84da1e7086a0324f498d409c39f
 conflicts="python-tmuxp>=0"
 
 post_patch() {

From 0f847a6bddb1cb48a0123e2ca7278bec700c6346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BChlinghaus?= <jazzman@alphabreed.com>
Date: Thu, 18 Nov 2021 19:28:34 +0100
Subject: [PATCH 3144/4088] run-mailcap: update to 3.70

---
 srcpkgs/run-mailcap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/run-mailcap/template b/srcpkgs/run-mailcap/template
index aef16fa059a5..63409eaf12b5 100644
--- a/srcpkgs/run-mailcap/template
+++ b/srcpkgs/run-mailcap/template
@@ -1,6 +1,6 @@
 # Template file for 'run-mailcap'
 pkgname=run-mailcap
-version=3.68
+version=3.70
 revision=1
 wrksrc="mailcap-${version}ubuntu1"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:ad-hoc, custom:Bellcore"
 homepage="https://packages.ubuntu.com/hirsute/mailcap"
 distfiles="${UBUNTU_SITE}/main/m/mailcap/mailcap_${version}ubuntu1.tar.xz"
-checksum=d5567fef2d81ecdc6b98f7a5a052375cbff000b2255567abe261c0b8371444f0
+checksum=a1b4ddff6781ddf6a335565b5dc3da55437a6f97d30465e4d49d21684133add2
 
 do_install() {
 	local _aliases="see edit compose print"

From 969aeed28768c0738e39ead5eb03ebbe6716669a Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Sat, 20 Nov 2021 14:06:51 +0100
Subject: [PATCH 3145/4088] ffmpeg: update to 4.4.1

---
 srcpkgs/ffmpeg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 9397ac713f68..7ea3d238c7db 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,7 +1,7 @@
 # Template file for 'ffmpeg'
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
-version=4.4
+version=4.4.1
 revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909
+checksum=eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel

From 23ef8a16572ea44b9bbcb7856137db30da5f369a Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Sat, 13 Nov 2021 23:08:25 +0600
Subject: [PATCH 3146/4088] leptonica: update to 1.82.0.

---
 .../patches/fix-flaky-test-on-i686.patch      | 70 +++++++++++++++++++
 srcpkgs/leptonica/template                    |  6 +-
 2 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch

diff --git a/srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch b/srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch
new file mode 100644
index 000000000000..bec1a2482f41
--- /dev/null
+++ b/srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch
@@ -0,0 +1,70 @@
+From ea2bb8c9cf61d3eba2589cfaac05f59a33b4110d Mon Sep 17 00:00:00 2001
+From: danblooomberg <dan.bloomberg@gmail.com>
+Date: Sun, 14 Nov 2021 14:52:24 -0800
+Subject: [PATCH] Fix flaky hash_reg test on i686 * The sets that are generated
+ from *SelectRange() functions can depend on   the platform, resulting in
+ intersection sizes that differ by 1. * So, loosen the comparison to allow a
+ difference of 1.
+
+---
+ prog/hash_reg.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/prog/hash_reg.c b/prog/hash_reg.c
+index 8b408d6d..3414ba90 100644
+--- a/prog/hash_reg.c
++++ b/prog/hash_reg.c
+@@ -100,7 +100,7 @@ L_REGPARAMS  *rp;
+     sarrayIntersectionByAset(sa1, sa2, &sa3);
+     c1 = sarrayGetCount(sa3);
+     sarrayDestroy(&sa3);
+-    regTestCompareValues(rp, string_intersection, c1, 0);  /* 2 */
++    regTestCompareValues(rp, string_intersection, c1, 1);  /* 2 */
+     if (rp->display) lept_stderr("  aset: intersection size = %d\n", c1);
+     sarrayUnionByAset(sa1, sa2, &sa3);
+     c1 = sarrayGetCount(sa3);
+@@ -123,7 +123,7 @@ L_REGPARAMS  *rp;
+     sarrayIntersectionByHmap(sa1, sa2, &sa3);
+     c1 = sarrayGetCount(sa3);
+     sarrayDestroy(&sa3);
+-    regTestCompareValues(rp, string_intersection, c1, 0);  /* 6 */
++    regTestCompareValues(rp, string_intersection, c1, 1);  /* 6 */
+     if (rp->display) lept_stderr("  hmap: intersection size = %d\n", c1);
+     sarrayUnionByHmap(sa1, sa2, &sa3);
+     c1 = sarrayGetCount(sa3);
+@@ -160,7 +160,7 @@ L_REGPARAMS  *rp;
+     ptaIntersectionByAset(pta1, pta2, &pta3);
+     c1 = ptaGetCount(pta3);
+     ptaDestroy(&pta3);
+-    regTestCompareValues(rp, pta_intersection, c1, 0);  /* 10 */
++    regTestCompareValues(rp, pta_intersection, c1, 1);  /* 10 */
+     if (rp->display) lept_stderr("  aset: intersection size = %d\n", c1);
+     ptaUnionByAset(pta1, pta2, &pta3);
+     c1 = ptaGetCount(pta3);
+@@ -182,7 +182,7 @@ L_REGPARAMS  *rp;
+     ptaIntersectionByHmap(pta1, pta2, &pta3);
+     c1 = ptaGetCount(pta3);
+     ptaDestroy(&pta3);
+-    regTestCompareValues(rp, pta_intersection, c1, 0);  /* 14 */
++    regTestCompareValues(rp, pta_intersection, c1, 1);  /* 14 */
+     if (rp->display) lept_stderr("  hmap: intersection size = %d\n", c1);
+     ptaUnionByHmap(pta1, pta2, &pta3);
+     c1 = ptaGetCount(pta3);
+@@ -220,7 +220,7 @@ L_REGPARAMS  *rp;
+     l_dnaIntersectionByAset(da1, da2, &da3);
+     c1 = l_dnaGetCount(da3);
+     l_dnaDestroy(&da3);
+-    regTestCompareValues(rp, da_intersection, c1, 0);  /* 18 */
++    regTestCompareValues(rp, da_intersection, c1, 1);  /* 18 */
+     if (rp->display) lept_stderr("  aset: intersection size = %d\n", c1);
+     l_dnaUnionByAset(da1, da2, &da3);
+     c1 = l_dnaGetCount(da3);
+@@ -242,7 +242,7 @@ L_REGPARAMS  *rp;
+     l_dnaIntersectionByHmap(da1, da2, &da3);
+     c1 = l_dnaGetCount(da3);
+     l_dnaDestroy(&da3);
+-    regTestCompareValues(rp, da_intersection, c1, 0);  /* 22 */
++    regTestCompareValues(rp, da_intersection, c1, 1);  /* 22 */
+     if (rp->display) lept_stderr("  hmap: intersection size = %d\n", c1);
+     l_dnaUnionByHmap(da1, da2, &da3);
+     c1 = l_dnaGetCount(da3);
diff --git a/srcpkgs/leptonica/template b/srcpkgs/leptonica/template
index cc24df74e47d..53e939a255ff 100644
--- a/srcpkgs/leptonica/template
+++ b/srcpkgs/leptonica/template
@@ -1,16 +1,18 @@
 # Template file for 'leptonica'
 pkgname=leptonica
-version=1.80.0
+version=1.82.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libopenjpeg2-devel libwebp-devel"
+checkdepends="which gnuplot"
 short_desc="Image processing and analysis library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://leptonica.org/"
+changelog="http://leptonica.org/source/version-notes.html"
 distfiles="http://leptonica.org/source/${pkgname}-${version}.tar.gz"
-checksum=ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4
+checksum=155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6
 
 post_install() {
 	vdoc moller52.jpg

From eb1fadbc28e021da592b22de1ee98fa11d214926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 17 Nov 2021 23:09:45 -0300
Subject: [PATCH 3147/4088] owncloudclient: update to 2.9.1.

---
 ...9a352063f372a1573d326a80bd79ff4d5c37.patch | 28 ------------
 ...a7e7cb19367d708e21f9ef881afecffe35a3.patch | 44 +++++++++++++++++++
 .../patches/skip-root-test.patch              | 36 +++++++++++++++
 srcpkgs/owncloudclient/template               |  5 ++-
 4 files changed, 83 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch
 create mode 100644 srcpkgs/owncloudclient/patches/d987a7e7cb19367d708e21f9ef881afecffe35a3.patch
 create mode 100644 srcpkgs/owncloudclient/patches/skip-root-test.patch

diff --git a/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch b/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch
deleted file mode 100644
index 536db5f230cd..000000000000
--- a/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Reported upstream: https://github.com/owncloud/client/pull/8684
-
-From 89e59a352063f372a1573d326a80bd79ff4d5c37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@gmail.com>
-Date: Sat, 5 Jun 2021 13:27:13 -0300
-Subject: [PATCH] Fix use of deleted function
-
-Compilation fails due to implicit cast to QChar
-
-Compilation on void linux (qt 5.15.3+20210429) fails with
-csync_exclude.cpp:489:34: error: use of deleted function 'QCharRef& QCharRef::operator=(char)'
----
- src/csync/csync_exclude.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
-index 586035346b7..c5c7bbccf5c 100644
---- a/src/csync/csync_exclude.cpp
-+++ b/src/csync/csync_exclude.cpp
-@@ -488,7 +488,7 @@ QString ExcludedFiles::convertToRegexpSyntax(QString exclude, bool wildcardsMatc
-             // Translate [! to [^
-             QString bracketExpr = exclude.mid(i, j - i + 1);
-             if (bracketExpr.startsWith(QLatin1String("[!")))
--                bracketExpr[1] = '^';
-+                bracketExpr[1] = QLatin1Char('^');
-             regex.append(bracketExpr);
-             i = j;
-             break;
diff --git a/srcpkgs/owncloudclient/patches/d987a7e7cb19367d708e21f9ef881afecffe35a3.patch b/srcpkgs/owncloudclient/patches/d987a7e7cb19367d708e21f9ef881afecffe35a3.patch
new file mode 100644
index 000000000000..dab71a91e7c9
--- /dev/null
+++ b/srcpkgs/owncloudclient/patches/d987a7e7cb19367d708e21f9ef881afecffe35a3.patch
@@ -0,0 +1,44 @@
+From d987a7e7cb19367d708e21f9ef881afecffe35a3 Mon Sep 17 00:00:00 2001
+From: Hannah von Reth <hannah.vonreth@owncloud.com>
+Date: Wed, 29 Sep 2021 13:36:26 +0200
+Subject: [PATCH] Fix unit test for the root user
+
+---
+ test/testdownload.cpp  | 4 ++++
+ test/testfolderman.cpp | 8 +++++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/test/testdownload.cpp b/test/testdownload.cpp
+index b37cb807da..4af30ae72e 100644
+--- a/test/testdownload.cpp
++++ b/test/testdownload.cpp
+@@ -150,6 +150,10 @@ private slots:
+     void testMoveFailsInAConflict() {
+ #ifdef Q_OS_WIN
+         QSKIP("Not run on windows because permission on directory does not do what is expected");
++#else
++        if (getuid() == 0) {
++            QSKIP("The permissions have no effect on the root user");
++        }
+ #endif
+         // Test for https://github.com/owncloud/client/issues/7015
+         // We want to test the case in which the renaming of the original to the conflict file succeeds,
+diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
+index 8fc2cc2627..47213ed6b9 100644
+--- a/test/testfolderman.cpp
++++ b/test/testfolderman.cpp
+@@ -102,9 +102,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+ 
+-        // Should not have the rights
+-        QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
+-        QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
++        if (getuid() != 0) {
++            // Should not have the rights
++            QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
++            QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
++        }
+ #endif
+ 
+ #ifdef Q_OS_WIN // drive-letter tests
diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
new file mode 100644
index 000000000000..50aa32e2cd47
--- /dev/null
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -0,0 +1,36 @@
+Hardcode `getuid()` as `0` in tests, since inside xbps-src the
+filesystem is not restricted.
+
+diff --git a/test/testdownload.cpp b/test/testdownload.cpp
+index b37cb807da..4af30ae72e 100644
+--- a/test/testdownload.cpp
++++ b/test/testdownload.cpp
+@@ -150,10 +150,10 @@ private slots:
+     void testMoveFailsInAConflict() {
+ #ifdef Q_OS_WIN
+         QSKIP("Not run on windows because permission on directory does not do what is expected");
+ #else
+-        if (getuid() == 0) {
++        if (0 == 0) {
+             QSKIP("The permissions have no effect on the root user");
+         }
+ #endif
+         // Test for https://github.com/owncloud/client/issues/7015
+         // We want to test the case in which the renaming of the original to the conflict file succeeds,
+diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
+index 8fc2cc2627..47213ed6b9 100644
+--- a/test/testfolderman.cpp
++++ b/test/testfolderman.cpp
+@@ -102,11 +102,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+ 
+-        if (getuid() != 0) {
++        if (0 != 0) {
+             // Should not have the rights
+             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+         }
+ #endif
+ 
+ #ifdef Q_OS_WIN // drive-letter tests
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 2146b9110d17..6731ba6409da 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,6 +1,6 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=2.8.2
+version=2.9.1
 revision=1
 wrksrc=client-${version}
 build_style=cmake
@@ -15,8 +15,9 @@ short_desc="Connect to ownCloud servers"
 maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.owncloud.org"
+changelog="https://raw.githubusercontent.com/owncloud/client/master/CHANGELOG.md"
 distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
-checksum=aafc6044a4c6727ad747195cb90a6be8c3a5b28de50df97fa961b6b551fe6d89
+checksum=fe19a24efeafb1e89c2857398d128ed056b07161e49867db503e40ed222d6022
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"

From fe4e5c77faf20d5df9bf9466c45fcc6467215d58 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Sat, 20 Nov 2021 16:18:46 +0100
Subject: [PATCH 3148/4088] rocksndiamonds: update to 4.3.0.1

---
 srcpkgs/rocksndiamonds/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 1985dee75923..b2301018dc39 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
 # Template file for 'rocksndiamonds'
 pkgname=rocksndiamonds
-version=4.2.3.1
+version=4.3.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,14 +10,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.artsoft.org/rocksndiamonds"
 distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=58c1a63c147b7e6a2294d461cb65e6162e8493ec144a4d7b405544f48c432dca
+checksum=997f6cddb2fc48aed6e6b524b150974410f43956b420d37ebc098f40be92807c
 replaces="rocksndiamonds-data>=0"
 
 do_build() {
 	vsed -i Makefile -e "s;^\(MAKE_CMD = \$(MAKE)\);& ${makejobs};"
 	CFLAGS+=" -DTARGET_SDL2"
-	CFLAGS+=" -DRO_GAME_DIR='\"/usr/share/${pkgname}\"'"
-	CFLAGS+=" -DRW_GAME_DIR='\"/var/lib/${pkgname}\"'"
+	CFLAGS+=" -DBASE_PATH='\"/usr/share/${pkgname}\"'"
 	CFLAGS+=" $(sdl2-config --cflags)"
 	LDFLAGS+=" $(sdl2-config --libs) -lSDL2_image -lSDL2_mixer -lSDL2_net -lm -lz"
 	make CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"

From 56b71ba72405ec95002dc496c07f4dcd55efdf2d Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Mon, 7 Jun 2021 21:54:34 +0800
Subject: [PATCH 3149/4088] New package: NoiseTorch-0.11.4

---
 srcpkgs/NoiseTorch/INSTALL  |  5 +++++
 srcpkgs/NoiseTorch/template | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 srcpkgs/NoiseTorch/INSTALL
 create mode 100644 srcpkgs/NoiseTorch/template

diff --git a/srcpkgs/NoiseTorch/INSTALL b/srcpkgs/NoiseTorch/INSTALL
new file mode 100644
index 000000000000..63f13c0c59ea
--- /dev/null
+++ b/srcpkgs/NoiseTorch/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap 'CAP_SYS_RESOURCE=+ep' usr/bin/noisetorch
+	;;
+esac
diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
new file mode 100644
index 000000000000..a9e9fb2c92d4
--- /dev/null
+++ b/srcpkgs/NoiseTorch/template
@@ -0,0 +1,25 @@
+# Template file for 'NoiseTorch'
+pkgname=NoiseTorch
+version=0.11.4
+revision=1
+build_style=go
+go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"
+go_import_path="noisetorch"
+depends="libcap-progs"
+short_desc="Real-time microphone noise suppression on Linux"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/lawl/NoiseTorch"
+distfiles="https://github.com/lawl/NoiseTorch/archive/${version}.tar.gz"
+checksum=3da6cad119ecca6f4e131c8bca86eb122d2363d5d30dcd1da41974af5887a3c1
+
+pre_build() {
+	make rnnoise
+	GOARCH= go build scripts/embedlicenses.go
+	./embedlicenses
+}
+
+post_install() {
+	vinstall assets/noisetorch.desktop 644 usr/share/applications
+	vinstall assets/icon/noisetorch.png 644 usr/share/icons/hicolor/256x256/apps
+}

From ded82e4dcd60874f071027e07372f107522eaffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 09:29:09 -0300
Subject: [PATCH 3150/4088] New package: gfan-0.6.2

Uses three patches taken from sagemath, cf
https://git.sagemath.org/sage.git/plain/build/pkgs/gfan/patches?h=9.5.beta7

 - fix location of cddlib include files
 - normalize the output of one failing test
 - make tests return an error so build aborts

Also fixes for 32 bit bugs catched by testsuite:
 - add `-ffloat-store` to CFLAGS to fix `0009RenderStairCase`
 - patch typedef for `int64` which causes hang in `0602ResultantFanProjection`
---
 .../patches/fix-int64-for-32bit-archs.patch   |  18 ++
 .../gfan/patches/maketestsreturnerror.patch   |  27 +++
 .../patches/new-cddlib-header-location.patch  |  71 +++++++
 .../gfan/patches/truncate0008outputs.patch    | 195 ++++++++++++++++++
 srcpkgs/gfan/template                         |  38 ++++
 srcpkgs/gfan/update                           |   1 +
 6 files changed, 350 insertions(+)
 create mode 100644 srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch
 create mode 100644 srcpkgs/gfan/patches/maketestsreturnerror.patch
 create mode 100644 srcpkgs/gfan/patches/new-cddlib-header-location.patch
 create mode 100644 srcpkgs/gfan/patches/truncate0008outputs.patch
 create mode 100644 srcpkgs/gfan/template
 create mode 100644 srcpkgs/gfan/update

diff --git a/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch b/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch
new file mode 100644
index 000000000000..c642e32c224e
--- /dev/null
+++ b/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch
@@ -0,0 +1,18 @@
+patch typedef for `int64` which causes hang in `0602ResultantFanProjection`
+
+cf:
+https://github.com/void-linux/void-packages/pull/34182
+https://trac.sagemath.org/ticket/32088
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905300
+
+--- a/src/vektor.h	2017-06-20 11:47:37.000000000 -0300
++++ b/src/vektor.h	2021-11-21 18:28:43.384750825 -0300
+@@ -10,7 +10,7 @@
+ 
+ using namespace std;
+ 
+-typedef signed long int int64;
++typedef int64_t int64;
+ 
+ void outOfRange(int i, int n);
+ 
diff --git a/srcpkgs/gfan/patches/maketestsreturnerror.patch b/srcpkgs/gfan/patches/maketestsreturnerror.patch
new file mode 100644
index 000000000000..8197f08b74f1
--- /dev/null
+++ b/srcpkgs/gfan/patches/maketestsreturnerror.patch
@@ -0,0 +1,27 @@
+diff --git a/src/app_test.cpp b/src/app_test.cpp
+index 755bfe6..183c735 100644
+--- a/src/app_test.cpp
++++ b/src/app_test.cpp
+@@ -562,6 +562,9 @@ int testIntegers()
+ 			  failed.push_back(i->folder);
+ 		  }
+ 	  cout<<"\n";
++	  cout<<"Number of succesful tests "<<good<<endl;
++	  cout<<"Number of failed tests "<<bad<<endl;
++
+ 	  if(!failed.empty())
+ 	  {
+ 		  cout<<"Failed tests:\n-------------\n";
+@@ -569,11 +572,9 @@ int testIntegers()
+ 		  {
+ 			  cout<<*i<<" FAILED!\n";
+ 		  }
++		  return 1;
+ 	  }
+ 
+-	  cout<<"Number of succesful tests "<<good<<endl;
+-	  cout<<"Number of failed tests "<<bad<<endl;
+-
+ 	  return 0;
+   }
+ };
diff --git a/srcpkgs/gfan/patches/new-cddlib-header-location.patch b/srcpkgs/gfan/patches/new-cddlib-header-location.patch
new file mode 100644
index 000000000000..e67c35ad452f
--- /dev/null
+++ b/srcpkgs/gfan/patches/new-cddlib-header-location.patch
@@ -0,0 +1,71 @@
+diff --git a/doc/installation.tex b/doc/installation.tex
+index 763f147..61c87be 100644
+--- a/doc/installation.tex
++++ b/doc/installation.tex
+@@ -20,7 +20,7 @@ Should this command fail, then you are using an old version of gfan.
+ As an alternative to using package managers as above you can try to locate an executable file named ``gfan'' in the installation of other math software. SageMath, for example, contains a gfan executable. You also have the possibility of installing a precompiled executables: go to the Gfan webpage, go to the binaries.html subpage, and follow the instructions there. There is however only very few executables available.
+ 
+ %% Rewrite this section.
+-%% The apt-get linux trouble disappears if all includes of cdd files are of form ``cdd/set\_oper.h''. Now of course if we cannot run apt-get because we are not root we need to install cddlib manually. Here we should use configure to specify how that is done correctly. We should use --prefix=, --includedir=, and possibly --libdir=.
++%% The apt-get linux trouble disappears if all includes of cdd files are of form ``cddlib/set\_oper.h''. Now of course if we cannot run apt-get because we are not root we need to install cddlib manually. Here we should use configure to specify how that is done correctly. We should use --prefix=, --includedir=, and possibly --libdir=.
+ 
+ %% The same thing goes for gmp???? EXCEPT THAT FOR SOME REASON gmp is allowed to be in /usr/include .
+ 
+diff --git a/src/app_librarytest.cpp b/src/app_librarytest.cpp
+index 3b1395b..d91a264 100644
+--- a/src/app_librarytest.cpp
++++ b/src/app_librarytest.cpp
+@@ -12,8 +12,8 @@
+ #include "setoper.h"
+ #include "cdd.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
+ #endif
+ #include <iostream>
+ #include <fstream>
+diff --git a/src/gfanlib_zcone.cpp b/src/gfanlib_zcone.cpp
+index f24f09c..481f116 100644
+--- a/src/gfanlib_zcone.cpp
++++ b/src/gfanlib_zcone.cpp
+@@ -16,8 +16,8 @@
+ #include "setoper.h"
+ #include "cdd.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
+ #endif
+ //}
+ 
+@@ -52,8 +52,8 @@ namespace gfan{
+ 				  "dd_free_global_constants()\n"
+ 				  "in your deinitialisation code (only available for cddlib version>=094d).\n"
+ 				  "This requires the header includes:\n"
+-				  "#include \"cdd/setoper.h\"\n"
+-				  "#include \"cdd/cdd.h\"\n"
++				  "#include \"cddlib/setoper.h\"\n"
++				  "#include \"cddlib/cdd.h\"\n"
+ 				  "\n"
+ 				  "Alternatively, you may call gfan:initializeCddlibIfRequired() and deinitializeCddlibIfRequired()\n"
+ 				  "if gfanlib is the only code using cddlib. If at some point cddlib is no longer required by gfanlib\n"
+diff --git a/src/lp_cdd.cpp b/src/lp_cdd.cpp
+index ec36517..5232d50 100644
+--- a/src/lp_cdd.cpp
++++ b/src/lp_cdd.cpp
+@@ -5,9 +5,9 @@
+ #include "cdd.h"
+ #include "cdd_f.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
+-#include "cdd/cdd_f.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
++#include "cddlib/cdd_f.h"
+ #endif
+ //}
+ #include "termorder.h"
diff --git a/srcpkgs/gfan/patches/truncate0008outputs.patch b/srcpkgs/gfan/patches/truncate0008outputs.patch
new file mode 100644
index 000000000000..bcc12b340b51
--- /dev/null
+++ b/srcpkgs/gfan/patches/truncate0008outputs.patch
@@ -0,0 +1,195 @@
+diff --git a/testsuite/0008PolynomialSetUnion/command b/testsuite/0008PolynomialSetUnion/command
+index cbb23d6..d61cb71 100644
+--- a/testsuite/0008PolynomialSetUnion/command
++++ b/testsuite/0008PolynomialSetUnion/command
+@@ -1 +1 @@
+-%s _bases | %s _polynomialsetunion |sort
++%s _bases | %s _polynomialsetunion |LC_ALL=C sort|tail -n +2 | sed -e '$ d'
+diff --git a/testsuite/0008PolynomialSetUnion/output b/testsuite/0008PolynomialSetUnion/output
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/output
++++ b/testsuite/0008PolynomialSetUnion/output
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
+diff --git a/testsuite/0008PolynomialSetUnion/outputNew b/testsuite/0008PolynomialSetUnion/outputNew
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/outputNew
++++ b/testsuite/0008PolynomialSetUnion/outputNew
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
diff --git a/srcpkgs/gfan/template b/srcpkgs/gfan/template
new file mode 100644
index 000000000000..174ed182f9d3
--- /dev/null
+++ b/srcpkgs/gfan/template
@@ -0,0 +1,38 @@
+# Template file for 'gfan'
+pkgname=gfan
+version=0.6.2
+revision=1
+wrksrc=gfan$version
+build_style=gnu-makefile
+makedepends="gmp-devel cddlib-devel"
+short_desc="Package for computing Groebner fans and tropical varieties"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://math.au.dk/~jensen/software/gfan/gfan.html"
+distfiles="https://math.au.dk/~jensen/software/gfan/gfan${version}.tar.gz"
+checksum=a674d5e5dc43634397de0d55dd5da3c32bd358d05f72b73a50e62c1a1686f10a
+
+# Makefile has this but our CFLAGS override it; build fails otherwise
+CFLAGS="-DGMPRATIONAL"
+
+case $XBPS_TARGET_MACHINE in
+	# avoid numerical noise caused by extended-precision of registers
+	# fixes testsuite/0009RenderStairCase
+	i686*) CFLAGS+=" -ffloat-store" ;;
+esac
+
+if [ -n "$CROSS_BUILD" ]; then
+	# depend on host gfan for installlinks
+	hostmakedepends+=" gfan"
+fi
+
+do_install() {
+	if [ -z "$CROSS_BUILD" ]; then
+		# Makefile doesn't support DESTDIR so we add it to PREFIX
+		make PREFIX=${DESTDIR}/usr install
+	else
+		vbin gfan
+		# use host gfan to install links
+		cd ${DESTDIR}/usr/bin && gfan installlinks
+	fi
+}
diff --git a/srcpkgs/gfan/update b/srcpkgs/gfan/update
new file mode 100644
index 000000000000..d7ac612f989d
--- /dev/null
+++ b/srcpkgs/gfan/update
@@ -0,0 +1 @@
+ignore=lib*

From 40ba8bebe603d868d2eb6c54e3e6142c5b2ab3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 12:18:20 -0300
Subject: [PATCH 3151/4088] New package: lrcalc-1.2

---
 common/shlibs           |  1 +
 srcpkgs/lrcalc-devel    |  1 +
 srcpkgs/lrcalc/template | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/lrcalc-devel
 create mode 100644 srcpkgs/lrcalc/template

diff --git a/common/shlibs b/common/shlibs
index 00d8a6cb0dd4..6ccb302132d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4026,6 +4026,7 @@ libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so lcalc-1.23_2
+liblrcalc.so.1 lrcalc-1.2_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/lrcalc-devel b/srcpkgs/lrcalc-devel
new file mode 120000
index 000000000000..fbb89b21f5b3
--- /dev/null
+++ b/srcpkgs/lrcalc-devel
@@ -0,0 +1 @@
+lrcalc
\ No newline at end of file
diff --git a/srcpkgs/lrcalc/template b/srcpkgs/lrcalc/template
new file mode 100644
index 000000000000..55ff5b1074cf
--- /dev/null
+++ b/srcpkgs/lrcalc/template
@@ -0,0 +1,21 @@
+# Template file for 'lrcalc'
+pkgname=lrcalc
+version=1.2
+revision=1
+build_style=gnu-configure
+short_desc="Littlewood-Richardson Calculator"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="https://sites.math.rutgers.edu/~asbuch/lrcalc/"
+distfiles="https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-$version.tar.gz"
+checksum=792dd538a0d19698be2c5b8c138730bbb4820e8a44e03b001ae14bd5f1d7040b
+
+lrcalc-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From b69539dc0737d72077ca10eb1350a915e86c5050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 20:15:25 -0300
Subject: [PATCH 3152/4088] New package: nauty-2.7r3

---
 srcpkgs/nauty-devel                           |  1 +
 .../nauty/patches/cross-disable-popcnt.patch  | 20 ++++++++++++++++
 srcpkgs/nauty/template                        | 24 +++++++++++++++++++
 srcpkgs/nauty/update                          |  1 +
 4 files changed, 46 insertions(+)
 create mode 120000 srcpkgs/nauty-devel
 create mode 100644 srcpkgs/nauty/patches/cross-disable-popcnt.patch
 create mode 100644 srcpkgs/nauty/template
 create mode 100644 srcpkgs/nauty/update

diff --git a/srcpkgs/nauty-devel b/srcpkgs/nauty-devel
new file mode 120000
index 000000000000..332f81a9affc
--- /dev/null
+++ b/srcpkgs/nauty-devel
@@ -0,0 +1 @@
+nauty
\ No newline at end of file
diff --git a/srcpkgs/nauty/patches/cross-disable-popcnt.patch b/srcpkgs/nauty/patches/cross-disable-popcnt.patch
new file mode 100644
index 000000000000..a5b7d59ff4e7
--- /dev/null
+++ b/srcpkgs/nauty/patches/cross-disable-popcnt.patch
@@ -0,0 +1,20 @@
+Disable popcnt in cross-builds, as we can't run programs to check.
+Note that using `configure --disable-popcnt` is broken.
+
+--- a/configure	2021-11-21 20:00:41.599629153 -0300
++++ b/configure	2021-11-21 20:00:45.891579837 -0300
+@@ -5766,10 +5766,10 @@
+ printf %s "checking if popcnt instruction is available and requested... " >&6; }
+ if test "$cross_compiling" = yes
+ then :
+-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++allow_popcnt=0  # { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++# printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
++# as_fn_error $? "cannot run test program while cross compiling
++# See \`config.log' for more details" "$LINENO" 5; }
+ else $as_nop
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/srcpkgs/nauty/template b/srcpkgs/nauty/template
new file mode 100644
index 000000000000..57025e400999
--- /dev/null
+++ b/srcpkgs/nauty/template
@@ -0,0 +1,24 @@
+# Template file for 'nauty'
+pkgname=nauty
+version=2.7r3
+revision=1
+wrksrc=${pkgname}${version/./}
+build_style=gnu-configure
+make_install_args="includedir=/usr/include/nauty
+ pkgconfigexecdir=/usr/lib/pkgconfig"
+short_desc="Compute the automorphism groups of graphs and digraphs"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://pallini.di.uniroma1.it/"
+distfiles="https://pallini.di.uniroma1.it/nauty${version/./}.tar.gz"
+checksum=4f0665b716a53f7a14ea2ae30059f23d064ce3fe4c12c013404ef6e1ee0b88c2
+
+nauty-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
diff --git a/srcpkgs/nauty/update b/srcpkgs/nauty/update
new file mode 100644
index 000000000000..6607167f897d
--- /dev/null
+++ b/srcpkgs/nauty/update
@@ -0,0 +1 @@
+version=${version/./}

From 8597c3f61149cbc2424df224f39a1a2065b9a42e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 20:50:42 -0300
Subject: [PATCH 3153/4088] New package: palp-2.20

---
 srcpkgs/palp/template | 50 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 srcpkgs/palp/template

diff --git a/srcpkgs/palp/template b/srcpkgs/palp/template
new file mode 100644
index 000000000000..6a11005d3052
--- /dev/null
+++ b/srcpkgs/palp/template
@@ -0,0 +1,50 @@
+# Template file for 'palp'
+pkgname=palp
+version=2.20
+revision=1
+build_style=gnu-makefile
+short_desc="Package for analyzing lattice polytopes"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-only"
+homepage="http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"
+distfiles="http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"
+checksum=723e89e78b2d3d94a720dd770c11b932b3e6b56f8a49e0bf3621c776f7a02ce0
+
+
+# build procedure taken from sagemath, see
+# https://git.sagemath.org/sage.git/plain/build/pkgs/palp/spkg-install.in
+# https://github.com/archlinux/svntogit-community/blob/packages/palp/trunk/PKGBUILD
+do_build() {
+	: ${make_cmd:=make}
+
+	mkdir bin
+	mv Global.h Global.h-template
+
+	for dim in 4 5 6 11; do
+		echo Building PALP optimized for $dim dimensions
+		sed "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax $dim/" Global.h-template > Global.h
+
+		${make_cmd} \
+			CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+			CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
+			CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
+			${makejobs} ${make_build_args} ${make_build_target}
+
+		for file in poly class cws nef mori; do
+			mv ${file}.x bin/${file}-${dim}d.x
+		done
+
+		# make sure we rebuild after changing Global.h to avoid races
+		${make_cmd} cleanall
+	done
+}
+
+do_install() {
+	for file in poly class cws nef mori; do
+		for dim in 4 5 6 11; do
+			vbin bin/${file}-${dim}d.x
+		done
+		# symlink for the default dimension
+		ln -sf ${file}-6d.x ${DESTDIR}/usr/bin/${file}.x
+	done
+}

From 9c4fea5f385bcca9727778f3cf5a3d210c434358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Nov 2021 00:16:52 -0300
Subject: [PATCH 3154/4088] New package: tachyon-0.99~b6+dsx

---
 srcpkgs/tachyon/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/tachyon/template

diff --git a/srcpkgs/tachyon/template b/srcpkgs/tachyon/template
new file mode 100644
index 000000000000..92eb2bbac78d
--- /dev/null
+++ b/srcpkgs/tachyon/template
@@ -0,0 +1,28 @@
+# Template file for 'tachyon'
+pkgname=tachyon
+version=0.99~b6+dsx
+revision=1
+wrksrc=${pkgname}-${version}.orig
+build_wrksrc=unix
+build_style=gnu-makefile
+make_build_target=all
+makedepends="libpng-devel libjpeg-turbo-devel"
+short_desc="Multithreaded ray tracing software"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="http://jedi.ks.uiuc.edu/~johns/raytracer/"
+distfiles="${DEBIAN_SITE}/main/t/tachyon/tachyon_${version}.orig.tar.xz"
+checksum=ec90074f569d6d797576611527caa6b1aac96125aea1ec89a31b2867f1cdf7ff
+
+pre_build() {
+	export LIBS+=" -ltachyon -ljpeg -lpng -lm -lpthread"
+	CFLAGS+=" -Wno-unused-result -DUSEPNG -DUSEJPEG"
+	CFLAGS+=" -DLinux -DTHR -DUSEATOMICBARRIERS -D_REENTRANT"
+}
+
+do_install() {
+	vlicense ../Copyright
+	vbin ../compile/tachyon
+	vmkdir usr/share/tachyon
+	vcopy ../scenes usr/share/tachyon
+}

From 5e506fbc13fc0543a3ddd1bc6af0990c9d372b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Nov 2021 10:31:03 -0300
Subject: [PATCH 3155/4088] lrcalc: add patch to fix includes

---
 srcpkgs/lrcalc/patches/includes.patch | 90 +++++++++++++++++++++++++++
 srcpkgs/lrcalc/template               |  2 +-
 2 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lrcalc/patches/includes.patch

diff --git a/srcpkgs/lrcalc/patches/includes.patch b/srcpkgs/lrcalc/patches/includes.patch
new file mode 100644
index 000000000000..707da176a60f
--- /dev/null
+++ b/srcpkgs/lrcalc/patches/includes.patch
@@ -0,0 +1,90 @@
+From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001
+From: Anders Skovsted Buch <asbuch@math.rutgers.edu>
+Date: Sun, 29 Nov 2015 16:25:56 -0500
+Subject: [PATCH] Patch by Jeroen Demeyer to change include <vector.h> to
+ "vector.h", plus similar cases.
+
+---
+ src/lrcalc.c   | 2 +-
+ src/maple.c    | 4 ++--
+ src/schublib.h | 2 +-
+ src/symfcn.c   | 6 +++---
+ src/symfcn.h   | 4 ++--
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/lrcalc.c b/src/lrcalc.c
+index aff3f75..60df49e 100644
+--- a/src/lrcalc.c
++++ b/src/lrcalc.c
+@@ -8,7 +8,7 @@
+ #include <stdlib.h>
+ extern char *optarg;
+ 
+-#include <vectarg.h>
++#include "vectarg.h"
+ 
+ #include "symfcn.h"
+ #include "maple.h"
+diff --git a/src/maple.c b/src/maple.c
+index fdc0768..a5f4d14 100644
+--- a/src/maple.c
++++ b/src/maple.c
+@@ -4,8 +4,8 @@
+  */
+ 
+ #include <stdio.h>
+-#include <vector.h>
+-#include <hashtab.h>
++#include "vector.h"
++#include "hashtab.h"
+ #include "maple.h"
+ 
+ 
+diff --git a/src/schublib.h b/src/schublib.h
+index a8e8511..864850c 100644
+--- a/src/schublib.h
++++ b/src/schublib.h
+@@ -1,7 +1,7 @@
+ #ifndef _SCHUBLIB_H
+ #define _SCHUBLIB_H
+ 
+-#include <hashtab.h>
++#include "hashtab.h"
+ 
+ hashtab *trans(vector *w, int vars, hashtab *res);
+ hashtab *monk(int i, hashtab *slc, int rank);
+diff --git a/src/symfcn.c b/src/symfcn.c
+index 4ffbe4b..fd5df5d 100644
+--- a/src/symfcn.c
++++ b/src/symfcn.c
+@@ -5,9 +5,9 @@
+ 
+ #include <stdio.h>
+ 
+-#include <alloc.h>
+-#include <vector.h>
+-#include <hashtab.h>
++#include "alloc.h"
++#include "vector.h"
++#include "hashtab.h"
+ 
+ #include "symfcn.h"
+ 
+diff --git a/src/symfcn.h b/src/symfcn.h
+index b8543b1..29bb00d 100644
+--- a/src/symfcn.h
++++ b/src/symfcn.h
+@@ -1,8 +1,8 @@
+ #ifndef _SYMFCN_H
+ #define _SYMFCN_H
+ 
+-#include <hashtab.h>
+-#include <vector.h>
++#include "hashtab.h"
++#include "vector.h"
+ 
+ int part_itr_sz(vector *part);
+ int part_itr_sub(vector *part, vector *outer);
+-- 
+2.1.1.1.g1fb337f
+
diff --git a/srcpkgs/lrcalc/template b/srcpkgs/lrcalc/template
index 55ff5b1074cf..8b33c3cba6c8 100644
--- a/srcpkgs/lrcalc/template
+++ b/srcpkgs/lrcalc/template
@@ -1,7 +1,7 @@
 # Template file for 'lrcalc'
 pkgname=lrcalc
 version=1.2
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Littlewood-Richardson Calculator"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"

From ff1c541232307024627f050584de9045482e7735 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 22 Nov 2021 08:27:50 -0500
Subject: [PATCH 3156/4088] python3-setuptools-rust: update to 1.0.0.

---
 srcpkgs/python3-setuptools-rust/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 2b998f2145f2..85c562f33602 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=0.12.1
-revision=3
+version=1.0.0
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-semanticversion python3-toml
+depends="python3-semanticversion python3-tomli
  python3-setuptools python3-typing_extensions"
 short_desc="Setuptools plugin for Rust support"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/PyO3/setuptools-rust"
 changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e
+checksum=eb6e6d41f01e63d042288e5c609684adf93426c10ea745ec324263f3fcbf27e9
 # Tests have unpackaged dependencies
 make_check=no
 

From c0997efff3d12a2289424106e1a10d75a4224f17 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 22 Nov 2021 08:27:54 -0500
Subject: [PATCH 3157/4088] python3-cryptography_vectors: update to 36.0.0.

---
 srcpkgs/python3-cryptography_vectors/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 3db092e596d6..d0b65d6ef0b2 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=3.4.8
-revision=2
+version=36.0.0
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=4c84410257993d3de058b44b777a49e1da2ae35ebea2970a360c7e3aa0f580f2
+checksum=c6b7e53ec701f47497297cfcfbafdf81a3f76f6f9d684721ef3dea254301faa5
 
 post_install() {
 	vlicense LICENSE

From 748fb7cae35338c00a9f45d4a02c4acc2b552ac4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 22 Nov 2021 08:27:59 -0500
Subject: [PATCH 3158/4088] python3-cryptography: update to 36.0.0.

---
 srcpkgs/python3-cryptography/template | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 495f4a69c954..40c226de9f8c 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=3.4.8
-revision=2
+version=36.0.0
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools-rust python3-cffi"
+build_helper="rust"
+hostmakedepends="python3-setuptools-rust python3-cffi cargo"
 makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
@@ -15,20 +16,15 @@ license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c
+checksum=52f769ecb4ef39865719aedc67b4b7eae167bafa48dbc2a26dd36fa56460507f
 
-# The rust extension is a no-op designed to test build systems and,
-# for the moment, does not work properly with Python 3.10 on cross.
-# Hoepfully upstream tooling will make accommodating Python 3.10 trivial by the
-# time the rust extension actually does something.
-#
-# See, e.g., commit 58bc3876d33bfa5e37a21b5a4b27f016af387a76 to see how the
-# rust extension was built with Python 3.9.
-export CRYPTOGRAPHY_DONT_BUILD_RUST=1
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" rust-std"
+	export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+	export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
 
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.BSD
-
-	chmod 755 ${DESTDIR}/${py3_sitelib}/cryptography/hazmat/bindings/*.so
 }

From 4cff665d4b9ebded6943181eb0f178b6308cb0c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 22 Nov 2021 08:37:19 -0500
Subject: [PATCH 3159/4088] python3-hypothesis: update to 6.27.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index c8a3a248e4ec..0c4993679d88 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.25.0
+version=6.27.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c54cc1cce9daefbc42316912b2f37a47abed07be48d60ccd0d7e6cbba8fd4bf3
+checksum=91912314804c37a0be3e830426d44341cbf4a751ad92e5bfdad35e434ffffd4a
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 43f4a6aeebc6d97f90024fc70c0ace1a7ba91c3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 22 Nov 2021 08:37:33 -0500
Subject: [PATCH 3160/4088] python3-iso8601: update to 1.0.1.

---
 srcpkgs/python3-iso8601/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-iso8601/template b/srcpkgs/python3-iso8601/template
index 55d696ac4e1f..45ff2c67dee7 100644
--- a/srcpkgs/python3-iso8601/template
+++ b/srcpkgs/python3-iso8601/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-iso8601'
 pkgname=python3-iso8601
-version=1.0.0
+version=1.0.1
 revision=1
 wrksrc="iso8601-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/micktwomey/pyiso8601"
 distfiles="${PYPI_SITE}/i/iso8601/iso8601-${version}.tar.gz"
-checksum=79ec9749f8bf35ffae77f835e80e96d2f95affa0f79d3d7b25c0fa7e06207a8b
+checksum=02b1c8683bd9c3a3ea381de89c3788cf0e6562dd1eb1e160e8f68141ac08ba90
 replaces="python3-iso-8601>=0"
 
 post_install() {

From 1e9bd27814657149be61385c46b583965e80ef92 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 22 Nov 2021 08:37:50 -0500
Subject: [PATCH 3161/4088] python3-ultrajson: update to 4.3.0.

---
 srcpkgs/python3-ultrajson/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9c513c995073..bac791064508 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=fffe509f556861c7343c6cba57ed05fe7bcf4b48a934a5b946ccb45428cf8883
+checksum=baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0
 
 post_install() {
 	vlicense LICENSE.txt

From 6540f22dba6308234258446f359d7223e21324e4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 22 Nov 2021 18:33:35 +0100
Subject: [PATCH 3162/4088] linux5.4: update to 5.4.161.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 1dd3e5b6e54d..e3e45c5e490a 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.160
+version=5.4.161
 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=d4b080290e9c6c5c250be6849eeb0d956f253a40bfcd4e4b41f750421eb50458
+checksum=3149c6b52a3079218a60bd369a80d18275b574d84908ffee32a0a8f9ddf939a7
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 3886079c08b1879f7c610cf59e4cab7ad26a3cb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Nov 2021 20:41:08 +0100
Subject: [PATCH 3163/4088] libimagequant: update to 2.17.0.

---
 srcpkgs/libimagequant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index edb1d4dc9ce4..0d4bcf6a0b89 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
 # Template file for 'libimagequant'
 pkgname=libimagequant
-version=2.16.0
+version=2.17.0
 revision=1
 build_style=configure
 configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/lib/"
 distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=360f88a4a85546405e6bec36d403cedfda43e7b8b5ec140216b727a05cd3a8ac
+checksum=9f6cc50182be4d2ece75118aa0b0fd3e9bbad06e94fd6b9eb3a4c08129c2dd26
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*) configure_args+=" --enable-sse";;

From 49756b1ad192a6b58624cca84a44d35d3ed848a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Nov 2021 20:41:11 +0100
Subject: [PATCH 3164/4088] pngquant: update to 2.17.0.

---
 srcpkgs/pngquant/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 9c617c28c5b2..8d72b2c6a6dc 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,16 +1,17 @@
 # Template file for 'pngquant'
 pkgname=pngquant
-version=2.16.0
+version=2.17.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-openmp"
+hostmakedepends="pkg-config"
 makedepends="lcms2-devel libgomp-devel libimagequant-devel libpng-devel"
 short_desc="Lossy PNG compressor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/"
-distfiles="https://github.com/pornel/${pkgname}/archive/${version}.tar.gz"
-checksum=6b186b76bc995ee12949a48a1041173459eb8050ef1dceb5f7ba43726327b1ea
+distfiles="https://github.com/kornelski/pngquant/archive/${version}.tar.gz"
+checksum=bc1baa43c814b4416bb63d7b2168d4e5395cfc69a00f8997a595361caa507887
 make_check_target=test
 
 case "$XBPS_TARGET_MACHINE" in

From 1b623677d0f28ce145b1e2de78d6dc289d62feb5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Nov 2021 20:42:44 +0100
Subject: [PATCH 3165/4088] xlbiff: update to 4.5.4.

---
 srcpkgs/xlbiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index 2b0b9cfaa087..589152a14287 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
 # Template file for 'xlbiff'
 pkgname=xlbiff
-version=4.5.3
+version=4.5.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.edsantiago.com/xlbiff/"
 distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=16ff629d278d52d049eae0e020740e765c8ab1252635876352e866823c58839d
+checksum=724893d64f8ba7b909dddc748195836bc548d009526f9e5f738e71ead15a2b1f
 
 pre_configure() {
 	autoreconf -fi

From b8e448068da68b923d832794de67ee1bbdb618f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 22 Nov 2021 20:39:52 -0500
Subject: [PATCH 3166/4088] python3-mpi4py: update to 3.1.2, steal
 maintainership

---
 srcpkgs/python3-mpi4py/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-mpi4py/template b/srcpkgs/python3-mpi4py/template
index de6c347721a4..df390242b39d 100644
--- a/srcpkgs/python3-mpi4py/template
+++ b/srcpkgs/python3-mpi4py/template
@@ -1,18 +1,21 @@
 # Template file for 'python3-mpi4py'
 pkgname=python3-mpi4py
-version=3.0.3
-revision=3
+version=3.1.2
+revision=1
 wrksrc="mpi4py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran openmpi"
 makedepends="python3-devel openmpi-devel"
-depends="openmpi"
+depends="openmpi python3"
 short_desc="Python bindings for the Message Passing Interface (MPI) standard"
-maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
-homepage="https://bitbucket.org/mpi4py/mpi4py"
+homepage="https://github.com/mpi4py/mpi4py"
+changelog="https://raw.githubusercontent.com/mpi4py/mpi4py/master/CHANGES.rst"
 distfiles="$PYPI_SITE/m/mpi4py/mpi4py-${version}.tar.gz"
-checksum=012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f
+checksum=40dd546bece8f63e1131c3ceaa7c18f8e8e93191a762cd446a8cfcf7f9cce770
+# Tests require a sensible MPI environment
+make_check=no
 
 post_extract() {
 	# recythonize
@@ -20,6 +23,7 @@ post_extract() {
 		src/mpi4py/include/mpi4py/mpi4py.MPI_api.h \
 		src/mpi4py.MPI.c
 }
+
 post_install() {
 	vlicense LICENSE.rst
 }

From 64cc571c45e6afe3780ec035b7b47f66c53e4e80 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Oct 2021 16:17:03 +0300
Subject: [PATCH 3167/4088] butt: update to 0.1.32.

Also:
- add a patch for musl support (@ericonr)
- add libXfixes-devel to makedepends.
---
 .../butt/patches/0001-limits.h-patch.patch    | 24 +++++++++++++++++++
 srcpkgs/butt/template                         |  7 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/butt/patches/0001-limits.h-patch.patch

diff --git a/srcpkgs/butt/patches/0001-limits.h-patch.patch b/srcpkgs/butt/patches/0001-limits.h-patch.patch
new file mode 100644
index 000000000000..3fee79e00893
--- /dev/null
+++ b/srcpkgs/butt/patches/0001-limits.h-patch.patch
@@ -0,0 +1,24 @@
+From 3ad9559e59905cb54c0d97f3d8e163517e4e0afd Mon Sep 17 00:00:00 2001
+From: mobinmob <mobinmob@disroot.org>
+Date: Mon, 22 Nov 2021 23:16:32 +0200
+Subject: [PATCH] limits.h patch
+
+---
+ src/FLTK/fl_callbacks.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/FLTK/fl_callbacks.h b/src/FLTK/fl_callbacks.h
+index baea11b..026bfb9 100644
+--- a/src/FLTK/fl_callbacks.h
++++ b/src/FLTK/fl_callbacks.h
+@@ -15,6 +15,7 @@
+ 
+ #ifndef FL_CALLBACKS_H
+ #define FL_CALLBACKS_H
++#include <limits.h>
+ 
+ enum { STREAM_TIME = 0, REC_TIME, SENT_DATA, REC_DATA };
+ enum { STREAM = 0, RECORD };
+-- 
+2.34.0
+
diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index 4dec2ddde090..f2df0ed6ac2e 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,15 +1,16 @@
 # Template file for 'butt'
 pkgname=butt
-version=0.1.31
+version=0.1.32
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel
+ libXfixes-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://danielnoethen.de/butt/"
 changelog="https://danielnoethen.de/butt/Changelog.html"
 distfiles="${SOURCEFORGE_SITE}/butt/butt-${version}.tar.gz"
-checksum=1f89fb85b78d953246803418167a51e95b50cac95102c36eb6789bbc4b6cfba7
+checksum=8a081e3a4e67feaa2e36420aa1deb921dbab2ce3ee267e7cd469f2f63c0de2d5

From 66bcd690e2f71a54a21e9cd68e95ea7aa0793c8c Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 22 Nov 2021 12:33:55 -0500
Subject: [PATCH 3168/4088] xh: update to 0.14.0.

---
 srcpkgs/xh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
index 7b628101b2b7..4a878889d438 100644
--- a/srcpkgs/xh/template
+++ b/srcpkgs/xh/template
@@ -1,6 +1,6 @@
 # Template file for 'xh'
 pkgname=xh
-version=0.13.0
+version=0.14.0
 revision=1
 # depends on ring
 archs="x86_64* i686* armv[67]* aarch64*"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/ducaale/xh"
 changelog="https://github.com/ducaale/xh/blob/master/CHANGELOG.md"
 distfiles="https://github.com/ducaale/xh/archive/v${version}.tar.gz"
-checksum=d3e46b6db5a131237d5f980ccaae6f04c5ba7b06922d97c7f98f36f03cf581fe
+checksum=6abc32e2fa49a3c7a08379dbe7375735ec7bc8f25c3f29774e275e9dcac42711
 
 post_install() {
 	ln -sf /usr/bin/${pkgname} ${DESTDIR}/usr/bin/${pkgname}s

From d2120b0b7e3a10fd8deee12780815b6b6888b615 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 23 Nov 2021 08:28:27 -0500
Subject: [PATCH 3169/4088] python3-bokeh: update to 2.4.2.

---
 srcpkgs/python3-bokeh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index ce5cb0c1b8c1..0564e75a2615 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
-version=2.4.1
+version=2.4.2
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://bokeh.org"
 changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
 distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
-checksum=d0410717d743a0ac251e62480e2ea860a7341bdcd1dbe01499a904f233c90512
+checksum=f0a4b53364ed3b7eb936c5cb1a4f4132369e394c7ae0a8ef420459410958033d
 # Tests have unpackaged dependencies and require fetching data; skipping
 make_check=no
 

From db85fd5f52297adadd588a02373fd073096a1046 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 23 Nov 2021 08:28:44 -0500
Subject: [PATCH 3170/4088] python3-flit_core: update to 3.5.1.

---
 srcpkgs/python3-flit_core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index d204e25f9e05..9e01b034a260 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.5.0
+version=3.5.1
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=7b55f406ee5c1505f463cd9a186c73d2ccaf7d44618ca59ae643e0dce27cadf7
+checksum=2e3b7377714483ecc54b236330d7bf3467b9f5b909b22333b50b6b4324162510
 
 post_install() {
 	vlicense ../LICENSE

From 9b830dac66a9397e3c5b9648f81d9b8ee1d6f984 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 23 Nov 2021 14:11:53 +0100
Subject: [PATCH 3171/4088] parallel: update to 20211122.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 5dc28f607799..9ae4f27f81f8 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20211022
+version=20211122
 revision=1
 build_style=gnu-configure
 depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=da7190fce22a9cda97b2ce36df112a2c634f1b4a5591af343b928253e996de9b
+checksum=48b256322c56a4cb1a7818fe0894fdde575dab0e0f925c6a2289517b6bd8962e
 
 pre_configure() {
 	# no html and pdf doc

From 486d92647448bad7363f01f59f707cea9351a8fd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 23 Nov 2021 14:32:11 +0100
Subject: [PATCH 3172/4088] New package: libptytty-2.0

---
 common/shlibs              |  1 +
 srcpkgs/libptytty-devel    |  1 +
 srcpkgs/libptytty/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libptytty-devel
 create mode 100644 srcpkgs/libptytty/template

diff --git a/common/shlibs b/common/shlibs
index 6ccb302132d5..ab865cc085d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4069,3 +4069,4 @@ libbrial.so.3 brial-1.2.10_1
 libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libptytty.so.0 libptytty-2.0_1
diff --git a/srcpkgs/libptytty-devel b/srcpkgs/libptytty-devel
new file mode 120000
index 000000000000..d34520bce191
--- /dev/null
+++ b/srcpkgs/libptytty-devel
@@ -0,0 +1 @@
+libptytty
\ No newline at end of file
diff --git a/srcpkgs/libptytty/template b/srcpkgs/libptytty/template
new file mode 100644
index 000000000000..ebcc1aeba333
--- /dev/null
+++ b/srcpkgs/libptytty/template
@@ -0,0 +1,27 @@
+# Template file for 'libptytty'
+pkgname=libptytty
+version=2.0
+revision=1
+build_style=cmake
+configure_args="-DTTY_GID_SUPPORT_EXITCODE=1 -DTTY_GID_SUPPORT_EXITCODE__TRYRUN_OUTPUT="
+short_desc="Library for pty/tty/utmp/wtmp/lastlog handling"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
+homepage="http://software.schmorp.de/pkg/libptytty.html"
+distfiles="http://dist.schmorp.de/libptytty/libptytty-${version}.tar.gz"
+checksum=8033ed3aadf28759660d4f11f2d7b030acf2a6890cb0f7926fb0cfa6739d31f7
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" -DPT_WTMPX_FILE=\"/dev/null/wtmp\""
+fi
+
+libptytty-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}

From a30a5409a2ce618596e470cf1e801f2c3a9c6347 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 23 Nov 2021 14:42:32 +0100
Subject: [PATCH 3173/4088] rxvt-unicode: update to 9.29.

---
 srcpkgs/rxvt-unicode/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 80ce8b968c5f..4223d2e8f789 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -1,7 +1,7 @@
 # Template file for 'rxvt-unicode'
 pkgname=rxvt-unicode
-version=9.26
-revision=13
+version=9.29
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-terminfo=/usr/share/terminfo --enable-256-color
@@ -15,7 +15,7 @@ configure_args="
  $(vopt_if unicode3 '--enable-unicode3' '--disable-unicode3')"
 hostmakedepends="pkg-config $(vopt_if perl 'perl')"
 makedepends="xorgproto fontconfig-devel
- libXrender-devel libXft-devel libSM-devel libXt-devel
+ libXrender-devel libXft-devel libSM-devel libXt-devel libptytty-devel
  $(vopt_if gdk_pixbuf gdk-pixbuf-devel)
  $(vopt_if perl perl)
  $(vopt_if startup_notification startup-notification-devel)"
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://software.schmorp.de/pkg/rxvt-unicode.html"
 distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=643116b9a25d29ad29f4890131796d42e6d2d21312282a613ef66c80c5b8c98b
+checksum=c18bc9de0c319db1f85748ecc2f255ff9eb2be0fbe9e15fe0eabefc063c4157c
 
 # Package build options
 build_options="gdk_pixbuf perl startup_notification unicode3"

From 8989649a244c724cd176a11aa830e364b7f03e7b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 23 Nov 2021 18:52:32 +0100
Subject: [PATCH 3174/4088] warzone2100: update to 4.2.2.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 0a2fb94ca64b..8331448ee4bc 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.2.1
+version=4.2.2
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=37d0f82b7fbf36ddcddffb870c3fa30fab732f414cc2657b97e5868c661add89
+checksum=17b4e59e541e11f1a9d4805795f2948082caba4510c41164a2a5d89b17d03a99
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 0db7d4a84cc77a181da1059610884fe6f98ded66 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Nov 2021 20:24:24 +0100
Subject: [PATCH 3175/4088] lc0: enable sse intrinsics on ppc64le + disable on
 big endian

This code is written heavily against x86 with a bunch of ifdefs
for ARM/aarch64 to make that build. Therefore, restrict archs
and instead of patching the code for ppc64le, allow usage of
the SSE intrinsics.
---
 srcpkgs/lc0/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template
index ba2e8dd8bb74..50863ab6da34 100644
--- a/srcpkgs/lc0/template
+++ b/srcpkgs/lc0/template
@@ -2,6 +2,7 @@
 pkgname=lc0
 version=0.28.0
 revision=1
+archs="x86_64* i686* aarch64* armv[67]l* ppc64le*"
 build_style=meson
 configure_args="-Dgtest=false"
 _lczero_commit=5680c5fad9f3b52288d67f738b272fd09de5ee0b
@@ -29,6 +30,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) export CXXFLAGS+=" -DNO_WARN_X86_INTRINSICS";;
+esac
+
 post_extract() {
 	rmdir libs/lczero-common
 	mv ../lczero-common-${_lczero_commit} libs/lczero-common

From 8dac4dde2af03a68597e15dfb92afcd74ef6e0cb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 23 Nov 2021 14:35:06 -0500
Subject: [PATCH 3176/4088] wren-cli: update to 0.4.0

---
 srcpkgs/wren-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wren-cli/template b/srcpkgs/wren-cli/template
index e96411c0d3df..71b5a7396222 100644
--- a/srcpkgs/wren-cli/template
+++ b/srcpkgs/wren-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'wren-cli'
 pkgname=wren-cli
-version=0.3.0
+version=0.4.0
 revision=1
 build_wrksrc=projects/make
 build_style=gnu-makefile
@@ -10,8 +10,8 @@ short_desc="Small, class-based, concurrent scripting language - CLI"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="http://wren.io/cli"
-distfiles="https://github.com/wren-lang/wren-cli/archive/${version}.tar.gz"
-checksum=a498d2ccb9a723e7163b4530efbaec389cc13e6baaf935e16cbd052a739b7265
+distfiles="https://github.com/wren-lang/wren-cli/archive/refs/tags/${version}.tar.gz"
+checksum=fafdc5d6615114d40de3956cd3a255e8737dadf8bd758b48bac00db61563cb4c
 
 post_patch() {
 	vsed -i -e 's/ -m64 / /;s/ -m32 / /;s/ -O3//' wren_cli.make

From c6c0fb637ba27273826f292253458f81c535f384 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 23 Nov 2021 10:20:03 +0100
Subject: [PATCH 3177/4088] python3-pikepdf: update to 4.0.2.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 2ff62d25ecf0..0781c73d5a7a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=4.0.0
+version=4.0.2
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=487be40a2ec463a272b4490396787c9fba2b0bbe6c44e7254e1867b1d3c02df9
+checksum=711d07e8c8cc8782563de3b9deb448b96bebe04fbc89d675016f91b3eb5296cb
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 4e3c68aeed4f03126071c4f664793a8afa87c5d5 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitz@disroot.org>
Date: Thu, 18 Nov 2021 22:56:04 +0200
Subject: [PATCH 3178/4088] foot: update to 1.10.1.

---
 srcpkgs/foot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index fb29953d7d29..b3cc9af397a9 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.9.2
+version=1.10.1
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/foot"
 changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=5859d8d7293da4c7c52f45a9756fc7989edc364057e8b86b4e1fbea7bc2b4009
+checksum=40aaf4ba96aa0cc977b7c3916b79fd5455cefea76c5c07cad43ff7aaf06fc1bd
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE

From 6540162c00428b6da4f49f7e0d822e2db55c8f07 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 23 Nov 2021 16:52:07 -0500
Subject: [PATCH 3179/4088] diskus: update to 0.7.0

---
 srcpkgs/diskus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diskus/template b/srcpkgs/diskus/template
index c171cbacb56e..130dbc15da25 100644
--- a/srcpkgs/diskus/template
+++ b/srcpkgs/diskus/template
@@ -1,6 +1,6 @@
 # Template file for 'diskus'
 pkgname=diskus
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=cargo
 short_desc="Minimal, fast alternative to du -sh"
@@ -8,7 +8,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/diskus"
 distfiles="https://github.com/sharkdp/diskus/archive/v${version}.tar.gz"
-checksum=661687edefa3218833677660a38ccd4e2a3c45c4a66055c5bfa4667358b97500
+checksum=64b1b2e397ef4de81ea20274f98ec418b0fe19b025860e33beaba5494d3b8bd1
 
 post_install() {
 	vlicense LICENSE-MIT

From 2cf114a644f98b697fe254f4484e8bfb6942c887 Mon Sep 17 00:00:00 2001
From: bjornstahl <arcanfe@nospam>
Date: Mon, 22 Nov 2021 20:18:57 +0000
Subject: [PATCH 3180/4088] arcan: update to 0.6.1.

---
 common/shlibs                               | 10 +++++-----
 srcpkgs/arcan/patches/cmake-espeak-ng.patch | 12 ------------
 srcpkgs/arcan/template                      |  6 +++---
 3 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/arcan/patches/cmake-espeak-ng.patch

diff --git a/common/shlibs b/common/shlibs
index ab865cc085d2..8403352d4b4d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3229,11 +3229,11 @@ libaacs.so.0 libaacs-0.9.0_1
 libttfautohint.so.1 ttfautohint-1.8.1_1
 libcob.so.4 gnucobol-libs-2.2_1
 libkrfbprivate.so.5.0 krfb-17.08.1_1
-libarcan_shmif.so.0.13 arcan-0.6.0_1
-libarcan_shmif_ext.so.0.13 arcan-0.6.0_1
-libarcan_shmif_server.so.0.13 arcan-0.6.0_1
-libarcan_tui.so.0.13 arcan-0.6.0_1
-libarcan_a12.so.0.1 arcan-0.6.0_1
+libarcan_shmif.so.0.14 arcan-0.6.1_1
+libarcan_shmif_ext.so.0.14 arcan-0.6.1_1
+libarcan_shmif_server.so.0.14 arcan-0.6.1_1
+libarcan_tui.so.0.14 arcan-0.6.1_1
+libarcan_a12.so.0.1 arcan-0.6.1_1
 liblwipv6.so.2 lwipv6-1.5a_1
 libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1
 libpipewire-0.3.so.0 libpipewire-0.3.6_1
diff --git a/srcpkgs/arcan/patches/cmake-espeak-ng.patch b/srcpkgs/arcan/patches/cmake-espeak-ng.patch
deleted file mode 100644
index c2ef22fd9d29..000000000000
--- a/srcpkgs/arcan/patches/cmake-espeak-ng.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/platform/cmake/modules/FindEspeak.cmake b/src/platform/cmake/modules/FindEspeak.cmake
-index 6815e874..a548a232 100644
---- a/src/platform/cmake/modules/FindEspeak.cmake
-+++ b/src/platform/cmake/modules/FindEspeak.cmake
-@@ -1,5 +1,5 @@
--FIND_PATH( ESPEAK_INCLUDE_DIR espeak/speak_lib.h  )
--FIND_LIBRARY(ESPEAK_LIBRARIES NAMES espeak )
-+FIND_PATH( ESPEAK_INCLUDE_DIR espeak/speak_lib.h)
-+FIND_LIBRARY(ESPEAK_LIBRARIES NAMES espeak espeak-ng)
- 
- IF( ESPEAK_LIBRARIES )
- 	SET( ESPEAK_FOUND TRUE )
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..2fcf11346b94 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,7 +1,7 @@
 # Template file for 'arcan'
 pkgname=arcan
-version=0.6.0.1
-revision=2
+version=0.6.1
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
@@ -25,7 +25,7 @@ homepage="https://arcan-fe.com/"
 _versionOpenal=0.5.4
 distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz
  https://github.com/letoram/openal/archive/${_versionOpenal}.tar.gz>openal_arcan.${_versionOpenal}.tar.gz"
-checksum="7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
+checksum="ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551
  3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da"
 
 export CMAKE_GENERATOR="Unix Makefiles"

From 9c4adabefb98e2b964e31c7e9d1a6a35ec2d631d Mon Sep 17 00:00:00 2001
From: bjornstahl <arcanfe@nospam>
Date: Mon, 22 Nov 2021 20:19:20 +0000
Subject: [PATCH 3181/4088] xarcan: bump revision to 0.6.0-3

match shlib version bump from arcan-0.6.1
---
 srcpkgs/xarcan/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 64f74efd209d..fef279d8e4ba 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,7 +1,7 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"

From 42d67952a0208025d258a5ca6db8ca4c6d86c94d Mon Sep 17 00:00:00 2001
From: bjornstahl <arcanfe@nospam>
Date: Mon, 22 Nov 2021 20:20:34 +0000
Subject: [PATCH 3182/4088] Aclip: update to 0.6.1

---
 srcpkgs/aclip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aclip/template b/srcpkgs/aclip/template
index 9f899495b3f8..f1dd8ee44265 100644
--- a/srcpkgs/aclip/template
+++ b/srcpkgs/aclip/template
@@ -1,7 +1,7 @@
 # Template file for 'aclip'
 # !! keep synced with arcan
 pkgname=aclip
-version=0.6.0.1
+version=0.6.1
 revision=1
 wrksrc=arcan-${version}
 build_wrksrc=src/tools/aclip
@@ -12,7 +12,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://arcan-fe.com/"
 distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
+checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551
 
 post_install() {
 	vlicense ../../../COPYING

From e1571c554f0acc441a51ae392e77e3ad612b44db Mon Sep 17 00:00:00 2001
From: bjornstahl <arcanfe@nospam>
Date: Mon, 22 Nov 2021 20:20:57 +0000
Subject: [PATCH 3183/4088] aloadimage: update to 0.6.1

---
 .../patches/0001-vendored-svgimage-fix.patch  | 37 +++++++++++++++++++
 srcpkgs/aloadimage/template                   |  4 +-
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch

diff --git a/srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch b/srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch
new file mode 100644
index 000000000000..2cde878a54c4
--- /dev/null
+++ b/srcpkgs/aloadimage/patches/0001-vendored-svgimage-fix.patch
@@ -0,0 +1,37 @@
+diff --git a/src/tools/aloadimage/nanosvg.h b/src/tools/aloadimage/nanosvg.h
+index f5058b17..716adea5 100644
+--- a/src/tools/aloadimage/nanosvg.h
++++ b/src/tools/aloadimage/nanosvg.h
+@@ -163,7 +163,7 @@ typedef struct NSVGimage
+ } NSVGimage;
+ 
+ // Parses SVG file from a file, returns SVG image as paths.
+-NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi);
++NSVGimage* nsvgParseFromFile(FILE* fp, const char* units, float dpi);
+ 
+ // Parses SVG file from a null terminated string, returns SVG image as paths.
+ // Important note: changes the string.
+@@ -200,7 +200,6 @@ void nsvgDelete(NSVGimage* image);
+ #define NSVG_ALIGN_SLICE 2
+ 
+ #define NSVG_NOTUSED(v) do { (void)(1 ? (void)0 : ( (void)(v) ) ); } while(0)
+-#define NSVG_RGB(r, g, b) (((unsigned int)r) | ((unsigned int)g << 8) | ((unsigned int)b << 16))
+ 
+ #ifdef _MSC_VER
+ 	#pragma warning (disable: 4996) // Switch off security warnings
+@@ -2930,14 +2929,12 @@ NSVGimage* nsvgParse(char* input, const char* units, float dpi)
+ 	return ret;
+ }
+ 
+-NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
++NSVGimage* nsvgParseFromFile(FILE* fp, const char* units, float dpi)
+ {
+-	FILE* fp = NULL;
+ 	size_t size;
+ 	char* data = NULL;
+ 	NSVGimage* image = NULL;
+ 
+-	fp = fopen(filename, "rb");
+ 	if (!fp) goto error;
+ 	fseek(fp, 0, SEEK_END);
+ 	size = ftell(fp);
diff --git a/srcpkgs/aloadimage/template b/srcpkgs/aloadimage/template
index 23c0367a5491..7e1dcbd97192 100644
--- a/srcpkgs/aloadimage/template
+++ b/srcpkgs/aloadimage/template
@@ -1,7 +1,7 @@
 # Template file for 'aloadimage'
 # !! keep synced with arcan
 pkgname=aloadimage
-version=0.6.0.1
+version=0.6.1
 revision=1
 wrksrc="arcan-${version}"
 build_wrksrc=src/tools/aloadimage
@@ -13,7 +13,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://arcan-fe.com/"
 distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
+checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551
 
 post_install() {
 	vlicense ../../../COPYING

From c5f07191fc37f0a69634b4fe9b16ae24a50a5d6e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 23 Nov 2021 13:02:25 -0600
Subject: [PATCH 3184/4088] ghostwriter: update to 2.1.0.

---
 srcpkgs/ghostwriter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 12a4b15a789e..e533fd8cb370 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'ghostwriter'
 pkgname=ghostwriter
-version=2.0.2
+version=2.1.0
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://wereturtle.github.io/ghostwriter"
 distfiles="https://github.com/wereturtle/ghostwriter/archive/${version}.tar.gz"
-checksum=9b7b02a58d78f5cbc535bdf5821f0012c66d6e92fc39b8b80ca59d23adb4f71c
+checksum=5a377e006bec14abbb935ed4ad027f489051b3ab49a0e33cc8e07c67e5b4799c
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5tel*) broken="qtwebengine not built for this platform";;

From bc709a7ea7aef34d0b1c2483fbccad02a5ad6be8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Nov 2021 13:15:47 +0100
Subject: [PATCH 3185/4088] perl-Try-Tiny: update to 0.31.

---
 srcpkgs/perl-Try-Tiny/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Try-Tiny/template b/srcpkgs/perl-Try-Tiny/template
index 54bc120424bb..d9a6e7ce7b34 100644
--- a/srcpkgs/perl-Try-Tiny/template
+++ b/srcpkgs/perl-Try-Tiny/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Try-Tiny'.
 pkgname=perl-Try-Tiny
-version=0.30
-revision=2
+version=0.31
+revision=1
 wrksrc="Try-Tiny-$version"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://metacpan.org/release/Try-Tiny"
 license="MIT"
 distfiles="${CPAN_SITE}/XML/ETHER/Try-Tiny-${version}.tar.gz"
-checksum=da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b
+checksum=3300d31d8a4075b26d8f46ce864a1d913e0e8467ceeba6655d5d2b2e206c11be
 
 post_install() {
 	vlicense LICENCE LICENSE

From 3d9d9e58fb903f0e62d4cc06e2cad54015bdfef2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Nov 2021 13:27:29 +0100
Subject: [PATCH 3186/4088] polyml: update to 5.9.

---
 srcpkgs/polyml/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/polyml/template b/srcpkgs/polyml/template
index 755274b19d7d..69eab5d9daf4 100644
--- a/srcpkgs/polyml/template
+++ b/srcpkgs/polyml/template
@@ -1,7 +1,7 @@
 # Template file for 'polyml'
 pkgname=polyml
-version=5.8.2
-revision=2
+version=5.9
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
 makedepends="gmp-devel"
@@ -10,12 +10,12 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.polyml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=310b0ba748a50f38e99de7f65ba990bc4b4f4b0123ad76aba4c44d7cd1ed9277
+checksum=5aa452a49f2ac0278668772af4ea0b9bf30c93457e60ff7f264c5aec2023c83e
 conflicts="mesa-demos>=0" # /usr/bin/poly
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
+	i686*)
 		# musl doesn't allow writing to .rodata and .text during
 		# relocation, but polyexport.o contains DT_TEXTREL
 		# since libpolyml/elfexport.cpp only creates absolute

From 34ab94c95ea56c802ec7bcfe6c8070955807ef43 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Nov 2021 16:03:28 +0100
Subject: [PATCH 3187/4088] ruby: update to 3.0.3.

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 0411719edc0d..f9fb36a74dda 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,7 +2,7 @@
 _ruby_abiver=3.0.0
 
 pkgname=ruby
-version=3.0.2
+version=3.0.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
@@ -16,7 +16,7 @@ homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Ruby, BSD-2-Clause"
 distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40
+checksum=88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally

From 75eb6515bf3dbab0e5b5b6955845af68088ad7be Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Nov 2021 17:50:50 +0100
Subject: [PATCH 3188/4088] ocaml: install stdlib to /usr/lib/ocaml.

Libraries using findlib are already in /usr/lib/ocaml,
OCaml links statically, so no rebuilds required.

Closes #33911.
---
 srcpkgs/ocaml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 6c4a9cf44161..629c13791dfe 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,9 +1,9 @@
 # Template file for 'ocaml'
 pkgname=ocaml
 version=4.13.1
-revision=1
+revision=2
 build_style="gnu-configure"
-configure_args="--with-pic"
+configure_args="--with-pic --libdir=/usr/lib/ocaml"
 make_build_target="world.opt"
 makedepends="ncurses-devel libX11-devel"
 short_desc="Main implementation of the Caml language"

From 5366a3eef63d41e8f2eea2fbdff047cd499a690d Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Wed, 24 Nov 2021 19:33:08 +0100
Subject: [PATCH 3189/4088] cpuid: update to 20211121.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 15269984b076..8f8f26c25920 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20211114
+version=20211121
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.etallen.com/cpuid.html"
 distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=7107dc8cc68f3fb3613244e44af7b4c91fa6cd14aec373e0c2e743545203e1b7
+checksum=172f562adf31b15de177b12e6154f67179a7e5ee14d078d72319c0c074e6c01a

From 406d8a6e7e9e4ea6b041d90767a57987c84b7929 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 23 Nov 2021 18:16:14 -0500
Subject: [PATCH 3190/4088] mdcat: update to 0.24.2

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index ea836a88c750..b418dc4fd1c9 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,6 +1,6 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.24.1
+version=0.24.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
@@ -12,7 +12,7 @@ license="MPL-2.0"
 homepage="https://github.com/lunaryorn/mdcat"
 changelog="https://raw.githubusercontent.com/lunaryorn/mdcat/main/CHANGELOG.md"
 distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=f0e400f2060a460e347546932fcb501da71fab5af602413c7932fac35136b89f
+checksum=2daafb8c9e90f8048810450566b4f4fde11ca76f3b5ec49c4878f68f475f3483
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 3a0ea2d28abf0cc76d7a37c19c13eb447fc3bdb9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 24 Nov 2021 15:54:58 +0200
Subject: [PATCH 3191/4088] opera: update to 81.0.4196.60.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 9f2f2f5c0d01..d7a461625e79 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=81.0.4196.54
+version=81.0.4196.60
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
-checksum=78912ec6fe1adfc54d8f8cfd41787c320930736c7511c939823d102cab5ea60b
+checksum=e72f4030dcdbb1e47fceb3122428406bbb12232c358ccd612c247cda6525c444
 repository="nonfree"
 nostrip=yes
 

From 6c3930b5f5ed10d1d60de20f8bc66216ddaa75d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 24 Nov 2021 20:23:49 +0100
Subject: [PATCH 3192/4088] calc: update to 2.14.0.8.

---
 common/shlibs         | 4 ++--
 srcpkgs/calc/template | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8403352d4b4d..3199833de6cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1597,8 +1597,8 @@ libfreerdp-server2.so.2 libfreerdp-server-2.4.0_1
 libfreerdp-shadow-subsystem2.so.2 libfreerdp-server-2.4.0_1
 libfreerdp-shadow2.so.2 libfreerdp-server-2.4.0_1
 libcppunit-1.15.so.1 libcppunit-1.15.1_1
-libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
-libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
+libcalc.so.2.14.0.8 libcalc-2.14.0.8_1
+libcustcalc.so.2.14.0.8 libcalc-2.14.0.8_1
 libOgreMain.so.1.12.9 libogre-1.12.9_1
 libOgreBites.so.1.12.9 libogre-1.12.9_1
 libOgreOverlay.so.1.12.9 libogre-1.12.9_1
diff --git a/srcpkgs/calc/template b/srcpkgs/calc/template
index bc2087ca2bd3..c150081ac2f7 100644
--- a/srcpkgs/calc/template
+++ b/srcpkgs/calc/template
@@ -1,15 +1,16 @@
 # Template file for 'calc'
 pkgname=calc
-version=2.12.7.1
+version=2.14.0.8
 revision=1
 build_style=gnu-makefile
+make_build_args="ARCH_CFLAGS="
 make_install_args="T=$""{DESTDIR}"
 short_desc="C-style arbitrary precision calculator"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-only"
 homepage="http://www.isthe.com/chongo/tech/comp/calc/index.html"
 distfiles="http://www.isthe.com/chongo/src/calc/calc-${version}.tar.bz2"
-checksum=eb1dc5dd680019e30264109167e20539fe9ac869049d8b1639781a51d1dea84c
+checksum=ad6a2c44eeea7e06efca5384f107ffaee7564407a7474d7cd4928a53b1a28386
 disable_parallel_build=yes
 
 post_extract() {

From 927248f7828ec7098ef2294e0284462c31d657c6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 24 Nov 2021 20:24:41 +0100
Subject: [PATCH 3193/4088] hashcat: update to 6.2.5.

---
 srcpkgs/hashcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template
index 5cf30687b71d..bebc7eb1bd31 100644
--- a/srcpkgs/hashcat/template
+++ b/srcpkgs/hashcat/template
@@ -1,6 +1,6 @@
 # Template file for 'hashcat'
 pkgname=hashcat
-version=6.2.4
+version=6.2.5
 revision=1
 build_style=gnu-makefile
 make_build_args="
@@ -23,7 +23,7 @@ license="MIT"
 homepage="https://hashcat.net/hashcat/"
 changelog="https://raw.githubusercontent.com/hashcat/hashcat/master/docs/changes.txt"
 distfiles="https://hashcat.net/files/hashcat-${version}.tar.gz"
-checksum=9020396ff933693e310b479b641e86f1783d9819d60d1d907752ad8d24a60c31
+checksum=6f6899d7ad899659f7b43a4d68098543ab546d2171f8e51d691d08a659378969
 
 build_options="unrar"
 desc_option_unrar="Enable support for unrar"

From b22679ac05232e8e204a886bbd7af2f9ae9b8bfa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 24 Nov 2021 00:29:19 -0500
Subject: [PATCH 3194/4088] qownnotes: update to 21.11.0

---
 srcpkgs/qownnotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index b3ee3ce21444..01a5aa1e89c7 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
 # Template file for 'qownnotes'
 pkgname=qownnotes
-version=21.7.2
+version=21.11.0
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="https://www.qownnotes.org"
 changelog="https://www.qownnotes.org/changelog.html"
 distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=e9dfde5013de2ebc1d2da62ce93544721ca47de11392540b310b43b06c48daef
+checksum=846f48b902169f49dbae5a5be917a3b14de4295c9a92270c021fa5a5470fa7e1
 
 pre_build() {
 	sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri

From 9154b47bb4f2b5233c502e83f3679de84592e599 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 24 Nov 2021 18:36:17 +0100
Subject: [PATCH 3195/4088] shfmt: update to 3.4.1.

---
 srcpkgs/shfmt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 7dedbc21a84e..96d51f68abf5 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.4.0
+version=3.4.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 changelog="https://raw.githubusercontent.com/mvdan/sh/master/CHANGELOG.md"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=0eb593457df63c5a98597f6235b1ff558fadd18aed54653604731906790a9c90
+checksum=a9e7a09dd0b099b8699b54af0e5911c19412dc7cea206e32377d974427688be1
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1

From 2f83b6f6746039b03443cba13bece8439ea4735e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 23 Nov 2021 17:10:34 -0500
Subject: [PATCH 3196/4088] just: update to 0.10.4

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index f36999e50cea..11097d935a51 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz"
-checksum=10ee1caaedb2e92257338942fce146e5d3aadd6f9f5e98fbc21e422e2d863169
+checksum=81d7e7d5496861a37f8668dbeb845381c41ea0ef5fa087c7b8bd41b70134218d
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From bd3611e009e3c929e28aa50f99d881cfb4b04312 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 23 Nov 2021 18:57:52 +0200
Subject: [PATCH 3197/4088] fltk: update to 1.3.8.

---
 srcpkgs/fltk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fltk/template b/srcpkgs/fltk/template
index 2973e4ec7533..cdc7a5418a15 100644
--- a/srcpkgs/fltk/template
+++ b/srcpkgs/fltk/template
@@ -1,6 +1,6 @@
 # Template file for 'fltk'
 pkgname=fltk
-version=1.3.6
+version=1.3.8
 revision=1
 build_style=gnu-configure
 configure_args="--enable-threads --enable-xft --enable-shared"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:LGPL-2.0-only WITH FLTK-exception"
 homepage="https://www.fltk.org/"
 distfiles="https://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"
-checksum=9aac75ef9e9b7bd7b5338a4c0d4dd536e6c22ea7b15ea622aa1d8f1fa30d37ab
+checksum=f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf
 
 pre_build() {
 	vsed -i '/DIRS =/s,test,,' Makefile

From 7c422bd4c3af70ea6cf85150c5d15b3c8ca600ad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 12 Aug 2021 14:37:25 +0300
Subject: [PATCH 3198/4088] poedit: update to 3.0.

Also:
- add pugixml-devel to makedepends.
---
 srcpkgs/poedit/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..717b8f6bc228 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,19 +1,19 @@
 # Template file for 'poedit'
 pkgname=poedit
-version=2.4.3
-revision=2
+version=3.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
 makedepends="boost-devel cld2-devel db-devel enchant2-devel gtk+3-devel
- gtkspell3-devel Lucene++-devel wxWidgets-gtk3-devel"
+ gtkspell3-devel Lucene++-devel wxWidgets-gtk3-devel pugixml-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Cross-platform gettext catalogs (.po files) editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.poedit.net/"
 distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=6601f5ddeeb5aee0a6687af7867e9f88f6989e7050137a42131b6ac16c0efd84
+checksum=dfbe5e8c5ea6e36fd472fc294f2cedf804656f52db372ea3fbbe4103136b2dc2
 
 CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy"
 
@@ -22,6 +22,11 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" WXRC=/usr/bin/wxrc --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	CXXFLAGS+=" -latomic "
+fi
+
 post_install() {
 	vlicense COPYING
 }

From 3627efdbd00c09f9b5988fbac31b5b8b3205ac39 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Thu, 25 Nov 2021 05:35:25 +1100
Subject: [PATCH 3199/4088] libopenmpt: update to 0.5.13

---
 srcpkgs/libopenmpt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index d0f3d275e552..148f678084a2 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,6 +1,6 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.12
+version=0.5.13
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 changelog="https://lib.openmpt.org/doc/changelog.html"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=892aea7a599b5d21842bebf463b5aafdad5711be7008dd84401920c6234820af
+checksum=6fa28ada93d95ee2428a2d37a5c24faaf9567ff6ede3d134c006b2a6cefbbfe8
 
 post_install() {
 	vlicense LICENSE

From 4e61185a0a451aca3c254bf016bc4f2f7edc772f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 22 Nov 2021 15:47:48 +0100
Subject: [PATCH 3200/4088] praat: update to 6.2.01

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 8c5f3d681c33..7a3c99e70ba0 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2
+version=6.2.01
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=7ad4238aaedb044dda83b08d972971e996c4af939b5ea6d18bf674ab5164e26d
+checksum=c029607f646642bbb945d622f9b58261ba403e72a438e7cbebc281db6171bca2
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From d35fc8251832d14a0c7b84a4e32969f27e46bbb9 Mon Sep 17 00:00:00 2001
From: 674Y3r <87250374+674Y3r@users.noreply.github.com>
Date: Thu, 2 Sep 2021 21:55:35 +0200
Subject: [PATCH 3201/4088] kapman: update to 21.08.3.

---
 srcpkgs/kapman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapman/template b/srcpkgs/kapman/template
index 131edb7f739f..717929e5a8c9 100644
--- a/srcpkgs/kapman/template
+++ b/srcpkgs/kapman/template
@@ -1,6 +1,6 @@
 # Template file for 'kapman'
 pkgname=kapman
-version=21.08.0
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -12,4 +12,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kapman"
 distfiles="${KDE_SITE}/release-service/${version}/src/kapman-${version}.tar.xz"
-checksum=655324811b544f7d4701a065da9b0e8414ad68044c289d722d0f91188dc12487
+checksum=23693e6695c7776a88c6acd1efc8723add5c0cf03003ac556f872283b4f00a6d

From 753009a89509a247ed51de48fa69f38e507f9970 Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+github@gmail.com>
Date: Mon, 22 Nov 2021 09:56:36 -0600
Subject: [PATCH 3202/4088] pcsc-tools: update to 1.5.8

---
 srcpkgs/pcsc-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsc-tools/template b/srcpkgs/pcsc-tools/template
index 3848f3ebe0d4..0825d36dd719 100644
--- a/srcpkgs/pcsc-tools/template
+++ b/srcpkgs/pcsc-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsc-tools'
 pkgname=pcsc-tools
-version=1.5.7
+version=1.5.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ludovic.rousseau.free.fr/softwares/pcsc-tools"
 distfiles="http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=e0ea8f8496d5bcf5316da913869ba95b925d0405c2aaade801c0d6ce7697699d
+checksum=87c1edbdb8c9735063f688aa3e05e3893a88e78b322dc69af80757ed90282212

From d85d6e7b34d7bbf416ac4ed4cd5aa5c551940e21 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Wed, 24 Nov 2021 22:31:30 +0100
Subject: [PATCH 3203/4088] mkvtoolnix: update to 63.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 07ff426921b5..9f6cb4d145b4 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=62.0.0
+version=63.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=42b853a063ea77b79d37fb698857947159a4481842c3b3d45fe862ee234400e1
+checksum=1884165cf1bdea6ed8697dda319a17967772152e3b2b3a5fdf6ec5c7740d1ec9
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 7b0925679040bc0d23d57a49c0119722845a3fbd Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Wed, 24 Nov 2021 18:54:33 -0300
Subject: [PATCH 3204/4088] oil: update to 0.9.4

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index e2e129d55b7a..af1eb57e8d1c 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.9.3
+version=0.9.4
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=62f36072f69f3378e03b79d8d5255c1d136094ec11410db4f16ee82f1660efda
+checksum=fac61bcd6b68c0bbf2e386aa84b107f26518527d4326bf473a02aadd85e53d02
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From b7b837390b08750fc3f25285390835fafb0104d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 Nov 2021 17:02:53 +0700
Subject: [PATCH 3205/4088] xfce4-power-manager: fix whitespace in patches

While we're at it, add upower as dependency.

Close: #34229
---
 srcpkgs/xfce4-power-manager/patches/void.patch | 16 ++++++++--------
 srcpkgs/xfce4-power-manager/template           |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/patches/void.patch b/srcpkgs/xfce4-power-manager/patches/void.patch
index 75f49b49944b..ad7736ce032d 100644
--- a/srcpkgs/xfce4-power-manager/patches/void.patch
+++ b/srcpkgs/xfce4-power-manager/patches/void.patch
@@ -1,5 +1,5 @@
---- a/src/xfpm-pm-helper.c	2019-08-13 12:17:22.787621859 +0200
-+++ b/src/xfpm-pm-helper.c	2019-08-13 12:18:31.946471555 +0200
+--- a/src/xfpm-pm-helper.c
++++ b/src/xfpm-pm-helper.c
 @@ -69,11 +69,8 @@
  #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3"
  #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
@@ -11,12 +11,12 @@
 -#ifdef BACKEND_TYPE_OPENBSD
 +/* voidlinux and openbsd use zzz(8) */
 +#if defined(BACKEND_TYPE_LINUX) || defined(BACKEND_TYPE_OPENBSD)
- #define UP_BACKEND_SUSPEND_COMMAND	"/usr/sbin/zzz"
+ #define UP_BACKEND_SUSPEND_COMMAND  "/usr/sbin/zzz"
  #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
  #endif
---- a/src/xfpm-suspend.c	2020-12-22 20:56:08.139119371 -0500
-+++ b/src/xfpm-suspend.c	2020-12-22 20:56:52.359241485 -0500
-@@ -105,40 +105,6 @@
+--- a/src/xfpm-suspend.c
++++ b/src/xfpm-suspend.c
+@@ -105,40 +105,6 @@ freebsd_supports_sleep_state (const gcha
  }
  #endif
  
@@ -57,7 +57,7 @@
  gboolean
  xfpm_suspend_can_suspend (void)
  {
-@@ -147,7 +113,7 @@
+@@ -147,7 +113,7 @@ xfpm_suspend_can_suspend (void)
    return freebsd_supports_sleep_state ("S3");
  #endif
  #ifdef BACKEND_TYPE_LINUX
@@ -66,7 +66,7 @@
  #endif
  #ifdef BACKEND_TYPE_OPENBSD
    return TRUE;
-@@ -164,7 +130,7 @@
+@@ -164,7 +130,7 @@ xfpm_suspend_can_hibernate (void)
    return freebsd_supports_sleep_state ("S4");
  #endif
  #ifdef BACKEND_TYPE_LINUX
diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index edc9a58e27b9..80eaad540da1 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,12 +1,12 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
-depends="hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils upower"
 short_desc="Xfce power manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From b7d422aa28741681808b68382f4877c7de0856ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 Nov 2021 17:12:29 +0700
Subject: [PATCH 3206/4088] ppl: use Debian's mirror

The original distfiles is dead.
---
 srcpkgs/ppl/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template
index b95eae07b464..7380c28301ec 100644
--- a/srcpkgs/ppl/template
+++ b/srcpkgs/ppl/template
@@ -10,7 +10,8 @@ short_desc="The Parma Polyhedra Library"
 homepage="http://www.bugseng.com/parma-polyhedra-library"
 license="GPL-3"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="ftp://ftp.cs.unipr.it/pub/ppl/releases/${version}/ppl-${version}.tar.xz"
+# distfiles="ftp://ftp.cs.unipr.it/pub/ppl/releases/${version}/ppl-${version}.tar.xz"
+distfiles="${DEBIAN_SITE}/main/p/ppl/ppl_${version}.orig.tar.xz"
 checksum=691f0d5a4fb0e206f4e132fc9132c71d6e33cdda168470d40ac3cf62340e9a60
 
 pre_configure() {

From 0f857e70e29a1f5765f48a8c39235efa2163bf80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 Nov 2021 17:37:44 +0700
Subject: [PATCH 3207/4088] git: update to 2.34.1.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 7ca728c73ba6..578474266412 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.34.0
+version=2.34.1
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f
+checksum=3a0755dd1cfab71a24dd96df3498c29cd0acd13b04f3d08bf933e81286db802c
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 9762f095af1104ec27f911f7cc52292c38a69a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 Nov 2021 17:37:41 +0700
Subject: [PATCH 3208/4088] chroot-git: update to 2.34.1.

---
 srcpkgs/chroot-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f7de7866263a..35de5f4f9416 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,6 +1,6 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.34.0
+version=2.34.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f
+checksum=3a0755dd1cfab71a24dd96df3498c29cd0acd13b04f3d08bf933e81286db802c
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From 63dff88e2cca0670c40be18557cd6a95467d0d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 2 Nov 2021 07:25:59 +0700
Subject: [PATCH 3209/4088] nss: update to 3.72.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 18e1d0f2a89e..968500eb758e 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.71
+version=3.72
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=99acd315d9af35419cda4a6960f00a7d446bd231bd407174a7b07cb3dba0c253
+checksum=6ea60a9ff113e493ea2ab25f41ea75a9fbd10af7903f26f703dac8680732d02e
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 35e0b035150093b2f14158c2ff2769d6b8067dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:01:37 +0700
Subject: [PATCH 3210/4088] fcitx5: update to 5.0.10.

---
 srcpkgs/fcitx5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index 5aca533806ad..75c9033334e0 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5'
 pkgname=fcitx5
-version=5.0.9
+version=5.0.10
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
 _en_dict_ver=20121020
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz
  https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz"
-checksum="703a6bdd82f0c0af2a0e1b3d16ac32d627178bff7a425c1fcf8df48f686e8b5c
+checksum="e24c39260f5a42ad4c3b5d19fb0b3ec06c0922a10c2dbb0606d9ef28ebb9116b
  c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
 skip_extraction=en_dict-${_en_dict_ver}.tar.gz
 lib32disabled=yes

From c6a808a4391d6e1bbb952df190ad6999746c982c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:01:42 +0700
Subject: [PATCH 3211/4088] fcitx5-anthy: update to 5.0.7.

---
 srcpkgs/fcitx5-anthy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index cdb0e0d5e81d..4678ff31b130 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-anthy'
 pkgname=fcitx5-anthy
-version=5.0.6
+version=5.0.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz"
-checksum=44527eb63d95215424d78d23469c8b45fa6f4f919515bd6de89b249f8d10822e
+checksum=080e8192093d447bd92bafc141470987c4df3016a0c561eef88070bca9cc8f3e
 
 fcitx5-anthy-icons_package() {
 	short_desc+=" - icons"

From 3080e1a96b537b57cd3400184cb641edfebf62c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:01:48 +0700
Subject: [PATCH 3212/4088] fcitx5-chewing: update to 5.0.7.

---
 srcpkgs/fcitx5-chewing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template
index d1958d03df1a..cfc95e49a1a5 100644
--- a/srcpkgs/fcitx5-chewing/template
+++ b/srcpkgs/fcitx5-chewing/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-chewing'
 pkgname=fcitx5-chewing
-version=5.0.6
+version=5.0.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chewing/fcitx5-chewing-${version}.tar.xz"
-checksum=e2d719b00b856604f130e015bb654976437dece5d93600991af9836adc0e540f
+checksum=e293a1472d797df1275846044e2aca27f6b55f8f30fbb3811cb1d2bb1f03be55
 lib32disabled=yes
 
 fcitx5-chewing-icons_package() {

From 962b31d98a194d252a95bc2d129dd1a641622f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:02:01 +0700
Subject: [PATCH 3213/4088] fcitx5-chinese-addons: update to 5.0.8.

---
 srcpkgs/fcitx5-chinese-addons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index 3c875f23ac7a..b3a1158103c3 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-chinese-addons'
 pkgname=fcitx5-chinese-addons
-version=5.0.7
+version=5.0.8
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
@@ -17,7 +17,7 @@ _pystroke_version=20121124
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz
  http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz
  http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz"
-checksum="b6087e9cddf1d75e7a23ff74e138f19577943a23ed2b4918bbf475d0d5fa2ae7
+checksum="554084525179e3b487c7395ab5d4e4fe2923889efe7f07e7993e84c0816afe51
  42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
  8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
 skip_extraction="

From 8f88ca8c70bf4da049332f95dd9de199018cc159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:02:06 +0700
Subject: [PATCH 3214/4088] fcitx5-configtool: update to 5.0.8.

---
 srcpkgs/fcitx5-configtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index 9477a5ff2d67..ea5d49e69fc7 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-configtool'
 pkgname=fcitx5-configtool
-version=5.0.6
+version=5.0.8
 revision=1
 build_style=cmake
 hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz"
-checksum=e5d5c84e36263a2973087074a214de6c9ed7df3f3bddbe4602731405759d4c5c
+checksum=84af8e06a946339518d01bf0b1cdc3dbf3af35a08a21004f0774551212cf5265
 lib32disabled=yes
 
 fcitx5-migrator_package() {

From a153df3ef2463cefae4b59b5d736c54d3bcafeaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:02:12 +0700
Subject: [PATCH 3215/4088] fcitx5-gtk: update to 5.0.9.

---
 srcpkgs/fcitx5-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index 17033d4f54b2..b4bdb08b36ed 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-gtk'
 pkgname=fcitx5-gtk
-version=5.0.8
+version=5.0.9
 revision=1
 build_style=cmake
 build_helper=gir
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz"
-checksum=c133f7a643ba95ebf0a79c9c364041c08e99a156a2303835394cce9a897b428e
+checksum=1600ecdf4a9c8d33654aefa65d33b71257c6db127bc77aee2d09e1e1ba26371e
 lib32disabled=yes
 
 build_options="gir"

From efcd5167c65817cff180c4dbb391bd089561e67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:02:17 +0700
Subject: [PATCH 3216/4088] fcitx5-hangul: update to 5.0.5.

---
 srcpkgs/fcitx5-hangul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template
index 12329a30856a..3dcaa31056a8 100644
--- a/srcpkgs/fcitx5-hangul/template
+++ b/srcpkgs/fcitx5-hangul/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-hangul'
 pkgname=fcitx5-hangul
-version=5.0.4
+version=5.0.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-hangul/fcitx5-hangul-${version}.tar.xz"
-checksum=9d9af72cfea596e862b04aad9a4bab8507df8c8fd4110e6ce7afa2d33b534790
+checksum=0ed5d898354220ec250bf11a69e7dbe46b2c3871f4eeaa7cc87461dce47b4876
 lib32disabled=yes
 
 fcitx5-hangul-icons_package() {

From b8c373e88667f0006a20a32cdaf3cb4dde7e5dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:02:22 +0700
Subject: [PATCH 3217/4088] fcitx5-m17n: update to 5.0.6.

---
 srcpkgs/fcitx5-m17n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-m17n/template b/srcpkgs/fcitx5-m17n/template
index 6f23d05ff8ec..e5f3cd507212 100644
--- a/srcpkgs/fcitx5-m17n/template
+++ b/srcpkgs/fcitx5-m17n/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-m17n'
 pkgname=fcitx5-m17n
-version=5.0.5
+version=5.0.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
@@ -12,5 +12,5 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-m17n/fcitx5-m17n-${version}.tar.xz"
-checksum=292deb065e571b38eacc28007e1a6b69d27d7332aa2708055a645d98549dd69f
+checksum=e6aa1404f3e070855f81abac0751c25327874f9355281f477f5c4a03ed393e79
 lib32disabled=yes

From 71aee9c398ff7413cd3c3b88a8c48cfc8b7f88f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:02:29 +0700
Subject: [PATCH 3218/4088] fcitx5-rime: update to 5.0.8.

---
 srcpkgs/fcitx5-rime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index 3f72384b4e0f..e60a48ba4eda 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-rime'
 pkgname=fcitx5-rime
-version=5.0.7
+version=5.0.8
 revision=1
 build_style=cmake
 configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz"
-checksum=87acb0c99c978bf42b8ecd2e08fe6df8b170d0e14c39aa693527c40fb6af3848
+checksum=e37eecb61bb1f0df59ccf24912681813f9b24a8d4d8ebee9883f5f19c2b38866
 lib32disabled=yes
 
 fcitx5-rime-icons_package() {

From 03b680de17a0d97b1a1dec47566591813d348150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:02:44 +0700
Subject: [PATCH 3219/4088] fcitx5-table-extra: update to 5.0.6.

---
 srcpkgs/fcitx5-table-extra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index 9d17d5f15661..ec5535283ba9 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-table-extra'
 pkgname=fcitx5-table-extra
-version=5.0.5
+version=5.0.6
 revision=1
 build_style=cmake
 hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Public Domain"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz"
-checksum=81c6e9ee90d77115fb4e018aaf9bfcfa8bcb4ca9b11048868a755c890c769bd6
+checksum=85ef72e47f612cdb21bd9b4b5a9245f04dc7effd81fd2caf858bd01ff53b28c2

From 4ef5a646c3f185b096fd386d7792ea9c2483aaf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:02:50 +0700
Subject: [PATCH 3220/4088] fcitx5-table-other: update to 5.0.6.

---
 srcpkgs/fcitx5-table-other/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template
index 0a7051c9a235..ef6702f9cd86 100644
--- a/srcpkgs/fcitx5-table-other/template
+++ b/srcpkgs/fcitx5-table-other/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-table-other'
 pkgname=fcitx5-table-other
-version=5.0.5
+version=5.0.6
 revision=1
 build_style=cmake
 hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-${version}.tar.xz"
-checksum=fc1ee1c234f54aacf8508e032d7384fdda3966d0d3ac8d2ac7ceff728980e885
+checksum=0dd78adb2828755b4de6696b2ba8e0f894e7fd18e91d129c95fda81840a0256f

From c2487e8fd4e846164f35ab6985e8b6d9c4e5ba04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:03:11 +0700
Subject: [PATCH 3221/4088] fcitx5-zhuyin: update to 5.0.7.

---
 srcpkgs/fcitx5-zhuyin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template
index 13b54308b13c..4f0612152695 100644
--- a/srcpkgs/fcitx5-zhuyin/template
+++ b/srcpkgs/fcitx5-zhuyin/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-zhuyin'
 pkgname=fcitx5-zhuyin
-version=5.0.6
+version=5.0.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin"
@@ -13,7 +13,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
 _model_version=20161206
 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-zhuyin/fcitx5-zhuyin-${version}.tar.xz
  https://download.fcitx-im.org/data/model.text.${_model_version}.tar.gz"
-checksum="06b380488c4e719e991a774337de2b40e5d552c0fd17116602565cd974fccb8d
+checksum="e40ea0fd2ae298453817d8fb35167a3c9d420424da7c2ce4a22fd09d174b1e5e
  5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704"
 skip_extraction="model.text.${_model_version}.tar.gz"
 lib32disabled=yes

From 041a5826960284f6ac02aa5d4e663fde48243c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 24 Nov 2021 18:03:48 +0700
Subject: [PATCH 3222/4088] libime: update to 1.0.9.

---
 srcpkgs/libime/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index b96dd07d5b52..060da90beff7 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,6 +1,6 @@
 # Template file for 'libime'
 pkgname=libime
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -11,14 +11,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://fcitx-im.org/wiki/Fcitx"
 _lm_sc_version=20140820
-_dict_version=20210402
+_dict_version=20211021
 distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz
  https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2
  https://download.fcitx-im.org/data/dict.utf8-${_dict_version}.tar.xz
  https://download.fcitx-im.org/data/table.tar.gz"
-checksum="0755548a197a9766c799c19281276796fc3b11573ba249980f85391e13207eb9
+checksum="4a32f35c1351d51b456523a4b342b7e38a562e0fbbf75f601eb6d5e5862a2c98
  751bab7c55ea93a2cedfb0fbb7eb09f67d4da9c2c55496e5f31eb8580f1d1e2f
- 818cfbb5a99ae5b40c2707b6158734f4a10196444853400cbd6b14505592d80d
+ 300597e6f7f79f788480fd665de8a07bfe90227048b5a7e39f40f43a62a981df
  6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
 skip_extraction="
  lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2

From bbfe631d110a63d179482c09f34d28d5630cd7f8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 25 Nov 2021 13:30:31 +0100
Subject: [PATCH 3223/4088] linux5.15: update to 5.15.5.

---
 srcpkgs/linux5.15/files/arm64-dotconfig   | 8 +++++++-
 srcpkgs/linux5.15/files/i386-dotconfig    | 8 +++++++-
 srcpkgs/linux5.15/files/ppc-dotconfig     | 7 ++++++-
 srcpkgs/linux5.15/files/ppc64-dotconfig   | 8 +++++++-
 srcpkgs/linux5.15/files/ppc64le-dotconfig | 9 +++++++--
 srcpkgs/linux5.15/files/x86_64-dotconfig  | 8 +++++++-
 srcpkgs/linux5.15/template                | 4 ++--
 7 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index 2de7a57b2495..fdd8b78dcb58 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.2 Kernel Configuration
+# Linux/arm64 5.15.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2478,6 +2478,7 @@ CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
 # CONFIG_SM_FTL is not set
 CONFIG_MTD_OOPS=m
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 CONFIG_MTD_PARTITIONED_MASTER=y
 
@@ -11029,6 +11030,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 95f9f21f866e..d80747cab758 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.2 Kernel Configuration
+# Linux/i386 5.15.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2193,6 +2193,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -9336,6 +9337,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
index dd2bd2da0a8e..8294073a1201 100644
--- a/srcpkgs/linux5.15/files/ppc-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.0 Kernel Configuration
+# Linux/powerpc 5.15.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7482,6 +7482,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
index 7527759d59df..410fb0c5c2e0 100644
--- a/srcpkgs/linux5.15/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.0 Kernel Configuration
+# Linux/powerpc 5.15.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2175,6 +2175,7 @@ CONFIG_MTD_BLOCK_RO=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -9458,6 +9459,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
index 6255c189c287..ba286205ec4e 100644
--- a/srcpkgs/linux5.15/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.0 Kernel Configuration
+# Linux/powerpc 5.15.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -58,7 +58,6 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_SIM=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_DOMAIN_NOMAP=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
@@ -2077,6 +2076,7 @@ CONFIG_MTD_BLOCK_RO=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -9182,6 +9182,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 226bb4207f00..8b0237cb40fe 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.4 Kernel Configuration
+# Linux/x86_64 5.15.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2258,6 +2258,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -9522,6 +9523,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 40c310a7daa8..02de9dab5756 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.4
+version=5.15.5
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- c33801f2d4ae027b5cb6ba49ff7daacc1ac25243cefcc0a4e6e358f5d36dca5b"
+ 8fdc0ef34a877379bcb9b617006edafba66f9213fc2c1df7451b578ae33b5496"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 3c7f242e3757818d079a35e0bc89c23dd1402458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Nov 2021 19:24:50 -0300
Subject: [PATCH 3224/4088] sympow: do not mess with fpu control word if
 possible

Also: add basic tests to detect fpu miscompilation.

The program sets the fpu to 53 bit mode to get consistent results. It
turns out that doing this on musl breaks fmt_fp (-> printf) which uses
long double to format floats. Note this is an issue even on 64 bit musl,
although setting fpu to 53 bits is unnecessary on 64 bits because of the
default -mfpmath=sse.

The way Configure works: it tries different combinations of flags which
exercise different methods to change the fpu control word until one
works, meaning doubles are effectively 53 bits.  The fix here is to try
first NOT touching the fpu control word. On x86_64 using the default
-mfpmath=sse this will succeed bypassing all fpucw modification.

For i686 using -mfpmath=387 (always if sse2 not available) the code will
fall back to changing the fpu control word as before. Since this is not
a problem for glibc, everything still works. I expect i686-musl to still
be broken, but we don't support that arch.

A simple way to test the bug on musl is to run

    $ sympow -curve '[0,0,0,0,1]' -analrank
    ...
    Analytic Rank is 0 : L-value 7.01091e-01

When the fpucw is changed, on musl this prints "7.01092e-01" instead.

The actual value computed to 128 bits with pari is:

    $ echo 'elllseries(ellinit([0,0,0,0,1]),1)' | gp -q
    0.70109105266272713058750953952514706773

so the glibc output is the correct one.

Again: what is broken is not computing but printing, as fmt_fp in musl
uses long double, which means messing with fpu control word breaks it.
This is important since sagemath parses sympow output.

This affects sagemath doctests as in

    $ sage -t src/sage/lfunctions/sympow.py
    ...
    (3 failures)

After this commit, the doctest in question passes on the 3 supported
archs.
---
 srcpkgs/sympow/files/test                     | 51 ++++++++++++++++++
 srcpkgs/sympow/files/test.out                 | 54 +++++++++++++++++++
 .../first-try-without-messing-the-fpucw.patch | 14 +++++
 srcpkgs/sympow/template                       | 10 +++-
 4 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sympow/files/test
 create mode 100644 srcpkgs/sympow/files/test.out
 create mode 100644 srcpkgs/sympow/patches/first-try-without-messing-the-fpucw.patch

diff --git a/srcpkgs/sympow/files/test b/srcpkgs/sympow/files/test
new file mode 100644
index 000000000000..5892937085f2
--- /dev/null
+++ b/srcpkgs/sympow/files/test
@@ -0,0 +1,51 @@
+#! /bin/sh
+
+# Quick minimal test for sympow
+#
+# Compute modular degree and analytic rank for some curves so we check
+# that it works and also that fpu arithmetic and output are ok
+
+# setup sympow to run from cwd
+export SYMPOW_PKGDATADIR=.
+export SYMPOW_PKGLIBDIR=.
+mkdir -p sympow_cache
+export SYMPOW_CACHEDIR=sympow_cache
+
+E11a=[0,-1,1,-10,-20]
+E37a=[0,0,1,-1,0]
+E389a=[0,1,1,-2,0]
+E5077a=[0,0,1,-7,6]
+E4=[1,-1,0,-79,289]
+E5=[0,0,1,-79,342]
+E6=[1,1,0,-2582,48720]
+E7=[0,0,0,-10012,346900]
+
+echo "### Compute modular degree for some curves"
+echo "# 11a"
+./sympow -quiet -curve $E11a -moddeg
+echo "# 37a"
+./sympow -quiet -curve $E37a -moddeg
+echo "# 389a"
+./sympow -quiet -curve $E389a -moddeg
+echo "# 5077a"
+./sympow -quiet -curve $E5077a -moddeg
+echo "# 234446a"
+./sympow -quiet -curve $E4 -moddeg
+
+echo "### Compute analytic rank for some curves"
+echo "# 11a"
+./sympow -quiet -curve $E11a -analrank
+echo "# 37a"
+./sympow -quiet -curve $E37a -analrank
+echo "# 389a"
+./sympow -quiet -curve $E389a -analrank
+echo "# 5077a"
+./sympow -quiet -curve $E5077a -analrank
+echo "# 234446a"
+./sympow -quiet -curve $E4 -analrank
+echo "# curve of rank 5"
+./sympow -quiet -curve $E5 -analrank
+echo "# curve of rank 6"
+./sympow -quiet -curve $E6 -analrank
+echo "# curve of rank 7"
+./sympow -quiet -curve $E7 -analrank
diff --git a/srcpkgs/sympow/files/test.out b/srcpkgs/sympow/files/test.out
new file mode 100644
index 000000000000..b95c57494135
--- /dev/null
+++ b/srcpkgs/sympow/files/test.out
@@ -0,0 +1,54 @@
+### Compute modular degree for some curves
+# 11a
+Minimal model of curve  is [0,-1,1,-10,-20]
+Maximal number of terms is 14
+Modular Degree is 1
+# 37a
+Minimal model of curve  is [0,0,1,-1,0]
+Maximal number of terms is 48
+Modular Degree is 2
+# 389a
+Minimal model of curve  is [0,1,1,-2,0]
+Maximal number of terms is 512
+Modular Degree is 40
+# 5077a
+Minimal model of curve  is [0,0,1,-7,6]
+Maximal number of terms is 8130
+Modular Degree is 1984
+# 234446a
+Minimal model of curve  is [1,-1,0,-79,289]
+Maximal number of terms is 518272
+Modular Degree is 334976
+### Compute analytic rank for some curves
+# 11a
+Minimal model of curve  is [0,-1,1,-10,-20]
+Maximal number of terms is 7
+Analytic Rank is 0 : L-value 2.53842e-01
+# 37a
+Minimal model of curve  is [0,0,1,-1,0]
+Maximal number of terms is 10
+Analytic Rank is 1 : L'-value 3.06000e-01
+# 389a
+Minimal model of curve  is [0,1,1,-2,0]
+Maximal number of terms is 43
+Analytic Rank is 2 : leading L-term 7.59317e-01
+# 5077a
+Minimal model of curve  is [0,0,1,-7,6]
+Maximal number of terms is 128
+Analytic Rank is 3 : leading L-term 1.73185e+00
+# 234446a
+Minimal model of curve  is [1,-1,0,-79,289]
+Maximal number of terms is 1064
+Analytic Rank is 4 : leading L-term 8.94385e+00
+# curve of rank 5
+Minimal model of curve  is [0,0,1,-79,342]
+Maximal number of terms is 7858
+Analytic Rank is 5 : leading L-term 3.02857e+01
+# curve of rank 6
+Minimal model of curve  is [1,1,0,-2582,48720]
+Maximal number of terms is 184767
+Analytic Rank is 6 : leading L-term 3.20781e+02
+# curve of rank 7
+Minimal model of curve  is [0,0,0,-10012,346900]
+Maximal number of terms is 1324544
+Analytic Rank is 7 : leading L-term 1.32517e+03
diff --git a/srcpkgs/sympow/patches/first-try-without-messing-the-fpucw.patch b/srcpkgs/sympow/patches/first-try-without-messing-the-fpucw.patch
new file mode 100644
index 000000000000..a7b17819b7e5
--- /dev/null
+++ b/srcpkgs/sympow/patches/first-try-without-messing-the-fpucw.patch
@@ -0,0 +1,14 @@
+--- a/Configure	2020-04-16 14:12:56.000000000 -0300
++++ b/Configure	2021-11-24 16:04:43.647041822 -0300
+@@ -154,10 +154,10 @@
+     try_add_CFLAG $FLAG bypass && break
+ done
+ 
+ # Select the most appropriate FPU control scheme
+-for FLAG in '-DISOC99_FENV' '-DFPUCONTROLH' '-Dx86'; do
++for FLAG in '' '-DISOC99_FENV' '-DFPUCONTROLH' '-Dx86'; do
+     try_add_CFLAG $FLAG && break
+ done
+ 
+ # Some flags to try as last resort.  These hurt performance, so only add
+ # them if needed.
diff --git a/srcpkgs/sympow/template b/srcpkgs/sympow/template
index d484cf847f57..b81d2d4097c8 100644
--- a/srcpkgs/sympow/template
+++ b/srcpkgs/sympow/template
@@ -1,7 +1,7 @@
 # Template file for 'sympow'
 pkgname=sympow
 version=2.023.6
-revision=2
+revision=3
 wrksrc=${pkgname}-v${version}
 build_style=configure
 make_build_target=all
@@ -15,6 +15,8 @@ distfiles="https://gitlab.com/rezozer/forks/sympow/-/archive/v${version}/sympow-
 checksum=d153530dfdd46da05c954121640e50771064536fedc22c7fef24fb11083172ef
 nocross=yes # runs binaries built for target
 
+CFLAGS="-Wno-unused-result"
+
 do_configure() {
 	PREFIX=/usr ./Configure
 }
@@ -22,3 +24,9 @@ do_configure() {
 post_install() {
 	vlicense COPYING
 }
+
+do_check() {
+	echo "Testing sympow ..."
+	sh "${FILESDIR}"/test > test.log
+	diff "${FILESDIR}"/test.out test.log && echo PASS
+}

From 8dee75d6d1f6c811c553e5ac03498f653d7eb3cc Mon Sep 17 00:00:00 2001
From: Ranme Fritzvilliams <ranme@dotnetfox.tk>
Date: Thu, 25 Nov 2021 04:53:27 +0300
Subject: [PATCH 3225/4088] stunnel: update to 5.60

The 'changelog' variable is replaced due to the inability to fetch it
(broken link).
---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e5e9636b2e66..feadf1d1a681 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,6 +1,6 @@
 # Template file for 'stunnel'
 pkgname=stunnel
-version=5.59
+version=5.60
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -11,9 +11,9 @@ short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.stunnel.org/"
-changelog="https://www.stunnel.org/sdf_ChangeLog.html"
+changelog="https://www.stunnel.org/NEWS.html"
 distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
-checksum=137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f
+checksum=c45d765b1521861fea9b03b425b9dd7d48b3055128c0aec673bba5ef9b8f787d
 
 post_install() {
 	rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8

From be14614c34139d2263b2a97be7861b1bdbb7cc01 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 24 Nov 2021 16:05:41 +0100
Subject: [PATCH 3226/4088] xterm: update to 370.

---
 srcpkgs/xterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 2a2cf63731c6..0af0328c6f96 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=369
+version=370
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -21,7 +21,7 @@ homepage="http://invisible-island.net/xterm/"
 changelog="http://invisible-island.net/xterm/xterm.log.html"
 # using HTTP TEMPORARILY due to cert issues
 distfiles="http://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=71ed6a48d064893d2149741a002781a973496fd24d52dadd364f63439a764e26
+checksum=963c5d840a0f0f4c077ff284586e8b1f83f3f983dca6f74f4b361975b5388c82
 
 post_install() {
 	for f in {u,}xterm.desktop; do

From 5776a611afd2e2225fa0425c1869ec3977efa4b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 Nov 2021 19:57:40 +0700
Subject: [PATCH 3227/4088] fcitx5-configtool: split KDE integration

---
 srcpkgs/fcitx5-configtool/template | 23 ++++++++++++++++++++++-
 srcpkgs/fcitx5-kcm                 |  1 +
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/fcitx5-kcm

diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index ea5d49e69fc7..9d5818296e32 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,7 +1,7 @@
 # Template file for 'fcitx5-configtool'
 pkgname=fcitx5-configtool
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
  extra-cmake-modules glib-devel qt5-qmake qt5-host-tools xkeyboard-config
@@ -11,6 +11,7 @@ makedepends="libfcitx5-devel fcitx5-gtk-devel fcitx5-qt5-devel
  qt5-quickcontrols2-devel qt5-declarative-devel kcoreaddons-devel
  ki18n-devel kpackage-devel kdeclarative-devel kirigami2-devel
  libxkbcommon-devel iso-codes libX11-devel libxkbfile-devel"
+depends="qt5-svg"
 short_desc="Fcitx v5 - config tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
@@ -19,6 +20,11 @@ distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configt
 checksum=84af8e06a946339518d01bf0b1cdc3dbf3af35a08a21004f0774551212cf5265
 lib32disabled=yes
 
+post_install() {
+	# belongs to fcitx5-kcm
+	rm ${DESTDIR}/usr/share/locale/*/*/org.fcitx.fcitx5.kcm.mo
+}
+
 fcitx5-migrator_package() {
 	short_desc="${short_desc/config/migration}"
 	lib32disabled=yes
@@ -28,3 +34,18 @@ fcitx5-migrator_package() {
 		vmove usr/share/applications/org.fcitx.fcitx5-migrator.desktop
 	}
 }
+
+fcitx5-kcm_package() {
+	short_desc="KDE config module for Fcitx5"
+	lib32disabled=yes
+	depends="${sourcepkg}>=${version}_${revision}<=${version}_9999
+	 kde-cli-tools"
+	pkg_install() {
+		vmove usr/lib/qt5/plugins/kcms
+		vmove usr/share/kpackage
+		vmove usr/share/kservices5
+		vmove usr/share/metainfo
+		DESTDIR=${PKGDESTDIR} \
+			ninja -C build po/org.fcitx.fcitx5.kcm/install
+	}
+}
diff --git a/srcpkgs/fcitx5-kcm b/srcpkgs/fcitx5-kcm
new file mode 120000
index 000000000000..e54fa5c62107
--- /dev/null
+++ b/srcpkgs/fcitx5-kcm
@@ -0,0 +1 @@
+fcitx5-configtool
\ No newline at end of file

From 5e13db98faf414bcc6e3f6702be8b1bc36f4d3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 Nov 2021 21:04:41 +0700
Subject: [PATCH 3228/4088] kpackage: use native kpackagetool5

---
 srcpkgs/kpackage/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 376cf7197482..127e70ff80ec 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,9 +1,10 @@
 # Template file for 'kpackage'
 pkgname=kpackage
 version=5.88.0
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules gettext"
+hostmakedepends="kcoreaddons extra-cmake-modules gettext
+ qt5-host-tools qt5-qmake python3 kdoctools"
 makedepends="karchive-devel kconfig-devel kcoreaddons-devel ki18n-devel kdoctools-devel"
 short_desc="KDE Installation and loading of additional content as packages"
 maintainer="John <me@johnnynator.dev>"
@@ -12,9 +13,10 @@ homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=9d4c8e5c44c14b0b020c8c71c6da64c78761ee01766874efed5f3077b86600ff
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
-fi
+post_install() {
+	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \
+		-i ${DESTDIR}/usr/lib/cmake/KF5Package/KF5PackageToolsTargets-*.cmake
+}
 
 kpackage-devel_package() {
 	short_desc+=" - development"

From 22df846bfe0c890993a51ff054723dab05dd9436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 Nov 2021 21:14:29 +0700
Subject: [PATCH 3229/4088] fcitx5-configtool: fix cross-build

---
 srcpkgs/fcitx5-configtool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index 9d5818296e32..068a84612b26 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cmake
 hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
  extra-cmake-modules glib-devel qt5-qmake qt5-host-tools xkeyboard-config
- AppStream kcoreaddons"
+ AppStream kcoreaddons kpackage"
 makedepends="libfcitx5-devel fcitx5-gtk-devel fcitx5-qt5-devel
  libglib-devel qt5-devel qt5-x11extras-devel kitemviews-devel
  qt5-quickcontrols2-devel qt5-declarative-devel kcoreaddons-devel

From bca41753aefd2964cc79cb9f8c4d79c9f6e5c6f9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 25 Nov 2021 23:59:55 +0100
Subject: [PATCH 3230/4088] logswan: update to 2.1.11.

---
 srcpkgs/logswan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/logswan/template b/srcpkgs/logswan/template
index e232b5b8fef9..e6a18fe21159 100644
--- a/srcpkgs/logswan/template
+++ b/srcpkgs/logswan/template
@@ -1,6 +1,6 @@
 # Template file for 'logswan'
 pkgname=logswan
-version=2.1.10
+version=2.1.11
 revision=1
 build_style=cmake
 makedepends="jansson-devel libmaxminddb-devel"
@@ -10,7 +10,7 @@ license="BSD-2-clause"
 homepage="https://www.logswan.org/"
 changelog="https://github.com/fcambus/logswan/raw/master/ChangeLog"
 distfiles="https://github.com/fcambus/logswan/archive/${version}.tar.gz"
-checksum=561027c1aa5ddc87dac43df9fa74b2009ba6b75c5512f83e2c48105e4624e3cc
+checksum=a031b04c2dcfe8195e4225b8dd5781fc76098b9d19d0e4a9cbe1da76a4928eea
 
 post_install() {
 	vlicense LICENSE

From bfb5b9652d7755a2e99430f9ba6a4c38f563b1b2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 26 Nov 2021 00:05:58 +0100
Subject: [PATCH 3231/4088] virt-viewer: update to 11.0.

---
 srcpkgs/virt-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virt-viewer/template b/srcpkgs/virt-viewer/template
index c7227bfc8cb5..687067771dea 100644
--- a/srcpkgs/virt-viewer/template
+++ b/srcpkgs/virt-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'virt-viewer'
 pkgname=virt-viewer
-version=10.0
+version=11.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel intltool pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="http://virt-manager.org/"
 changelog="https://gitlab.com/virt-viewer/virt-viewer/-/raw/master/NEWS"
 distfiles="http://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d23bc0a06e4027c37b8386cfd0286ef37bd738977153740ab1b6b331192389c5
+checksum=a43fa2325c4c1c77a5c8c98065ac30ef0511a21ac98e590f22340869bad9abd0

From 13e3f1c8df8936af7b41fdbef8b7d629ce5134c7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 26 Nov 2021 00:51:58 +0100
Subject: [PATCH 3232/4088] lagrange: update to 1.8.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 69d69e8de55f..fd3b3f64fbcb 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.8.1
+version=1.8.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=5ecfbce492ffc2905f4980a95ec1f1b3118374c5de37120ad020d1fdaba19b32
+checksum=375a3640284d29a182ffec138298c9590d7228a390113023164a6a312c7e64f1
 
 post_install() {
 	vlicense LICENSE.md

From 0e90385545750b36daf239811335ac549dbd6640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Priner?= <jan@priner.net>
Date: Thu, 25 Nov 2021 20:40:29 +0100
Subject: [PATCH 3233/4088] grc: update to 1.13

---
 srcpkgs/grc/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/grc/template b/srcpkgs/grc/template
index 04525b09757e..04af7e9e97b5 100644
--- a/srcpkgs/grc/template
+++ b/srcpkgs/grc/template
@@ -1,14 +1,15 @@
 # Template file for 'grc'
 pkgname=grc
-version=1.11.3
-revision=2
+version=1.13
+revision=1
 depends="python3"
 short_desc="Colouriser for logfiles and output of commands"
 maintainer="Georg Schabel <gescha@posteo.de>"
-license="GPL-2.0-only"
+license="GPL-2.0-or-later"
 homepage="http://korpus.juls.savba.sk/~garabik/software/grc.html"
+changelog="https://raw.githubusercontent.com/garabik/grc/master/debian/changelog"
 distfiles="https://github.com/garabik/grc/archive/v${version}.tar.gz"
-checksum=b167babd8f073a68f5a3091f833e4036fb8d86504e746694747a3ee5048fa7a9
+checksum=a7b10d4316b59ca50f6b749f1d080cea0b41cb3b7258099c3eb195659d1f144f
 conf_files="/etc/grc.conf"
 
 do_install() {
@@ -19,7 +20,8 @@ do_install() {
 	vconf grc.conf
 	vmkdir usr/share/grc
 	vcopy colourfiles/conf.* usr/share/grc
+	vcopy "${FILESDIR}/conf.*" usr/share/grc
 	vcopy grc.zsh usr/share/grc
 	vcopy grc.fish usr/share/grc
-	vcopy grc.bashrc usr/share/grc
+	vcopy grc.sh usr/share/grc
 }

From d1e2973ae60e06727703939030ff0fa9f3105e76 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 25 Nov 2021 09:41:12 +0100
Subject: [PATCH 3234/4088] s: update to 0.6.1.

---
 srcpkgs/s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 05b801ea5a5c..e55d22e4d3d5 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,6 +1,6 @@
 # Template file for 's'
 pkgname=s
-version=0.6.0
+version=0.6.1
 revision=1
 build_helper=qemu
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=0019e21dba7bb30e4de279b71e027c7d78f3236d709c2fe5be39b38d22aa7097
+checksum=8f5f3e9503edcf9eb4792379f93c1e08806b8b9699121a72745d1d63c91a0426
 
 post_build() {
 	s_cli=$(find $GOPATH/bin -name s)

From 5525ebfd6e60bdcb94847ed2f2615479b93d8a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 25 Nov 2021 20:06:53 +0100
Subject: [PATCH 3235/4088] bfs: update to 2.3.

---
 srcpkgs/bfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index c0a36ae67f52..876d492f4d25 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.2.1
+version=2.3
 revision=1
 build_style=gnu-makefile
 makedepends="acl-devel libcap-devel"
@@ -11,7 +11,7 @@ license="0BSD"
 homepage="https://github.com/tavianator/bfs"
 changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md"
 distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=94a9c9a03d82c2d8e81ff373021d8188925a1a5e525937ddda2523483629e390
+checksum=15d5455af3a399561db1d701f2032d743a7a1a201d60df2b55cafd3517277bd3
 
 post_install() {
 	vlicense LICENSE

From 71b9f09bb93810d777479deba63143d40aa964d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 25 Nov 2021 20:15:04 +0100
Subject: [PATCH 3236/4088] visidata: update to 2.7.1.

---
 srcpkgs/visidata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index f3e5385c2b15..f3c267c50145 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,6 +1,6 @@
 # Template file for 'visidata'
 pkgname=visidata
-version=2.6.1
+version=2.7.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ license="GPL-3.0-only"
 homepage="https://visidata.org/"
 changelog="https://raw.githubusercontent.com/saulpw/visidata/stable/CHANGELOG.md"
 distfiles="https://github.com/saulpw/visidata/archive/v${version}.tar.gz"
-checksum=a48da174b50fe671cba8f72e020f3f33227c93da275981b2ac253a0233af5cff
+checksum=860f9a415e2cfb32e7be9d6c080abba326e573522593e4fa766b7f6b32443ba9

From 186d999ec80c93e9983de2cb4807e1f6469549e6 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Thu, 25 Nov 2021 20:37:22 +0700
Subject: [PATCH 3237/4088] pcmanfm: add lxmenu-data as dependency

---
 srcpkgs/pcmanfm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcmanfm/template b/srcpkgs/pcmanfm/template
index 300e881d7c1e..61e612b90991 100644
--- a/srcpkgs/pcmanfm/template
+++ b/srcpkgs/pcmanfm/template
@@ -1,12 +1,12 @@
 # Template file for 'pcmanfm'
 pkgname=pcmanfm
 version=1.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-gtk=3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel libfm-gtk+3-devel"
-depends="desktop-file-utils"
+depends="desktop-file-utils lxmenu-data"
 short_desc="LXDE file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7a6f51b301d5b63987d4f533f4ff6c9433b94aef Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Wed, 24 Nov 2021 16:50:07 -0700
Subject: [PATCH 3238/4088] jamulus: update to 3.8.1

---
 srcpkgs/jamulus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template
index 0ab292a4873f..9147a20a5075 100644
--- a/srcpkgs/jamulus/template
+++ b/srcpkgs/jamulus/template
@@ -1,6 +1,6 @@
 # Template file for 'jamulus'
 pkgname=jamulus
-version=3.8.0
+version=3.8.1
 revision=1
 _version=r${version//./_}
 wrksrc=${pkgname}-${_version}
@@ -13,4 +13,4 @@ maintainer="KawaiiAmber <japaneselearning101@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://jamulus.io"
 distfiles="https://github.com/corrados/jamulus/archive/${_version}.tar.gz"
-checksum=eb3df34ab9e7c8443775bdff9867bd8e8415061eef1baeb2c55b777aedb2c1cd
+checksum=bc20c6aa8d0d3dd6c98a54cc1759d611fe564a8c73f7da9b09b48d2a3dee1d25

From 5334460d38d9d1c5f0e91ceb5b63136a86d42a1e Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 23 Nov 2021 00:06:10 +0100
Subject: [PATCH 3239/4088] chezmoi: update to 2.8.0

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index b3305a56ea10..1aaf32f386e8 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.7.5
+version=2.8.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=ed9de88a851cbbb2acce77e13615fe45a19350112f58d9acc268b2ff4961d8ab
+checksum=3c7408625639c215926e1401b9acc037a0c2216984a7d063cf647d9ec0798937
 
 export CGO_ENABLED=1
 

From 41d52a6186f83bffa7a0e9eeb692a3fae2e0b61c Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 22 Nov 2021 14:15:46 +0100
Subject: [PATCH 3240/4088] quadrapassel: update to 40.2

---
 srcpkgs/quadrapassel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/quadrapassel/template b/srcpkgs/quadrapassel/template
index 02e8a514a1bd..8f3d5656dfd1 100644
--- a/srcpkgs/quadrapassel/template
+++ b/srcpkgs/quadrapassel/template
@@ -1,6 +1,6 @@
 # Template file for 'quadrapassel'
 pkgname=quadrapassel
-version=3.38.1
+version=40.2
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Quadrapassel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19fe9fc17bbc9895a6ecadf5770a67fb806b3ea2d5962cb1997a60c396a2770c
+checksum=0bd822414207c73123ed6a49f723da5ac8dd4df5d35edc099ffea2e1399cc00a

From e7123059d44d48c970d16b952d04eb5b6dae834e Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 21 Nov 2021 13:06:14 +0100
Subject: [PATCH 3241/4088] libpurple-facebook: update to 0.9.6.

---
 srcpkgs/libpurple-facebook/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libpurple-facebook/template b/srcpkgs/libpurple-facebook/template
index 53e705e40861..14730392162e 100644
--- a/srcpkgs/libpurple-facebook/template
+++ b/srcpkgs/libpurple-facebook/template
@@ -1,10 +1,9 @@
 # Template file for 'libpurple-facebook'
 pkgname=libpurple-facebook
 reverts="20160409.66ee77378d82_1 20160125.92885e0456ed_1"
-version=0.9.5.9ff9acf9fa14
+version=0.9.6
 revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="purple-facebook-${_distver}"
+wrksrc="purple-facebook-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libpurple-devel json-glib-devel"
@@ -12,5 +11,5 @@ short_desc="Facebook plugin for libpurple"
 maintainer="John Regan <john@jrjrtech.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dequis/purple-facebook"
-distfiles="https://github.com/dequis/purple-facebook/releases/download/v${_distver}/purple-facebook-${_distver}.tar.gz"
-checksum=7ab652dd0430166465f820e6e72bf6fffe09db936b535c212e571ec1742146dc
+distfiles="https://github.com/dequis/purple-facebook/releases/download/v${version}/purple-facebook-${version}.tar.gz"
+checksum=1db6ed9e8f81cbd4ae10d75c04f5393e5cd4ca11ced74408ca6d07c7b888f3f7

From 7a8cfe3bee7f34f5a3cdca8cce6bba4f7949cf05 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:26 +0100
Subject: [PATCH 3242/4088] gamehub: update to 0.16.1-2.

---
 srcpkgs/gamehub/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index ccbf98b53483..e8f110b3eb8d 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -1,8 +1,8 @@
 # Template file for 'gamehub'
 pkgname=gamehub
-version=0.16.0
+version=0.16.1
 revision=1
-wrksrc="GameHub-${version}-1-master"
+wrksrc="GameHub-${version}-2-master"
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
@@ -12,8 +12,8 @@ short_desc="All your games in one place"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tkashkin.tk/projects/gamehub/"
-distfiles="https://github.com/tkashkin/GameHub/archive/${version}-1-master.tar.gz"
-checksum=4244c914d7427933727ec0611886720b9325c4d4a852e0e8c283f6331ebd30e2
+distfiles="https://github.com/tkashkin/GameHub/archive/refs/tags/${version}-2-master.tar.gz"
+checksum=bbbf2f5216ce6f0d6a57179f388a714aec52188f4e67a9deb6478061441a30b5
 
 post_install() {
 	vinstall data/com.github.tkashkin.gamehub.desktop.in 644 usr/share/applications com.github.tkashkin.gamehub.desktop

From 1979cde65c5366fc367afa94be56a944e57de008 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:24:04 +0100
Subject: [PATCH 3243/4088] PackageKit: update to 1.2.4.

---
 srcpkgs/PackageKit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 155dd156a06a..062dba3d3b00 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
-version=1.2.2
-revision=2
+version=1.2.4
+revision=1
 wrksrc="PackageKit-PACKAGEKIT_${version//./_}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
-checksum=e87e95ce7423f49eff6dad054c86ba6f922e52d0a757f822e0343da0f44d3dbb
+checksum=4a7b0a41ffa56ad8af67156c46ecb9d4eb439b31a4cb581d959bd5480444954b
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 
 build_options="gir vala"

From 228361effabf386f38bc3cbaa9bed80464b1c581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 Nov 2021 22:39:54 -0300
Subject: [PATCH 3244/4088] linbox: fix broken linbox.pc

---
 .../remove-linboxsage-libs-from-pc.patch      | 23 +++++++++++++++++++
 srcpkgs/linbox/template                       |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch

diff --git a/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch b/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch
new file mode 100644
index 000000000000..c93915fb1b06
--- /dev/null
+++ b/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch
@@ -0,0 +1,23 @@
+Backported from:
+
+From 426eb97ba762c7663884f57ead0909f2aa3cd6a5 Mon Sep 17 00:00:00 2001
+From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
+Date: Thu, 17 Jan 2019 16:32:19 +0100
+Subject: [PATCH] Remove @LINBOXSAGE_LIBS@ from linbox.pc.in
+
+---
+ linbox.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linbox.pc.in b/linbox.pc.in
+index 278f127e4..c6b8091eb 100644
+--- a/linbox.pc.in
++++ b/linbox.pc.in
+@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library
+ URL: http://github.com/linbox-team/linbox
+ Version: @VERSION@
+ Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0
+-Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
++Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
+ Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@  @IML_CFLAGS@ @FLINT_CFLAGS@ 
+ \-------------------------------------------------------
diff --git a/srcpkgs/linbox/template b/srcpkgs/linbox/template
index 3ea51f5dcce1..096a15b3390b 100644
--- a/srcpkgs/linbox/template
+++ b/srcpkgs/linbox/template
@@ -1,7 +1,7 @@
 # Template file for 'linbox'
 pkgname=linbox
 version=1.6.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fflas-ffpack"

From 0032b4c1a297b5c7c293fdcaa0675bbe5616f420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 25 Nov 2021 22:59:15 -0300
Subject: [PATCH 3245/4088] linux5.14: update to 5.14.21.

---
 srcpkgs/linux5.14/files/i386-dotconfig    | 5 +++--
 srcpkgs/linux5.14/files/ppc64-dotconfig   | 7 ++++---
 srcpkgs/linux5.14/files/ppc64le-dotconfig | 7 ++++---
 srcpkgs/linux5.14/template                | 4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/linux5.14/files/i386-dotconfig b/srcpkgs/linux5.14/files/i386-dotconfig
index 3721da32f6ef..6449fb55d808 100644
--- a/srcpkgs/linux5.14/files/i386-dotconfig
+++ b/srcpkgs/linux5.14/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.14.10 Kernel Configuration
+# Linux/i386 5.14.21 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1564,6 +1564,7 @@ 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
@@ -6994,7 +6995,7 @@ CONFIG_SURFACE_HID_CORE=m
 
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
diff --git a/srcpkgs/linux5.14/files/ppc64-dotconfig b/srcpkgs/linux5.14/files/ppc64-dotconfig
index ca92335e81fa..49eaafbfb9d4 100644
--- a/srcpkgs/linux5.14/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.14/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.14.7 Kernel Configuration
+# Linux/powerpc 5.14.21 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1474,6 +1474,7 @@ 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
@@ -6407,7 +6408,7 @@ CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
 # CONFIG_FB_MB862XX_LIME is not set
 CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_SIMPLE=y
+CONFIG_FB_SIMPLE=m
 CONFIG_FB_SSD1307=m
 CONFIG_FB_SM712=m
 # end of Frame buffer Devices
@@ -7078,7 +7079,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
diff --git a/srcpkgs/linux5.14/files/ppc64le-dotconfig b/srcpkgs/linux5.14/files/ppc64le-dotconfig
index 0c74bf13ce14..a3800cba94ed 100644
--- a/srcpkgs/linux5.14/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.14/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.14.7 Kernel Configuration
+# Linux/powerpc 5.14.21 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1400,6 +1400,7 @@ 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
@@ -6170,7 +6171,7 @@ CONFIG_FB_IBM_GXT4500=m
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
-CONFIG_FB_SIMPLE=y
+CONFIG_FB_SIMPLE=m
 CONFIG_FB_SSD1307=m
 CONFIG_FB_SM712=m
 # end of Frame buffer Devices
@@ -6824,7 +6825,7 @@ CONFIG_I2C_HID_CORE=m
 
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
diff --git a/srcpkgs/linux5.14/template b/srcpkgs/linux5.14/template
index f508174e5c82..f6659603431f 100644
--- a/srcpkgs/linux5.14/template
+++ b/srcpkgs/linux5.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.14'
 pkgname=linux5.14
-version=5.14.16
+version=5.14.21
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2
- e96f1d8ea64bf66cd2e01e54e0929117feafe443161bc665af1ef48474cb45e2"
+ 578be613998d8aa7e5460d6d5448799e422198d31e157c67eec2e5e58abb9c60"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b5920b2cb7e8ed18f0682e030e61accdf6a98af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 11:43:03 +0700
Subject: [PATCH 3246/4088] PackageKit: needs docbook-xsl in hostmakedepends

---
 srcpkgs/PackageKit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 062dba3d3b00..944bcc83f6c0 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dgstreamer_plugin=false -Dgtk_module=false
  -Dsystemd=false -Dgobject_introspection=$(vopt_if gir true false)
  -Doffline_update=false -Dbash_command_not_found=false"
-hostmakedepends="glib-devel gettext-devel polkit-devel
+hostmakedepends="glib-devel gettext-devel polkit-devel docbook-xsl
  $(vopt_if vala 'vala-devel') libxslt-devel pkg-config which"
 makedepends="bash-completion gettext-devel glib-devel polkit-devel
  sqlite-devel $(vopt_if vala 'vala-devel') libxslt-devel"

From 1bbced5346b024eeecb1083af961541ee4e1f144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 26 Nov 2021 01:31:12 -0300
Subject: [PATCH 3247/4088] speed-dreams: touch so builders pick it up.

Currently missing from x86_64-musl repos.
---
 srcpkgs/speed-dreams/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index ba808ced2721..2e862d8cae9d 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -2,8 +2,8 @@
 pkgname=speed-dreams
 version=2.2.3
 revision=1
-archs="i686* x86_64* ppc64le*"
 _rev=r7616
+archs="i686* x86_64* ppc64le*"
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DSD_BINDIR=/usr/bin -DSD_DATADIR=/usr/share/speed-dreams-2

From afbc447d4713cb5bafc0b1815fe72dfacbc50fd3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Nov 2021 15:26:38 +0100
Subject: [PATCH 3248/4088] xlbiff: update to 4.5.5.

---
 srcpkgs/xlbiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index 589152a14287..34cff616327a 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
 # Template file for 'xlbiff'
 pkgname=xlbiff
-version=4.5.4
+version=4.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.edsantiago.com/xlbiff/"
 distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=724893d64f8ba7b909dddc748195836bc548d009526f9e5f738e71ead15a2b1f
+checksum=c773486518c7927ec01fc4eb3105087faae65c1e05447fedcc245b47d5ddfa46
 
 pre_configure() {
 	autoreconf -fi

From 3b4befce8d89866380bbb4a5d32d7fa0009e3ff2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Nov 2021 15:27:38 +0100
Subject: [PATCH 3249/4088] ocaml-findlib: rebuild for changed ocaml stdlib
 path.

---
 srcpkgs/ocaml-findlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index ee4c78918e78..73cca5a2cafa 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
 version=1.9.1
-revision=2
+revision=3
 wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"

From a2a92d20e5d1eec2fa78aa701cc0c9c7caadbe04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Nov 2021 15:32:16 +0100
Subject: [PATCH 3250/4088] coq: update to 8.14.1.

---
 srcpkgs/coq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 88bbe0631db0..7b82c2bef784 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,6 +1,6 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.14.0
+version=8.14.1
 revision=1
 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only"
 homepage="https://coq.inria.fr"
 distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=b1501d686c21836302191ae30f610cca57fb309214c126518ca009363ad2cd3c
+checksum=3cbfc1e1a72b16d4744f5b64ede59586071e31d9c11c811a0372060727bfd9c3
 nopie=yes
 nocross=yes
 

From ff02d7416e8e82d27b5a018724cee511e4f32dee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Nov 2021 15:39:17 +0100
Subject: [PATCH 3251/4088] babashka: update to 0.6.5.

---
 srcpkgs/babashka/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index f9a5e52f03f3..588d3139d6d1 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.6.4
+version=0.6.5
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=75b9ba73f7c9afca4c8d00023ba71456fac0f4af
+_sci_commit=7896fe1bab824e8e07b198c6eaed1ec465ae3baa
 _babashka_curl_commit=2187f908c033da45978512979c53bb53321120ce
 _babashka_nrepl_commit=eadb3330f0a65e781755d8b328727698f1d41fb0
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
 _process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=f360afa6135b8bd2d384d9ba4582c0de6fdac804
-_deps_clj_commit=e3e80c5676e8f4c6e3f674f879afc061f222c0a3
-_fs_commit=d3dfbd6832ba819340f4d494cca3d55b38870cdf
+_deps_clj_commit=422b080c64dedad37979a748377394b2d4de7e7c
+_fs_commit=21eb0654efad0ffbeedfe8319dd1194319b30d29
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="329d263fa6ac1d8712742aff95c92ece477130c7ab7055124a338e9ae1ebb779
- 8f07f49c4a6ffb67b5679eafbe5662937dd109ce0559c481c006123a8fef9c44
+checksum="9053ba3582dbc94e4221eefe4e7f507d0c9e4d90aa5f941fb504f658ed3ceea2
+ 9ec8e74253e1a3a5ac1fbb1b1ed2c549a4bb194ffde55829683c11d6a1c67904
  d4efe2c84512c3914d80087a43f9dc8377b4318ab63579959c4488038d6b766b
  916d9cc8c0a3b895a72068b95c6ac985a65d30465a9d556af8acea20aaaacc42
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
  dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  4070395956fc3cb0c22bac6fb4de1ad27130d24916e1915d8a3fe9eb591f6143
- cb0f8b0a35df214949a9d6a8cee5bfd35c9dfd6d5f7a0c22fd6bd27a54dbdb3b
- 3d03aefe44839aa61c9a3db28751d9d9bdf941843d7441a6ff5601c17c4aaec8"
+ dba354c4637595ed6a24e76914497dcb6f0059b531d8cd3c8c8c23385fff605a
+ 2ebe97b7fe0ad349a6a1ff567df2c372571b9a672d81f5f5f83bbf45af708d71"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From cb9017c540ff3f70855b5c0a8df1ef00de24b359 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Nov 2021 07:06:38 -0500
Subject: [PATCH 3252/4088] python3-scipy: update to 1.7.3.

---
 srcpkgs/python3-scipy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 1e39f97d895a..dafa8c7017c9 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.2
+version=1.7.3
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=ee5d018ecad0364289efe3301f6445d7ef548637e0e14d0205bbf363f0dfe66a
+checksum=4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694
 
 build_options="openblas"
 

From f0a4d4e7dd5aa05f88584e2442e1f81543aaea0c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Nov 2021 07:16:14 -0500
Subject: [PATCH 3253/4088] openmpi: update to 4.1.2.

---
 srcpkgs/openmpi/patches/drop-orted-mpir.patch | 19 -------------------
 srcpkgs/openmpi/template                      |  4 ++--
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/openmpi/patches/drop-orted-mpir.patch

diff --git a/srcpkgs/openmpi/patches/drop-orted-mpir.patch b/srcpkgs/openmpi/patches/drop-orted-mpir.patch
deleted file mode 100644
index 75ab3d26323f..000000000000
--- a/srcpkgs/openmpi/patches/drop-orted-mpir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-orted-mpir is a helper that avoids CFLAGS which can optimize out certain MPIR
-debugging functionality. It is unversioned, leaks dependencies into other MPI
-modules and libraries, and upstream agrees it shouldn't be installed.
-
-https://github.com/open-mpi/ompi/pull/8892
-
-diff --git orte/orted/orted-mpir/Makefile.am orte/orted/orted-mpir/Makefile.am
-index 5c0dd33564..8a03fcd387 100644
---- a/orte/orted/orted-mpir/Makefile.am
-+++ b/orte/orted/orted-mpir/Makefile.am
-@@ -15,7 +15,7 @@
- 
- CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)
- 
--lib_LTLIBRARIES = lib@ORTE_LIB_PREFIX@open-orted-mpir.la
-+noinst_LTLIBRARIES = lib@ORTE_LIB_PREFIX@open-orted-mpir.la
- lib@ORTE_LIB_PREFIX@open_orted_mpir_la_SOURCES = \
-         orted_mpir_breakpoint.c \
-         orted_mpir.h
diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index ce8585fa6835..1ed46e523216 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,6 +1,6 @@
 # Template file for 'openmpi'
 pkgname=openmpi
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.open-mpi.org/"
 distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda
+checksum=9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527
 nocross="configure attempts to run target binaries"
 lib32disabled=yes
 

From 4144dda3e7cb67d783609f2e28ddfb5de94ab761 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Nov 2021 07:17:22 -0500
Subject: [PATCH 3254/4088] python3-mpi4py: update to 3.1.3.

---
 srcpkgs/python3-mpi4py/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mpi4py/template b/srcpkgs/python3-mpi4py/template
index df390242b39d..216ea7b58f00 100644
--- a/srcpkgs/python3-mpi4py/template
+++ b/srcpkgs/python3-mpi4py/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mpi4py'
 pkgname=python3-mpi4py
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="mpi4py-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/mpi4py/mpi4py"
 changelog="https://raw.githubusercontent.com/mpi4py/mpi4py/master/CHANGES.rst"
 distfiles="$PYPI_SITE/m/mpi4py/mpi4py-${version}.tar.gz"
-checksum=40dd546bece8f63e1131c3ceaa7c18f8e8e93191a762cd446a8cfcf7f9cce770
+checksum=f1e9fae1079f43eafdd9f817cdb3fd30d709edc093b5d5dada57a461b2db3008
 # Tests require a sensible MPI environment
 make_check=no
 

From 38506c26f6d54ad70daee9d888eeed44752c1c37 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Nov 2021 07:18:34 -0500
Subject: [PATCH 3255/4088] python3-imageio: update to 2.12.0.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 441b8f567e4f..21b0e0981e11 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.11.1
+version=2.12.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5ab8ec9aad5c3e2338ea459ae92a4a1b53749cb7d5ffb00aefd2451a863dda7b
+checksum=e7d1e7b135415db608f32c2feebd139afb9b8379dd4e49c661578f999dfc2cea
 
 post_install() {
 	vlicense LICENSE

From 2c398b9316de7b24636731b17189f898da8fbcce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Nov 2021 07:18:50 -0500
Subject: [PATCH 3256/4088] python3-iso8601: update to 1.0.2.

---
 srcpkgs/python3-iso8601/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-iso8601/template b/srcpkgs/python3-iso8601/template
index 45ff2c67dee7..22d4ade77de8 100644
--- a/srcpkgs/python3-iso8601/template
+++ b/srcpkgs/python3-iso8601/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-iso8601'
 pkgname=python3-iso8601
-version=1.0.1
+version=1.0.2
 revision=1
 wrksrc="iso8601-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/micktwomey/pyiso8601"
 distfiles="${PYPI_SITE}/i/iso8601/iso8601-${version}.tar.gz"
-checksum=02b1c8683bd9c3a3ea381de89c3788cf0e6562dd1eb1e160e8f68141ac08ba90
+checksum=27f503220e6845d9db954fb212b95b0362d8b7e6c1b2326a87061c3de93594b1
 replaces="python3-iso-8601>=0"
 
 post_install() {

From b29afe0517fa6fa96205a55f2f8899c582c32f3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Nov 2021 07:19:11 -0500
Subject: [PATCH 3257/4088] python3-more-itertools: update to 8.12.0.

---
 srcpkgs/python3-more-itertools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index a2a10f5cbb63..59676a780535 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
-version=8.11.0
+version=8.12.0
 revision=1
 wrksrc="more-itertools-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/erikrose/more-itertools"
 distfiles="${PYPI_SITE}/m/more-itertools/more-itertools-${version}.tar.gz"
-checksum=0a2fd25d343c08d7e7212071820e7e7ea2f41d8fb45d6bc8a00cd6ce3b7aab88
+checksum=7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064
 
 post_install() {
 	vlicense LICENSE

From 5edbd43785ba95c17b697b96d3cc284e2aa45946 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Nov 2021 07:19:33 -0500
Subject: [PATCH 3258/4088] vkQuake: update to 1.12.1.

---
 srcpkgs/vkQuake/patches/fix-fmt-len.patch | 25 +++++++++++++++++++++++
 srcpkgs/vkQuake/template                  |  4 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vkQuake/patches/fix-fmt-len.patch

diff --git a/srcpkgs/vkQuake/patches/fix-fmt-len.patch b/srcpkgs/vkQuake/patches/fix-fmt-len.patch
new file mode 100644
index 000000000000..39323473b97a
--- /dev/null
+++ b/srcpkgs/vkQuake/patches/fix-fmt-len.patch
@@ -0,0 +1,25 @@
+From 6c16e1ee44f0ce02fdac3a83df744a79305af13e Mon Sep 17 00:00:00 2001
+From: "Andrew J. Hesford" <ajh@sideband.org>
+Date: Fri, 26 Nov 2021 07:57:31 -0500
+Subject: [PATCH] Fix format overflow warning with 32-bit gcc
+
+---
+ Quake/gl_model.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Quake/gl_model.c b/Quake/gl_model.c
+index 75d2ae6..062ce2a 100644
+--- a/Quake/gl_model.c
++++ b/Quake/gl_model.c
+@@ -2465,7 +2465,7 @@ visdone:
+ 
+ 		if (i < mod->numsubmodels-1)
+ 		{	// duplicate the basic information
+-			char	name[10];
++			char	name[12];
+ 
+ 			sprintf (name, "*%i", i+1);
+ 			loadmodel = Mod_FindName (name);
+-- 
+2.34.1
+
diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index bc9aacd697d1..ea43fb75603d 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
 # Template file for 'vkQuake'
 pkgname=vkQuake
-version=1.11.1
+version=1.12.1
 revision=1
 build_wrksrc="Quake"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Novum/vkQuake"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c0dafb1b0b9392a1fdda60531e60d2e719cad772e56ee913ac5c72e0146cbee7
+checksum=8adbc27dd46962cd69165e84559b7bda8515ade381f22ba775c333440f2a2f32
 
 do_install() {
 	vbin vkquake

From 304f07ed8fe47b5531fa9c8d2abe6260d56ce68f Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Tue, 19 Oct 2021 17:42:24 +0200
Subject: [PATCH 3259/4088] intellij-idea-community-edition: update to 2021.2.3

---
 srcpkgs/intellij-idea-community-edition/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 460f8429da73..e597b68bb6d4 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2021.1
+version=2021.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=becd31e78d430db7a3edf381343f6722926e6e16b35d39371b74786decc40617
+checksum=b9f111cef1eab6ca5b6801abb06fffbc964d39887a9381131ef096f933d28f44
 repository=nonfree
 nopie=yes
 python_version=3
@@ -38,22 +38,22 @@ do_install() {
 	case $XBPS_TARGET_MACHINE in
 		x86_64)
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier
-		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea.vmoptions
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/aarch64 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/mips64el -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf
+		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/arm -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/webp/lib/libwebp/linux/libwebp_jni.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux32 -rf
 		;;
 		i686)
-		rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier64
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea64.vmoptions
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/libdbm64.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86_64 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/aarch64 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/mips64el -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf
+		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/arm -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/webp/lib/libwebp/linux/libwebp_jni64.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux64 -rf
 		;;

From 94b991ef56fb7441c76d6ba4d70407bdffe7e3fd Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Fri, 26 Nov 2021 10:05:30 +0100
Subject: [PATCH 3260/4088] zoom: update to 5.8.4.210

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 166bc27e9a46..c6d57a36e361 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.8.3.145
+version=5.8.4.210
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=4bc1a6fb54d375fc0fdc02ea599b89f9efb655c082724c369c3e45f6d9a9c191
+checksum=b3fc9eef929d418873bdf3cc6df38297b86deaf330259e633d17459ec8718034
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 38867e7be76b4ef9ac6acf02f1566f70df2a0b4c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 26 Nov 2021 20:28:51 +0100
Subject: [PATCH 3261/4088] bdf2sfd: update to 1.1.7.

---
 srcpkgs/bdf2sfd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bdf2sfd/template b/srcpkgs/bdf2sfd/template
index fdccefbc7534..38b26c5184d8 100644
--- a/srcpkgs/bdf2sfd/template
+++ b/srcpkgs/bdf2sfd/template
@@ -1,7 +1,7 @@
 # Template file for 'bdf2sfd'
 pkgname=bdf2sfd
-version=1.1.6
-revision=2
+version=1.1.7
+revision=1
 build_style=cmake
 short_desc="BDF to SFD converter to vectorize bitmap fonts"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -9,7 +9,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/fcambus/bdf2sfd"
 changelog="https://github.com/fcambus/bdf2sfd/raw/master/ChangeLog"
 distfiles="https://github.com/fcambus/bdf2sfd/archive/${version}.tar.gz"
-checksum=c9e8d675e5c5f4b40dfa4645db5d1133bcb526a3b7faf75bdfe613cf22003699
+checksum=37aca3d5117151de3b265761d18930364918bd69750d98e2e9713b4344e1d860
 
 post_install() {
 	vlicense LICENSE

From 3ff3457e00a8347baaabdee1f7075e41c757fc41 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 26 Nov 2021 20:59:54 +0100
Subject: [PATCH 3262/4088] cppcheck: update to 2.6.2.

---
 srcpkgs/cppcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 0f0501f09db6..739fd847b353 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.6.1
+version=2.6.2
 revision=1
 build_style=gnu-makefile
 make_build_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 changelog="https://sourceforge.net/p/cppcheck/news/"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=41700db44b349428d5602356b32183b7776380e7a5b0b82a2f2764fadadb015e
+checksum=a11602c15bf951ba5bb67655ca6c06986ec64770d8004759a8c53db013286a5e
 
 post_install() {
 	vman cppcheck.1

From 0f8f4b2a224bd5334ec583a4d799e40995c3f9ee Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 26 Nov 2021 21:03:49 +0100
Subject: [PATCH 3263/4088] libuev: update to 2.4.0.

---
 common/shlibs           | 2 +-
 srcpkgs/libuev/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3199833de6cd..dac22845d445 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2715,7 +2715,7 @@ libR.so R-4.0.2_1
 libmarkdown.so.2 discount-2.2.0_3
 libkeystone.so.0 keystone-0.9_1
 libmate-slab.so.0 libmate-control-center-1.14.0_2
-libuev.so.2 libuev-2.0.0_1
+libuev.so.3 libuev-2.4.0_1
 liburcu-bp.so.6 liburcu-0.10.0_1
 liburcu-cds.so.6 liburcu-0.10.0_1
 liburcu-common.so.6 liburcu-0.10.0_1
diff --git a/srcpkgs/libuev/template b/srcpkgs/libuev/template
index f573d05b4df8..0bfa8edfb579 100644
--- a/srcpkgs/libuev/template
+++ b/srcpkgs/libuev/template
@@ -1,6 +1,6 @@
 # Template file for 'libuev'
 pkgname=libuev
-version=2.3.2
+version=2.4.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/troglobit/libuev"
 changelog="https://github.com/troglobit/libuev/raw/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/libuev/archive/v${version}.tar.gz"
-checksum=df61afd529af6f223c4dbfd8bb22e4a45b98b91d090e0bb409957ea7c6147899
+checksum=671ce75d06b2620535171bfe1751db0511a19dfcc791d4f0f0c3cb53bf237b3a
 
 pre_configure() {
 	./autogen.sh

From 5ff4d4527b37b3767b3f91c89177d46d5d0952c5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 26 Nov 2021 16:08:55 +0200
Subject: [PATCH 3264/4088] ristretto: update to 0.12.1.

Also:
- fix changelog.
---
 srcpkgs/ristretto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template
index e163a7ff724c..52dd310881d8 100644
--- a/srcpkgs/ristretto/template
+++ b/srcpkgs/ristretto/template
@@ -1,6 +1,6 @@
 # Template file for 'ristretto'
 pkgname=ristretto
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,6 +11,6 @@ short_desc="Picture-viewer for the Xfce desktop environment"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/ristretto/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
+changelog="https://gitlab.xfce.org/apps/ristretto/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=47032da8216a83c1cb349bece7521494e7509469a82236cfeadc0a8469451001
+checksum=13853f9ca18466a8e4788e92c7bde3388a93e8340283568f5dee1a9396ffd7ee

From 6429ce32337db1cebc191a2f1ecce8726105a919 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 26 Nov 2021 16:03:54 +0200
Subject: [PATCH 3265/4088] mousepad: update to 0.5.8.

---
 srcpkgs/mousepad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 5e612c5b101d..1a85167aeb8e 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,6 +1,6 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.7
+version=0.5.8
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=105315743042e09e794037ab0594a1c47cbbf0b6b834dffed157192f4f03bde8
+checksum=921ebbcfdfd5e2e56f31a5177a2d26f46c758cc972595017bca9e0a6a3c3a721

From f501510581ab4f96e61d42c3df5a323268e9e519 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 26 Nov 2021 14:54:00 +0200
Subject: [PATCH 3266/4088] cozy: update to 1.1.2.

Also:
- add Apache-2.0 as license (bundled lib).
---
 srcpkgs/cozy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 011d28c09913..a2ad1e79ea73 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,7 +1,7 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
-revision=2
+version=1.1.2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
  python3-mutagen python3-gobject-devel gettext desktop-file-utils
@@ -12,7 +12,7 @@ depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-only, LGPL-3.0-only"
+license="GPL-3.0-only, LGPL-3.0-only, Apache-2.0"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=04120ad17216511b1eb1bdb3cdfb0b61ad15b324d478afac46461628ba34570e

From 2af9b3e1a091200d0c4b60e2f7717488d2d09169 Mon Sep 17 00:00:00 2001
From: 674Y3r <87250374+674Y3r@users.noreply.github.com>
Date: Thu, 2 Sep 2021 21:57:41 +0200
Subject: [PATCH 3267/4088] konquest: update to 21.08.3.

---
 srcpkgs/konquest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konquest/template b/srcpkgs/konquest/template
index 0b4048452986..3416520d56c5 100644
--- a/srcpkgs/konquest/template
+++ b/srcpkgs/konquest/template
@@ -1,6 +1,6 @@
 # Template file for 'konquest'
 pkgname=konquest
-version=21.08.0
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kdoctools
@@ -12,4 +12,4 @@ maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.konquest"
 distfiles="${KDE_SITE}/release-service/${version}/src/konquest-${version}.tar.xz"
-checksum=70698768df845678205f9b0f28da1b43046fd85f0b5ca36493066302f2452250
+checksum=3b4ab2ba43c2131cdead87b1de68a1c690935ed06e59f911f5bc587fc8ff5b6f

From cc7415bf2acb64dd6f53ce1aeac18622278fc3bd Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 26 Nov 2021 12:27:23 +0000
Subject: [PATCH 3268/4088] nnn: update to 4.4.

---
 srcpkgs/nnn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index 53e0269a5335..ac5827f0e9af 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.3
+version=4.4
 revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=b6df8e262e5613dd192bac610a6da711306627d56573f1a770a173ef078953bb
+checksum=e04a3f0f0c2af1e18cb6f005d18267c7703644274d21bb93f03b30e4fd3d1653
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"

From 472c4413eeccf041d603f7da5eccdc6b81369210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 26 Nov 2021 01:58:27 -0300
Subject: [PATCH 3269/4088] thunderbird: update to 91.3.2.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 1757e6c9dfa1..6d9904fb07c8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=91.3.0
+version=91.3.2
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=d3abcf55637fb21bd9d68a19c01780edd82e6e72b5e850b31de186dddc2708ad
+checksum=37bedce79458531ce55806b194669f6e270e4bc3b0fa0949577af1822e57b11d
 
 lib32disabled=yes
 

From 927c138475c83fa23c5f94845ba0d3c74c093dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 26 Nov 2021 01:58:32 -0300
Subject: [PATCH 3270/4088] thunderbird-i18n: update to 91.3.2.

---
 srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index cccf51a2fed7..96f34ec0d055 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=91.3.0
+version=91.3.2
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -95,57 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="54aaacc9db66162d2ffea6c36642e92b545193c6a24e9ba6a13bbad0cfb692ef
- 042db64a29dbb9c0826f8b86df3389e3bc4ae98a64f4edf1ecada75c464457b5
- 5f8b86b763a3f3dfcfa0f3a803511f70d37a6ab9d028f4c636a21fcc2e8d97c1
- 908d3a1a108e67b0833c8f815aa4e5610908d8145a181e942b4ff43b7ad6575e
- f3f7a7c364d63fe3f29f5c10b137865add53e65d6b34a391142a19bf1d138b39
- a0020bddefb84bbe5a68a86bcb8852e30739d3e5670c8e3ac25e8fa166b8c689
- 6f8d12d2deba1df2ecf1ded751570a24a63c21f9393e5a59b7889696ab5d4d93
- b7ebbb43d5721c6825b8859e7d8c7702bb06c3d4762c13d671143809b7ca8828
- bbf25e35f372e420401d1ccbb51c038b307d2b0e8a23f788127c2aa2287315be
- a66ca0af6e2ecac6032e4ccbdfcadd46aaec251805dda0567329df6674103e94
- eda372a287843a450a3f40e1fc243b7f8662433b51185af63dcb0b666b08f370
- 330bdd81270688e3265ca489c32f2f3427b39f432ffef24fc680f68360731a86
- 75584278dd682485818f2f91f260754187f5c930da94b77032695077049c90af
- 9d403380614ce709deb3c613b7da06b02c00d3ce9aa0ed33a1468aac6d882040
- dd09cc0927a29aca676b954a342ea2a11692d27b1d3cb11decfb581c0d99abd7
- 3a63e31ce53d0922b5caa0018f2cb91f75611488b5fab0d59918fc47319e314d
- 0b97007f0b8b16fbb19b43b1a0dd28fed53041c91324e6f68bca55b55bc941ee
- 30ca307bb447165710c8911539d89965875204abedbf57f8fbf77616bbba7379
- d574c0a6439efac6e4cc462ef40fbddadf31f0cd735cdacb66899568275b0a1c
- 172f238430867aafc66863e6e229e5c2416993fe0bd97b6fc285a1498a66078a
- fa514d1d0cde0af3c3137e690525397b324760cd5dd4e3919721376011bb904a
- 2148938002a1bb0e018dd0a5f4725a3f57ce5ebc9053d959c00c93766c58c6d4
- fe3fb83cb738f6b7a3de033b6df5d6f5fdb87eb18370f36b5cb94c49894c2671
- ca4ab1806947dca8aa67dc9780d8253117ae44764f4342eccb06d81b9624e58c
- fb56fa4da47d487238227f38cff8ae80bde6ce205f0decd7001955530dd5c10b
- 3be8f8f1c486125f6da08158c6219b632e1c380bfcc9b255a2b7abc459873c55
- 2a3222f60e3943086066d9803d675c01b3c5e8fe411ea28a4d043ba5c28ce37c
- 953d61e06f875c5023ca8016e8fa75f385e0e5d88ef0befad0aae7ea94f89d00
- f87e38d51c06c9da9ee8fd55b67714a6ed7996d77e04f473e9404dc958cc09c6
- d1b883ff2d35d4c02df4789b358c54c89ca5e29b4325be6a1c5abe172f99cb81
- 0e6655e16af2bad6c0498d2698fbb1a82086d4d0c9e35e847c57843cf06cae35
- f2f2a48a8099548d301b3b9a6cbfb64b01a9a0300f8ef60d17e963b1057918de
- 3a0854d79a8b6c1713557561e8061fab1689ac8a792efc9ba659d55ba448f712
- 2fa565d91c0793d30dd20ad6f44b3f55ef510f3a6bd30fc82d9a5caffe0a4a7b
- 66ec9dfe5e8ab82f726ba1c1702a5c41282ef6ebf8dec9cddbc8e429db7ec8da
- 7304c1451aa84c29ad1e9fd2896dcc3d0c71be1106cb5f4c59ed928c05f7298a
- 9cc9c81ed0ec25c1affeeb285599993285917b344c40a8859609dccfbdf1ec50
- e11e315748a8e3630b5e3ef33e4f4e41fd9e00ba488c612f1bccb25b889c5f7c
- fafab2f3592998ea53e090d67f5ed15f7be34355f08c20d3b87bb17fd7d5c7ea
- 0d642d944fbaedf8232dba8feec02560b2c543a0f2d48024a468f7fb1ec0cc96
- 571974d5909c18e36aba64ab18e10886e6087e526311d8d22e8ecd5fc9a23534
- b6f77f962743803c74f86c946bbc17e6353dae6ce849cd8597d71e11ea54b595
- 2dc9be4bc0d168d1d7bc241cfec205745358ecae0215bb273dffb9c14f84f344
- 03d723e839ab16179fcf255788a93e7820db3469dfa7f7fbdce1e2633397b086
- d90230840b596f0ef1aa3ea0ae9bf7a116ee8a30e537c55b27a88fa825bcaad3
- f140722daf5c1e14be850dc3540507f73ce36b814d4bb3dd30026c84aff41d07
- 2e5db76cd24c641b78b5ddf032533a39afb3f2c6dbca7413d715585f16e975b0
- 7cfb6f6e078226e4e8c8d4827544411228c98e08fd727fbec73e4e53b3bb7978
- 57f15ad36bed50d908e6aa9e5b21a1e1c67b5b0ac78c634481e2a54f47703158
- ebdc46df664d3d76c82e94951794f964fdc0e1248bd22c17524468118c97fcfc
- 20a92b971a86a3db414bae904dc54842fa94f4e926a168d800c760efcbb00683
- e81cebbee2858b7ffc92f9d74eaeed978c2fabafa827d5aa2870cc53ef795116
- 3a702e18735c278d4dee08869a2442884a809688c81487b97ea088a3fd922761
- 697ae2d5f007be138dc1e0e3132349f083de8d046de69dfa268ae542c498499c"
+checksum="f72b2cf826f0a967b31c47fdb4bcc2a5eea0d165874af84edd4d33486780cb7b
+ 19ce342190192162c909298b056a610ecda256bb1e832b42898c749e33c7d220
+ b8ac36cb77e87b7b6d52071e565f771a16fd65b34eb478daa1452fc92b32cb40
+ 67154b4bd5a88d1d8fc058d0c92a8f04e54ec87eb4af5bdaa2fe9f6e037eec51
+ e4048b367e8cf49de7c109a8ff82677301fa98cd17cab9c59177fe9b5b4d2d9e
+ 472ee617e3e1291e5fdf4653bfca0675ca86c40c44162b95f570e34a139149b3
+ e125faf19636d5af7c8479f698c4965925106fefd917e5cb5dafc8f3dc250982
+ 06fd3c895dd9ae9103d92642792dc528ef9b67b6fd0963fada447f22ecf4b936
+ c5cad7e51e8a63368201d2c5a80c670d25dd30d6cecd99a684d054154af2c865
+ 4f8679430f6c64bd5839d8d3385baf74b537a3ce8e614709f5b61f89655ed74b
+ 287b05e501c21adc88b2e46fd5739f69a129482ebf9f9b92646fbf588b5ada1b
+ e581f6bfa9c4b0c7b77a2c9d08398988917b64ea5bc5064a3a1dca207da7052a
+ 8b827a804c4b251c28b13ba9a2864084ef00163d3dcdf38e7c3364154220a22e
+ 7a74601f9d0f167b9f732ba8fc04f6eb4929c41bb5a3ad25d9430deb84a89cc9
+ f8320aa4ee834cc5361c0e3d3148159facecd160e78002c4eaf9ac3c4d134d7f
+ fb21923d5a6b1ac6bdf4792320ec3261e29129bef82605769982b4ad14d01949
+ d0eb71c6b33c7d37ea9a1e66ca20c3acbed33367594383d4d2a83b29d68b9f85
+ 480a7aed03ba0ceeb386ac2d574190f282cd940be08b51b4912841ae405a9f0f
+ b808fd195f81e69261160d2b724b6f69639a62fa3860fec578575c3452b4f4b3
+ 0d860b60ddc9647cc9f00a7f11d73f74a9feecc7e0184e6204181d2805db2ced
+ 585ccaf8dfbfa9048734e7694631048b0a43e8124089ef1cbc3f2b2919799327
+ 5386104da3018a084142a03ce4e9dbadf8f28e30e8e9c20fd8e97397ffededd0
+ 0bffc4394f857ac42bf821427e1d4ac32f4d329689b26868a08ed6915a42ae08
+ ea233c0ed77fd6600b6fe547d30755fa46fcbea66645eaaf06ff9863b83fc66b
+ 8480a4cd2f903e54d3501d5f7e7f8d240ef6b35abb98ea96456e7cc4f6afd6a1
+ 50cb72d28edcaaa312b26362e9b2d6d8733b88d3332b6412299b61ea7eeedc24
+ ee1d3beee11513db4ff505f7c00d2e61940272e7d2c5b287ad3ddb0f19dbd0d3
+ eb1f18de4c798f441ef8bec51adcf02c329a10be49cc1acc5e5c365638588130
+ 58305d62ac521030cc75f6222ed068760f607c3d842a6f3be9db697137e8a5f5
+ 0ed7c4e09c6c34efb57f2ce08617f96804bafa1e4b85f1b4117060e08e7cd7ee
+ 3e7dcd6244da31d248f2e1b54cd7832ba57edd03c585e0955a2e281585e9a841
+ a0fe4ad890c2bdacc00afeb3f631ccab633a1d36c8e9f1e39776bd9e7a4a90c4
+ 1b7c7226621ddcd167c142968d8fbef3028e66ab4aaf4467b4f689304a39e04c
+ 24128e98fd48b72efc8f5331b3c714599e969b897d119a652c373941f2eb4cee
+ 0fd6146ea2dc8642c37b4e82279ce0eb1b9122c118fdd96e42525bf779ae88bd
+ 6cf39864701147e3af958e50c702841c90af1cc0c64f29c32b718c5bddff254c
+ 63616c4796921761b649aaceeecbf05aeaf41f69b74cb1337cfd9ecebfcc7eca
+ 712c7fc70a77cc89919a98086453f0c830847a6f2f82ca3ab2f98f4587be37c8
+ f6712c2d8a22b4fa24e713f3c974663675a2dfb296a0c9b087f7d9717e6c7cef
+ adaa4557ebf12eac88c9b9015f1dfb3f5205b6498d3161f4b840e9935af15a5c
+ 3c25c1357821ab4187485873e6546b150890149df335bdb4a3861651e8a0edd8
+ 0edc7c5af9648dc2d89b6e452285ca15f6a4ab3e716067187a533ce51e26cb4c
+ 9a0eaf7136032749add03c6a602cffbb373d5014e07d81403560acf08b6ad1f8
+ e52a81d859f88fbbc88ad162813af1ea3f6a08ca578bd2c6edf3598a88312951
+ d232778e67a36dd66f14b93abe12e6e867fc1e124ad04f572bff180d342ae2da
+ 0f3294bfb576a7be717014a4b48f8027ac79a1877c59a3cd4a9feb543a87bfb0
+ 26fd38cdde3ae447b08af5ac500699382be573e370a34fa0dcd451501b644bd4
+ 44ddaee30b1ccf4995293eb47c2fb345e688de765c4eb5b86ff0f3514b78bcb6
+ 6f7dc251e6a1acb349f90184751d585dfc9b95c232e6387988f44616547b6ea1
+ f98805c2cd0ab105fa91a8b89aefd30e1321ea1d794ad4371acbc88ed3812f02
+ 2c4d3990ea6dac49d704719e8430f437db1f4f539e9365ec00a937484b1559d7
+ 3a81e4fb7bd53ebd439efe35714df57dde3125cd75a7366a9c9be8bcb8496b2a
+ 7340e84cee9775726bf83de8371815be21c67f5138ad7ea29e64c9922f9991c4
+ b4094e63f09d87f7675bd90034f1df14efff5cad74d53bfbe991ecb0716c3b29"

From 1f141e1d71e48db16441d961ce5aeef913a2cde5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Nov 2021 23:23:00 +0100
Subject: [PATCH 3271/4088] neatvi: update to 10.

---
 srcpkgs/neatvi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..9b512934f5d8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=10
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=643189221b245045a406dadabe35a0d257e3ba0e5e18f0500fb6d3338c349936
 
 alternatives="
  vi:ex:/usr/bin/neatex

From db37ea832dd378dd3eb5db70aae13052f7755925 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Nov 2021 23:24:09 +0100
Subject: [PATCH 3272/4088] linux5.10: update to 5.10.82.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 4ddc5683305c..295165a43440 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.80
+version=5.10.82
 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=477ce8f7624263e4346c0fc25ffc334af06bcac4d6bebdd5a7fe4681557fdb39
+checksum=d66f7c7eed02f84ae550b3c91a26c70eea13682a6d672432f07bce66ff8ce350
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 0ec9cd533200c5e8a089403499af36d1334fb36b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 26 Nov 2021 22:17:57 +0100
Subject: [PATCH 3273/4088] python-lxml: update to 4.6.4.

---
 srcpkgs/python-lxml/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
index aacddf9cdcb0..12f708f0f3f9 100644
--- a/srcpkgs/python-lxml/template
+++ b/srcpkgs/python-lxml/template
@@ -1,7 +1,7 @@
 # Template file for 'python-lxml'
 pkgname=python-lxml
-version=4.6.3
-revision=2
+version=4.6.4
+revision=1
 wrksrc="lxml-lxml-${version}"
 build_style=python-module
 make_build_args="--with-cython"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause, custom:ElementTree"
 homepage="https://lxml.de/"
 distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=5955ed615b7be9407d9eab83edde8f1818c94224d762d1d6355bf0371f220bd6
+checksum=5a7cef132353fc36de6f6b26dacde07b22217c6b4f8c11ef48e8bf0011f48160
 
 do_check() {
 	cp -f build-3.*/lib.linux-*/lxml/*.so src/lxml

From 0f3b281314209e682fce32cd3afadf5b6db38883 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 26 Nov 2021 18:48:50 +0100
Subject: [PATCH 3274/4088] streamlink: update to 3.0.2.

---
 srcpkgs/streamlink/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index fb7d9e6a9704..447ac90ccb29 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,25 +1,22 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=2.4.0
-revision=2
+version=3.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-lxml python3-pycryptodome python3-pycountry
  python3-pysocks python3-requests python3-websocket-client python3-isodate"
-checkdepends="python3-pycryptodome python3-pycountry python3-pysocks
- python3-pytest python3-mock python3-requests-mock python3-websocket-client
- python3-isodate python3-freezegun"
+checkdepends="$depends python3-pytest python3-mock python3-requests-mock
+ python3-freezegun"
 short_desc="Utility extracting streams from services, forked from livestreamer"
-maintainer="wkuipers <wietse@kuiprs.nl>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af
+checksum=d4d0fbf2067af32d2c3e8a6bea7ea1cef6a28020fe452a80d8bd55c2a5fed68a
 make_check=ci-skip # some tests fail when running as root
 
-export STREAMLINK_USE_PYCOUNTRY=1
-
 post_install() {
 	vlicense LICENSE
 }

From b4c1399e4c34014ca24c8acd2bbe2744e70c9f96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Nov 2021 17:36:33 -0500
Subject: [PATCH 3275/4088] maturin: update to 0.12.2.

---
 srcpkgs/maturin/patches/add-ppc-tier3.patch |  8 ++++----
 srcpkgs/maturin/patches/edition2018.patch   | 18 ++++++++++++++++++
 srcpkgs/maturin/template                    |  6 +++---
 3 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/maturin/patches/edition2018.patch

diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch
index c837a90fb2b6..5b5b7c2021a1 100644
--- a/srcpkgs/maturin/patches/add-ppc-tier3.patch
+++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch
@@ -5,11 +5,11 @@ diff -ur setup.py setup.py
                  "--message-format=json",
              ]
  
--            if platform.machine() in ("ppc64le", "ppc64", "powerpc"):
-+            if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc"):
+-            if platform.machine() in ("ppc64le", "ppc64", "powerpc") or (
++            if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc") or (
+                 sys.platform == "win32" and platform.machine() == "ARM64"
+             ):
                  cargo_args.extend(
-                     ["--no-default-features", "--features=upload,log,human-panic"]
-                 )
 diff -ur src/target.rs src/target.rs
 --- a/src/target.rs
 +++ b/src/target.rs
diff --git a/srcpkgs/maturin/patches/edition2018.patch b/srcpkgs/maturin/patches/edition2018.patch
new file mode 100644
index 000000000000..7e6b267507b4
--- /dev/null
+++ b/srcpkgs/maturin/patches/edition2018.patch
@@ -0,0 +1,18 @@
+Void can't yet compile with edition2021 and there seems to be no reason to
+demand it, so partially revert
+
+    https://github.com/PyO3/maturin/commit/4d51112a18a331248bb36c0cb5b4c60c6fe0091a
+
+and make maturin work.
+
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -10,7 +10,7 @@
+ license = "MIT OR Apache-2.0"
+ keywords = ["python", "cffi", "packaging", "pypi", "pyo3"]
+ categories = ["api-bindings", "development-tools::ffi", "command-line-utilities"]
+-edition = "2021"
++edition = "2018"
+ 
+ [badges]
+ travis-ci = { repository = "PyO3/maturin" }
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 01363b438ae8..d5eb458e50a5 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.11.5
+version=0.12.2
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -16,8 +16,8 @@ license="Apache-2.0, MIT"
 homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
- https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz"
-checksum="33b67e66e725c76eac866c2174cfbe708e77a44d215878474d84bc5f9f6386f3
+ https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz>target-lexicon-${version}.tar.gz"
+checksum="d66d21703a78d71061b279b97fb7dd15a925474da19bce9928d87f1c22550ed6
  b6c2ddab7498cf6eab8e637a5b7895f3170b2f9ef989861d1ff33af6c8459b27"
 # Tests use unstable features and fail to build
 make_check=no

From ed62b6f5be1efd95b12a6c08dcb8030e9006593d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 25 Nov 2021 16:26:13 +0100
Subject: [PATCH 3276/4088] libexif: update to 0.6.24.

---
 srcpkgs/libexif/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libexif/template b/srcpkgs/libexif/template
index 793fff37cce1..85d34f58cdc9 100644
--- a/srcpkgs/libexif/template
+++ b/srcpkgs/libexif/template
@@ -1,6 +1,6 @@
 # Template file for 'libexif'
 pkgname=libexif
-version=0.6.23
+version=0.6.24
 revision=1
 wrksrc="libexif-libexif-${version//./_}-release"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/libexif/libexif"
 distfiles="https://github.com/libexif/libexif/archive/${pkgname}-${version//./_}-release.tar.gz"
-checksum=7701ec4b7071b1ac4f253c6d2478851c3baa5287302c336f68dd1810e8902bae
+checksum=d3fb7c47829ec4d2def39aa38f4c35a0891763448a05dbf216a329a12bf198f9
 
 pre_configure() {
 	autoreconf -if

From e92f6aef6a9c10e3f50985a4627df5e8eee86d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Fri, 26 Nov 2021 16:48:25 +0100
Subject: [PATCH 3277/4088] autotiling: update to 1.6

---
 srcpkgs/autotiling/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/autotiling/template b/srcpkgs/autotiling/template
index 437d2a955294..8488a77f5315 100644
--- a/srcpkgs/autotiling/template
+++ b/srcpkgs/autotiling/template
@@ -1,7 +1,7 @@
 # Template file for 'autotiling'
 pkgname=autotiling
-version=1.5
-revision=2
+version=1.6
+revision=1
 build_style=python3-module
 hostmakedepends="python3-wheel"
 depends="python3-i3ipc"
@@ -10,6 +10,6 @@ maintainer="Adrian Göransson <adriangoransson@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/autotiling"
 distfiles="https://github.com/nwg-piotr/${pkgname}/archive/v${version}.tar.gz"
-checksum=aa7ec1e3efbd409c06002c9229f2c198686bef1f907bc9d811b97a02de6ed0de
+checksum=a92b67e081df4923ef83d1b22cd9c046f878dfd5f17ff987c08da3db4ec50349
 # There is no test suite for this package
 make_check=no

From 41492b0e9e7a205579f72424c1a912cf7e6d68eb Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 26 Nov 2021 16:22:36 -0600
Subject: [PATCH 3278/4088] mesa: update to 21.2.6.

---
 srcpkgs/mesa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 6c3b705002cb..eebe1f722e9e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.2.5
-revision=2
+version=21.2.6
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=8e49585fb760d973723dab6435d0c86f7849b8305b1e6d99f475138d896bacbb
+checksum=1e7e22d93c6e8859fa044b1121119d26b2e67e4184b92ebb81c66497dc80c954
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 70d35911aae0abbf027a7bf4867605d6fadb40db Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 25 Nov 2021 17:22:00 +0200
Subject: [PATCH 3279/4088] mate-tweak: update to 21.10.0.

---
 srcpkgs/mate-tweak/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template
index 84991ef8aebb..fd0dbd0747cf 100644
--- a/srcpkgs/mate-tweak/template
+++ b/srcpkgs/mate-tweak/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-tweak'
 pkgname=mate-tweak
-version=21.04.1
-revision=2
+version=21.10.0
+revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools"
 depends="mate-panel python3-gobject python3-psutil python3-setproctitle
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ubuntu-mate/mate-tweak"
 distfiles="https://github.com/ubuntu-mate/mate-tweak/archive/${version}.tar.gz"
-checksum=4ea3a181d15816358534105c7546eb8058702490af3e5c44482c38e212295361
+checksum=1bacc9b92960c712697e0c44fbcaaebed9683b4ff899af5af88506f7e13e1aff

From 16cb2b57c661797e3c71b6dc4a329411f8e7f37c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 26 Nov 2021 15:05:24 +0200
Subject: [PATCH 3280/4088] minisign: update to 0.10.

---
 srcpkgs/minisign/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minisign/template b/srcpkgs/minisign/template
index f86361d85db2..a96a13970599 100644
--- a/srcpkgs/minisign/template
+++ b/srcpkgs/minisign/template
@@ -1,6 +1,6 @@
 # Template file for 'minisign'
 pkgname=minisign
-version=0.9
+version=0.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://jedisct1.github.io/minisign"
 distfiles="https://github.com/jedisct1/minisign/archive/${version}.tar.gz"
-checksum=caa4b3dd314e065c6f387b2713f7603673e39a8a0b1a76f96ef6c9a5b845da0f
+checksum=9fe40c2bd899a91f6b62a6ff3d469ece670f155307df50c2482ddd31337ab6da
 
 post_install() {
 	vlicense LICENSE

From 1d155073e3d1bb3230d642e5be150146744776f3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Nov 2021 15:22:43 +0200
Subject: [PATCH 3281/4088] CopyQ: update to 5.0.0, adopt.

---
 srcpkgs/CopyQ/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index e65649e824fd..3f9db762dbb0 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=4.1.0
+version=5.0.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
@@ -9,9 +9,9 @@ makedepends="libXtst-devel qt5-script-devel qt5-svg-devel qt5-tools-devel
  qt5-x11extras-devel knotifications-devel qt5-wayland-devel wayland-devel
  qt5-declarative-devel"
 short_desc="Clipboard manager with searchable and editable history"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=adc97a663c9d95a5cacc2e89ad46fc8ab2b3d1436eaf076772214895d3507921
+checksum=cc77ef8104771bbaa8f99025c1e7a3d318892b0e8767021f3243457b0c68948e

From b9680c96c0d18d77a73a5ab1754728f61c49b62e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 27 Nov 2021 16:53:28 +0100
Subject: [PATCH 3282/4088] xa: update to 2.3.12.

---
 srcpkgs/xa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xa/template b/srcpkgs/xa/template
index 0766a7e10a6d..913275ab347a 100644
--- a/srcpkgs/xa/template
+++ b/srcpkgs/xa/template
@@ -1,6 +1,6 @@
 # Template file for 'xa'
 pkgname=xa
-version=2.3.11
+version=2.3.12
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.floodgap.com/retrotech/xa/"
 distfiles="https://www.floodgap.com/retrotech/xa/dists/xa-${version}.tar.gz"
-checksum=32f2164c99e305218e992970856dd8e2309b5cb6ac4758d7b2afe3bfebc9012d
+checksum=f8fd1536012d676fc6cbfcdd6a91793e564c89b6ef747f8db8f467c178fb0704
 
 post_extract() {
 	vsed -i 's/${LD}/${CC}/' src/Makefile

From f5bef59cb9d288e13d0e5e3a2a1f9296b116a6c2 Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Sat, 27 Nov 2021 19:11:05 +0100
Subject: [PATCH 3283/4088] swirc: update to 3.3.3.

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7cbd1631cc89..edafade6cd5b 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,6 +1,6 @@
 # Template file for 'swirc'
 pkgname=swirc
-version=3.3.2
+version=3.3.3
 revision=1
 build_style=configure
 configure_args="$(vopt_with notify libnotify)"
@@ -15,7 +15,7 @@ license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.nifty-networks.net/swirc"
 changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
 distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="9c61a2ad1f31d254c0ec1b64bbbf0b42d554cb58b40379bf3dc74ecce1d24c70"
+checksum="29bd8ece384527ab22ee994c000049ba4623e8ce6e0ca8023e1386ba60e72acf"
 
 build_options="notify"
 

From 7e99041087fac9fc1712b43c327ed3c4052a22ae Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 23 Nov 2021 19:55:14 +0200
Subject: [PATCH 3284/4088] liberation-fonts-ttf: update to 2.1.5.

Also:
- update font metadata in pre_build().
---
 srcpkgs/liberation-fonts-ttf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template
index 34312aaa9622..1e5b1997b0bd 100644
--- a/srcpkgs/liberation-fonts-ttf/template
+++ b/srcpkgs/liberation-fonts-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'liberation-fonts-ttf'
 pkgname=liberation-fonts-ttf
-version=2.1.4
+version=2.1.5
 revision=1
 wrksrc=${pkgname%-*}-${version}
 build_style=gnu-makefile
@@ -12,9 +12,13 @@ license="OFL-1.1"
 homepage="https://github.com/liberationfonts/liberation-fonts"
 changelog="https://raw.githubusercontent.com/liberationfonts/liberation-fonts/devel/ChangeLog"
 distfiles="https://github.com/liberationfonts/liberation-fonts/archive/${version}.tar.gz"
-checksum=e76de918e7c98f4a992d2ab397196bde217d9aebc2ec305bf4d1d5bc765dbabc
+checksum=9a823ccb33c8a8a865e84b982bcdc44d03ba4914adb91e6000df035dc0e55936
 font_dirs="/usr/share/fonts/TTF"
 
+pre_build() {
+	make versionupdate
+}
+
 do_install() {
 	vmkdir usr/share/fonts/TTF
 	install -m644 ${pkgname}-${version}/*.ttf ${DESTDIR}/usr/share/fonts/TTF

From da6223d0d632163d607b50725e95601b55a81179 Mon Sep 17 00:00:00 2001
From: NotMyName <32569636+123randomuser321@users.noreply.github.com>
Date: Mon, 22 Nov 2021 18:02:20 +0100
Subject: [PATCH 3285/4088] handbrake: update to 1.4.2.

zimg-devel added as dependency for build to succeed.

template was changed in accordance.
---
 .../patches/fix-missing-x265-link-flag.patch  | 11 ++++----
 .../patches/remove-faac-dependency.patch      | 26 +++++++++----------
 srcpkgs/handbrake/template                    | 10 +++----
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/handbrake/patches/fix-missing-x265-link-flag.patch b/srcpkgs/handbrake/patches/fix-missing-x265-link-flag.patch
index 51979f82f827..26db03867a0c 100644
--- a/srcpkgs/handbrake/patches/fix-missing-x265-link-flag.patch
+++ b/srcpkgs/handbrake/patches/fix-missing-x265-link-flag.patch
@@ -1,18 +1,17 @@
 --- a/gtk/configure.ac
 +++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@
+@@ -203,7 +203,7 @@
  
  AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
  
--HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
+-HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -lturbojpeg -llzma -lzimg"
++HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -lturbojpeg -llzma -lzimg -ldl"
  HB_CPPFLAGS="$HB_CPPFLAGS $HBINC"
  
  PKG_CHECK_MODULES([x264], [x264], sys_x264=yes, sys_x264=no)
-
 --- a/test/module.defs
 +++ b/test/module.defs
-@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux)
+@@ -69,6 +69,9 @@
  ifeq (1, $(FEATURE.numa))
      TEST.GCC.l += numa
  endif
@@ -21,4 +20,4 @@
 +endif
  else ifeq ($(HOST.system),kfreebsd)
      TEST.GCC.l += pthread dl m
- else ifeq ($(HOST.system),freebsd)
+ else ifneq (,$(filter $(HOST.system),freebsd netbsd))
diff --git a/srcpkgs/handbrake/patches/remove-faac-dependency.patch b/srcpkgs/handbrake/patches/remove-faac-dependency.patch
index 7e8ab99730a8..81eb33a20083 100644
--- a/srcpkgs/handbrake/patches/remove-faac-dependency.patch
+++ b/srcpkgs/handbrake/patches/remove-faac-dependency.patch
@@ -1,14 +1,14 @@
 --- a/libhb/common.c
 +++ b/libhb/common.c
-@@ -243,7 +243,6 @@
+@@ -375,7 +375,6 @@
  {
      // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
-     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS,   },
--    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
-     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
-     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3,        },
-     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3,        },
---- a/scripts/manicure.rb
+     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_DTS_PASS,   },
+-    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC,        },
+     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC,        },
+     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AC3,        },
+     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_MP3,        },
+--- a/scripts/manicure.rb	
 +++ b/scripts/manicure.rb
 @@ -349,7 +349,7 @@
            audioEncoders << "copy:dtshd"
@@ -28,7 +28,7 @@
          audioEncoderFallback << "av_aac"
        when "AAC (FDK)"
          audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
+@@ -748,7 +748,7 @@
            audioEncoders << "copy:dtshd"
          when /AAC Pass/
            audioEncoders << "copy:aac"
@@ -37,7 +37,7 @@
            audioEncoders << "av_aac"
          when "AAC (FDK)"
            audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
+@@ -865,7 +865,7 @@
      case hash["AudioEncoderFallback"]
        when /AC3/
          audioEncoderFallback << "ac3"
@@ -46,7 +46,7 @@
          audioEncoderFallback << "av_aac"
        when "AAC (FDK)"
          audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
+@@ -1148,7 +1148,7 @@
            audioEncoders << "copy:dtshd"
          when /AAC Pass/
            audioEncoders << "copy:aac"
@@ -55,7 +55,7 @@
            audioEncoders << "av_aac"
          when "AAC (FDK)"
            audioEncoders << "fdk_aac"
-@@ -1298,7 +1298,7 @@
+@@ -1283,7 +1283,7 @@
      case hash["AudioEncoderFallback"]
        when /AC3/
          audioEncoderFallback << "ac3"
@@ -64,7 +64,7 @@
          audioEncoderFallback << "av_aac"
        when "AAC (FDK)"
          audioEncoderFallback << "fdk_aac"
-@@ -1615,7 +1615,7 @@
+@@ -1600,7 +1600,7 @@
            audioEncoders << "copy:dtshd"
          when /AAC Pass/
            audioEncoders << "copy:aac"
@@ -73,7 +73,7 @@
            audioEncoders << "av_aac"
          when "AAC (FDK)"
            audioEncoders << "fdk_aac"
-@@ -1732,7 +1732,7 @@
+@@ -1717,7 +1717,7 @@
      case hash["AudioEncoderFallback"]
        when /AC3/
          audioEncoderFallback << "ac3"
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..d9ce9515820d 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
-version=1.3.3
-revision=4
+version=1.4.2
+revision=1
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
@@ -13,7 +13,7 @@ makedepends="bzip2-devel ffmpeg-devel gst-plugins-base1-devel gtk+3-devel
  jansson-devel lame-devel libass-devel libbluray-devel libdav1d-devel
  libdvdnav-devel libdvdread-devel libgudev-devel libnuma-devel
  libsamplerate-devel libtheora-devel libvorbis-devel libvpx-devel libxml2-devel
- opus-devel speex-devel x264-devel x265-devel
+ opus-devel speex-devel x264-devel x265-devel zimg-devel
  $(vopt_if fdk_aac fdk-aac-devel)
  $(vopt_if nvenc nv-codec-headers)"
 depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme"
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://handbrake.fr/"
 distfiles="https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2"
-checksum=218a37d95f48b5e7cf285363d3ab16c314d97627a7a710cab3758902ae877f85
+checksum=8b8e81b7dc2e3180f4e94e8c7f5337d2953f69f0d983ccce48096e29ed6dfb61
 nocross=yes
 
 build_options="fdk_aac nvenc"
@@ -38,7 +38,7 @@ pre_configure() {
 	# use system libraries, don't download them
 	rm -rf contrib/
 	for module in fdk-aac ffmpeg libbluray libdav1d libdvdnav libdvdread nvenc \
-		x265; do
+		x265 zimg; do
 	    vsed -i "/MODULES += contrib\/${module}/d" make/include/main.defs
 	done
 }

From 2d9f8edf189f0c7e38ffc8cdeb0e0f7c5b4a0f5d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 23 Nov 2021 21:48:51 +0200
Subject: [PATCH 3286/4088] rpm: update to 4.17.0.

- lua is always required, so remove config arg
- no longer uses Berkeley DB or NSS

By ericonr:
- clean up musl: add CFLAGS for gettext includes; add musl-legacy-compat
to allow us to compile the libelf integration (was previously disabled
on musl)
- use >= for versioning deps

Closes: #34219 [via git-merge-pr]
---
 srcpkgs/rpm/patches/fix-musl.patch | 31 ----------------------------
 srcpkgs/rpm/template               | 33 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/rpm/patches/fix-musl.patch

diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch
deleted file mode 100644
index 3bf351392d84..000000000000
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -229,6 +229,7 @@ AC_SEARCH_LIBS(dlopen, [dl])
- # Check for libelf library. Prefer external, otherwise none.
- WITH_LIBELF_LIB=
- AC_CHECK_HEADER([libelf.h])
-+AC_CHECK_HEADERS([error.h], [WITH_ERROR_H=yes])
- AC_CHECK_HEADERS([gelf.h], [
- 	AC_CHECK_LIB(elf, gelf_getvernaux, [
- 	    AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
-@@ -237,7 +238,7 @@ AC_CHECK_HEADERS([gelf.h], [
- 	])
- ])
- AC_SUBST(WITH_LIBELF_LIB)
--AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes])
-+AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes && test "$WITH_ERROR_H" = yes])
- 
- AC_CHECK_HEADERS([dwarf.h], [
-   WITH_LIBDWARF=yes
-diff --git rpmio/digest_nss.c rpmio/digest_nss.c
-index 992d9ac..5f43b57 100644
---- a/rpmio/digest_nss.c
-+++ b/rpmio/digest_nss.c
-@@ -6,6 +6,7 @@
- #include <keyhi.h>
- #include <cryptohi.h>
- #include <blapit.h>
-+#include <signal.h>
- 
- #include <rpm/rpmlog.h>
- #include "rpmio/digest.h"
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 2bd5ff9883e4..6d252bd4cf58 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,37 +1,36 @@
 # Template file for 'rpm'
 pkgname=rpm
-version=4.16.1.3
-revision=2
+version=4.17.0
+revision=1
 build_style=gnu-configure
 # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
 # until this is fixed upstream, manually define am_cv_python_version to circumvent
-configure_args="--with-lua --with-cap --with-acl --with-external-db
+configure_args="--with-cap --with-acl
  --enable-python PYTHON=python3 --sharedstatedir=/var/lib
  am_cv_python_version=${py3_ver}"
-hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
+hostmakedepends="automake gettext-devel libtool pkg-config
  python3-setuptools"
-makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
- libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
+makedepends="libgcrypt-devel binutils-devel elfutils-devel file-devel libarchive-devel
+ libcap-devel lua53-devel popt-devel python3-devel libgomp-devel sqlite-devel"
 short_desc="Red Hat Package Management Utils"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://rpm.org"
 changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.16.x/rpm-${version}.tar.bz2"
-checksum=513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d
+distfiles="https://ftp.osuosl.org/pub/rpm/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
+checksum=2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a
 python_version=3
 conflicts="rpmextract>=0" # Both provide rpm2cpio
 
 CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
-CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss"
-CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr"
 
 case "$XBPS_TARGET_MACHINE" in
-	# Musl requires gettext to be included and it's cflag added otherwise
-	# it fails with _nl_msg_cat_cntr undefined reference error
+	# rpm uses _nl_msg_cat_cntr, so it needs the glibc gettext impl
+	# it uses <error.h> header, provided by legacy-compat
 	*-musl)
-	makedepends+=" gettext-devel"
-	LDFLAGS+=" -lintl"
+	makedepends+=" gettext-devel musl-legacy-compat"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/gettext"
+	LDFLAGS="-lintl"
 	;;
 esac
 
@@ -40,9 +39,9 @@ pre_configure() {
 }
 
 librpm-devel_package() {
-	depends="librpm-${version}_${revision} librpmbuild-${version}_${revision}
-	 librpmsign-${version}_${revision} librpmio-${version}_${revision} db-devel
-	 popt-devel liblzma-devel zlib-devel bzip2-devel nss-devel lua52-devel"
+	depends="librpm>=${version}_${revision} librpmbuild>=${version}_${revision}
+	 librpmsign>=${version}_${revision} librpmio>=${version}_${revision} sqlite-devel
+	 popt-devel liblzma-devel zlib-devel bzip2-devel libgcrypt-devel lua53-devel"
 	short_desc+=" - development files"
 	depends="${makedepends}"
 	pkg_install() {

From a9c5e1f2fba18a4c3d4910a1af832e1164c27d57 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 28 Nov 2021 11:49:51 +0530
Subject: [PATCH 3287/4088] Komikku: update to 0.35.2.

---
 srcpkgs/Komikku/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 429ab6dd4ff2..91de9f9e4f0c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.35.1
+version=0.35.2
 revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -16,4 +16,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=107dcb99fad250e431050fd9aa10f0a0d64c5321282e23b6545e491eb5a931f5
+checksum=b349c67a5b4ddf49b6edf87e5fb4a8f41a1f10a0967ff7d4fe4db40eb0b4eb72

From ac5728bb3559f02407e25597e21fef2a4cc955eb Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 28 Nov 2021 11:58:49 +0530
Subject: [PATCH 3288/4088] corectrl: update to 1.2.2.

---
 srcpkgs/corectrl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index d2af4b27d4b9..513afe8b595a 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,6 +1,6 @@
 # Template file for 'corectrl'
 pkgname=corectrl
-version=1.2.1
+version=1.2.2
 revision=1
 wrksrc=${pkgname}-v${version}
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/corectrl/corectrl"
 distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz"
-checksum=f984e5b23f35c6ef4e36a431a09d6edb427084f6fce5fb6c63d6e815282ca25b
+checksum=ecfbdb3d99974a64fe6fab90f4bb543154ddc7004eeac14ef65b4ae6e661ca57
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From bdf852073222ac399a4efb01431c2382333170f4 Mon Sep 17 00:00:00 2001
From: Johannes Daniel Nuemm <daniel.nuemm@blacktre.es>
Date: Thu, 18 Nov 2021 18:33:41 +0100
Subject: [PATCH 3289/4088] firefox-esr: update to 91.3.0.

---
 srcpkgs/firefox-esr/files/mozconfig           |   1 +
 srcpkgs/firefox-esr/files/vendor.js           |   2 +-
 .../patches/avoid-redefinition.patch          |  15 +
 srcpkgs/firefox-esr/patches/fix-cross.patch   |  16 -
 .../patches/fix-fortify-inline.patch          |  11 -
 .../firefox-esr/patches/fix-i386-fdlibm.patch |  18 +
 .../firefox-esr/patches/fix-python3.10.patch  | 826 ------------------
 .../firefox-esr/patches/fix-wasm-arm.patch    |  15 -
 .../patches/fix-webrtc-glibcisms.patch        |   4 +-
 .../firefox-esr/patches/flac-no-ffvpx.patch   |   5 +-
 .../patches/musl-rust.configure.patch         |  26 -
 .../firefox-esr/patches/rust-configure.patch  | 132 ++-
 .../firefox-esr/patches/rust-has-i128.patch   |  21 -
 .../firefox-esr/patches/sandbox-fork.patch    |   4 +-
 srcpkgs/firefox-esr/patches/sndio.patch       |  14 +-
 srcpkgs/firefox-esr/template                  | 127 ++-
 16 files changed, 208 insertions(+), 1029 deletions(-)
 create mode 100644 srcpkgs/firefox-esr/patches/avoid-redefinition.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-cross.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-fortify-inline.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-i386-fdlibm.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-python3.10.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/musl-rust.configure.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/rust-has-i128.patch

diff --git a/srcpkgs/firefox-esr/files/mozconfig b/srcpkgs/firefox-esr/files/mozconfig
index 708ee9eded9b..fa5a7a42e04b 100644
--- a/srcpkgs/firefox-esr/files/mozconfig
+++ b/srcpkgs/firefox-esr/files/mozconfig
@@ -32,4 +32,5 @@ ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=browser
+
 ac_add_options --allow-addon-sideload
diff --git a/srcpkgs/firefox-esr/files/vendor.js b/srcpkgs/firefox-esr/files/vendor.js
index d8d606bc15d7..5be4f1b5f3ff 100644
--- a/srcpkgs/firefox-esr/files/vendor.js
+++ b/srcpkgs/firefox-esr/files/vendor.js
@@ -1,5 +1,5 @@
 // Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
+pref("intl.locale.requested", "");
 
 // Disable default browser checking.
 pref("browser.shell.checkDefaultBrowser", false);
diff --git a/srcpkgs/firefox-esr/patches/avoid-redefinition.patch b/srcpkgs/firefox-esr/patches/avoid-redefinition.patch
new file mode 100644
index 000000000000..867d37c62a90
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/avoid-redefinition.patch
@@ -0,0 +1,15 @@
+Author: Rasmus Thomsen <oss@cogitri.dev>
+Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
+(linux/if.h), leading to redefinitions. We need to include net/if.h before
+linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
+Upstream: No
+--- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:32.359751046 +0200
++++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
+@@ -31,6 +31,7 @@
+ */
+ 
+ #if defined(LINUX)
++#include <net/if.h>
+ #include "addrs-netlink.h"
+ #include <csi_platform.h>
+ #include <assert.h>
diff --git a/srcpkgs/firefox-esr/patches/fix-cross.patch b/srcpkgs/firefox-esr/patches/fix-cross.patch
deleted file mode 100644
index fad8f9060c46..000000000000
--- 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
-
---- a/third_party/rust/glslopt/build.rs
-+++ b/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-fortify-inline.patch b/srcpkgs/firefox-esr/patches/fix-fortify-inline.patch
deleted file mode 100644
index 2498c57fc738..000000000000
--- a/srcpkgs/firefox-esr/patches/fix-fortify-inline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-@@ -27,8 +27,5 @@
- typedef int16_t    int16;
- typedef unsigned short ushort;
- typedef unsigned long  ulong;
--#ifndef __GNUC_STDC_INLINE__
--#define inline
--#endif
- 
- #endif /* _SDP_OS_DEFS_H_ */
diff --git a/srcpkgs/firefox-esr/patches/fix-i386-fdlibm.patch b/srcpkgs/firefox-esr/patches/fix-i386-fdlibm.patch
new file mode 100644
index 000000000000..831e5e03678d
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-i386-fdlibm.patch
@@ -0,0 +1,18 @@
+# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double')
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
+
+--- a/modules/fdlibm/src/math_private.h
++++ b/modules/fdlibm/src/math_private.h
+@@ -30,7 +30,12 @@
+  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+  */
+ 
++#if defined(__linux__) && defined(__i386__)
++// rely on glibc's double_t
++typedef long double __double_t;
++#else
+ typedef double      __double_t;
++#endif
+ typedef __double_t  double_t;
+ 
+ /*
diff --git a/srcpkgs/firefox-esr/patches/fix-python3.10.patch b/srcpkgs/firefox-esr/patches/fix-python3.10.patch
deleted file mode 100644
index 143e58782581..000000000000
--- a/srcpkgs/firefox-esr/patches/fix-python3.10.patch
+++ /dev/null
@@ -1,826 +0,0 @@
-diff -ur a/python/mach/mach/config.py b/python/mach/mach/config.py
---- a/python/mach/mach/config.py	2021-09-01 13:26:18.000000000 -0400
-+++ b/python/mach/mach/config.py	2021-11-05 15:29:12.000000000 -0400
-@@ -144,7 +144,7 @@
-     return _
- 
- 
--class ConfigSettings(collections.Mapping):
-+class ConfigSettings(collections.abc.Mapping):
-     """Interface for configuration settings.
- 
-     This is the main interface to the configuration.
-@@ -190,7 +190,7 @@
-     will result in exceptions being raised.
-     """
- 
--    class ConfigSection(collections.MutableMapping, object):
-+    class ConfigSection(collections.abc.MutableMapping, object):
-         """Represents an individual config section."""
-         def __init__(self, config, name, settings):
-             object.__setattr__(self, '_config', config)
-diff -ur a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
---- a/python/mach/mach/decorators.py	2021-09-01 13:26:18.000000000 -0400
-+++ b/python/mach/mach/decorators.py	2021-11-05 15:29:12.000000000 -0400
-@@ -140,7 +140,7 @@
-               'Conditions argument must take a list ' + \
-               'of functions. Found %s instead.'
- 
--        if not isinstance(command.conditions, collections.Iterable):
-+        if not isinstance(command.conditions, collections.abc.Iterable):
-             msg = msg % (command.name, type(command.conditions))
-             raise MachError(msg)
- 
-diff -ur a/python/mach/mach/main.py b/python/mach/mach/main.py
---- a/python/mach/mach/main.py	2021-09-01 13:26:23.000000000 -0400
-+++ b/python/mach/mach/main.py	2021-11-05 15:29:12.000000000 -0400
-@@ -16,7 +16,7 @@
- import sys
- import traceback
- import uuid
--from collections import Iterable
-+from collections.abc import Iterable
- 
- from six import string_types
- 
-diff -ur a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
---- a/python/mozbuild/mozbuild/backend/configenvironment.py	2021-09-01 13:26:34.000000000 -0400
-+++ b/python/mozbuild/mozbuild/backend/configenvironment.py	2021-11-05 15:29:12.000000000 -0400
-@@ -9,7 +9,8 @@
- import sys
- import json
- 
--from collections import Iterable, OrderedDict
-+from collections import OrderedDict
-+from collections.abc import Iterable
- from types import ModuleType
- 
- import mozpack.path as mozpath
-diff -ur a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py
---- a/python/mozbuild/mozbuild/makeutil.py	2021-09-01 13:26:18.000000000 -0400
-+++ b/python/mozbuild/mozbuild/makeutil.py	2021-11-05 15:29:12.000000000 -0400
-@@ -7,7 +7,7 @@
- import os
- import re
- import six
--from collections import Iterable
-+from collections.abc import Iterable
- 
- 
- class Makefile(object):
-diff -ur a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
---- a/python/mozbuild/mozbuild/util.py	2021-09-01 13:26:18.000000000 -0400
-+++ b/python/mozbuild/mozbuild/util.py	2021-11-05 15:29:12.000000000 -0400
-@@ -782,7 +782,7 @@
-         self._strings = StrictOrderingOnAppendList()
-         self._children = {}
- 
--    class StringListAdaptor(collections.Sequence):
-+    class StringListAdaptor(collections.abc.Sequence):
-         def __init__(self, hsl):
-             self._hsl = hsl
- 
-diff -ur a/testing/marionette/client/marionette_driver/wait.py b/testing/marionette/client/marionette_driver/wait.py
---- a/testing/marionette/client/marionette_driver/wait.py	2021-09-01 13:26:30.000000000 -0400
-+++ b/testing/marionette/client/marionette_driver/wait.py	2021-11-05 15:29:12.000000000 -0400
-@@ -82,7 +82,7 @@
- 
-         exceptions = []
-         if ignored_exceptions is not None:
--            if isinstance(ignored_exceptions, collections.Iterable):
-+            if isinstance(ignored_exceptions, collections.abc.Iterable):
-                 exceptions.extend(iter(ignored_exceptions))
-             else:
-                 exceptions.append(ignored_exceptions)
-diff -ur a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py
---- a/testing/mozbase/manifestparser/manifestparser/filters.py	2021-09-01 13:26:23.000000000 -0400
-+++ b/testing/mozbase/manifestparser/manifestparser/filters.py	2021-11-05 15:29:12.000000000 -0400
-@@ -12,7 +12,8 @@
- 
- import itertools
- import os
--from collections import defaultdict, MutableSequence
-+from collections import defaultdict
-+from collections.abc import MutableSequence
- 
- import six
- from six import string_types
-diff -ur a/testing/mozbase/versioninfo.py b/testing/mozbase/versioninfo.py
---- a/testing/mozbase/versioninfo.py	2021-09-01 13:26:23.000000000 -0400
-+++ b/testing/mozbase/versioninfo.py	2021-11-05 15:29:12.000000000 -0400
-@@ -11,7 +11,7 @@
- 
- from __future__ import absolute_import, print_function
- 
--from collections import Iterable
-+from collections.abc import Iterable
- from distutils.version import StrictVersion
- import argparse
- import os
-diff -ur a/testing/web-platform/tests/tools/manifest/typedata.py b/testing/web-platform/tests/tools/manifest/typedata.py
---- a/testing/web-platform/tests/tools/manifest/typedata.py	2021-09-01 13:26:40.000000000 -0400
-+++ b/testing/web-platform/tests/tools/manifest/typedata.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,4 +1,4 @@
--from collections import MutableMapping
-+from collections.abc import MutableMapping
- 
- from six import itervalues, iteritems
- 
-diff -ur a/testing/web-platform/tests/tools/manifest/vcs.py b/testing/web-platform/tests/tools/manifest/vcs.py
---- a/testing/web-platform/tests/tools/manifest/vcs.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/testing/web-platform/tests/tools/manifest/vcs.py	2021-11-05 15:29:12.000000000 -0400
-@@ -3,7 +3,7 @@
- import os
- import stat
- from collections import deque
--from collections import MutableMapping
-+from collections.abc import MutableMapping
- 
- from six import with_metaclass, PY2
- 
-diff -ur a/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py b/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py
---- a/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py	2021-09-01 13:26:56.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/attrs/tests/test_funcs.py	2021-11-05 15:29:12.000000000 -0400
-@@ -4,7 +4,8 @@
- 
- from __future__ import absolute_import, division, print_function
- 
--from collections import Mapping, OrderedDict, Sequence
-+from collections import OrderedDict
-+from collections.abc import Mapping, Sequence
- 
- import pytest
- 
-diff -ur a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py
---- a/testing/web-platform/tests/tools/third_party/h2/h2/settings.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/h2/h2/settings.py	2021-11-05 15:32:28.817737357 -0400
-@@ -88,7 +88,7 @@
-         )
- 
- 
--class Settings(collections.MutableMapping):
-+class Settings(collections.abc.MutableMapping):
-     """
-     An object that encapsulates HTTP/2 settings state.
- 
-diff -ur a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py
---- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/_trie/_base.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,6 +1,6 @@
- from __future__ import absolute_import, division, unicode_literals
- 
--from collections import Mapping
-+from collections.abc import Mapping
- 
- 
- class Trie(Mapping):
-diff -ur a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py
---- a/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,7 +1,7 @@
- from __future__ import absolute_import, division, unicode_literals
- 
- 
--from collections import MutableMapping
-+from collections.abc import MutableMapping
- from xml.dom import minidom, Node
- import weakref
- 
-diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py
---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/common/headers.py	2021-11-05 15:29:12.000000000 -0400
-@@ -10,7 +10,7 @@
- from hyper.common.util import to_bytestring, to_bytestring_tuple
- 
- 
--class HTTPHeaderMap(collections.MutableMapping):
-+class HTTPHeaderMap(collections.abc.MutableMapping):
-     """
-     A structure that contains HTTP headers.
- 
-diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py
---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py	2021-09-01 13:26:56.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/h2/settings.py	2021-11-05 15:29:12.000000000 -0400
-@@ -151,7 +151,7 @@
-         )
- 
- 
--class Settings(collections.MutableMapping):
-+class Settings(collections.abc.MutableMapping):
-     """
-     An object that encapsulates HTTP/2 settings state.
- 
-diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py
---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/http11/connection.py	2021-11-05 15:29:12.000000000 -0400
-@@ -10,7 +10,7 @@
- import socket
- import base64
- 
--from collections import Iterable, Mapping
-+from collections.abc import Iterable, Mapping
- 
- import collections
- from hyperframe.frame import SettingsFrame
-@@ -295,7 +295,7 @@
-                 return
- 
-             # Iterables that set a specific content length.
--            elif isinstance(body, collections.Iterable):
-+            elif isinstance(body, collections.abc.Iterable):
-                 for item in body:
-                     try:
-                         self._sock.send(item)
-diff -ur a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py
---- a/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/hyper/hyper/packages/hyperframe/flags.py	2021-11-05 15:29:12.000000000 -0400
-@@ -11,7 +11,7 @@
- Flag = collections.namedtuple("Flag", ["name", "bit"])
- 
- 
--class Flags(collections.MutableSet):
-+class Flags(collections.abc.MutableSet):
-     """
-     A simple MutableSet implementation that will only accept known flags as elements.
- 
-diff -ur a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py
---- a/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py	2021-09-01 13:26:39.000000000 -0400
-+++ b/testing/web-platform/tests/tools/third_party/hyperframe/hyperframe/flags.py	2021-11-05 15:29:12.000000000 -0400
-@@ -11,7 +11,7 @@
- Flag = collections.namedtuple("Flag", ["name", "bit"])
- 
- 
--class Flags(collections.MutableSet):
-+class Flags(collections.abc.MutableSet):
-     """
-     A simple MutableSet implementation that will only accept known flags as
-     elements.
-diff -ur a/testing/web-platform/tests/tools/wptserve/wptserve/config.py b/testing/web-platform/tests/tools/wptserve/wptserve/config.py
---- a/testing/web-platform/tests/tools/wptserve/wptserve/config.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/testing/web-platform/tests/tools/wptserve/wptserve/config.py	2021-11-05 15:29:12.000000000 -0400
-@@ -2,7 +2,8 @@
- import logging
- import os
- 
--from collections import defaultdict, Mapping
-+from collections import defaultdict
-+from collections.abc import Mapping
- from six import integer_types, iteritems, itervalues, string_types
- 
- from . import sslutils
-diff -ur a/testing/web-platform/tests/webdriver/tests/support/sync.py b/testing/web-platform/tests/webdriver/tests/support/sync.py
---- a/testing/web-platform/tests/webdriver/tests/support/sync.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/testing/web-platform/tests/webdriver/tests/support/sync.py	2021-11-05 15:29:12.000000000 -0400
-@@ -81,7 +81,7 @@
- 
-         exceptions = []
-         if ignored_exceptions is not None:
--            if isinstance(ignored_exceptions, collections.Iterable):
-+            if isinstance(ignored_exceptions, collections.abc.Iterable):
-                 exceptions.extend(iter(ignored_exceptions))
-             else:
-                 exceptions.append(ignored_exceptions)
-diff -ur a/third_party/python/gyp/pylib/gyp/common.py b/third_party/python/gyp/pylib/gyp/common.py
---- a/third_party/python/gyp/pylib/gyp/common.py	2021-09-01 13:26:46.000000000 -0400
-+++ b/third_party/python/gyp/pylib/gyp/common.py	2021-11-05 15:29:12.000000000 -0400
-@@ -494,7 +494,7 @@
- 
- 
- # Based on http://code.activestate.com/recipes/576694/.
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(collections.abc.MutableSet):
-   def __init__(self, iterable=None):
-     self.end = end = []
-     end += [None, end, end]         # sentinel node for doubly linked list
-diff -ur a/third_party/python/gyp/pylib/gyp/msvs_emulation.py b/third_party/python/gyp/pylib/gyp/msvs_emulation.py
---- a/third_party/python/gyp/pylib/gyp/msvs_emulation.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/gyp/pylib/gyp/msvs_emulation.py	2021-11-05 15:30:47.757760820 -0400
-@@ -91,7 +91,7 @@
-   """Add |prefix| to |element| or each subelement if element is iterable."""
-   if element is None:
-     return element
--  if (isinstance(element, collections.Iterable) and
-+  if (isinstance(element, collections.abc.Iterable) and
-       not isinstance(element, basestring)):
-     return [prefix + e for e in element]
-   else:
-@@ -104,7 +104,7 @@
-   if map is not None and element is not None:
-     if not callable(map):
-       map = map.get # Assume it's a dict, otherwise a callable to do the remap.
--    if (isinstance(element, collections.Iterable) and
-+    if (isinstance(element, collections.abc.Iterable) and
-         not isinstance(element, basestring)):
-       element = filter(None, [map(elem) for elem in element])
-     else:
-@@ -117,7 +117,7 @@
-   then add |element| to it, adding each item in |element| if it's a list or
-   tuple."""
-   if append is not None and element is not None:
--    if (isinstance(element, collections.Iterable) and
-+    if (isinstance(element, collections.abc.Iterable) and
-         not isinstance(element, basestring)):
-       append.extend(element)
-     else:
-diff -ur a/third_party/python/gyp/test/lib/TestGyp.py b/third_party/python/gyp/test/lib/TestGyp.py
---- a/third_party/python/gyp/test/lib/TestGyp.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/gyp/test/lib/TestGyp.py	2021-11-05 15:30:37.671763157 -0400
-@@ -496,7 +496,7 @@
-     if status is None:
-       kw['status'] = None
-     else:
--      if not isinstance(status, collections.Iterable): status = (status,)
-+      if not isinstance(status, collections.abc.Iterable): status = (status,)
-       kw['status'] = list(itertools.chain((0,), status))
-     self.cmake_build(gyp_file, target, **kw)
-     kw['status'] = status
-diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py
---- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
-@@ -319,7 +319,7 @@
- try:
-     callable = callable
- except NameError:   # pragma: no cover
--    from collections import Callable
-+    from collections.abc import Callable
- 
-     def callable(obj):
-         return isinstance(obj, Callable)
-@@ -475,7 +475,7 @@
- try:
-     from collections import ChainMap
- except ImportError: # pragma: no cover
--    from collections import MutableMapping
-+    from collections.abc import MutableMapping
- 
-     try:
-         from reprlib import recursive_repr as _recursive_repr
-diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py
---- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py	2021-09-01 13:26:46.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,7 +1,7 @@
- from __future__ import absolute_import, division, unicode_literals
- 
- 
--from collections import MutableMapping
-+from collections.abc import MutableMapping
- from xml.dom import minidom, Node
- import weakref
- 
-diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py
---- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py	2021-09-01 13:26:46.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/pyparsing.py	2021-11-05 15:29:12.000000000 -0400
-@@ -940,7 +940,7 @@
-     def __dir__(self):
-         return (dir(type(self)) + list(self.keys()))
- 
--collections.MutableMapping.register(ParseResults)
-+collections.abc.MutableMapping.register(ParseResults)
- 
- def col (loc,strg):
-     """Returns current column within a string, counting newlines as line separators.
-@@ -3223,7 +3223,7 @@
- 
-         if isinstance( exprs, basestring ):
-             self.exprs = [ ParserElement._literalStringClass( exprs ) ]
--        elif isinstance( exprs, collections.Iterable ):
-+        elif isinstance( exprs, collections.abc.Iterable ):
-             exprs = list(exprs)
-             # if sequence of strings provided, wrap with Literal
-             if all(isinstance(expr, basestring) for expr in exprs):
-@@ -4564,7 +4564,7 @@
-     symbols = []
-     if isinstance(strs,basestring):
-         symbols = strs.split()
--    elif isinstance(strs, collections.Iterable):
-+    elif isinstance(strs, collections.abc.Iterable):
-         symbols = list(strs)
-     else:
-         warnings.warn("Invalid argument to oneOf, expected string or iterable",
-diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py
---- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
-@@ -169,7 +169,7 @@
-     """
- 
- 
--class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
-+class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
-     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
-     interface.
- 
-diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py
---- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py	2021-09-01 13:26:46.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/models.py	2021-11-05 15:31:35.745749692 -0400
-@@ -174,10 +174,10 @@
-         if event not in self.hooks:
-             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
- 
--        if isinstance(hook, collections.Callable):
-+        if isinstance(hook, collections.abc.Callable):
-             self.hooks[event].append(hook)
-         elif hasattr(hook, '__iter__'):
--            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
-+            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
- 
-     def deregister_hook(self, event, hook):
-         """Deregister a previously registered hook.
-@@ -461,7 +461,7 @@
- 
-         is_stream = all([
-             hasattr(data, '__iter__'),
--            not isinstance(data, (basestring, list, tuple, collections.Mapping))
-+            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
-         ])
- 
-         try:
-diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py
---- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
-@@ -12,7 +12,7 @@
- from .compat import OrderedDict
- 
- 
--class CaseInsensitiveDict(collections.MutableMapping):
-+class CaseInsensitiveDict(collections.abc.MutableMapping):
-     """A case-insensitive ``dict``-like object.
- 
-     Implements all methods and operations of
-@@ -71,7 +71,7 @@
-         )
- 
-     def __eq__(self, other):
--        if isinstance(other, collections.Mapping):
-+        if isinstance(other, collections.abc.Mapping):
-             other = CaseInsensitiveDict(other)
-         else:
-             return NotImplemented
-diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py
---- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/requests/utils.py	2021-11-05 15:31:40.157748665 -0400
-@@ -262,7 +262,7 @@
-     if isinstance(value, (str, bytes, bool, int)):
-         raise ValueError('cannot encode objects that are not 2-tuples')
- 
--    if isinstance(value, collections.Mapping):
-+    if isinstance(value, collections.abc.Mapping):
-         value = value.items()
- 
-     return list(value)
-diff -ur a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py
---- a/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/patched/notpip/_vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,5 +1,5 @@
- from __future__ import absolute_import
--from collections import Mapping, MutableMapping
-+from collections.abc import Mapping, MutableMapping
- try:
-     from threading import RLock
- except ImportError:  # Platform-specific: No threads available
-diff -ur a/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py b/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py
---- a/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py	2021-11-05 15:29:12.000000000 -0400
-@@ -14,7 +14,7 @@
- """
- import types
- import operator
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.environment import Environment
- from jinja2.exceptions import SecurityError
- from jinja2._compat import string_types, PY2
-@@ -79,7 +79,7 @@
-     pass
- 
- #: register Python 2.6 abstract base classes
--from collections import MutableSet, MutableMapping, MutableSequence
-+from collections.abc import MutableSet, MutableMapping, MutableSequence
- _mutable_set_types += (MutableSet,)
- _mutable_mapping_types += (MutableMapping,)
- _mutable_sequence_types += (MutableSequence,)
-diff -ur a/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py b/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py
---- a/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/jinja2/utils.py	2021-11-05 15:29:12.000000000 -0400
-@@ -482,7 +482,7 @@
- 
- # register the LRU cache as mutable mapping if possible
- try:
--    from collections import MutableMapping
-+    from collections.abc import MutableMapping
-     MutableMapping.register(LRUCache)
- except ImportError:
-     pass
-diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py
---- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
-@@ -319,7 +319,7 @@
- try:
-     callable = callable
- except NameError:   # pragma: no cover
--    from collections import Callable
-+    from collections.abc import Callable
- 
-     def callable(obj):
-         return isinstance(obj, Callable)
-@@ -475,7 +475,7 @@
- try:
-     from collections import ChainMap
- except ImportError: # pragma: no cover
--    from collections import MutableMapping
-+    from collections.abc import MutableMapping
- 
-     try:
-         from reprlib import recursive_repr as _recursive_repr
-diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py
---- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/html5lib/treebuilders/dom.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,7 +1,7 @@
- from __future__ import absolute_import, division, unicode_literals
- 
- 
--from collections import MutableMapping
-+from collections.abc import MutableMapping
- from xml.dom import minidom, Node
- import weakref
- 
-diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py
---- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py	2021-09-01 13:26:46.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/pyparsing.py	2021-11-05 15:29:12.000000000 -0400
-@@ -940,7 +940,7 @@
-     def __dir__(self):
-         return (dir(type(self)) + list(self.keys()))
- 
--collections.MutableMapping.register(ParseResults)
-+collections.abc.MutableMapping.register(ParseResults)
- 
- def col (loc,strg):
-     """Returns current column within a string, counting newlines as line separators.
-@@ -3223,7 +3223,7 @@
- 
-         if isinstance( exprs, basestring ):
-             self.exprs = [ ParserElement._literalStringClass( exprs ) ]
--        elif isinstance( exprs, collections.Iterable ):
-+        elif isinstance( exprs, collections.abc.Iterable ):
-             exprs = list(exprs)
-             # if sequence of strings provided, wrap with Literal
-             if all(isinstance(expr, basestring) for expr in exprs):
-@@ -4564,7 +4564,7 @@
-     symbols = []
-     if isinstance(strs,basestring):
-         symbols = strs.split()
--    elif isinstance(strs, collections.Iterable):
-+    elif isinstance(strs, collections.abc.Iterable):
-         symbols = list(strs)
-     else:
-         warnings.warn("Invalid argument to oneOf, expected string or iterable",
-diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py
---- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
-@@ -169,7 +169,7 @@
-     """
- 
- 
--class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
-+class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
-     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
-     interface.
- 
-diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py
---- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py	2021-09-01 13:26:46.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/models.py	2021-11-05 15:31:52.397745825 -0400
-@@ -174,10 +174,10 @@
-         if event not in self.hooks:
-             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
- 
--        if isinstance(hook, collections.Callable):
-+        if isinstance(hook, collections.abc.Callable):
-             self.hooks[event].append(hook)
-         elif hasattr(hook, '__iter__'):
--            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
-+            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
- 
-     def deregister_hook(self, event, hook):
-         """Deregister a previously registered hook.
-@@ -461,7 +461,7 @@
- 
-         is_stream = all([
-             hasattr(data, '__iter__'),
--            not isinstance(data, (basestring, list, tuple, collections.Mapping))
-+            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
-         ])
- 
-         try:
-diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py
---- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/structures.py	2021-11-05 15:32:02.765743413 -0400
-@@ -12,7 +12,7 @@
- from .compat import OrderedDict
- 
- 
--class CaseInsensitiveDict(collections.MutableMapping):
-+class CaseInsensitiveDict(collections.abc.MutableMapping):
-     """A case-insensitive ``dict``-like object.
- 
-     Implements all methods and operations of
-@@ -71,7 +71,7 @@
-         )
- 
-     def __eq__(self, other):
--        if isinstance(other, collections.Mapping):
-+        if isinstance(other, collections.abc.Mapping):
-             other = CaseInsensitiveDict(other)
-         else:
-             return NotImplemented
-diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py
---- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/requests/utils.py	2021-11-05 15:31:57.123744724 -0400
-@@ -262,7 +262,7 @@
-     if isinstance(value, (str, bytes, bool, int)):
-         raise ValueError('cannot encode objects that are not 2-tuples')
- 
--    if isinstance(value, collections.Mapping):
-+    if isinstance(value, collections.abc.Mapping):
-         value = value.items()
- 
-     return list(value)
-diff -ur a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py
---- a/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/pip9/_vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,5 +1,5 @@
- from __future__ import absolute_import
--from collections import Mapping, MutableMapping
-+from collections.abc import Mapping, MutableMapping
- try:
-     from threading import RLock
- except ImportError:  # Platform-specific: No threads available
-diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/cookies.py b/third_party/python/pipenv/pipenv/vendor/requests/cookies.py
---- a/third_party/python/pipenv/pipenv/vendor/requests/cookies.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
-@@ -169,7 +169,7 @@
-     """
- 
- 
--class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
-+class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
-     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
-     interface.
- 
-diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/models.py b/third_party/python/pipenv/pipenv/vendor/requests/models.py
---- a/third_party/python/pipenv/pipenv/vendor/requests/models.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/requests/models.py	2021-11-05 15:32:09.732741793 -0400
-@@ -174,10 +174,10 @@
-         if event not in self.hooks:
-             raise ValueError('Unsupported event specified, with event name "%s"' % (event))
- 
--        if isinstance(hook, collections.Callable):
-+        if isinstance(hook, collections.abc.Callable):
-             self.hooks[event].append(hook)
-         elif hasattr(hook, '__iter__'):
--            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
-+            self.hooks[event].extend(h for h in hook if isinstance(h, collections.abc.Callable))
- 
-     def deregister_hook(self, event, hook):
-         """Deregister a previously registered hook.
-@@ -461,7 +461,7 @@
- 
-         is_stream = all([
-             hasattr(data, '__iter__'),
--            not isinstance(data, (basestring, list, tuple, collections.Mapping))
-+            not isinstance(data, (basestring, list, tuple, collections.abc.Mapping))
-         ])
- 
-         try:
-diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/structures.py b/third_party/python/pipenv/pipenv/vendor/requests/structures.py
---- a/third_party/python/pipenv/pipenv/vendor/requests/structures.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
-@@ -12,7 +12,7 @@
- from .compat import OrderedDict
- 
- 
--class CaseInsensitiveDict(collections.MutableMapping):
-+class CaseInsensitiveDict(collections.abc.MutableMapping):
-     """A case-insensitive ``dict``-like object.
- 
-     Implements all methods and operations of
-@@ -71,7 +71,7 @@
-         )
- 
-     def __eq__(self, other):
--        if isinstance(other, collections.Mapping):
-+        if isinstance(other, collections.abc.Mapping):
-             other = CaseInsensitiveDict(other)
-         else:
-             return NotImplemented
-diff -ur a/third_party/python/pipenv/pipenv/vendor/requests/utils.py b/third_party/python/pipenv/pipenv/vendor/requests/utils.py
---- a/third_party/python/pipenv/pipenv/vendor/requests/utils.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/requests/utils.py	2021-11-05 15:32:13.776740860 -0400
-@@ -262,7 +262,7 @@
-     if isinstance(value, (str, bytes, bool, int)):
-         raise ValueError('cannot encode objects that are not 2-tuples')
- 
--    if isinstance(value, collections.Mapping):
-+    if isinstance(value, collections.abc.Mapping):
-         value = value.items()
- 
-     return list(value)
-diff -ur a/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py b/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py
---- a/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py	2021-09-01 13:26:46.000000000 -0400
-+++ b/third_party/python/pipenv/pipenv/vendor/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,5 +1,5 @@
- from __future__ import absolute_import
--from collections import Mapping, MutableMapping
-+from collections.abc import Mapping, MutableMapping
- try:
-     from threading import RLock
- except ImportError:  # Platform-specific: No threads available
-diff -ur a/third_party/python/pyyaml/lib3/yaml/constructor.py b/third_party/python/pyyaml/lib3/yaml/constructor.py
---- a/third_party/python/pyyaml/lib3/yaml/constructor.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/pyyaml/lib3/yaml/constructor.py	2021-11-05 15:29:12.000000000 -0400
-@@ -123,7 +123,7 @@
-         mapping = {}
-         for key_node, value_node in node.value:
-             key = self.construct_object(key_node, deep=deep)
--            if not isinstance(key, collections.Hashable):
-+            if not isinstance(key, collections.abc.Hashable):
-                 raise ConstructorError("while constructing a mapping", node.start_mark,
-                         "found unhashable key", key_node.start_mark)
-             value = self.construct_object(value_node, deep=deep)
-diff -ur a/third_party/python/requests/requests/cookies.py b/third_party/python/requests/requests/cookies.py
---- a/third_party/python/requests/requests/cookies.py	2021-09-01 13:27:05.000000000 -0400
-+++ b/third_party/python/requests/requests/cookies.py	2021-11-05 15:29:12.000000000 -0400
-@@ -161,7 +161,7 @@
-     Use .get and .set and include domain and path args in order to be more specific."""
- 
- 
--class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
-+class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
-     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
-     interface.
- 
-diff -ur a/third_party/python/requests/requests/packages/urllib3/_collections.py b/third_party/python/requests/requests/packages/urllib3/_collections.py
---- a/third_party/python/requests/requests/packages/urllib3/_collections.py	2021-09-01 13:27:13.000000000 -0400
-+++ b/third_party/python/requests/requests/packages/urllib3/_collections.py	2021-11-05 15:29:12.000000000 -0400
-@@ -1,5 +1,5 @@
- from __future__ import absolute_import
--from collections import Mapping, MutableMapping
-+from collections.abc import Mapping, MutableMapping
- try:
-     from threading import RLock
- except ImportError:  # Platform-specific: No threads available
-diff -ur a/third_party/python/requests/requests/structures.py b/third_party/python/requests/requests/structures.py
---- a/third_party/python/requests/requests/structures.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/requests/requests/structures.py	2021-11-05 15:29:12.000000000 -0400
-@@ -11,7 +11,7 @@
- import collections
- 
- 
--class CaseInsensitiveDict(collections.MutableMapping):
-+class CaseInsensitiveDict(collections.abc.MutableMapping):
-     """
-     A case-insensitive ``dict``-like object.
- 
-@@ -71,7 +71,7 @@
-         )
- 
-     def __eq__(self, other):
--        if isinstance(other, collections.Mapping):
-+        if isinstance(other, collections.abc.Mapping):
-             other = CaseInsensitiveDict(other)
-         else:
-             return NotImplemented
-diff -ur a/third_party/python/requests/requests/utils.py b/third_party/python/requests/requests/utils.py
---- a/third_party/python/requests/requests/utils.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/requests/requests/utils.py	2021-11-05 15:30:55.420759045 -0400
-@@ -189,7 +189,7 @@
-     if isinstance(value, (str, bytes, bool, int)):
-         raise ValueError('cannot encode objects that are not 2-tuples')
- 
--    if isinstance(value, collections.Mapping):
-+    if isinstance(value, collections.abc.Mapping):
-         value = value.items()
- 
-     return list(value)
-diff -ur a/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py b/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py
---- a/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py	2021-09-01 13:27:00.000000000 -0400
-+++ b/third_party/python/virtualenv/__virtualenv__/distlib-0.3.1-py2.py3-none-any/distlib/compat.py	2021-11-05 15:29:12.000000000 -0400
-@@ -481,7 +481,7 @@
- try:
-     from collections import ChainMap
- except ImportError: # pragma: no cover
--    from collections import MutableMapping
-+    from collections.abc import MutableMapping
- 
-     try:
-         from reprlib import recursive_repr as _recursive_repr
-diff -ur a/third_party/python/voluptuous/voluptuous/schema_builder.py b/third_party/python/voluptuous/voluptuous/schema_builder.py
---- a/third_party/python/voluptuous/voluptuous/schema_builder.py	2021-09-01 13:27:09.000000000 -0400
-+++ b/third_party/python/voluptuous/voluptuous/schema_builder.py	2021-11-05 15:30:32.399764374 -0400
-@@ -280,7 +280,7 @@
-             return schema.__voluptuous_compile__(self)
-         if isinstance(schema, Object):
-             return self._compile_object(schema)
--        if isinstance(schema, collections.Mapping):
-+        if isinstance(schema, collections.abc.Mapping):
-             return self._compile_dict(schema)
-         elif isinstance(schema, list):
-             return self._compile_list(schema)
diff --git a/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
deleted file mode 100644
index a6035e876163..000000000000
--- a/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -243,9 +243,9 @@
- // If you run into compile problems on a tier-3 platform, you can disable the
- // emulation here.
- 
--#if defined(__linux__) && defined(__arm__)
--#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#endif
-+// #if defined(__linux__) && defined(__arm__)
-+// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-+// #endif
- 
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
- #  include <sys/user.h>
diff --git a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
index 70910da5861e..5d17021a99f4 100644
--- a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
@@ -1,5 +1,5 @@
---- a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:20:52.298793223 +0100
-+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+--- a/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:20:52.298793223 +0100
++++ b/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
 @@ -14,7 +14,7 @@
  #ifndef __GLIBC_PREREQ
  #define __GLIBC_PREREQ(a, b) 0
diff --git a/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch b/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch
index 154aad63e33a..ebf48deb9720 100644
--- a/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch
+++ b/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch
@@ -12,15 +12,14 @@ index 53fc3c9937f7..b23771ab80fa 100644
  
  namespace mozilla {
  
-@@ -14,6 +15,11 @@ namespace mozilla {
+@@ -14,6 +15,10 @@ 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);
++         platform->SupportsMimeType("audio/flac"_ns);
  #else
    // Until bug 1295886 is fixed.
    return false;
diff --git a/srcpkgs/firefox-esr/patches/musl-rust.configure.patch b/srcpkgs/firefox-esr/patches/musl-rust.configure.patch
deleted file mode 100644
index 0b2f7dee1d3c..000000000000
--- a/srcpkgs/firefox-esr/patches/musl-rust.configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/build/moz.configure/rust.configure	2019-10-28 12:05:04.930404603 +0700
-+++ b/build/moz.configure/rust.configure	2019-10-28 12:09:42.742338957 +0700
-@@ -297,11 +297,20 @@
-                     suffix = 'hf'
-                 else:
-                     suffix = ''
-+
-+                narrowed = []
-                 for p in prefixes:
-                     for c in candidates:
--                        if c.rust_target.startswith('{}-'.format(p)) and \
--                                c.rust_target.endswith(suffix):
--                            return c.rust_target
-+                        if c.rust_target.startswith('{}-'.format(p)):
-+                            narrowed.append(c.rust_target)
-+
-+                for target in narrowed:
-+                    if target.endswith(host_or_target.raw_os):
-+                        return target
-+
-+                for target in narrowed:
-+                    if target.endswith(suffix):
-+                        return target
- 
-             # See if we can narrow down on the exact alias
-             narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/firefox-esr/patches/rust-configure.patch b/srcpkgs/firefox-esr/patches/rust-configure.patch
index 07b98d6c7cae..61fb2ba891d9 100644
--- a/srcpkgs/firefox-esr/patches/rust-configure.patch
+++ b/srcpkgs/firefox-esr/patches/rust-configure.patch
@@ -1,42 +1,112 @@
 Mozilla rustc check does not support crossbuild: let's remove it
 Remove calls to unwrap_rustup, they fail if rustup isn't present
 
---- a/build/moz.configure/rust.configure	2019-10-17 04:19:59.000000000 +0700
-+++ b/build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
-@@ -78,9 +78,6 @@
- 
+Do not try to figure out the rust target as it is broken on musl
+instead use what is set in RUST_TARGET
+
+Skip extra checks on cross builds (broken for arm*)
+
+--- a/build/moz.configure/rust.configure	2020-12-12 01:35:33.000000000 +0100
++++ b/build/moz.configure/rust.configure	2020-12-15 19:45:16.467750787 +0100
+@@ -91,9 +91,6 @@
      return unwrap
  
--rustc = unwrap_rustup(rustc, 'rustc')
--cargo = unwrap_rustup(cargo, 'cargo')
+ 
+-rustc = unwrap_rustup(rustc, "rustc")
+-cargo = unwrap_rustup(cargo, "cargo")
 -
  
- set_config('CARGO', cargo)
- set_config('RUSTC', rustc)
-@@ -348,26 +345,6 @@
+ set_config("CARGO", cargo)
+ set_config("RUSTC", rustc)
+@@ -260,7 +257,9 @@
+         data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+     return data
+ 
+-
++@imports('os')
++@imports(_from='mozbuild.util', _import='ensure_unicode')
++@imports(_from='mozbuild.util', _import='system_encoding')
+ def detect_rustc_target(
+     host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -382,12 +381,12 @@
+ 
+         return None
+ 
+-    rustc_target = find_candidate(candidates)
++    rustc_target = os.environ['RUST_TARGET']
  
-             os.write(in_fd, source)
-             os.close(in_fd)
+     if rustc_target is None:
+         die("Don't know how to translate {} for rustc".format(host_or_target.alias))
+ 
+-    return rustc_target
++    return ensure_unicode(rustc_target, system_encoding)
+ 
+ 
+ @imports("os")
+@@ -410,35 +409,6 @@
+ 
+         os.write(in_fd, ensure_binary(source))
+         os.close(in_fd)
 -
--            cmd = [
--                rustc,
--                '--crate-type', 'staticlib',
--                target_arg,
--                '-o', out_path,
--                in_path,
--            ]
+-        cmd = [
+-            rustc,
+-            "--crate-type",
+-            "staticlib",
+-            target_arg,
+-            "-o",
+-            out_path,
+-            in_path,
+-        ]
 -
--            def failed():
--                die(dedent('''\
--                Cannot compile for {} with {}
--                The target may be unsupported, or you may not have
--                a rust std library for that target installed. Try:
+-        def failed():
+-            die(
+-                dedent(
+-                    """\
+-            Cannot compile for {} with {}
+-            The target may be unsupported, or you may not have
+-            a rust std library for that target installed. Try:
 -
--                  rustup target add {}
--                '''.format(host_or_target.alias, rustc, rustc_target)))
--            check_cmd_output(*cmd, onerror=failed)
--            if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
--                failed()
-         finally:
-             os.remove(in_path)
-             os.remove(out_path)
+-              rustup target add {}
+-            """.format(
+-                        host_or_target.alias, rustc, rustc_target
+-                    )
+-                )
+-            )
+-
+-        check_cmd_output(*cmd, onerror=failed)
+-        if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
+-            failed()
+     finally:
+         os.remove(in_path)
+         os.remove(out_path)
+@@ -462,28 +432,7 @@
+         host, compiler_info, arm_target, rust_supported_targets
+     )
+     if rustc_target != rustc_host:
+-        if host.alias == rustc_target:
+-            configure_host = host.alias
+-        else:
+-            configure_host = "{}/{}".format(host.alias, rustc_target)
+-        die(
+-            dedent(
+-                """\
+-        The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
+-
+-        You can solve this by:
+-        * Set your configure host to match the rust compiler host by editing your
+-        mozconfig and adding "ac_add_options --host={rustc}".
+-        * Or, install the rust toolchain for {configure}, if supported, by running
+-        "rustup default stable-{rustc_target}"
+-        """.format(
+-                    rustc=rustc_host,
+-                    configure=configure_host,
+-                    rustc_target=rustc_target,
+-                )
+-            )
+-        )
+-    assert_rust_compile(host, rustc_target, rustc)
++        return rustc_host
+     return rustc_target
+ 
+ 
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 c25a185c1c11..000000000000
--- 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
-
---- a/third_party/rust/num-traits/build.rs	2020-02-14 23:57:25.985355610 +0100
-+++ b/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
index 328943cb0013..d4584e74b91c 100644
--- a/srcpkgs/firefox-esr/patches/sandbox-fork.patch
+++ b/srcpkgs/firefox-esr/patches/sandbox-fork.patch
@@ -2,12 +2,14 @@ make SYS_fork non-fatal, musl uses it for fork(2)
 
 --- a/security/sandbox/linux/SandboxFilter.cpp
 +++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -1253,6 +1253,8 @@
+@@ -1420,6 +1420,10 @@
          // usually do something reasonable on error.
        case __NR_clone:
          return ClonePolicy(Error(EPERM));
++#  ifdef __NR_fork
 +      case __NR_fork:
 +        return Error(ENOSYS);
++#  endif
  
  #  ifdef __NR_fadvise64
        case __NR_fadvise64:
diff --git a/srcpkgs/firefox-esr/patches/sndio.patch b/srcpkgs/firefox-esr/patches/sndio.patch
index 959fc1ec913a..68628bea8d8f 100644
--- a/srcpkgs/firefox-esr/patches/sndio.patch
+++ b/srcpkgs/firefox-esr/patches/sndio.patch
@@ -42,11 +42,11 @@
  if CONFIG['OS_TARGET'] == 'Darwin':
 --- a/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
 +++ b/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
-@@ -210,6 +210,7 @@
+@@ -88,6 +88,7 @@
  @old_configure_options(
-     '--cache-file',
-     '--datadir',
-+    '--enable-sndio',
-     '--enable-crashreporter',
-     '--enable-dbus',
-     '--enable-debug-js-modules',
+     "--cache-file",
+     "--datadir",
++    "--enable-sndio",
+     "--enable-crashreporter",
+     "--enable-dbus",
+     "--enable-debug-js-modules",
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 33fa4dfaf2a0..35e7b0be93c8 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,58 +3,63 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.14.0
+version=91.3.0
 revision=1
 wrksrc="firefox-${version}"
-build_helper="rust qemu"
+build_helper="rust"
+short_desc="Mozilla Firefox web browser - Extended Support Release"
+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/"
+distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
+checksum=128b5349f112d8a0fd8698f3645ed43ea29d4b95047b7c4fd770b95d0661e96c
+
+lib32disabled=yes
+
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
  llvm clang nodejs-lts cbindgen python nasm which tar"
-makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
+makedepends="nss-devel libjpeg-turbo-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="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=aa0e28a4150c33a165120a24f20e0373e74635c9f812732a08850d71cda3b2fa
-lib32disabled=yes
+depends="nss>=3.66 nspr>=4.32 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"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-
 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
+
+# work around large debug symbols on 32-bit hosts
+# cargo:warning=cc1plus: out of memory allocating 65536 bytes after a total of 1010126848 bytes
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+	nodebug=yes
+fi
 
-# We need this because cargo verifies checksums of all files
-# in vendor crates when it builds and gives us no way to
-# override or update the file sanely... so just clear out the file list
+# 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
-	# 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
+		;;
+	esac
 
 	# Mozilla API keys (see https://location.services.mozilla.com/api)
 	# Note: This is for Void Linux use ONLY.
@@ -63,20 +68,20 @@ post_extract() {
 
 post_patch() {
 	_clear_vendor_checksums num-traits
-	_clear_vendor_checksums glslopt
 }
 
 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*)
+	x86_64*|i686*|arm*)
 		echo "ac_add_options --disable-elf-hack" >>.mozconfig
 		;;
 	esac
@@ -98,16 +103,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
@@ -126,19 +132,18 @@ do_build() {
 
 	# work around large debug symbols on 32-bit hosts
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
-		export CFLAGS="${CFLAGS/-g/-g1}"
-		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+		echo "ac_add_options --disable-debug" >>.mozconfig
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
-		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		vsed -i 's/debug_info = "2"/debug_info = "0"/' \
 		build/moz.configure/toolchain.configure
 	fi
 
-	# FIXME: incompatible with rust 1.48 in this release
-	#case "$XBPS_TARGET_MACHINE" in
-	#aarch64*|i686*|x86_64*)
-	#	echo "ac_add_options --enable-rust-simd" >>.mozconfig ;;
-	#esac
+	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"
 
@@ -153,9 +158,7 @@ do_build() {
 
 	export AS=$CC
 
-	cat >>.mozconfig <<EOF
-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"
+	cat <<! >>.mozconfig
 ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key"
 ac_add_options $(vopt_enable alsa)
 ac_add_options $(vopt_enable jack)
@@ -164,42 +167,28 @@ 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
+!
+
 	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}
+	vbin ${FILESDIR}/firefox-wayland
 }

From 37de2bed32b766a478957b9df2098790441f5e82 Mon Sep 17 00:00:00 2001
From: Johannes Daniel Nuemm <daniel.nuemm@blacktre.es>
Date: Sat, 20 Nov 2021 15:13:43 +0100
Subject: [PATCH 3290/4088] firefox-esr-i18n: update to 91.3.0.

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 258494c4a723..51583fb80e9b 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.14.0
+version=91.3.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6e91070c0ee58852ac3b8c8f0ac9620289ca4e200b8074dee8449374301616d1
- 764a7f3a61f0d1b50fdc6dc313f7651e8aa62df4e8883af1a6ef4d18750909c7
- 941ab61c6cb0d52c0e348e080e769cfebe2364eb8cf24a94f625b57f84ba17f1
- a0e0649532c34ccdc1abe1cc1215e66186df8d9d484dfc4337df92151629e04d
- 6c21635e8b1293f9b6b8acdcebd372574610ba535d35f21cf77c73bffb88dd92
- 71d4a6b25d6f18e207c7749f8e50a70a122acea8208c9940c8c882cea7435e0d
- 37209366ed7a66ad7710f268d326a79198c0e9459f751776cf74cb5e5b181d08
- 7638eafa83ac00c88f4410bd67d997570f2635cfc9e7448389ad73e9330b2141
- 3d0e276f98253020935fdec54d906633992848acd4a14d3c48f30fbc6d58c752
- 0b8073a34cd6c62ed8a32c5a0d04a715839b7421a4a681c69bcf9c5d3b0b257d
- 39ee3a5be8fead6f9d69e151107402e234ba6ccd6052573ec48ce71c7d63c964
- 04d517783ec518afc6550b7ca7b591fb17967d8f1c47cfd552b7aeab3d7239c1
- d87112e2791a3fc49c33e4a4be445bebe64d69894a472d0c3f063129294c321f
- e8ab1a8f936f9f8b554573b9b65d8b3377f6fcc6256087424866d3c93dc4bd31
- 518232ababbf0a4f8d5c9aea0e21a2d019b781988bc448a20066b9798bf79a7e
- 50d1fc49591b2a4211337034f036725bf6d0d1816cf54b5a7c4091af504541bc
- f61902d98456796d545a9cfcc3362c682b9938bdfdb6b5d4b9184cc33efbb481
- c254eed182b5c49b52dcea39f8a4af0c14ecece14ea1fb02fe75770fda4dcec1
- 8c9ba5f38c939166fa557e7fc2de1e7880719e4671d3e35d7f0902d7367a759e
- a76a8263887dc89c4f5cc4cfd70eb36406fddd8e9d569bb62ab82fc68849a655
- e6d33c3f1d0173886bf9118695fa9b613b99fdb5777b2582c2d43827e08732fa
- f524faec3cbf044e2082306decd1f6c4737a6babc4a5886b50de71c6a1482de2
- e1ad21912117ed7019498a2a0f65db03ebace025fbd7119f2632f580e1bfdfc6
- 586538a8b5a643329e21a0e66244dc30c5b065684c37c06d92ccfc244bb117a6
- 741c5c34ef55bdd3484f32aa11ce96230a4ad94be929fc3219935d09c22dac09
- 557233773969799d2b946a68e732c55ff4b901d5a1cf45552ab1bb6801024e01
- 8aa1bf00d7e97981dc0933dbe4f886ac9f9e1569f5b60ae219c50a7e82d6e81f
- 1cffa9258de8c892eaf13dc6fcb0883b2bcd418af567d6685eb0b89ada1b6260
- c5b3271069de86cc1713c9a93d4be1941792a55b7831a191369935b18d450fd1
- 00338ba5f470c3d4171d271b97692f6e66f94579709395f7409f4b535cbee1c3
- 1708326197664159d86812e28084975f63ae8112b2d805e62f4acb741bae803b
- 1c86c059ec1ca13904d40fe121cab5ed502f829533fb0ef649396cd5d94e074e
- 6b7885a7cb52c6a74064bc83f7f1d4117994bda1487255f1d91cb6d663149073
- d3b14f75fc0da0940a540afb402f41f097ecaa281f5decbcbc6a05ca0e102283
- c2dd8a7920c1baa2a13af9cc13b523c9162c213c79b063e1b2bb41290c5938f2
- ef7e94deeb31bfc0edec3265de05bf1881bf4c9b348f9ba539f0e4b74368225e
- f8031fbc3b85324ad05e415a0cdf8c189ed95bf6fd4a793e3d5f7b8e1e361966
- 138c430787462e3e77e87ae86178a663777a970c5a3bcc6236d0e5042a958c1e
- 49d98fdbbee4998a856634e4556a4ea1bda13ee60ea328accd381a3eb0ce1196
- 27ed18424e42b98b213714f864216be9eff08a5ed910be69b6dd82b9ec592ca9
- dc4cf3f9d0c9104d615e1760eae09326605b31a4efb69938cffbf553dec0d0a2
- 6db58cccd8cc96014ce481225b34a5d2bcbe4766ceca676bb6b56ee53a31fcd1
- ac10d3163d8d50746d3f2bbee8309508297654a5f5f40d003631cecd9920e8ce
- d4c03de6fce7abc8ce0c98547c45fed6c44229fe0737dd514c0681dc31e37cde
- 8ea5624f13b33073b704a5f967075c29ccfa64b9985432407b656a66a6e47b64
- f7b8654b8d5d0b5513bfaa4ce1ab171ce4b63aed297be7c416df42a5e127c370
- a7e805711ef4fdbe402bef807a5a8af92af99448366f34d61ba9e3d8d267c1f8
- 4fb10b2d88af4ce05b685562a07cb8fd29cfe0a479472d6c156799c83e2bf579
- 4398447f5f86446095f5f361ecc80750d0d6fbed6aa1cf85afe594beb2687c88
- fd87b2fda7d00d6e981d5eba8dccce8d1a30a5582a2c7dcf746d06233b45c18b
- 0436bf7c162632dbe4c64d15401b5f5c42feaf723ea67cf05a9e316dea14abaf
- f8998bb3b5761a00a57ae042422779f05034dd69f3196fb828aaf75e5e3b6337
- c37bb2c9bc3184d7ad4ecd5849d0c2a5e77c4d7ec4afc0844feb9f3ad757d1d5
- f371deedf56b3f255379ca97aa6dafa47dceee58fd6d16193f186dbab7465ad1
- c76bc59d2208494f09bdfb4d96ac9a7ed5f1a638e54dbfeea450a69b58880f6d
- 16bb969ac6361be47396433559096a37d6cca1f05bedd9e366515b8a34ad8c1b
- e1c1100b75b1a15616e646289785673b3e8f8a7e22386dc77aa18016f7ea4934
- a5b8b2baff1adf9eda601210d86aacc933c4228611bc45d1a6df8433ca6ef946
- 0b3fea009c5add84a640fbae307d591714f01229f57f43257fa6c2e19b464b5f
- 9d30fa8a25a24c524d1e23a06689dd2f830aebbca92f0f77f72c3728efa1d960
- 4591f36f1ee21dfe64710f5027549591cecb952c1d4e67d4ef70038c63194874
- 716ad69bb9e3f06e6d00acc34be816072e0dd1d96715ee0d7906beed94ee4732
- 316d93e9dd34495b156cc625b5a4077d427cf809ade0e0f810ae35bb16766bf6
- 30ea50cd8518bb7e5339111eafd0af87a35dd930efc1e635760d3e4627ef7554
- d99bf09e2cc94cbf752a144e6c0cb47f51eb5f6785709af2410ce6177dee20de
- 6355fd36f28b81ef08b6a038cf6b3dc7bd22b36bb135473fc259453bd73c1432
- ef8b8b7d79e8d9ea8c2a44193498d4887d1ce1ed5bd66373422b68e86f81b3d1
- 5607e93a36a9dcf78000fab7b69e4bba868654a6a1b0f9d516ed4463c490f57a
- e0ecd0dd559c050f4f1e8db8e94b7db84ab73e3417658ef8374b5f116050d530
- c5fe51c00538aa8241b94c1a4297a66ea10cd54bdf71d90253ace7c731ba9fbe
- a335ec53c6dcdf7a464d3b5277921c53461f91e2f9a03ec5d08daa72b1600efc
- 8f8a52f9e80c985ac16cae526a68aa08e2869fcaf1acfef9438b587ccc51941f
- 56fc9691d438f2d120a8d769896cba6132ce2c1b4a1a36b64eb8504987c6579b
- 10ba83c6355c6f7ffee301c28940d98249c06e8f36d0c728d448244b144d4f3c
- 407a2137aecb233bcb357cfe20c798e3fb37c1d715d98d5f290fdd0770c15ef6
- a175a2046c88f70d5758dc8dbe2c418152fe4e4b008ca4cd0c3e5ac6de13290c
- 35c87e3ad5dad7736036edcf35b1c2f33a4f46df41d0b802e136ee13faead1fc
- c56ebb4f1d1b887a829ba460fb03c474cb67b470b8f938ff8a32da1d58fc48fb
- aebab0123ce77668cff72bb095d2ac30621868782c4fc93b52a5f8576d3a8871
- bb08adf26a85f7406dc996b89a487c5fa0d3c0e4305fa4c533841b41076bd507
- c6c8a8307e332639c7bc9ef840b09cd4c861c1bd943b7c66c1b444c245c1cf93
- d0c7ebd30244c515e1be32f623d338cc4d615d36dae162f82c707ba69da3f484
- 947e7d619562722590db3826cf101d778a26e7aed70d8e9ead439c05e6f809bf
- 574b1e04824158e5a0957438ee6286adeb1cb42fe646ca42ff75c1c86e3ad17d
- 099c671e44e2469c0dd346b3d4c51311309628b96b35f1208e0963d8cf3498c4
- 87d11612ee4d7fb05ba8e409b8b26bcf5e0c210a2da12de71aa97d7ff25a1c0a
- bb9d38cfd9f739f0051508527a9a53c6ad45f4c6f6ca1d47cca3b0564e732817
- f9fd22a7b66d45475e817bb9c045b46d4d819b9b608b64987c43935f51de40f8
- b587c932a5c493f4f7572ca15c43af2efb2611f827194b73a695b9d504f5e89e
- 861fe37d11daf1b0d789a910ba951b7826e69e0f8f222df15df156dfb9144821
- e5af78b8e3851e057e36e562914907fe6eab527885f671f8b68b447304c804f8
- 1211d210260ad788b85c72a0ec3eac9904de5c61426ef4fe5ccce5b3e0de536f
- 5d0170365a32c1df7a4504430d547d7b9b7626715ba52d00334717ed5696a7f4"
+checksum="0eee1b17b1f5aed676a2a494cf29b5e5d3d2698728a35eba08e66571d8c84c14
+ bff092f5e1bc8e01e3d88fad4f6121f71c6df9f3f68a0437ef0a14050c7e3b42
+ 71498faef46ff645bbbac526bb66b1cbca34c2b7022ac570a4796c6a39a8975f
+ bd99f9ada2c8248ee1239aa95f448804ec9686a73a28045bf05689d6919fbfcd
+ 467e04bd6eecf14f1b565ee9b89161873d205f54076d94d41a8bfc6fa2a58996
+ 9881874658e6066b366a0a0f6140141caa165c1830f74947270c52c06cb38fa8
+ a9c1c955fb11c7f473ea615c917804cbba1cc1c87b027b581f5c8a738f1a34fb
+ c61f578136c998d7fcfe157dd85637d536da4593a4f8fa90ffc5fe94bba9a803
+ 47ce84a0d744c33049a6e081bd8d65dac515237e5298ff9fc424a1bc4700cc92
+ 08f6eb5779f4399fdf0a8132dc92438e974cd3dcb4c5438fb587db876ee889ec
+ e16ed1906c49edfaaa233338bfd6eaf9e4f2113260a5682d4fdd9e9ce71b017e
+ ddb25de3a9e4cc3e282ffe270e62c13287a016e3c0d676cf8242b6d93afccaf5
+ 9ad51c6346e7d70a94277eaf7146fa11199b2ab40d91653d6abf0d374f7134fd
+ 64ad0267457678a7b6f2b3e452f3678a3aaf14bfb905f4f78ce4d99e06312c37
+ 91df48c9b6ae23e9e94641b98a0ba978f308cfd72236f0a0b9fa712e026cc71d
+ 52e87048120243092d77f79aa33852b57f6aec875b44cc7f321abd50f88afe7d
+ a98a26d0a50af7fec7a95f138d724ef67f309303a0df8067c0755c139b254aee
+ 126894015f17d908062f1600c7d8fa4010b8ed70d206bffc4a408b43356ea3d4
+ 22180f6601376b132f2f46eb08a4ecb3c484e76bb90587764addd5d0647029ea
+ cbb323b2b1133d8290b991b79008ee8471a916c5ba542ca8e359770c19d4759a
+ b3015a7dbf693ce9ef44c6f3b8f7c0f043bb13474e4144159cc26a65cbb23521
+ 2ab851974bdbb5b914acd44edfd6ef2adf4d0d83b872a8adb8b2b64d620b27fc
+ 234ecc57e99be39aa51ab5e5e5b238a9c5857fd366f69cdf160efd25237d0496
+ e627aa9ee85e449ced2e655f45ab60e1372a36f4b9ff8543839a864766718569
+ de9b1a64b01fd15ff6b89d6ccc93451e1f11216b07dc5e6fa05268c3e926cae1
+ 2ca889180191d8183e052c9df3c377600fcae622f7649ab488a3c1a5a1cd8d5b
+ 3b95aace3579b535a55128b9959979a61dba22bcdb195e362ceeb7526407c77a
+ 49154388549a9c5db321ebb7d327708a7bf4b36de39cdf0d93d3b88cee077fb3
+ 9f2b35bc942ca69cb498c2752a234f58a1a765ce30563589c720a755bf29e655
+ e10a8e72f0b6aa267a4a3e51708c86c21d9b92ddfac28d1f2d68a8b21729ca8c
+ 09a1e51ba668959331ac46041a76cc15f345b8634a642918544c0158777dd989
+ 7792bbcc9a1ddcfca8968cea5bcaae250095b5a46fde5d51a48d4426b4c6f5d2
+ 638c665557ef6556a5bbb2c9f79fca780a081226dbd5a465e7615f055a117748
+ 9c3b45900a28ab3efb5b3bb52daebacc1dd3a246936b745fff676e6c3fd251fd
+ 7bcbba3e353cc7a0344302db8a9888f606e28e8c2f11f4f88dde52fba69b43c4
+ 62383ba98a16964ce6ef2bde878515505965cfded17b69e477d3671e1a942fef
+ dcc2212529bea4e8b21bedf3ceefeec1a798818005d526d6d18cabecdff230e1
+ 5d0c64cec6aafcf478b57c26640e18cfae6928d5ae705b9a82337559389a57fe
+ dab730eab216c2cb0a1672a21e78fbf93c672498d5e36781b1c68050ae8431d9
+ e9296fdadb84d3462f63a06e9e72e3d7c1e6df95870a6f303b498fb115e8ac6b
+ 519f1afe2b1a6747e26718f28b39d27f5d0188bc85ed906b54d18cbca6a67ec7
+ e90fdd34d1d4612bd1a7a81ca3275be2dada26862944b4caeb356482596f591a
+ 83142afa82a9db327475afcc3318882fd8a26d81bc946749d57eb3923c5f489b
+ 027604328860d5bc938ac9564aae8957308da5b9ec05cd3984856da1c2af3ea0
+ a7028398816ae2334bf94c66efe429d981a48b790286d27fdc25f3388720e62c
+ 9224a7e0f1ceecdf4c7f77fdeb510100419f9e805e0b204f0c59d36275f6d925
+ 8af990a6fb805f552643b6ee38d178d2f75bd169802cec178175c8005bc77b37
+ b629886a47facaf7fad105b7ee9dc98b470670b25b575e51710d876235209674
+ 31fc7f882b79c4d91d270bcc8e5b2fa7066f21d6c8a5d4d491d7896e49202f06
+ fd7e5dc510770cc601f9ed4e174b8585ef28316f660379235245f10cc0c6bc3e
+ e0ac6d1626c1dfa05bcf6298919aeee4fa6904d4a347608d729e38ead4baf120
+ fe05e00413a2905f3f25d65d635655cf9e37d62fec5d0d235ea5cc7fa08ee1fd
+ 20ff2c930b732082a44020fdebc588ac069264ead48fa0f9ace5aea4210b046f
+ 4346e474009cbb630392ed0583c65448ee577a71403cb164e904a99bf6e819c2
+ f48ac2e2725c83c82af0374b5aa7a1da270bf25ea696c533c981d34518746fbd
+ e520a79ebdec829889a2225079ea7081bfa153ccf71024a9617625b88923d011
+ feb471682e8aa79cdc410c053bd2763878275f1abff17bcb1783798ee264b6be
+ f98a07ccb4806ddfef815712756f06b82543dd13483abe9865434d4c247fa2b0
+ 17f6388807ec48a8419dcc67381f8d8a5aadd467ed7d6c386ff56173e645633c
+ f7aab2c51a78cac47270bd37c9b545fe07b08429299d8fdc27b087ccbb4108f1
+ 0dd59e9a669894d9ae82c50f2ee04495922aa6f45780b51df089706c7ba9cbcc
+ 7579ce83f088693989326b7166f66a3808398be81b922361556c3efbc8a8c08a
+ f07e95eea11c8f6e516c0fdb33038c321ae8aa27ac81f5c6773cf3104e967a19
+ 5e247f86c15a267ac017dfcf73395ed3104f407c96bb606e34070332e2b26050
+ 8b61a367a186feca735487d9f62f0de7865d1a678e7e9f990ad31945bab10eb7
+ 080f150e066508946482e78dcc714c9fb3b63a7975f66ceba018ffc5bc65a833
+ e9f5b74a2856fc009c3139164872ccbe284618d7fc1fa59c16575c82cda8491e
+ 80c50b252b4bc0c00a336a9bdbfb05e7c510f4ad1ae6c64f92f6f6a037f9d762
+ 85596a73a957ff80d403d691cbc96724bae7186e1358f85c3ef21c501b033ad1
+ 81277a3e8b896e760ef75ad90c197818aa3395abf017b7560db5b189302d8e1d
+ 733de2df49762e7c6e16a02acbfe409869ec61f071364d0bbe8cbee43f350c07
+ b8d634c6ce7b03bc78c02480d82a4effbec46119cd8a6c7a0fbfbdbd7f8bee93
+ f68c8c8de23ec4eae407e44176df77b48146a2bd6de4edbcf6eca33f3cf93cb2
+ da5b8d10bfae987051f978f5f5707c9532c124233929402249ac99fe027c4c56
+ 5a00221c264e06b04476acf4098eb9a5813eaebd38d35527652ae757bd7ac819
+ 849872f1edf674b5200c35b05375a23ae56437e8ec1f5cbbd8cd4470127896d1
+ c37075191481a93fd82c3ec12cb5ed81682eff4722e1d519287535e959a46379
+ 286fd2991570be7813a7372b0651ee84de3e94e12b41e906de380573c05b75a9
+ 8f367feebd634b1cdd004c0c448fed8473f780511f525eba7a902753d873b63a
+ f58b3eb8dbf4b214cd6de44ffc23ddddd2a2e61ba4f2b21eb1ae134669e3e19a
+ c527ca276d7c2b676e89030a36b1b0d2eb30eb986849d1ecc3c7fc90ed1b5b22
+ 893484fbfa297fc87733918620f94629f2baee5d747b8cbcef4ff5268d0b8d3e
+ 11a46dde2f4e32c7ba5498195973e26dd757e6eb6f81717259062a92c0bc6cc0
+ 0bca99ff50cb7105bbaba19b345c933b9e4902a92e439bc1bddc8db210a0416e
+ 07536a87813be5de3f2d7b9828b9d846daa4656ed983ef8321496d63d74ed55f
+ bf57e98659c357fb4223d1320d445ad58cb75a5327eceecc9deef4f81b713388
+ 795322220ec8916e15938637d3d0ee0fedc876e6020a5e8d26d8281829b7a609
+ 0b4327c104f159202f4d0ec2c4af3f742551322ea7880194cb4d5eb2e72efb39
+ 9cc3ac6c592f7cc08f5bd0c7285c5de6530a63397212878d69f436f07110049b
+ c63c170c66b39ad9de3f8f6adc5980c7994ea5ee873140654bdcf12c3bc315d1
+ cf94ac6f8728367d485173afc6b17d1687ebb23cb7bc3cf36073ceb0786e6283
+ abceb2f7f9ea142c9029344e502cfad821d32960462b9c1747c289db19a652bc
+ e0eb06bf6818df10345e08ad1431d300bbe26c52f1c1795e95fd157296d3794d"

From f09b9e2a8bb8d183369e36ec8c9a50496d006fec Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Nov 2021 08:48:47 -0500
Subject: [PATCH 3291/4088] python3-canonicaljson: update to 1.5.0, adopt.

---
 srcpkgs/python3-canonicaljson/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index 88ffaede6ebd..7dbdf1adb9d0 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.4.0
-revision=2
+version=1.5.0
+revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-simplejson python3-frozendict"
+checkdepends="${depends} python3-pytest"
 short_desc="Canonical JSON"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=899b7604f5a6a8a92109115d9250142cdf0b1dfdcb62cdb21d8fb5bf37780631
+checksum=5ebddcd74c5b066ee68ecca56465338e9b1380467e0a906f4797697c9fb381e2

From ecf13be3b74856a02b185bee7023758966752e15 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Nov 2021 09:15:30 -0500
Subject: [PATCH 3292/4088] python3-unpaddedbase64: update to 2.1.0, adopt.

---
 srcpkgs/python3-unpaddedbase64/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-unpaddedbase64/template b/srcpkgs/python3-unpaddedbase64/template
index dab9eac87fe6..e751848ad4b2 100644
--- a/srcpkgs/python3-unpaddedbase64/template
+++ b/srcpkgs/python3-unpaddedbase64/template
@@ -1,15 +1,15 @@
 # Template file for 'python3-unpaddedbase64'
 pkgname=python3-unpaddedbase64
-version=1.1.0
-revision=4
+version=2.1.0
+revision=1
 wrksrc="python-unpaddedbase64-${version}"
-build_style=python3-module
-pycompile_module="unpaddedbase64.py"
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Encode and decode Base64 without '=' padding"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
-homepage="https://pypi.org/project/unpaddedbase64/"
+homepage="https://github.com/matrix-org/python-unpaddedbase64"
 distfiles="https://github.com/matrix-org/python-unpaddedbase64/archive/v${version}.tar.gz"
-checksum=4e3fc1883e75f70380e903e858ffdcb77b85624213ab9559c5f1e5917491bb73
+checksum=8f3aeae62aad49ee385c15c37bb64b625c96bb85a820aeab149c21970843ba68

From d9d038fcf75fb353aca3dd898e778536bd675978 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Nov 2021 09:25:13 -0500
Subject: [PATCH 3293/4088] python3-phonenumbers: update to 8.12.37, adopt.

---
 srcpkgs/python3-phonenumbers/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 4242d2623783..70699dac90eb 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.13
-revision=2
+version=8.12.37
+revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Library for dealing with international phone numbers"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
+changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=96d02120a3481e22d8a8eb5e4595ceec1930855749f6e4a06ef931881f59f562
+checksum=dbc560992844a059f56c7c0c6a587904e65d956740bbfb7e39589980bc9055b8

From 6f4acf6442101f8297173500f14f8c9f94080e55 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Nov 2021 09:40:07 -0500
Subject: [PATCH 3294/4088] python3-saml2: update to 7.1.0, adopt.

---
 srcpkgs/python3-saml2/template | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 355d99a85c68..c506b92e2486 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=6.5.1
-revision=2
+version=7.1.0
+revision=1
 wrksrc="pysaml2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,20 +10,12 @@ depends="python3-cryptography python3-openssl python3-dateutil
  python3-xmlschema"
 checkdepends="python3-pytest python3-mock xmlsec1-devel $depends"
 short_desc="Python3 implementation of SAML Version 2 Standard"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
+changelog="https://raw.githubusercontent.com/IdentityPython/pysaml2/master/CHANGELOG.md"
 distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz"
-checksum=3940f4b7da41f42d4155a21d50d28145b5bfec4724300553f09e4fe647f76cf9
-
-post_patch() {
-	# importlib_resources just delegate to importlib.resources
-	# in Python 3.9
-	vsed -i -e 's/importlib_resources/importlib.resources/' \
-		src/saml2/xml/schema/__init__.py \
-		src/saml2/sigver.py
-	vsed -i -e '/importlib_resources/d' setup.cfg
-}
+checksum=2c5224cd52525d92000c0a5a2f732718fa9935de98c1c42e6dbea322aeffdd6d
 
 do_check() {
 	# Ignore tests that depend on packages not provided by Void

From 0b18833c83117e69df4745a4a4489e24e24a28b6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Nov 2021 10:00:02 -0500
Subject: [PATCH 3295/4088] python3-treq: update to 21.5.0, adopt.

---
 srcpkgs/python3-treq/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template
index d312d6beb046..281981f220af 100644
--- a/srcpkgs/python3-treq/template
+++ b/srcpkgs/python3-treq/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-treq'
 pkgname=python3-treq
-version=20.3.0
-revision=4
+version=21.5.0
+revision=1
 wrksrc="treq-${version}"
 build_style=python3-module
+make_check_args="--ignore=src/treq/test/local_httpbin \
+ --ignore=src/treq/test/test_treq_integration.py"
 hostmakedepends="python3-setuptools python3-incremental"
-depends="python3-incremental python3-requests python3-six
+depends="python3-incremental python3-requests python3-hyperlink
  python3-Twisted python3-attrs"
+checkdepends="${depends} python3-pytest"
 short_desc="Requests-like API built on top of twisted.web's Agent"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/twisted/treq"
+changelog="https://raw.githubusercontent.com/twisted/treq/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/t/treq/treq-${version}.tar.gz"
-checksum=a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98
+checksum=02ea86383fc4b57539c45a965eaa1e9fd28302cdf382d21da8430050c97be9b8
 
 post_install() {
 	vlicense LICENSE

From 111ccbd0ce6008e6d392d137fe5b0e18461340f3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 10 Nov 2021 08:51:35 -0500
Subject: [PATCH 3296/4088] python3-signedjson: update to 1.1.1, adopt.

---
 .../patches/importlib_metadata.patch          | 39 +++++++++++++++++++
 srcpkgs/python3-signedjson/template           | 19 ++++-----
 2 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/python3-signedjson/patches/importlib_metadata.patch

diff --git a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch
new file mode 100644
index 000000000000..d7553958cc15
--- /dev/null
+++ b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch
@@ -0,0 +1,39 @@
+From c40c83f844fee3c1c7b0c5d1508f87052334b4e5 Mon Sep 17 00:00:00 2001
+From: MeggyCal <MeggyCal@users.noreply.github.com>
+Date: Tue, 21 Apr 2020 18:55:37 +0200
+Subject: [PATCH] Do not require importlib_metadata on python 3.8. (#9)
+
+---
+ setup.py               | 2 +-
+ signedjson/__init__.py | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9c09760..c1cc299 100755
+--- a/setup.py
++++ b/setup.py
+@@ -41,7 +41,7 @@ def read_file(path_segments):
+         "pynacl>=0.3.0",
+         "typing_extensions>=3.5",
+         'typing>=3.5;python_version<"3.5"',
+-        "importlib_metadata",
++        'importlib_metadata;python_version<"3.8"',
+     ],
+     long_description=read_file(("README.rst",)),
+     keywords="json",
+diff --git a/signedjson/__init__.py b/signedjson/__init__.py
+index 6641e64..62faa5e 100644
+--- a/signedjson/__init__.py
++++ b/signedjson/__init__.py
+@@ -12,7 +12,10 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-from importlib_metadata import version, PackageNotFoundError
++try:
++    from importlib.metadata import version, PackageNotFoundError
++except ImportError:  # pragma: nocover
++    from importlib_metadata import version, PackageNotFoundError
+ 
+ try:
+     __version__ = version(__name__)
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 60616a1791dc..bf9a8ddc1255 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-signedjson'
 pkgname=python3-signedjson
-version=1.1.0
-revision=4
-wrksrc="python-signedjson-${version}"
+version=1.1.1
+revision=1
+wrksrc="signedjson-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1
- python3-pynacl"
+hostmakedepends="python3-setuptools_scm"
+depends="python3-canonicaljson python3-unpaddedbase64 python3-pynacl
+ python3-typing_extensions"
+checkdepends="${depends} python3-pytest"
 short_desc="Sign JSON with Ed25519 signatures"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-signedjson"
-distfiles="https://github.com/matrix-org/python-signedjson/archive/v${version}.tar.gz"
-checksum=1daf71f476245f7e5c2b06a1e0b617e800d7a39bbc943263e99f00536dbe9347
+distfiles="${PYPI_SITE}/s/signedjson/signedjson-${version}.tar.gz"
+checksum=350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009

From de9d3f7a390a9960e983c74b038a467da8855697 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 21 Nov 2021 20:33:28 -0500
Subject: [PATCH 3297/4088] python3-frozendict: update to 2.1.0, adopt.

---
 srcpkgs/python3-frozendict/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 6a478b3e1b5d..cb161120a342 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.0.7
+version=2.1.0
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -8,12 +8,21 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Immutable mapping for Python3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=a68f609d1af67da80b45519fdcfca2d60249c0a8c96e68279c1b6ddd92128204
+checksum=0189168749ddea8601afd648146c502533f93ae33840eb76cd71f694742623cd
 
 do_check() {
-	PYTHONPATH="$(cd build/lib* && pwd)" pytest3 -k 'not test_empty_sub'
+	# skip tests that are failing when using C
+	# extension due to difference between pure py and
+	# C extension
+	PYTHONPATH="$(cd build/lib* && pwd)" pytest3 \
+	 --deselect=test/test_coold.py::test_repr \
+	 --deselect=test/test_coold.py::test_str \
+	 --deselect=test/test_coold.py::test_format \
+	 --deselect=test/test_frozendict_c.py::test_repr \
+	 --deselect=test/test_frozendict_c.py::test_str \
+	 --deselect=test/test_frozendict_c.py::test_format
 }

From 5e4af71b3326621f3ae939251ad58de2574c4c38 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 3 Nov 2021 10:16:56 -0400
Subject: [PATCH 3298/4088] synapse: update to 1.47.1, adopt.

---
 srcpkgs/synapse/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 57f8a3b06822..20c4a4cc9970 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.46.0
+version=1.47.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,13 +12,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson"
+checkdepends="$depends python3-parameterized"
 short_desc="Matrix reference homeserver"
-maintainer="Pete <pete@port22.co.uk>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=5f730958e57b8196ee9352b8abc32da612296f8febf675dec76e0b9d3a322ec5
+checksum=cc385b6cfeba671bba800c2557ad39063bdd53f70dfb3781c85df7af6f5d064c
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -27,6 +28,10 @@ make_dirs="
 	/var/lib/synapse 0700 synapse synapse
 	/etc/synapse 0755 synapse synapse"
 
+do_check() {
+	PYTHONPATH="." trial3 tests
+}
+
 post_install() {
 	vsv synapse
 }

From a3a132b5ad952f0c01d5ca545fac13714f2750c4 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 28 Nov 2021 16:37:40 +0530
Subject: [PATCH 3299/4088] notes-up: update to 2.0.5, orphan.

---
 srcpkgs/notes-up/patches/vala-0.50.patch | 18 ------------------
 srcpkgs/notes-up/template                | 20 ++++++++------------
 2 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/notes-up/patches/vala-0.50.patch

diff --git a/srcpkgs/notes-up/patches/vala-0.50.patch b/srcpkgs/notes-up/patches/vala-0.50.patch
deleted file mode 100644
index 2d6bfb9ee459..000000000000
--- a/srcpkgs/notes-up/patches/vala-0.50.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/vapi/libmarkdown.vapi	2020-11-21 13:32:35.540125253 +0700
-+++ b/vapi/libmarkdown.vapi	2020-11-21 13:40:04.961780640 +0700
-@@ -41,7 +41,7 @@
- 	public void initialize ();
- 	public void with_html5_tags ();
- 	public void shlib_destructor ();
--	public char markdown_version[];
-+	public string markdown_version;
- 
- 	[Compact]
- 	[CCode (cname = "MMIOT", cprefix = "mkd_", free_function = "mkd_cleanup")]
-@@ -125,4 +125,4 @@
- 		NOSTYLE,
- 		EMBED
- 	}
--}
-\ No newline at end of file
-+}
diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 8fcacc6f4d99..481a214cfbc2 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,25 +1,21 @@
 # Template file for 'notes-up'
 pkgname=notes-up
-version=2.0.2
+version=2.0.5
 revision=1
 wrksrc=Notes-up-${version}
-build_style=cmake
-configure_args="-Dnoele=$(vopt_if pantheon false true)"
-hostmakedepends="pkg-config intltool vala glib-devel"
+build_style=meson
+hostmakedepends="pkg-config vala gettext glib-devel"
 makedepends="libgee08-devel discount-devel webkit2gtk-devel granite-devel
-gtksourceview-devel gtkspell3-devel"
-depends="hicolor-icon-theme $(vopt_if pantheon contractor)"
+gtksourceview4-devel gtkspell3-devel"
+depends="hicolor-icon-theme"
 short_desc="Markdown notes editor & manager"
-maintainer="Lorem <notloremipsum@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="https://github.com/Philip-Scott/Notes-up"
 distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz"
-checksum=35eb1df71034a118e66e6e00f5394c68423cfba7ceac035bde156d77da933b17
-build_options="pantheon"
-desc_option_pantheon="build with Contractor support"
+checksum=56ddf5ab3468c3bbb806106c41b485b020ade3c7f48d271bda1e78ddce5e1664
 
 post_install() {
-	ln -s com.github.philip-scott.notes-up ${DESTDIR}/usr/bin/notes-up
+	ln -s com.github.philip_scott.notes-up ${DESTDIR}/usr/bin/notes-up
 	vlicense data/assets/highlightjs/highlight.LICENSE
-	rm  ${DESTDIR}/usr/share/notes-up/highlight.LICENSE
 }

From 52421d3a2349cdf3f7093772295521e514bed58e Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Sun, 28 Nov 2021 15:39:13 +0100
Subject: [PATCH 3300/4088] sacc: update to 1.05

---
 srcpkgs/sacc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sacc/template b/srcpkgs/sacc/template
index cf993b046c6d..39e1edb01681 100644
--- a/srcpkgs/sacc/template
+++ b/srcpkgs/sacc/template
@@ -1,15 +1,15 @@
 # Template file for 'sacc'
 pkgname=sacc
-version=1.03
+version=1.05
 revision=1
 build_style="gnu-makefile"
-makedepends="ncurses-devel"
+makedepends="ncurses-devel libtls-devel"
 short_desc="Terminal gopher client"
 maintainer="Quentin Rameau <quinq@fifth.space>"
 license="ISC"
 homepage="gopher://gopher.fifth.space/1/scm/sacc"
-distfiles="ftp://ftp.bitreich.org/releases/$pkgname/$pkgname-$version.tgz"
-checksum=10bc0416e5c429c7a634cd4dddece282fff0a2efa083d71d28cddc693eca33c9
+distfiles="ftp://ftp.bitreich.org/releases/$pkgname/$pkgname-$version.tar.gz"
+checksum=295585f703ad113a9917ad1a1983c2a6eed30f191fd02114155b0332962e955f
 
 post_install() {
 	vlicense LICENSE

From f8fff70016d153e35d8366e5e575cae988cbd00e Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Sun, 28 Nov 2021 14:26:40 +0100
Subject: [PATCH 3301/4088] gemserv: update to 0.5.0.

---
 srcpkgs/gemserv/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index 89a3d17e7917..5fa724d4771f 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,7 +1,7 @@
 # Template file for 'gemserv'
 pkgname=gemserv
-version=0.4.5
-revision=2
+version=0.5.0
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="gemini://80h.dev/projects/gemserv/"
 distfiles="https://git.sr.ht/~int80h/gemserv/archive/v${version}.tar.gz"
-checksum=7aeb5edc8af6ebefc2331aebc0c360798711c2fb16ee9cbde8c5c4f9502c491f
+checksum=20e9aa28e719199f94099889ca224f83012f893730c1e14beb06b5a0a2578cb6
 system_accounts="_gemserv"
 
 post_install() {

From b48051aa7adfee86405b743a2e17b469b05b3a6d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Nov 2021 11:16:36 -0600
Subject: [PATCH 3302/4088] Amass: update to 3.15.1.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 71ee291c99e6..f78e2f70cf12 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.15.0
+version=3.15.1
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=084ddbc8171e354abee3098458064fbcc9db059a25c4845dfc151803833df2dd
+checksum=217f5f0fed02d730543a56b58f1be3ec0fb07e57b3ace53fc673c6d0132f36a8
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From 64b8fcc6c00bb7e0a63faa5319158ca49f41c538 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Nov 2021 11:19:21 -0600
Subject: [PATCH 3303/4088] python3-httpx: update to 0.21.1.

---
 srcpkgs/python3-httpx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template
index 5c99c9208213..55f843ed478c 100644
--- a/srcpkgs/python3-httpx/template
+++ b/srcpkgs/python3-httpx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-httpx'
 pkgname=python3-httpx
-version=0.21.0
+version=0.21.1
 revision=1
 wrksrc="httpx-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://www.python-httpx.org"
 changelog="https://raw.githubusercontent.com/encode/httpx/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/h/httpx/httpx-${version}.tar.gz"
-checksum=5ae1d9deb30fe074596551b3ab98f94dfd9d7efe3ecd2d08662a5c29f6fba0e4
+checksum=02af20df486b78892a614a7ccd4e4e86a5409ec4981ab0e422c579a887acad83
 # the pypi tarball doesn't contain tests
 # the tests need unpackaged dependencies trustme and uvicorn
 make_check=no

From 931a98c7fe78d815edc9d36a6db50289babcf359 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Nov 2021 11:19:24 -0600
Subject: [PATCH 3304/4088] python3-youtubesearch: update to 1.5.2.

---
 srcpkgs/python3-youtubesearch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index c284178a44a8..8319d620097d 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.5.1
+version=1.5.2
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=485825a741ef5e7c327eaf65b27f7ffd7d10e218072a972012ff3301c2d7c488
+checksum=6094c819b195de0ef7363e76594b5c34479438a45e72c1e9f763cd9cf17a64ea
 make_check=no # no tests defined
 
 post_install() {

From 31b8c812dc0277f0310e2ec7f3a3214ff54ee011 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 28 Nov 2021 11:23:29 -0600
Subject: [PATCH 3305/4088] mongo-c-driver: update to 1.20.0.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index ee79f2e3d329..b3eec27c4bab 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.2
+version=1.20.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=b6feb4fd65423140cdee02df392cd9db2bb459731e992a5385afa554a7515762
+checksum=a97242866212bdcf9dfb8030b31a32eef9ff83082b34e1027339c805a3c50b0d
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 61e54e4287659528d633018a7f21045a13ecd42d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Nov 2021 14:45:12 +0100
Subject: [PATCH 3306/4088] libuninameslist: update to 20211114.

---
 srcpkgs/libuninameslist/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libuninameslist/template b/srcpkgs/libuninameslist/template
index a7e509d4b0b5..8b97662a4a31 100644
--- a/srcpkgs/libuninameslist/template
+++ b/srcpkgs/libuninameslist/template
@@ -1,6 +1,6 @@
 # Template file for 'libuninameslist'
 pkgname=libuninameslist
-version=20210917
+version=20211114
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/fontforge/libuninameslist"
 distfiles="https://github.com/fontforge/libuninameslist/archive/${version}.tar.gz"
-checksum=7d60ea37813590c9d319d53aaac831fedf8067c980167877bc5daa351b378031
+checksum=c089c6164f2cef361c3419a07408be72d6b58d6ef224ec226724a9fa93c0d46e
 
 pre_configure() {
 	autoreconf -fi

From 1339f5d433195c2ca3f659e19453e4cb75f2a292 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Nov 2021 14:47:22 +0100
Subject: [PATCH 3307/4088] libtls: update to 3.4.2.

---
 srcpkgs/libtls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 3a0922788b7e..42f33db208a6 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.4.1
+version=3.4.2
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="OpenSSL, ISC"
 homepage="http://www.libressl.org/"
 changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
-checksum=107ceae6ca800e81cb563584c16afa36d6c7138fade94a2b3e9da65456f7c61c
+checksum=cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 

From 61ea9ca2c2bd2d1e4aa26cf1d03e8fb093496397 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Nov 2021 15:04:23 +0100
Subject: [PATCH 3308/4088] crash: update to 8.0.0.

---
 srcpkgs/crash/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 72a0cdd6c36a..82d9a3968c11 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,10 +1,10 @@
 # Template file for 'crash'
 pkgname=crash
-version=7.3.0
-revision=2
+version=8.0.0
+revision=1
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
-hostmakedepends="flex tar wget"
+hostmakedepends="flex tar wget texinfo"
 makedepends="lzo-devel ncurses-devel zlib-devel"
 depends="binutils"
 short_desc="Kernel crash dump debugger and live inspector"
@@ -13,7 +13,7 @@ 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=98d4367ae0ea7d2eda547357a839f7bddee517b588b281574d58a15a418af5b9
+checksum=caab49b7b6d442f60c41360e0ec80cf852dc64e89303b41d704d7661cef43e68
 nocross=yes
 LDFLAGS=-llzo2
 

From 344e1b33571bf03cb3e160d9a881c5a8442dac20 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Nov 2021 15:04:29 +0100
Subject: [PATCH 3309/4088] python3-pipenv: update to 2021.11.23.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 01863718c2fd..1a8b586387f8 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2021.11.15
+version=2021.11.23
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/pypa/pipenv"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=616766b1e8dfc24b2e7c6dfbbc8276b7d7ba07e778e5eb0f1b6e59fcd4532fd1
+checksum=1bde859e8bbd1d21d503fd995bc0170048d6da7686ab885f074592c99a16e8f3
 conflicts="python-pipenv>=0"
 
 post_extract() {

From c842e025b29b35e5fc2658ffebbc9a788eeb301c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Nov 2021 19:50:36 +0100
Subject: [PATCH 3310/4088] erlang: update to 24.1.7.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index cd7340ad4bcb..c51edbde3e10 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.1.6
+version=24.1.7
 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=1b0db74f01f0072299347b794b51d170bf1b71a8f9b6c0aac404ed2c440611ad
+checksum=a1dd1a238f1f3e79784b902f3cd00e06f35a630191eaf73324a07a26a2c93af3
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 1ebf60b61b8f14e5834f8d5601646929ae84f0d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 28 Nov 2021 14:30:45 -0500
Subject: [PATCH 3311/4088] python3-aiofiles: update to 0.8.0.

---
 srcpkgs/python3-aiofiles/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-aiofiles/template b/srcpkgs/python3-aiofiles/template
index 95660af980b3..d4c6a5445630 100644
--- a/srcpkgs/python3-aiofiles/template
+++ b/srcpkgs/python3-aiofiles/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiofiles'
 pkgname=python3-aiofiles
-version=0.7.0
-revision=2
+version=0.8.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/Tinche/aiofiles"
 changelog="https://raw.githubusercontent.com/Tinche/aiofiles/master/README.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2baf8e70f95618214c4910730fd625bfaa4a8b8957838b34364b0a2c7d41db9e
+checksum=1ee866ce57b47e2f5ae2c06c0372458a6eb08131a9b1d7216a234fa0d516d638
 
 do_check() {
 	PYTHONPATH=src python3 -m pytest

From 9f5b53b333fd15ecfc24d10d505549175d88e47f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 28 Nov 2021 14:37:14 -0500
Subject: [PATCH 3312/4088] python3-hypothesis: update to 6.28.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 0c4993679d88..460af8b6cc06 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.27.0
+version=6.28.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=91912314804c37a0be3e830426d44341cbf4a751ad92e5bfdad35e434ffffd4a
+checksum=34a4e30f9a0a88bb48c2faf6d78512fb7978e03e152026e00210245b20356d70
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From c0a73d7abdb2e03644a6930810cc2371f7cdce50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 28 Nov 2021 14:37:55 -0500
Subject: [PATCH 3313/4088] python3-prompt_toolkit: update to 3.0.23.

---
 srcpkgs/python3-prompt_toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index f7dbc0c33666..ca30e275d05f 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.22
+version=3.0.23
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=449f333dd120bd01f5d296a8ce1452114ba3a71fae7288d2f0ae2c918764fa72
+checksum=7053aba00895473cb357819358ef33f11aa97e4ac83d38efb123e5649ceeecaf
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From 56e4bc2150c25112c42b166f8baa34a656f865c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 28 Nov 2021 14:39:32 -0500
Subject: [PATCH 3314/4088] python3-ipython: update to 7.30.0.

---
 srcpkgs/python3-ipython/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index c2a1120bcac4..85a1ae2e64c5 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.29.0
+version=7.30.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=4f69d7423a5a1972f6347ff233e38bbf4df6a150ef20fbb00c635442ac3060aa
+checksum=d41f8e80b99690122400f9b2069b12f670246a1b4cc5d332bd6c4e2500e6d6fb
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From 08a6bde544f778434596cd09746ecfe2c9891767 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 28 Nov 2021 14:39:38 -0500
Subject: [PATCH 3315/4088] zfs-prune-snapshots: update to 1.3.0.

---
 srcpkgs/zfs-prune-snapshots/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zfs-prune-snapshots/template b/srcpkgs/zfs-prune-snapshots/template
index 08f538004b9e..63cf6ba63a3f 100644
--- a/srcpkgs/zfs-prune-snapshots/template
+++ b/srcpkgs/zfs-prune-snapshots/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs-prune-snapshots'
 pkgname=zfs-prune-snapshots
-version=1.1.0
-revision=3
+version=1.3.0
+revision=1
 build_style=gnu-makefile
 depends="bash zfs"
 checkdepends="shellcheck"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/bahamas10/zfs-prune-snapshots"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a9f2fb3c5230111db7622f70318219a37aa8d6bd3d7f894fee54e1ec00cdff2f
+checksum=aacd3683f2bf615286f6c0b154162df11e29783897127a55e1fe73c6a342979f
 
 post_install() {
 	vlicense LICENSE

From 49db7dfe102afcc73d5379fafbb1f1a2d3f62547 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 28 Nov 2021 15:15:17 -0300
Subject: [PATCH 3316/4088] icewm: update to 2.9.0.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index e9ba69605326..118071556e15 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.8.0
+version=2.9.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=f225a7e5cf225493b6ae8d427d3a08ab9d3ab6bcd2a297ec41350655ddba7be1
+checksum=eacf813ee427cf80f46aaf8d104d7d0e79937b38dff362a857ce86a091c9de5b
 # broken tests
 make_check=no
 

From 5c92304f99c827ab2e9ffa3c81659889176a98a0 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 28 Nov 2021 11:52:21 +0530
Subject: [PATCH 3317/4088] badwolf: update to 1.2.1, orphan.

---
 srcpkgs/badwolf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 9b9f2a1fe84f..0397fe5aa59a 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,6 +1,6 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.2.0
+version=1.2.1
 revision=1
 build_style=configure
 make_check_target=test
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gettext"
 makedepends="webkit2gtk-devel libsoup-devel"
 checkdepends="mdocml"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Lorem <notloremipsum@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=eaf5b99f1fc0ea94552c64f3b5e84cf9e76891882ea5e767bf633341e0265cba
+checksum=7a658908551bc0389fc43bd04a9decfef3815d28ff2097957bf6ab186a05ffd2
 
 pre_configure() {
 	export PREFIX=/usr

From c7ff8e816f8a9f6291292e1de8764acd90658903 Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Sun, 28 Nov 2021 23:44:08 -0500
Subject: [PATCH 3318/4088] xonsh: update to 0.11.0.

---
 srcpkgs/xonsh/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index 150d83d4c8f7..69caa602e442 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,7 +1,7 @@
 # Template file for 'xonsh'
 pkgname=xonsh
-version=0.10.1
-revision=2
+version=0.11.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 checkdepends="python3-pytest python3-prompt_toolkit python3-Pygments"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://xon.sh/"
 changelog="https://raw.githubusercontent.com/xonsh/xonsh/master/CHANGELOG.rst"
 distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz"
-checksum=4ede94226b0cc5f429bc7605ace88137c685d24675228e9e94ec18341dd30be4
+checksum=9d73273276996297920c234c7d4267a305c695f0e9e2454dbdf0655c3a8f75cb
 register_shell="/bin/xonsh"
 # FIXME: fails with multiple AttributeErrors
 make_check=extended

From e0ce13ba1c2e338d4906f58f328cef3a595190e4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 28 Nov 2021 23:59:11 -0500
Subject: [PATCH 3319/4088] sof-tools: update to 1.9.2

---
 srcpkgs/sof-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sof-tools/template b/srcpkgs/sof-tools/template
index e10c8afe210f..ecd8c553e5b1 100644
--- a/srcpkgs/sof-tools/template
+++ b/srcpkgs/sof-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-tools'
 pkgname=sof-tools
-version=1.9
+version=1.9.2
 revision=1
 # https://github.com/thesofproject/sof/issues/4902
 archs="x86_64"
@@ -14,7 +14,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
 distfiles="https://github.com/thesofproject/sof/archive/refs/tags/v${version}.tar.gz"
-checksum=29b83a63720ace3a9173073f12c4dfae5ece841773483cb025623506cd02eccb
+checksum=77fc2200f96c565b18b5975fc2ac19c54a93e83502f13b4f782567e5c44f45da
 
 post_install() {
 	vlicense ../LICENCE

From 0c2d86166bc0b0230e153052be171ae266543060 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 28 Nov 2021 23:57:23 -0500
Subject: [PATCH 3320/4088] sof-firmware: update to 1.9.2

---
 srcpkgs/sof-firmware/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 5e866cb448f7..5e6399eca917 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=1.9
+version=1.9.2
 revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
@@ -11,13 +11,13 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
 distfiles="https://github.com/thesofproject/sof-bin/archive/refs/tags/v${version}.tar.gz"
-checksum=633bff2cc1490146de66796e52e06c7a608591a328c0bfc6f3fc30114640803a
+checksum=8eac925c129d195072237dcd28f4bbe80cf63eb00fd8b23bdc0719cd1ee9b395
 
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof
 	vmkdir usr/lib/firmware/intel/sof-tplg
-	rsync -a "v${version}.x/sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
-	rsync -a "v${version}.x/sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
+	rsync -a "v${version%.*}.x/sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
+	rsync -a "v${version%.*}.x/sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
 
 	vlicense LICENCE.NXP
 }

From da16b508d269d11ceb8d8a52446579586067a2b2 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 28 Nov 2021 00:46:53 +0100
Subject: [PATCH 3321/4088] viewnior: update to 1.8.

---
 srcpkgs/viewnior/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/viewnior/template b/srcpkgs/viewnior/template
index 8232c1eb787b..efea8ef77dfb 100644
--- a/srcpkgs/viewnior/template
+++ b/srcpkgs/viewnior/template
@@ -1,7 +1,7 @@
 # Template file for 'viewnior'
 pkgname=viewnior
-version=1.7
-revision=2
+version=1.8
+revision=1
 wrksrc="Viewnior-${pkgname}-${version}"
 build_style=meson
 hostmakedepends="pkg-config intltool gnome-common glib-devel gettext-devel"
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="http://siyanpanayotov.com/project/viewnior/"
 distfiles="https://github.com/hellosiyan/Viewnior/archive/${pkgname}-${version}.tar.gz"
-checksum=b9fad3b2909a78f65b33f4dfb47fcdfa97150275e00d5c44d0aa0f1dc499f3e6
+checksum=b9319171ebca23929e6ea8039c194b1595d92e764db5e3890836fb5c36e233b0

From 15ac5e895269b16e07061c50b045f55136667583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 26 Nov 2021 18:26:01 +0100
Subject: [PATCH 3322/4088] common/environment/build-style: add zig-build.sh

---
 common/environment/build-style/zig-build.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 common/environment/build-style/zig-build.sh

diff --git a/common/environment/build-style/zig-build.sh b/common/environment/build-style/zig-build.sh
new file mode 100644
index 000000000000..049b7cd437d5
--- /dev/null
+++ b/common/environment/build-style/zig-build.sh
@@ -0,0 +1 @@
+hostmakedepends+=" zig"

From 884a5ef8e704fc3900854c9c5a7b2a73f40debdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 26 Nov 2021 18:30:51 +0100
Subject: [PATCH 3323/4088] rundird: zig-build now adds zig to hostmakedepends

---
 srcpkgs/rundird/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/rundird/template b/srcpkgs/rundird/template
index 8fa83b5e0dcc..5ff897abd456 100644
--- a/srcpkgs/rundird/template
+++ b/srcpkgs/rundird/template
@@ -3,7 +3,6 @@ pkgname=rundird
 version=0.2.0
 revision=1
 build_style=zig-build
-hostmakedepends="zig"
 makedepends="pam-devel"
 short_desc="Simple daemon + PAM module providing an XDG_RUNTIME_DIR"
 maintainer="Isaac Freund <mail@isaacfreund.com>"

From 43450aefe830095901f5e61365964b2d6b5d1fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 26 Nov 2021 18:32:32 +0100
Subject: [PATCH 3324/4088] river: zig-build now adds zig to hostmakedepends

---
 srcpkgs/river/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/river/template b/srcpkgs/river/template
index d30060422419..314ed6c53146 100644
--- a/srcpkgs/river/template
+++ b/srcpkgs/river/template
@@ -4,7 +4,7 @@ version=0.1.0
 revision=1
 build_style=zig-build
 configure_args="$(vopt_if xwayland -Dxwayland)"
-hostmakedepends="zig pkg-config wayland-devel scdoc git"
+hostmakedepends="pkg-config wayland-devel scdoc git"
 makedepends="wlroots-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"

From 27af8e17f247584c687f1fbc67de959d8686da48 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 28 Nov 2021 11:25:31 +0530
Subject: [PATCH 3325/4088] minigalaxy: update to 1.1.0, orphan.

---
 srcpkgs/minigalaxy/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/minigalaxy/template b/srcpkgs/minigalaxy/template
index 9b7d2f6dbc90..30d360cf6414 100644
--- a/srcpkgs/minigalaxy/template
+++ b/srcpkgs/minigalaxy/template
@@ -1,18 +1,18 @@
 # Template file for 'minigalaxy'
 pkgname=minigalaxy
-version=1.0.2
-revision=2
+version=1.1.0
+revision=1
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="hicolor-icon-theme webkit2gtk python3-gobject python3-requests"
-checkdepends="$depends"
+checkdepends="$depends python3-simplejson"
 short_desc="Simple GOG client for Linux"
-maintainer="Lorem <notloremipsum@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, CC-BY-3.0"
 homepage="https://sharkwouter.github.io/minigalaxy/"
 changelog="https://github.com/sharkwouter/minigalaxy/blob/master/CHANGELOG.md"
 distfiles="https://github.com/sharkwouter/minigalaxy/archive/${version}.tar.gz"
-checksum=9cb482760c68153f2fc8b8fe229d60033634bc0c7b83a6aa43a9cfa20ab2d0e9
+checksum=581e7abfb4af0c01d795dc57a93b1305644d8bdd11ecb533bb2787f85b4bc992
 
 do_check() {
 	python -m unittest tests/*.py

From 3d3b6054893ae51fd2f06f2659c7fbb56730a2ba Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 27 Nov 2021 01:46:21 -0800
Subject: [PATCH 3326/4088] pacman: update to 6.0.1

---
 srcpkgs/pacman/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index b98560e10637..d14176f089d7 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,13 +1,13 @@
 # Template file for 'pacman'
 pkgname=pacman
-version=5.2.2
-revision=3
+version=6.0.1
+revision=1
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"
 conf_files="/etc/pacman.conf"
 build_style=meson
-hostmakedepends="autoconf automake curl libtool gettext-devel pkg-config asciidoc"
+hostmakedepends="curl gettext-devel pkg-config asciidoc"
 makedepends="libarchive-devel gpgme-devel libcurl-devel"
 depends="gnupg>=2"
 checkdepends="fakeroot"
@@ -15,8 +15,8 @@ short_desc="Simple library-based package manager"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.archlinux.org/pacman/"
-distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz"
-checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
+distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.xz"
+checksum=0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731
 make_check=ci-skip
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 070335ba07d4e8726983e89f31bdd447a7cec4cb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 29 Nov 2021 01:08:42 -0500
Subject: [PATCH 3327/4088] delta: update to 0.10.2

---
 srcpkgs/delta/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 15481ba9a01b..bd5040d70709 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.9.2
+version=0.10.2
 revision=1
 build_style=cargo
 checkdepends="git"
@@ -9,7 +9,8 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f002a94119cd5b6fd9deede7f344667358baf5015d0051e055fec6334ee0653f
+checksum=e0f71d72eca543478941401bd96fefc5fa3f70e7860a9f858f63bfecf8fd77a5
+make_check=no  # TODO: Re-enable checks when Rust gets updated
 
 post_install() {
 	vlicense LICENSE

From 8ace34b4a8e4552e83b6163261acef82aa3c5a0a Mon Sep 17 00:00:00 2001
From: Cullen Ross <cullenrss@gmail.com>
Date: Sun, 28 Nov 2021 19:27:26 -0500
Subject: [PATCH 3328/4088] rxvt-unicode: update to 9.30.

---
 srcpkgs/rxvt-unicode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 4223d2e8f789..00ebdf63c3ca 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -1,6 +1,6 @@
 # Template file for 'rxvt-unicode'
 pkgname=rxvt-unicode
-version=9.29
+version=9.30
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://software.schmorp.de/pkg/rxvt-unicode.html"
 distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c18bc9de0c319db1f85748ecc2f255ff9eb2be0fbe9e15fe0eabefc063c4157c
+checksum=fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d
 
 # Package build options
 build_options="gdk_pixbuf perl startup_notification unicode3"

From 3f4c603171098160b2b3772f72ae960dfb8b5fea Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 29 Nov 2021 12:46:14 +0100
Subject: [PATCH 3329/4088] balsa: update to 2.6.3

---
 srcpkgs/balsa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template
index 70838929c35a..af0f741d1860 100644
--- a/srcpkgs/balsa/template
+++ b/srcpkgs/balsa/template
@@ -1,6 +1,6 @@
 # Template file for 'balsa'
 pkgname=balsa
-version=2.6.2
+version=2.6.3
 revision=1
 build_style=gnu-configure
 configure_args="--without-gnome --with-libsecret --with-gpgme --with-sqlite
@@ -13,5 +13,5 @@ short_desc="Email client for GNOME"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pawsa.fedorapeople.org/balsa/"
-distfiles="https://pawsa.fedorapeople.org/balsa/balsa-${version}.tar.bz2"
-checksum=51d52040577b730d7a199e97ea3687b3d0f7cf7f08f6e339e784d700621a02f0
+distfiles="https://pawsa.fedorapeople.org/balsa/balsa-${version}.tar.xz"
+checksum=d4d04576c9a5026064f7d480b34531faf59543f2e4d57c48a6fa5c76661e1dd4

From 5bacc92269d2a3c99aae026495f3c2769f0c521b Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 29 Nov 2021 03:05:34 -0500
Subject: [PATCH 3330/4088] hugo: update to 0.89.4.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d2765c6722db..444018d45dbf 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.89.1
+version=0.89.4
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=c47f144291819a8d9f065f69ab290a198dfabde86a27ac2325a89f03c6e5ea3f
+checksum=9d4f61788f8d886913a1be15b3eae04fad04a4e243bd7f65c5e7367bd617856d
 
 post_install() {
 	vdoc README.md

From 364bd1e076689db60855ac3f743af431bbded02c Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 29 Nov 2021 02:00:44 -0500
Subject: [PATCH 3331/4088] stagit: update to 0.9.6.

---
 srcpkgs/stagit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 89c5a8cb177c..7078a4f6c946 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,6 +1,6 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9.5
+version=0.9.6
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="https://codemadness.org/git/stagit/log.html"
 distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
-checksum=025a17c7be3a4e98a2319efc4eb6329e9ea6a778b2b24b0eb97a342ece9bb039
+checksum=d072f386f3a546ed0341e20f9c2dfd7756a761fab1c40316a96690cb2b3066d0
 LDFLAGS="-lgit2"
 
 post_install() {

From aa3cf86c8c67cb7833d1749dfbda537df179c4fd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 29 Nov 2021 01:37:08 -0500
Subject: [PATCH 3332/4088] onefetch: update to 2.11.0

---
 srcpkgs/onefetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index cf9832cb5459..88f21bc3b351 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,6 +1,6 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.10.2
+version=2.11.0
 revision=1
 build_style=cargo
 short_desc="Git repository summary on your terminal"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/o2sh/onefetch"
 distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
-checksum=6e4d4effcd4fd94ce21625a5e32da5da6446c8874200e40dd791e623b7aff7bb
+checksum=ffd3cc3bd24e299ede1fada2b2da8bf066d59219da167477e1997c860650c192
 
 post_install() {
 	vlicense LICENSE.md

From 00320a50b5f6cc8f99b3595e9db1d1ec3ced0d5f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 29 Nov 2021 00:50:38 -0500
Subject: [PATCH 3333/4088] mdBook: update to 0.4.14

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index b9df0433334f..465ff1a1bbbc 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.13
+version=0.4.14
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=12a88a08e5c5b26810cc33b4e0ebed7cc72394f9041e8b15253e3cfac1223a7b
+checksum=59fd3e417e9d09deac89e20467194dd9f93854c2f1a87e845816c5cec676765c
 
 post_install() {
 	vlicense LICENSE

From 927a56eede5a5a7e43d1034eac2f4db7f994f71b Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 28 Nov 2021 01:11:22 +0100
Subject: [PATCH 3334/4088] py3status: update to 3.40.

---
 srcpkgs/py3status/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 5267fd63fdbe..092ccfbe2bd9 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,7 +1,7 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.39
-revision=2
+version=3.40
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-pyudev"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d18b81e86d5a44d2fa67453c3e9f04b9285005b2a7a9455890903d0e2dfe843c
+checksum=84885ec8a43626dcd7576b9cad029406c98675ca00ba66ff124d7607290d2b66
 
 post_install() {
 	vlicense LICENSE

From 2ed0366cd77ca0247a3442a1fe5c916b430b429d Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 28 Nov 2021 01:08:24 +0100
Subject: [PATCH 3335/4088] openimagedenoise: update to 1.4.2.

---
 srcpkgs/openimagedenoise/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..8190e029a08b 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.2
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=e70d27ce24b41364782376c1b3b4f074f77310ccfe5f8ffec4a13a347e48a0ea
 
 do_check() {
 	build/oidnTest

From 11e0a7a16e6f572ed354ddff76c73b9995d71cf0 Mon Sep 17 00:00:00 2001
From: Firgen <filip.frgelec@disroot.org>
Date: Sun, 14 Nov 2021 15:27:49 +0100
Subject: [PATCH 3336/4088] i3lock-color: update to 2.13.c.4.

---
 srcpkgs/i3lock-color/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3lock-color/template b/srcpkgs/i3lock-color/template
index 7f5572f99d64..6ce184239bb4 100644
--- a/srcpkgs/i3lock-color/template
+++ b/srcpkgs/i3lock-color/template
@@ -1,6 +1,6 @@
 # Template file for 'i3lock-color'
 pkgname=i3lock-color
-version=2.12.c.5
+version=2.13.c.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
@@ -11,7 +11,7 @@ maintainer="jtalowell <jtalowell@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Raymo111/i3lock-color"
 distfiles="https://github.com/Raymo111/i3lock-color/archive/${version}.tar.gz"
-checksum=62c9bdff2759186426b184ed45e4c1aae1dc3c582499d94da68d9b08662a96a9
+checksum=5df4cd3d515d938630ced981a7f0a6e01344d1ec51d10fd3c3d131d19283df69
 conf_files="/etc/pam.d/i3lock"
 conflicts="i3lock"
 

From 306623aaf074082a69f26fc215a3bd9d4de6efa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 29 Nov 2021 20:04:48 +0100
Subject: [PATCH 3337/4088] diffoscope: update to 194.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 596f402323fe..31a2ca350066 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=193
+version=194
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,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=d836ddf24ccb4ffabd798ea1b7fcb66b87e55d5e8ff08286620bb7c64e1d829f
+checksum=3d28f0325e00effc6c23c50f916d153524aa393623df2fd1fc8ae0f6a12daf94

From 654e3cd4cbf67ee0fe7603137e17dfb7d87bbcba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 29 Nov 2021 02:01:44 -0300
Subject: [PATCH 3338/4088] gnome-keyring: remove libcap-ng, adopt.

We don't set capabilities on the binary right now, so it's better to
build without libcap-ng, so it doesn't complain on start-up. This is
also done by other distros, see [1].

libcap was no longer used, and neither was libtasn1.

We already depend on gcr via shlibs, so it doesn't need to be in
depends= explicitly.

Also update changelog to canonical URL.

[1] https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/41#note_1277767
---
 srcpkgs/gnome-keyring/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index 12f1e8d2df64..f479f7f0fe5e 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,19 +1,19 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
 version=40.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
  openssh pkg-config"
-makedepends="gcr-devel libcap-devel libcap-ng-devel libtasn1-devel pam-devel"
-depends="dconf gcr"
+makedepends="gcr-devel pam-devel"
+depends="dconf"
 checkdepends="dbus xvfb-run"
 short_desc="GNOME password and secret manager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnome.org"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-keyring/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 make_check=ci-skip

From fd01d5edaed62a9a43a6a90654d69e06c93eb21f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 29 Nov 2021 02:10:34 -0300
Subject: [PATCH 3339/4088] texinfo: update to 6.8.

---
 srcpkgs/texinfo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template
index c183625028c5..55948fd8bab5 100644
--- a/srcpkgs/texinfo/template
+++ b/srcpkgs/texinfo/template
@@ -1,6 +1,6 @@
 # Template file for 'texinfo'
 pkgname=texinfo
-version=6.7
+version=6.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-perl-xs"
@@ -10,9 +10,9 @@ depends="gzip perl"
 short_desc="GNU Documentation System"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/texinfo/"
+homepage="https://www.gnu.org/software/texinfo/"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa
+checksum=8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4
 
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX fails with cross compilation

From d3b21e42389745a2546138fc73aff8f5db5e1209 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Mon, 29 Nov 2021 17:50:36 +0200
Subject: [PATCH 3340/4088] R: update to 4.1.2.

---
 srcpkgs/R/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index db75515b11cd..8a7db746af46 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
-version=4.1.1
-revision=2
+version=4.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
@@ -22,7 +22,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
 distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
-checksum=515e03265752257d0b7036f380f82e42b46ed8473f54f25c7b67ed25bbbdd364
+checksum=2036225e9f7207d4ce097e54972aecdaa8b40d7d9911cd26491fac5a0fab38af
 nocross=yes
 shlib_provides="libR.so"
 make_check=extended

From d6e1c0f2c2aa18061ea9c0bdc2c6403d7b02d0e6 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 28 Nov 2021 11:05:58 +0530
Subject: [PATCH 3341/4088] New package: coeurl-0.1.0

---
 common/shlibs           |  1 +
 srcpkgs/coeurl-devel    |  1 +
 srcpkgs/coeurl/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/coeurl-devel
 create mode 100644 srcpkgs/coeurl/template

diff --git a/common/shlibs b/common/shlibs
index dac22845d445..527588585aec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4070,3 +4070,4 @@ libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
 libptytty.so.0 libptytty-2.0_1
+libcoeurl.so.0 coeurl-0.1.0_1
diff --git a/srcpkgs/coeurl-devel b/srcpkgs/coeurl-devel
new file mode 120000
index 000000000000..bdd2ff71f0cb
--- /dev/null
+++ b/srcpkgs/coeurl-devel
@@ -0,0 +1 @@
+coeurl
\ No newline at end of file
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
new file mode 100644
index 000000000000..dd6600a89bba
--- /dev/null
+++ b/srcpkgs/coeurl/template
@@ -0,0 +1,28 @@
+# Template file for 'coeurl'
+pkgname=coeurl
+version=0.1.0
+revision=1
+wrksrc=coeurl-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="spdlog libevent-devel libcurl-devel"
+short_desc="Simple async wrapper around CURL for C++"
+maintainer="Lorem <notloremipsum@protonmail.com>"
+license="MIT"
+homepage="https://nheko.im/nheko-reborn/coeurl"
+distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
+checksum=2861453317c6da359a00083e39d899dfe0fc71becadd726ef845a5fba57d3f64
+
+post_install() {
+	vlicense LICENSE
+}
+
+coeurl-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From a0d10a99adda9c11eb3e0d87dfd6138d06a27d5b Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 28 Nov 2021 11:07:15 +0530
Subject: [PATCH 3342/4088] mtxclient: update to 0.6.0.

---
 common/shlibs              | 2 +-
 srcpkgs/mtxclient/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 527588585aec..ad60646030fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -420,7 +420,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.5.1 mtxclient-0.5.1_1
+libmatrix_client.so.0.6.0 mtxclient-0.6.0_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 35f3d4a10f42..9c8c1e3a9efe 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,17 +1,17 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.5.1
+version=0.6.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel openssl-devel"
+makedepends="json-c++ olm-devel openssl-devel coeurl-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=9478d870296ebe7679c90f563cb798eb3cdd3f9c4578ceea5af75b66f456baaa
+checksum=4245feb0bd4ae8e026c01f546a6bea45bc9d9d57d13430b8ba446b0aec4915c4
 
 post_install() {
 	vlicense LICENSE

From 4fd3ab16d75df0aa06eb0c1a174a0141cff5bbde Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 28 Nov 2021 11:07:27 +0530
Subject: [PATCH 3343/4088] nheko: update to 0.9.0.

---
 srcpkgs/nheko/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..deaf85713976 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,11 +1,11 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.8.2
-revision=2
+version=0.9.0
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
- spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++ lmdb++
+ spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
  qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel
  gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel"
 depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Nheko-Reborn/nheko"
 changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=df4575c47daab47d418637a4637b599e3848dd749132ca1e92f981d9212eabb2
+checksum=309505f13d3b65ea23c0db19e59e469905b1ae437d2d6c7d1b496ac0921fb141
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

From eab89e899eb3945ff45e334a7b98ad9560882af8 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 06:03:00 +1100
Subject: [PATCH 3344/4088] cglm: update to 0.8.4.

---
 srcpkgs/cglm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index c7dfee606c45..5b553c7c0d12 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,6 +1,6 @@
 # Template file for 'cglm'
 pkgname=cglm
-version=0.8.3
+version=0.8.4
 revision=1
 build_style=cmake
 short_desc="Highly Optimized Graphics Math (glm) for C"
@@ -8,7 +8,7 @@ maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=3a3f935f9f2ed5a8cb6337e421bf6f3a699a72d8cfe26fde1bbb8fde5c1c8aaf
+checksum=42f84c42c8a3e62954da77ab5c5d3264033d5802009e175db7921332a476126e
 
 post_install() {
 	vlicense LICENSE

From dd5f61a201f62a1e66c3ecce16543aa141356886 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 29 Nov 2021 21:37:47 +0100
Subject: [PATCH 3345/4088] debootstrap: update to 1.0.126+nmu1.

---
 srcpkgs/debootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index df67a598d286..14d0528a710c 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.126
+version=1.0.126+nmu1
 revision=1
 build_style=fetch
 depends="binutils gnupg gzip tar wget xz zstd"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
  ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2021.1.1_all.deb"
-checksum="3084a2dcb4cd56a7c094c6b7cd745b6736ad78846b108275616d448fa6911f5e
+checksum="396f694346e6b401341ca07e30355faebea0ff490322cdbba804066cf4a0d048
  56beca470dcd9b6d7e6c3c9e9d702101e01e9467e62810a8c357bd7b9c26251d"
 
 case "$XBPS_TARGET_MACHINE" in

From e405858b356e897769ae5b43603aea45586894c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 29 Nov 2021 21:37:56 +0100
Subject: [PATCH 3346/4088] linux: update to 5.15.

---
 srcpkgs/linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..f76a6a1d27e8 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,6 +1,6 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.15
 revision=1
 build_style=meta
 depends="linux${version} linux-base"

From d156edbb5b28044d1a362948474eb9a5360c661b Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 29 Nov 2021 10:05:29 -0600
Subject: [PATCH 3347/4088] font-sil-charis: update to 6.001

Remove unzip hostdepend: bsdtar works just fine
---
 srcpkgs/font-sil-charis/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/font-sil-charis/template b/srcpkgs/font-sil-charis/template
index b8b351e36462..5d804c0e6bfe 100644
--- a/srcpkgs/font-sil-charis/template
+++ b/srcpkgs/font-sil-charis/template
@@ -1,21 +1,20 @@
 # Template file for 'font-sil-charis'
 pkgname=font-sil-charis
-version=5.000
-revision=2
+version=6.001
+revision=1
 wrksrc="CharisSIL-${version}"
-hostmakedepends="unzip"
 depends="font-util"
 short_desc="Unicode serif font, similar to Bitstream Charter"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="OFL-1.1"
 homepage="https://software.sil.org/charis/"
 distfiles="https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"
-checksum=5e3e5473b30363008c289cc87e2aa584a0916087a63a3f689defa8e0cee09bfd
+checksum=850df14e9024790e061a406715693ff39489dd071ea583b3258bdeba8384ebe8
 font_dirs="/usr/share/fonts/SIL"
 
 do_install() {
-	vinstall CharisSIL-B.ttf 644 ${font_dirs}
-	vinstall CharisSIL-BI.ttf 644 ${font_dirs}
-	vinstall CharisSIL-I.ttf 644 ${font_dirs}
-	vinstall CharisSIL-R.ttf 644 ${font_dirs}
+	vinstall CharisSIL-Bold.ttf 644 ${font_dirs}
+	vinstall CharisSIL-BoldItalic.ttf 644 ${font_dirs}
+	vinstall CharisSIL-Italic.ttf 644 ${font_dirs}
+	vinstall CharisSIL-Regular.ttf 644 ${font_dirs}
 }

From d5611387194c62eaf2058d432138122aed1f10d8 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Mon, 29 Nov 2021 22:06:04 +0100
Subject: [PATCH 3348/4088] todoist: update to 0.16.0.

---
 srcpkgs/todoist/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 49761d228b01..9e96ed98dc5f 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,6 +1,6 @@
 # Template file for 'todoist'
 pkgname=todoist
-version=0.15.0
+version=0.16.0
 revision=1
 build_style=go
 go_import_path="github.com/sachaos/todoist"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/sachaos/todoist"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b7ffa14574bd241ab9e21a28f3d40c17b1a12250e89cfbc8ad708cfbfcdd84b3
+checksum=9d5a8f5c6b92d3d6df292f9ae96bec46049b4e4b7a482f7232e4e5b9708dfffa
 
 post_install() {
 	vdoc README.md

From 313ed96b9f300b312173e44d9c92320e4dade2bb Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Mon, 29 Nov 2021 22:08:08 +0100
Subject: [PATCH 3349/4088] cpuid: update to 20211129.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 8f8f26c25920..0b363cdf07ff 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20211121
+version=20211129
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.etallen.com/cpuid.html"
 distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=172f562adf31b15de177b12e6154f67179a7e5ee14d078d72319c0c074e6c01a
+checksum=230772bb88c44732e68a42d2eff43bcff46d893bf4ea6e04151d4cb6e8c88e2f

From 66fdf909213525ed7b365d6cea5f7234cb00ff67 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 28 Nov 2021 21:06:05 +0100
Subject: [PATCH 3350/4088] tor: update to 0.4.6.8.

---
 srcpkgs/tor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 39ee33963862..d6e94e369de1 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,6 +1,6 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.6.7
+version=0.4.6.8
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zstd"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://www.torproject.org/"
 changelog="https://gitlab.torproject.org/tpo/core/tor/-/raw/main/ChangeLog"
 distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
-checksum=ff665ce121b2952110bd98b9c8741b5593bf6c01ac09033ad848ed92c2510f9a
+checksum=15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a
 
 conf_files="/etc/tor/torrc"
 system_accounts="tor"

From f9e5bb4d9c2fdddf509d4559cca79d2f4b10fad4 Mon Sep 17 00:00:00 2001
From: wundrweapon <whhacker.dcx@gmail.com>
Date: Mon, 29 Nov 2021 21:23:49 -0500
Subject: [PATCH 3351/4088] font-firacode: update to 6.

---
 srcpkgs/font-firacode/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-firacode/template b/srcpkgs/font-firacode/template
index 73536112a695..35d4a5630c48 100644
--- a/srcpkgs/font-firacode/template
+++ b/srcpkgs/font-firacode/template
@@ -1,7 +1,7 @@
 # Template file for 'font-firacode'
 pkgname=font-firacode
-version=5.2
-revision=2
+version=6
+revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
 short_desc="FiraCode: monospaced font with programming ligatures"
@@ -10,7 +10,7 @@ license="OFL-1.1"
 homepage="https://github.com/tonsky/FiraCode"
 changelog="https://github.com/tonsky/FiraCode/raw/master/CHANGELOG.md"
 distfiles="https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"
-checksum=521a72be00dd22678d248e63f817c0c79c1b6f23a4fbd377eba73d30cdca5efd
+checksum=a4997c2f905fb20a6d814baf7b9bab7df7de574a8e87d6af509685a43291caf1
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {

From fc5aa9d3c980057ea802e7d4d187bb95369a875b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 05:48:58 +1100
Subject: [PATCH 3352/4088] scrot: update to 1.7.

---
 srcpkgs/scrot/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..6c1336c260ef 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,6 +1,6 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.7
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
@@ -11,7 +11,13 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=e4ff764f93ea98018d46192c35bd34eeb577040ac6e217aa0d83b2a63d88f66b
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-legacy-compat"
+else
+	makedepends+=" libbsd-devel"
+fi
 
 pre_configure() {
 	./autogen.sh

From c82f0bf4f53228d2e7e017920deefa6c2e3e53d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 30 Nov 2021 14:25:44 +0700
Subject: [PATCH 3353/4088] ca-certificates: fix busybox mktemp compat

Close: #34323
---
 .../ca-certificates/patches/busybox-flags.patch    | 14 ++++++++++++++
 srcpkgs/ca-certificates/template                   |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ca-certificates/patches/busybox-flags.patch

diff --git a/srcpkgs/ca-certificates/patches/busybox-flags.patch b/srcpkgs/ca-certificates/patches/busybox-flags.patch
new file mode 100644
index 000000000000..0f109e1b0bc1
--- /dev/null
+++ b/srcpkgs/ca-certificates/patches/busybox-flags.patch
@@ -0,0 +1,14 @@
+diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
+--- a/work/sbin/update-ca-certificates
++++ b/work/sbin/update-ca-certificates
+@@ -81,8 +81,8 @@ trap cleanup 0
+ # Helper files.  (Some of them are not simple arrays because we spawn
+ # subshells later on.)
+ TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new"
+-ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
+-REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
++ADDED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
++REMOVED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
+ 
+ # Adds a certificate to the list of trusted ones.  This includes a symlink
+ # in /etc/ssl/certs to the certificate file and its inclusion into the
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index d328fae1eb72..30b2c68d95db 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,6 +1,6 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20211016+3.71
+version=20211016+3.72
 revision=1
 _nss_version=${version#*+}
 bootstrap=yes
@@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
  ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
 checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88
- 99acd315d9af35419cda4a6960f00a7d446bd231bd407174a7b07cb3dba0c253"
+ 6ea60a9ff113e493ea2ab25f41ea75a9fbd10af7903f26f703dac8680732d02e"
 
 post_extract() {
 	cp ${FILESDIR}/* $build_wrksrc/mozilla

From 365c2df3e650f108787afc1b11e96975440e9dd9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 30 Nov 2021 07:09:02 -0600
Subject: [PATCH 3354/4088] python3-rich: update to 10.15.1.

---
 srcpkgs/python3-rich/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 79e4226fd0c1..a11c142a2002 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.14.0
+version=10.15.1
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=8bfe4546d56b4131298d3a9e571a0742de342f1593770bd0d4707299f772a0af
+checksum=93d0ea3c35ecfd8703dbe52b76885e224ad8d68c7766c921c726b14b22a57b7d
 
 post_install() {
 	vlicense LICENSE

From 9742acbcd36a0ea8fe7524b17fd6dadf84414be4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 30 Nov 2021 13:57:53 +0100
Subject: [PATCH 3355/4088] harfbuzz: update to 3.1.2.

---
 srcpkgs/harfbuzz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index e9924e9ed1aa..974779480058 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.9.1
+version=3.1.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=0edcc980f526a338452180e701d6aba6323aef457b6686976a7d17ccbddc51cf
+checksum=4056b1541dd8bbd8ec29207fe30e568805c0705515632d7fec53a94399bc7945
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From 2836e36ad56272d688bd530fa0ce36173d648095 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 Nov 2021 15:53:03 +0100
Subject: [PATCH 3356/4088] babashka: update to 0.6.7.

---
 srcpkgs/babashka/template | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 588d3139d6d1..aba66be44069 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.6.5
+version=0.6.7
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,15 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=7896fe1bab824e8e07b198c6eaed1ec465ae3baa
-_babashka_curl_commit=2187f908c033da45978512979c53bb53321120ce
+_sci_commit=f3d2764b8f9fc14026c89e23d94fa2071ededcea
+_babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df
 _babashka_nrepl_commit=eadb3330f0a65e781755d8b328727698f1d41fb0
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=cb12d2eea240fc1401feb9af2606a0847edfab10
 _pods_commit=f360afa6135b8bd2d384d9ba4582c0de6fdac804
-_deps_clj_commit=422b080c64dedad37979a748377394b2d4de7e7c
-_fs_commit=21eb0654efad0ffbeedfe8319dd1194319b30d29
+_deps_clj_commit=e06a1a450625a11409be0e2e8199415e0d2e51a9
+_fs_commit=6019ec9cb09632fdf84e4bc5879fd47ed57a35eb
+_babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -25,22 +26,26 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/process/archive/${_process_commit}.tar.gz
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
- https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="9053ba3582dbc94e4221eefe4e7f507d0c9e4d90aa5f941fb504f658ed3ceea2
- 9ec8e74253e1a3a5ac1fbb1b1ed2c549a4bb194ffde55829683c11d6a1c67904
- d4efe2c84512c3914d80087a43f9dc8377b4318ab63579959c4488038d6b766b
+ https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
+ https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
+checksum="2ec3ab92626ec42d681bb486e06ce784732401d404dfea32dbe5be23c26b3f5e
+ 89bfee50868795b09551550b5156865623fec8435eea8b9e8f71ae0ffab362eb
+ 45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d
  916d9cc8c0a3b895a72068b95c6ac985a65d30465a9d556af8acea20aaaacc42
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 510facf66f1b4404de0ab12a1093b85213cf396f5d061728315c95fc527ed96b
  4070395956fc3cb0c22bac6fb4de1ad27130d24916e1915d8a3fe9eb591f6143
- dba354c4637595ed6a24e76914497dcb6f0059b531d8cd3c8c8c23385fff605a
- 2ebe97b7fe0ad349a6a1ff567df2c372571b9a672d81f5f5f83bbf45af708d71"
+ c7ee5cfac6592885342897b3a2a2276385a3c40f0df61beee9c0e84e313b3469
+ 9bb9cb06a1a2a3cd2e9334e9e1082a510474760ed650c98b9650ceca41f4fa42
+ bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
 post_extract() {
 	rmdir -v ${wrksrc}/sci
 	mv ${wrksrc}/../sci-${_sci_commit} ${wrksrc}/sci
+	rmdir -v ${wrksrc}/babashka.core
+	mv ${wrksrc}/../babashka.core-${_babashka_core_commit} ${wrksrc}/babashka.core
 	rmdir -v ${wrksrc}/babashka.curl
 	mv ${wrksrc}/../babashka.curl-${_babashka_curl_commit} ${wrksrc}/babashka.curl
 	rmdir -v ${wrksrc}/babashka.nrepl

From 0f3a2ad8ffe4184e8ec77973f52670dca128c4fe Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 30 Nov 2021 15:55:29 +0100
Subject: [PATCH 3357/4088] Revert "harfbuzz: update to 3.1.2."

This reverts commit 908b075ecb296ec246e5553abefcdb3175fb0d1b.
---
 srcpkgs/harfbuzz/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 974779480058..1764bc6ef8c5 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,8 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=3.1.2
-revision=1
+reverts="3.1.2_1"
+version=2.9.1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
@@ -14,7 +15,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4056b1541dd8bbd8ec29207fe30e568805c0705515632d7fec53a94399bc7945
+checksum=0edcc980f526a338452180e701d6aba6323aef457b6686976a7d17ccbddc51cf
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From 0f560fa5a70ae128abf36c354b11522a604f545c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 12:01:25 +0700
Subject: [PATCH 3358/4088] gconf-editor: remove

---
 srcpkgs/gconf-editor/template     | 27 ---------------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 srcpkgs/gconf-editor/template

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
deleted file mode 100644
index d4d9fa79bd25..000000000000
--- a/srcpkgs/gconf-editor/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'gconf-editor'
-pkgname=gconf-editor
-version=3.0.1
-revision=3
-build_style=gnu-configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
-hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
-makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
- hicolor-icon-theme desktop-file-utils gnome-doc-utils GConf-devel"
-depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
-short_desc="Graphical editor to maintain the Gnome registry"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
-
-post_patch() {
-	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
-	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \
-		--domain ${pkgname} ${wrksrc}/*.schemas
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8b9aa9d8bdff..ef53eba7a92e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -67,6 +67,7 @@ replaces="
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2
  fuse-usmb<=20130204_7
+ gconf-editor<=3.0.1_3
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2

From d602db9911d20a25bf8e6acebdf4c9471cdd901d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 12:16:56 +0700
Subject: [PATCH 3359/4088] gmpc: not require gnome-doc-utils for check

---
 srcpkgs/gmpc/patches/locale-dir.patch       | 20 +++++++++++++++++++
 srcpkgs/gmpc/patches/no-mallard-check.patch | 22 +++++++++++++++++++++
 srcpkgs/gmpc/template                       |  5 -----
 3 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/gmpc/patches/locale-dir.patch
 create mode 100644 srcpkgs/gmpc/patches/no-mallard-check.patch

diff --git a/srcpkgs/gmpc/patches/locale-dir.patch b/srcpkgs/gmpc/patches/locale-dir.patch
new file mode 100644
index 000000000000..8398823dd765
--- /dev/null
+++ b/srcpkgs/gmpc/patches/locale-dir.patch
@@ -0,0 +1,20 @@
+--- a/configure
++++ b/configure
+@@ -11347,7 +11347,7 @@ fi
+ 
+     ;;
+     *)
+-    DATADIRNAME=lib
++    DATADIRNAME=share
+     ;;
+     esac
+ fi
+@@ -15026,7 +15026,7 @@ fi
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac
+ fi
diff --git a/srcpkgs/gmpc/patches/no-mallard-check.patch b/srcpkgs/gmpc/patches/no-mallard-check.patch
new file mode 100644
index 000000000000..f36891f28498
--- /dev/null
+++ b/srcpkgs/gmpc/patches/no-mallard-check.patch
@@ -0,0 +1,22 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
+ EXTRA_DIST = $(man_MANS)
+ 
+-SUBDIRS=Mallard
++SUBDIRS=
+ 
+ .PHONY: doc
+ doc: Manual.txt
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -311,7 +311,7 @@ unique_CFLAGS = @unique_CFLAGS@
+ unique_LIBS = @unique_LIBS@
+ man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
+ EXTRA_DIST = $(man_MANS)
+-SUBDIRS = Mallard
++SUBDIRS =
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 9993e6c49dfa..ec0c03ade913 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -6,7 +6,6 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
-checkdepends="gnome-doc-utils"
 short_desc="Gnome Music Player Client - The true MPD client"
 maintainer="Dave Davenport <qball@gmpclient.org>"
 license="GPL-2.0-or-later"
@@ -16,10 +15,6 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
-post_patch() {
-	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From 589a97227ef39652b6ab2805d64ed985f9198645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 13:03:18 +0700
Subject: [PATCH 3360/4088] gnac: disable old gnome-help format

---
 srcpkgs/gnac/patches/fix-debug-log.patch      | 29 +++++++++++++++++++
 srcpkgs/gnac/patches/no-gnome-doc-utils.patch | 20 +++++++++++++
 srcpkgs/gnac/patches/no-po-check.patch        |  7 +++++
 srcpkgs/gnac/template                         |  6 ++--
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gnac/patches/fix-debug-log.patch
 create mode 100644 srcpkgs/gnac/patches/no-gnome-doc-utils.patch
 create mode 100644 srcpkgs/gnac/patches/no-po-check.patch

diff --git a/srcpkgs/gnac/patches/fix-debug-log.patch b/srcpkgs/gnac/patches/fix-debug-log.patch
new file mode 100644
index 000000000000..88fd15de6a56
--- /dev/null
+++ b/srcpkgs/gnac/patches/fix-debug-log.patch
@@ -0,0 +1,29 @@
+--- a/libgnac/libgnac-debug.h
++++ b/libgnac/libgnac-debug.h
+@@ -32,7 +32,7 @@
+ 
+ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define libgnac_debug(...) \
+-        libgnac_debug_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
++        libgnac_debug_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
+ #elif defined(__GNUC__) && __GNUC__ >= 3
+ #define libgnac_debug(...) \
+         libgnac_debug_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+@@ -42,7 +42,7 @@
+ 
+ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define libgnac_warning(...) \
+-        libgnac_warning_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
++        libgnac_warning_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
+ #elif defined(__GNUC__) && __GNUC__ >= 3
+ #define libgnac_warning(...) \
+         libgnac_warning_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+@@ -52,7 +52,7 @@
+ 
+ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define libgnac_critical(...) \
+-        libgnac_critical_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
++        libgnac_critical_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
+ #elif defined(__GNUC__) && __GNUC__ >= 3
+ #define libgnac_critical(...) \
+         libgnac_critical_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
diff --git a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch
new file mode 100644
index 000000000000..00f89a338dbc
--- /dev/null
+++ b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT
+ dnl Check for GSettings macros
+ GLIB_GSETTINGS
+ 
+-GNOME_DOC_INIT([0.17.2])
++GNOME_DOC_INIT([0.17.2],[:],[:])
+ GNOME_DEBUG_CHECK
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_CXX_WARNINGS([yes])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,5 @@
+ SUBDIRS = \
+ 	data \
+-	help \
+ 	libgnac \
+ 	man \
+ 	po \
diff --git a/srcpkgs/gnac/patches/no-po-check.patch b/srcpkgs/gnac/patches/no-po-check.patch
new file mode 100644
index 000000000000..bf1ddb4a9e7d
--- /dev/null
+++ b/srcpkgs/gnac/patches/no-po-check.patch
@@ -0,0 +1,7 @@
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,3 +1,4 @@
+ # List of source files that should NOT be translated.
+ # Please keep this file sorted alphabetically.
+ data/gnac.desktop.in
++intl/plural.c
diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template
index ad01a1e97f91..9fea6a370e87 100644
--- a/srcpkgs/gnac/template
+++ b/srcpkgs/gnac/template
@@ -1,15 +1,15 @@
 # Template file for 'gnac'
 pkgname=gnac
 version=0.2.4.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-schemas-compile"
 hostmakedepends="gnome-common gettext-devel pkg-config intltool libtool
- gnome-doc-utils glib-devel gtk+3-devel gst-plugins-base1-devel
+ glib-devel gtk+3-devel gst-plugins-base1-devel
  autoconf-archive which"
 makedepends="libxml2-devel gtk+3-devel gst-plugins-base1-devel libunique-devel
  libnotify-devel gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1
- desktop-file-utils hicolor-icon-theme gnome-doc-utils"
+ desktop-file-utils hicolor-icon-theme"
 depends="gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1
  desktop-file-utils hicolor-icon-theme"
 short_desc="Audio conversion program for the Gnome desktop"

From 95f11b3682cc0c9c64ae351ca09813c66b2a29be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 13:05:33 +0700
Subject: [PATCH 3361/4088] gnome-doc-utils: remove

---
 srcpkgs/gnome-doc-utils/patches/python3.patch | 521 ------------------
 srcpkgs/gnome-doc-utils/template              |  21 -
 srcpkgs/removed-packages/template             |   1 +
 3 files changed, 1 insertion(+), 542 deletions(-)
 delete mode 100644 srcpkgs/gnome-doc-utils/patches/python3.patch
 delete mode 100644 srcpkgs/gnome-doc-utils/template

diff --git a/srcpkgs/gnome-doc-utils/patches/python3.patch b/srcpkgs/gnome-doc-utils/patches/python3.patch
deleted file mode 100644
index 284e38e775de..000000000000
--- a/srcpkgs/gnome-doc-utils/patches/python3.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-taken from fedora, alpine, gentoo
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py	2011-08-04 09:36:03.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:30:28.018627919 -0500
-@@ -86,14 +86,14 @@
-                 self.messages.append(t)
-                 if spacepreserve:
-                     self.nowrap[t] = True
--                if t in self.linenos.keys():
-+                if t in list(self.linenos.keys()):
-                     self.linenos[t].append((self.filename, tag, lineno))
-                 else:
-                     self.linenos[t] = [ (self.filename, tag, lineno) ]
-                 if (not self.do_translations) and comment and not t in self.comments:
-                     self.comments[t] = comment
-             else:
--                if t in self.linenos.keys():
-+                if t in list(self.linenos.keys()):
-                     self.linenos[t].append((self.filename, tag, lineno))
-                 else:
-                     self.linenos[t] = [ (self.filename, tag, lineno) ]
-@@ -166,7 +166,7 @@
-         elif node.isText():
-             if node.isBlankNode():
-                 if self.app.options.get('expand_entities') or \
--                  (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
-+                  (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
-                     #print >>sys.stderr, "BLANK"
-                     node.setContent('')
-             else:
-@@ -176,7 +176,7 @@
-             child = node.children
-             while child:
-                 self.normalizeNode(child)
--                child = child.next
-+                child = child.__next__
- 
-     def normalizeString(self, text, spacepreserve = False):
-         """Normalizes string to be used as key for gettext lookup.
-@@ -200,7 +200,7 @@
-             tree = ctxt.doc()
-             newnode = tree.getRootElement()
-         except:
--            print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text)
-+            print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr)
-             return text
- 
-         self.normalizeNode(newnode)
-@@ -209,7 +209,7 @@
-         child = newnode.children
-         while child:
-             result += child.serialize('utf-8')
--            child = child.next
-+            child = child.__next__
- 
-         result = re.sub('^ ','', result)
-         result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
-         ctxt.parseDocument()
-         tree = ctxt.doc()
-         if next:
--            newnode = tree.children.next
-+            newnode = tree.children.__next__
-         else:
-             newnode = tree.children
- 
-@@ -243,7 +243,7 @@
-         child = newnode.children
-         while child:
-             result += child.serialize('utf-8')
--            child = child.next
-+            child = child.__next__
-         tree.freeDoc()
-         return result
- 
-@@ -262,7 +262,7 @@
-                         result += child.content.decode('utf-8')
-                 else:
-                     result += self.myAttributeSerialize(child)
--                child = child.next
-+                child = child.__next__
-         else:
-             result = node.serialize('utf-8')
-         return result
-@@ -338,7 +338,7 @@
-                 pass
- 
-             if not newnode:
--                print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8'))
-+                print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr)
-                 return
- 
-             newelem = newnode.getRootElement()
-@@ -346,13 +346,13 @@
-             if newelem and newelem.children:
-                 free = node.children
-                 while free:
--                    next = free.next
-+                    next = free.__next__
-                     free.unlinkNode()
-                     free = next
- 
-                 if node:
-                     copy = newelem.copyNodeList()
--                    next = node.next
-+                    next = node.__next__
-                     node.replaceNode(newelem.copyNodeList())
-                     node.next = next
- 
-@@ -378,7 +378,7 @@
-             if child.type in ['text'] and  child.content.strip()!='':
-                 final = True
-                 break
--            child = child.next
-+            child = child.__next__
- 
-         node.__autofinal__ = final
-         return final
-@@ -457,7 +457,7 @@
-                     outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
-                 else:
-                     outtxt += self.doSerialize(child)
--            child = child.next
-+            child = child.__next__
- 
-         if self.app.operation == 'merge':
-             norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
-             outtxt = ''
-             while child:
-                 outtxt += self.doSerialize(child)
--                child = child.next
-+                child = child.__next__
-             return outtxt
- 
- def xml_error_handler(arg, ctxt):
-@@ -577,8 +577,8 @@
-                 raise IOError("Unable to read file '%s'" % xmlfile)
-             try:
-                 doc = XMLDocument(xmlfile, self)
--            except Exception, e:
--                print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e))
-+            except Exception as e:
-+                print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr)
-                 sys.exit(1)
-             self.current_mode.preProcessXml(doc.doc, self.msg)
-             doc.generate_messages()
-@@ -590,14 +590,14 @@
-             raise IOError("Unable to read file '%s'" % xmlfile)
-         try:
-             doc = XMLDocument(xmlfile, self)
--        except Exception, e:
--            print >> sys.stderr, str(e)
-+        except Exception as e:
-+            print(str(e), file=sys.stderr)
-             sys.exit(1)
- 
-         try:
-             mfile = open(mofile, "rb")
-         except:
--            print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
-+            print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
-         self.gt = gettext.GNUTranslations(mfile)
-         self.gt.add_fallback(NoneTranslations())
-         # Has preProcessXml use cases for merge?
-@@ -619,16 +619,16 @@
-             raise IOError("Unable to read file '%s'" % xmlfile)
-         try:
-             doc = XMLDocument(xmlfile, self)
--        except Exception, e:
--            print >> sys.stderr, str(e)
-+        except Exception as e:
-+            print(str(e), file=sys.stderr)
-             sys.exit(1)
-         doc.generate_messages()
- 
-         self.msg.translationsFollow()
-         try:
-             doc = XMLDocument(origxml, self)
--        except Exception, e:
--            print >> sys.stderr, str(e)
-+        except Exception as e:
-+            print(str(e), file=sys.stderr)
-             sys.exit(1)
-         doc.generate_messages()
-         self.output_po()
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py	2011-01-10 10:08:10.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py	2019-09-10 09:31:15.199572286 -0500
-@@ -43,7 +43,7 @@
- except ImportError:
-     from md5 import new as md5_new
- 
--from basic import basicXmlMode
-+from .basic import basicXmlMode
- 
- class docbookXmlMode(basicXmlMode):
-     """Class for special handling of DocBook document types.
-@@ -131,7 +131,7 @@
-                     hash = self._md5_for_file(fullpath)
-                 else:
-                     hash = "THIS FILE DOESN'T EXIST"
--                    print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+                    print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
- 
-                 msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
-                                   "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-@@ -198,10 +198,10 @@
- # Perform some tests when ran standalone
- if __name__ == '__main__':
-     test = docbookXmlMode()
--    print "Ignored tags       : " + repr(test.getIgnoredTags())
--    print "Final tags         : " + repr(test.getFinalTags())
--    print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
-+    print("Ignored tags       : " + repr(test.getIgnoredTags()))
-+    print("Final tags         : " + repr(test.getFinalTags()))
-+    print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
- 
--    print "Credits from string: '%s'" % test.getStringForTranslators()
--    print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
-+    print("Credits from string: '%s'" % test.getStringForTranslators())
-+    print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators())
- 
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py	2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py	2019-09-10 09:31:15.201572284 -0500
-@@ -20,7 +20,7 @@
- # Special case Gnome Summary
- #
- 
--from basic import basicXmlMode
-+from .basic import basicXmlMode
- 
- class gsXmlMode(basicXmlMode):
-     """Abstract class for special handling of document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py	2011-01-10 10:08:50.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py	2019-09-10 09:31:15.212572271 -0500
-@@ -39,7 +39,7 @@
- except ImportError:
-     from md5 import new as md5_new
- 
--from basic import basicXmlMode
-+from .basic import basicXmlMode
- 
- class mallardXmlMode(basicXmlMode):
-     """Class for special handling of Mallard document types."""
-@@ -112,7 +112,7 @@
-                     hash = self._md5_for_file(fullpath)
-                 else:
-                     hash = "THIS FILE DOESN'T EXIST"
--                    print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+                    print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
-                     
-                 msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
-                                   "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py	2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py	2019-09-10 09:31:15.213572270 -0500
-@@ -2,7 +2,7 @@
- 
- import libxml2
- 
--from docbook import docbookXmlMode
-+from .docbook import docbookXmlMode
- 
- class ubuntuXmlMode (docbookXmlMode):
-     """Special-casing Ubuntu DocBook website documentation."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py	2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py	2019-09-10 09:31:15.214572269 -0500
-@@ -21,7 +21,7 @@
- # This implements special instructions for handling XHTML documents
- # in a better way, particularly to extract some attributes in HTML tags
- 
--from basic import basicXmlMode
-+from .basic import basicXmlMode
- 
- class xhtmlXmlMode(basicXmlMode):
-     """Class for special handling of XHTML document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in	2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in	2019-09-10 09:30:28.217627684 -0500
-@@ -41,9 +41,9 @@
- if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
- 
- def usage (with_help = False):
--    print >> sys.stderr, "Usage:  %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
-+    print("Usage:  %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr)
-     if with_help:
--        print >> sys.stderr, """
-+        print("""
- OPTIONS may be some of:
-     -a    --automatic-tags     Automatically decides if tags are to be considered
-                                  "final" or not
-@@ -72,7 +72,7 @@
-     using -p option for each XML file:
-         %(command)s -p de.po chapter1.xml > chapter1.de.xml
-         %(command)s -p de.po chapter2.xml > chapter2.de.xml
--""" % {'command': sys.argv[0]}
-+""" % {'command': sys.argv[0]}, file=sys.stderr)
- 
- 
- def main(argv):
-@@ -82,7 +82,7 @@
- 
-     name = os.path.join(os.path.dirname(__file__), '..')
-     if os.path.exists(os.path.join(name, 'tests')):
--        print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH'
-+        print('Running from source folder, modifying PYTHONPATH', file=sys.stderr)
-         sys.path.insert(0, name)
- 
-     from xml2po import Main
-@@ -142,14 +142,14 @@
-         elif opt in ('-o', '--output'):
-             output = arg
-         elif opt in ('-v', '--version'):
--            print VERSION
-+            print(VERSION)
-             sys.exit(0)
-         elif opt in ('-h', '--help'):
-             usage(True)
-             sys.exit(0)
- 
-     if operation == 'update' and output != "-":
--        print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option."
-+        print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr)
- 
-     # Treat remaining arguments as XML files
-     filenames = []
-@@ -159,16 +159,16 @@
-     try:
-         xml2po_main = Main(default_mode, operation, output, options)
-     except IOError:
--        print >> sys.stderr, "Error: cannot open file %s for writing." % (output)
-+        print("Error: cannot open file %s for writing." % (output), file=sys.stderr)
-         sys.exit(5)
- 
-     if operation == 'merge':
-         if len(filenames) > 1:
--            print  >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
-+            print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr)
-             sys.exit(2)
- 
-         if not mofile:
--            print >> sys.stderr, "Error: You must specify MO file when merging translations."
-+            print("Error: You must specify MO file when merging translations.", file=sys.stderr)
-             sys.exit(3)
- 
-         xml2po_main.merge(mofile, filenames[0])
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:34:42.110328324 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:34:44.170325899 -0500
-@@ -166,7 +166,7 @@
-         elif node.isText():
-             if node.isBlankNode():
-                 if self.app.options.get('expand_entities') or \
--                  (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
-+                  (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
-                     #print >>sys.stderr, "BLANK"
-                     node.setContent('')
-             else:
-@@ -176,7 +176,7 @@
-             child = node.children
-             while child:
-                 self.normalizeNode(child)
--                child = child.__next__
-+                child = child.next
- 
-     def normalizeString(self, text, spacepreserve = False):
-         """Normalizes string to be used as key for gettext lookup.
-@@ -209,7 +209,7 @@
-         child = newnode.children
-         while child:
-             result += child.serialize('utf-8')
--            child = child.__next__
-+            child = child.next
- 
-         result = re.sub('^ ','', result)
-         result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
-         ctxt.parseDocument()
-         tree = ctxt.doc()
-         if next:
--            newnode = tree.children.__next__
-+            newnode = tree.children.next
-         else:
-             newnode = tree.children
- 
-@@ -243,7 +243,7 @@
-         child = newnode.children
-         while child:
-             result += child.serialize('utf-8')
--            child = child.__next__
-+            child = child.next
-         tree.freeDoc()
-         return result
- 
-@@ -262,7 +262,7 @@
-                         result += child.content.decode('utf-8')
-                 else:
-                     result += self.myAttributeSerialize(child)
--                child = child.__next__
-+                child = child.next
-         else:
-             result = node.serialize('utf-8')
-         return result
-@@ -346,13 +346,13 @@
-             if newelem and newelem.children:
-                 free = node.children
-                 while free:
--                    next = free.__next__
-+                    next = free.next
-                     free.unlinkNode()
-                     free = next
- 
-                 if node:
-                     copy = newelem.copyNodeList()
--                    next = node.__next__
-+                    next = node.next
-                     node.replaceNode(newelem.copyNodeList())
-                     node.next = next
- 
-@@ -378,7 +378,7 @@
-             if child.type in ['text'] and  child.content.strip()!='':
-                 final = True
-                 break
--            child = child.__next__
-+            child = child.next
- 
-         node.__autofinal__ = final
-         return final
-@@ -457,7 +457,7 @@
-                     outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
-                 else:
-                     outtxt += self.doSerialize(child)
--            child = child.__next__
-+            child = child.next
- 
-         if self.app.operation == 'merge':
-             norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
-             outtxt = ''
-             while child:
-                 outtxt += self.doSerialize(child)
--                child = child.__next__
-+                child = child.next
-             return outtxt
- 
- def xml_error_handler(arg, ctxt):
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:39:57.733974912 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:40:24.761946962 -0500
-@@ -326,7 +326,7 @@
-                 pass
- 
-             content = '<%s>%s</%s>' % (starttag, text, endtag)
--            tmp = tmp + content.encode('utf-8')
-+            tmp = tmp + content
- 
-             newnode = None
-             try:
-@@ -663,7 +663,7 @@
-         if not text or text.strip() == '':
-             return text
-         if self.gt:
--            res = self.gt.ugettext(text.decode('utf-8'))
-+            res = self.gt.gettext(text)
-             return res
- 
-         return text
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:41:23.853885851 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:44:23.580699979 -0500
-@@ -352,9 +352,10 @@
- 
-                 if node:
-                     copy = newelem.copyNodeList()
--                    next = node.next
-+                    #next = node.next
-                     node.replaceNode(newelem.copyNodeList())
--                    node.next = next
-+                    #print(type(next))
-+                    #node.next = next
- 
-             else:
-                 # In practice, this happens with tags such as "<para>    </para>" (only whitespace in between)
-@@ -470,7 +471,7 @@
- 
-         worth = self.worthOutputting(node)
-         if not translation:
--            translation = outtxt.decode('utf-8')
-+            translation = outtxt
-             if worth and self.app.options.get('mark_untranslated'):
-                 node.setLang('C')
- 
---- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig	2019-09-10 09:46:15.409584334 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py	2019-09-10 09:46:30.164569075 -0500
-@@ -184,7 +184,7 @@
-                     else:
-                         ai.addChild(copy)
-                     if match.group(3):
--                        copy.newChild(None, "year", match.group(3).encode('utf-8'))
-+                        copy.newChild(None, "year", match.group(3))
-                     if match.group(1) and match.group(2):
-                         holder = match.group(1)+"(%s)" % match.group(2)
-                     elif match.group(1):
-@@ -193,7 +193,7 @@
-                         holder = match.group(2)
-                     else:
-                         holder = "???"
--                    copy.newChild(None, "holder", holder.encode('utf-8'))
-+                    copy.newChild(None, "holder", holder)
- 
- # Perform some tests when ran standalone
- if __name__ == '__main__':
---- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~	2019-09-10 09:50:34.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in	2019-09-10 09:50:45.114305443 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -u
-+#!/usr/bin/python3 -u
- # -*- encoding: utf-8 -*-
- # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
- # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
deleted file mode 100644
index f63c6106f6c1..000000000000
--- a/srcpkgs/gnome-doc-utils/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gnome-doc-utils'
-pkgname=gnome-doc-utils
-version=0.20.10
-revision=9
-build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
-hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
- gsettings-desktop-schemas"
-makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
- libxml2-python3 libxslt"
-depends="libxslt docbook-xml docbook-xsl rarian python3 libxml2-python3"
-short_desc="Documentation utilities for GNOME"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
-distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
-checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
-
-post_patch() {
-	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ef53eba7a92e..2b16ae44131f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -74,6 +74,7 @@ replaces="
  gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-doc-utils<=0.20.10_9
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_1

From 4a52cddb6fbf18fdefbcd8afa205bf2dfb992c4d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Dec 2021 15:04:30 +0100
Subject: [PATCH 3362/4088] linux5.15: update to 5.15.6.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 02de9dab5756..484f473b5ba8 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.5
+version=5.15.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 8fdc0ef34a877379bcb9b617006edafba66f9213fc2c1df7451b578ae33b5496"
+ 23f5753121e2f18ef757449f94728d18ba70a20728dd217a53d4fa0a1cde621e"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From f5218a42397d86627122ff843e9c7c7d1454f92b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Dec 2021 15:05:25 +0100
Subject: [PATCH 3363/4088] linux5.10: update to 5.10.83.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 295165a43440..422c10d16ba8 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.82
+version=5.10.83
 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=d66f7c7eed02f84ae550b3c91a26c70eea13682a6d672432f07bce66ff8ce350
+checksum=ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 7b6ed06b1095190eea2fc37517d6a4e6446063fd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 1 Dec 2021 17:25:33 +0100
Subject: [PATCH 3364/4088] yt-dlp: add missing python3 dependency

---
 srcpkgs/yt-dlp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index b142e21ddba6..9432641a5e73 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,11 +1,12 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
 version=2021.11.10.1
-revision=1
+revision=2
 wrksrc="$pkgname"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 checkdepends="python3-pytest flake8 python3-nose"
+depends="python3"
 short_desc="CLI program to download videos from YouTube and other sites"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="Unlicense"

From 7aa29e952c1d1b81d5dcae8418db1606427fb44d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 30 Nov 2021 19:36:35 +0100
Subject: [PATCH 3365/4088] skype: update to 8.79.0.92.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index a09223ab1b54..c018a5e5031d 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.78.0.161
+version=8.79.0.92
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=db6a9aafa028c16f2f789e3d496adb465f1b6476f88c384752d95130d6af72a1
+checksum=93b3cfd8fc403fb7b4707579a2f4b068ed7077c257179b7b401612d60b41c8f7
 repository="nonfree"
 nostrip="yes"
 

From 400d6f051107c69338ac1261a609b08357b2d30f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 1 Dec 2021 15:26:38 -0600
Subject: [PATCH 3366/4088] wgetpaste: update to 2.32.

---
 srcpkgs/wgetpaste/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wgetpaste/template b/srcpkgs/wgetpaste/template
index 1688736a76b4..c91532415d78 100644
--- a/srcpkgs/wgetpaste/template
+++ b/srcpkgs/wgetpaste/template
@@ -1,17 +1,18 @@
 # Template file for 'wgetpaste'
 pkgname=wgetpaste
-version=2.30
+version=2.32
 revision=1
 depends="bash wget"
 short_desc="Script that automates pasting to a number of pastebin services"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
+license="MIT"
 homepage="http://wgetpaste.zlin.dk/"
-distfiles="http://wgetpaste.zlin.dk/${pkgname}-${version}.tar.bz2"
-checksum=e3ec35f1ff49f2204864e3b4d784f6c032cdddb62cadf69263900c67a4896592
+distfiles="https://github.com/zlin/wgetpaste/releases/download/${version}/wgetpaste-${version}.tar.xz"
+checksum=621dbafbc7bcf5438f11447a325d8974069e3df03ef0c8bb2a2cc3de2c0cdb13
 
 do_install() {
 	vbin ${pkgname}
 	vinstall _${pkgname} 644 usr/share/zsh/site-functions
 	vsconf ${FILESDIR}/${pkgname}.example
+	vlicense LICENSE
 }

From 59ed32d5c248b4527a01065424499bd098ae345d Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Wed, 1 Dec 2021 23:07:30 +0000
Subject: [PATCH 3367/4088] i3status-rust: update to 0.20.7.

---
 srcpkgs/i3status-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 36178f3938bc..d58ecb206a22 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.6
+version=0.20.7
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,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=a8b1257b09b73add3969c8bff2a4c77142164449ae3fea37a050ee95cc138b95
+checksum=995efe21ecf03e532cff9140cab1d4de9a35f91204d9e9edf0bfe3a22fedf5a0
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 5b9476293194d64ee72a09ff0dbbe2988dfbc5c0 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Wed, 1 Dec 2021 14:46:40 -0300
Subject: [PATCH 3368/4088] oil: update to 0.9.5

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index af1eb57e8d1c..9af2cc8e5435 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.9.4
+version=0.9.5
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=fac61bcd6b68c0bbf2e386aa84b107f26518527d4326bf473a02aadd85e53d02
+checksum=d89d8c081c8bc536dfc7b437b965a265c07e24cf5142ff26b21b4cc4a3139e32
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 992080439c9c3a8abf836d6d39b8549b6561f61e Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Tue, 30 Nov 2021 23:34:20 -0800
Subject: [PATCH 3369/4088] intellij-idea-ultimate-edition: update to 2021.3.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index e3b32fea16d8..20f99d94125f 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2.3
+version=2021.3
 revision=1
 archs="i686 x86_64"
 create_wrksrc="true"
@@ -11,7 +11,7 @@ license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 _filename="ideaIU-${version}-no-jbr.tar.gz"
 distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=0d879d4b16f096b81f401e0ab76a8b565d8142c632f9667cdb7fe5e6bd9813b4
+checksum=0b46ebb2381bd587bbec9d15ff78f11380bcf2654c0716c0caf747550ee73c66
 repository=nonfree
 restricted=yes
 nopie=yes

From ad3bf0aa263ce6f55f4ec350cdb7c08c04694aa6 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Tue, 30 Nov 2021 23:28:45 -0800
Subject: [PATCH 3370/4088] jetbrains-jdk-bin: update to 11.0.13b1504.49.

---
 srcpkgs/jetbrains-jdk-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 7114636c6562..f6b26790ad82 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'jetbrains-jdk-bin'
 pkgname=jetbrains-jdk-bin
-version=11.0.12b1504.40
+version=11.0.13b1504.49
 revision=1
 archs="x86_64"
 wrksrc="jbr"
@@ -11,7 +11,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
 _jdk_ver=${version%b*}
 _jdk_build=${version#*b}
 distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=56646f634eafbe85d177e40267f52d83a4bbfcb2bd359b97282bca54812e0784
+checksum=6e84df3c86adc9ec8d63f1151ffbe2081b2c10eb04ff40e1cb86d04b20c5d36e
 # This JDK appears to link to libs that do not exist, but functions well even in their absence.
 # Best guess is that they are optional. ¯\_(ツ)_/¯
 noverifyrdeps=yes

From d916c270576be02913cbe5af93dd86b0d5466320 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 30 Nov 2021 09:52:30 -0500
Subject: [PATCH 3371/4088] python3-frozendict: update to 2.1.1.

---
 srcpkgs/python3-frozendict/template | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index cb161120a342..f6e3b6661395 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.1.0
+version=2.1.1
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -12,17 +12,8 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=0189168749ddea8601afd648146c502533f93ae33840eb76cd71f694742623cd
+checksum=655b879217dd445a2023e16154cc231febef802b5c812d5c2e822280ad69e1dc
 
 do_check() {
-	# skip tests that are failing when using C
-	# extension due to difference between pure py and
-	# C extension
-	PYTHONPATH="$(cd build/lib* && pwd)" pytest3 \
-	 --deselect=test/test_coold.py::test_repr \
-	 --deselect=test/test_coold.py::test_str \
-	 --deselect=test/test_coold.py::test_format \
-	 --deselect=test/test_frozendict_c.py::test_repr \
-	 --deselect=test/test_frozendict_c.py::test_str \
-	 --deselect=test/test_frozendict_c.py::test_format
+	PYTHONPATH="$(cd build/lib* && pwd)" pytest3
 }

From 79b256281c0ae5180305911cb0673483b689d4e9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 30 Nov 2021 10:00:42 -0500
Subject: [PATCH 3372/4088] python3-phonenumbers: update to 8.12.38.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 70699dac90eb..29e82870d9a4 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.37
+version=8.12.38
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=dbc560992844a059f56c7c0c6a587904e65d956740bbfb7e39589980bc9055b8
+checksum=3cda1d1cea9a6801babf825e6c0f6a9776ea6d8a68b81b256178f8e5aa813344

From 9638cb562ba9c4e6cec29429471c6b46e9098d2d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 30 Nov 2021 09:55:55 -0500
Subject: [PATCH 3373/4088] synapse: update to 1.48.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 20c4a4cc9970..bd5f529503e5 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.47.1
+version=1.48.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=cc385b6cfeba671bba800c2557ad39063bdd53f70dfb3781c85df7af6f5d064c
+checksum=182facc856f8d0c0d2d0dd4105fae4f851297167c0ee95c202a3aad9ed86c486
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 1dd0d470a261962ee1d3a20fe8f7bd68fc2d13b3 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 30 Nov 2021 12:51:38 +0100
Subject: [PATCH 3374/4088] ddpt: update to 0.97

---
 srcpkgs/ddpt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ddpt/template b/srcpkgs/ddpt/template
index a647dfdc9a81..cbb5c53e0aa8 100644
--- a/srcpkgs/ddpt/template
+++ b/srcpkgs/ddpt/template
@@ -1,6 +1,6 @@
 # Template file for 'ddpt'
 pkgname=ddpt
-version=0.96
+version=0.97
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/ddpt.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=8f231342af7458fe592496d5e8ff4e9a22313b6e0bbc5be9c588ed392d75e1f4
+checksum=e340a529aeef6a107b0c24c64873da590f5284557faffdf57a0f9dc48807233d
 
 post_install() {
 	vlicense COPYING

From 1c2e58b4f6eca67b7107f5046de1db2cd23a54f4 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 30 Nov 2021 12:25:35 +0100
Subject: [PATCH 3375/4088] chuck: update to 1.4.1.0

---
 srcpkgs/chuck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chuck/template b/srcpkgs/chuck/template
index acf5648af53b..9c6c8be9364a 100644
--- a/srcpkgs/chuck/template
+++ b/srcpkgs/chuck/template
@@ -1,6 +1,6 @@
 # Template file for 'chuck'
 pkgname=chuck
-version=1.4.0.1
+version=1.4.1.0
 revision=1
 build_wrksrc=src
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="http://chuck.cs.princeton.edu"
 changelog="https://chuck.cs.princeton.edu/release/VERSIONS"
 distfiles="http://chuck.cs.princeton.edu/release/files/$pkgname-$version.tgz"
-checksum=11a20c34b385e132bf43d5ae6a562c652f631828cc6b1562a4c029bc9a850ed4
+checksum=74bf99ad515e3113c55b833152936fad02a3cf006a54105ff11777c473194928
 
 
 post_extract() {

From 964b9d353645bdd88190861cbe3de7b6e64f563f Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 29 Nov 2021 23:00:26 -0500
Subject: [PATCH 3376/4088] chicken: update to 5.3.0.

---
 srcpkgs/chicken/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chicken/template b/srcpkgs/chicken/template
index 7da68b4a0468..79fdc41fbfb6 100644
--- a/srcpkgs/chicken/template
+++ b/srcpkgs/chicken/template
@@ -1,6 +1,6 @@
 # Template file for 'chicken'
 pkgname=chicken
-version=5.2.0
+version=5.3.0
 revision=1
 short_desc="Practical and portable Scheme system"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,7 +8,7 @@ license="BSD-3-Clause"
 homepage="http://www.call-cc.org"
 changelog="https://code.call-cc.org/releases/$version/NEWS"
 distfiles="http://code.call-cc.org/releases/$version/$pkgname-$version.tar.gz"
-checksum=819149c8ce7303a9b381d3fdc1d5765c5f9ac4dee6f627d1652f47966a8780fa
+checksum=c3ad99d8f9e17ed810912ef981ac3b0c2e2f46fb0ecc033b5c3b6dca1bdb0d76
 
 do_configure() {
 	make -B -f Makefile.linux chicken-defaults.h PREFIX=/usr

From 157847166da11a3dc06afa1ec9b8cb3ba82aa542 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 06:15:55 +1100
Subject: [PATCH 3377/4088] fasm: update to 1.73.28.

---
 srcpkgs/fasm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fasm/template b/srcpkgs/fasm/template
index 020b96a5a3b8..9137a57e86e0 100644
--- a/srcpkgs/fasm/template
+++ b/srcpkgs/fasm/template
@@ -1,6 +1,6 @@
 # Template file for 'fasm'
 pkgname=fasm
-version=1.73.27
+version=1.73.28
 revision=1
 archs="i686* x86_64*"
 wrksrc=fasm
@@ -9,7 +9,7 @@ maintainer="Dmitry Bogatov <KAction@disroot.org>"
 license="BSD-2-Clause"
 homepage="https://flatassembler.net"
 distfiles="https://flatassembler.net/fasm-${version}.tgz"
-checksum=680148377fb6d3b6663852880faa03514d7326b5995742d33a87e244f48cf0b1
+checksum=9ed1ebb485fd1174111a94eb773105a234911398e05090f5e714abf62c809292
 nostrip=yes
 
 case ${XBPS_TARGET_MACHINE} in

From dffb45b124a49c19661694d63b86ecefca65d29a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 06:22:00 +1100
Subject: [PATCH 3378/4088] gtkwave: update to 3.3.111.

---
 srcpkgs/gtkwave/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template
index d99b80e33dbf..9370f93039b3 100644
--- a/srcpkgs/gtkwave/template
+++ b/srcpkgs/gtkwave/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkwave'
 pkgname=gtkwave
-version=3.3.109
+version=3.3.111
 revision=1
 build_style=gnu-configure
 configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib"
@@ -11,7 +11,7 @@ maintainer="allan <mail@may.mooo.com>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://gtkwave.sourceforge.net/"
 distfiles="http://gtkwave.sourceforge.net/gtkwave-${version}.tar.gz"
-checksum=ca487e5e9b728086ba4de6581058d6c096a7771915163ef600f63d0e88c3c05d
+checksum=f6e6046674033e5bab6e4e2720d6bd7dba70b23f329614191b029e06c57ec296
 
 post_install() {
 	vlicense LICENSE.TXT

From f105828eb5552b7b77296b1f13069c704d7e4c2f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 06:09:12 +1100
Subject: [PATCH 3379/4088] glfw: update to 3.3.5.

---
 srcpkgs/glfw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template
index 99feb63bca77..997829355280 100644
--- a/srcpkgs/glfw/template
+++ b/srcpkgs/glfw/template
@@ -1,7 +1,7 @@
 # Template file for 'glfw'
 # update together with glfw-wayland
 pkgname=glfw
-version=3.3.4
+version=3.3.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=035f4572d9b7967433b3256f0eaa5257532b0e18865878a162233b108b6ca1db
+checksum=7bf8d4df3436f6eac7356e47fff7eb5a3610a692bffa27ce57dd55166abed5ea
 
 glfw-devel_package() {
 	depends="glfw>=${version}_${revision} $makedepends"

From 9c06437ca6a544e732f419f6657744f7978ff142 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 06:11:30 +1100
Subject: [PATCH 3380/4088] glfw-wayland: update to 3.3.5.

---
 srcpkgs/glfw-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template
index 6f90d6bc7778..8991962c6af5 100644
--- a/srcpkgs/glfw-wayland/template
+++ b/srcpkgs/glfw-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'glfw-wayland'
 pkgname=glfw-wayland
-version=3.3.4
+version=3.3.5
 revision=1
 wrksrc=glfw-${version}
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2"
-checksum=035f4572d9b7967433b3256f0eaa5257532b0e18865878a162233b108b6ca1db
+checksum=7bf8d4df3436f6eac7356e47fff7eb5a3610a692bffa27ce57dd55166abed5ea
 provides="glfw-${version}_${revision}"
 replaces="glfw>=0"
 

From 6b936a39462b5b1143de5e35f7a73ed8d3a5a1c6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 06:25:14 +1100
Subject: [PATCH 3381/4088] socat: update to 1.7.4.2.

---
 srcpkgs/socat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index d4e0f0a9bbdb..92ccc52bc08f 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,7 +1,7 @@
 # Template file for 'socat'
 pkgname=socat
-version=1.7.4.1
-revision=2
+version=1.7.4.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.dest-unreach.org/socat/"
 distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
-checksum=3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9
+checksum=6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;

From 0fd6fe9ddb7b658ef6fe149b0830478d88c15a23 Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 29 Nov 2021 00:35:59 -0500
Subject: [PATCH 3382/4088] tree-sitter: update to 0.20.1.

---
 srcpkgs/tree-sitter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index 25d2743934c5..0f92c4e67130 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -1,6 +1,6 @@
 # Template file for 'tree-sitter'
 pkgname=tree-sitter
-version=0.20.0
+version=0.20.1
 revision=1
 build_style=cargo
 make_install_args="--path=cli"
@@ -9,7 +9,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://tree-sitter.github.io"
 distfiles="https://github.com/tree-sitter/tree-sitter/archive/v${version}.tar.gz"
-checksum=4a8070b9de17c3b8096181fe8530320ab3e8cca685d8bee6a3e8d164b5fb47da
+checksum=12a3f7206af3028dbe8a0de50d8ebd6d7010bf762db918acae76fc7585f1258d
 make_check=no # tests require generating fixtures from remote repositories
 
 post_build() {

From 2ea227ac876ef153923dad77c58c59ae40610de7 Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Wed, 1 Dec 2021 09:29:47 +0100
Subject: [PATCH 3383/4088] neovim: update to 0.6.0.

---
 srcpkgs/neovim/patches/python-3.10.patch | 23 -----------------------
 srcpkgs/neovim/template                  |  6 +++---
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/neovim/patches/python-3.10.patch

diff --git a/srcpkgs/neovim/patches/python-3.10.patch b/srcpkgs/neovim/patches/python-3.10.patch
deleted file mode 100644
index 7ff1b17cc24f..000000000000
--- a/srcpkgs/neovim/patches/python-3.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e78fc38908dfb9f952e75026987f0db1f9ce4253 Mon Sep 17 00:00:00 2001
-From: "Tejasvi S. Tomar" <45873379+tejasvi@users.noreply.github.com>
-Date: Thu, 7 Oct 2021 11:41:52 +0530
-Subject: [PATCH] Fix python provider's minor version comparison
-
-`'3.10' < '3.3'` but v3.10 > v3.3
----
- runtime/autoload/provider/pythonx.vim | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
-index c292b374b6f5..0eeb35cba8f1 100644
---- a/runtime/autoload/provider/pythonx.vim
-+++ b/runtime/autoload/provider/pythonx.vim
-@@ -96,7 +96,7 @@ function! provider#pythonx#CheckForModule(prog, module, major_version) abort
-     if prog_version !~ '^' . a:major_version
-       return [0, prog_path . ' is Python ' . prog_version . ' and cannot provide Python '
-             \ . a:major_version . '.']
--    elseif prog_version =~ '^' . a:major_version && prog_version < min_version
-+    elseif prog_version =~ '^' . a:major_version && str2nr(prog_version[2:]) < str2nr(min_version[2:])
-       return [0, prog_path . ' is Python ' . prog_version . ' and cannot provide Python >= '
-             \ . min_version . '.']
-     endif
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index bb22714097d4..ea9d0e5daa02 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.5.1
-revision=2
+version=0.6.0
+revision=1
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_BUILD_TYPE=Release"
@@ -14,7 +14,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="Apache-2.0, custom:Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=aa449795e5cc69bdd2eeed7095f20b9c086c6ecfcde0ab62ab97a9d04243ec84
+checksum=2cfd600cfa5bb57564cc22ffbbbcb2c91531053fc3de992df33656614384fa4c
 
 alternatives="
  vi:vi:/usr/bin/nvim

From cb13a7516f00fc3066d7f476890d70df8afb1491 Mon Sep 17 00:00:00 2001
From: Dakota Walsh <kota@nilsu.org>
Date: Tue, 30 Nov 2021 09:42:07 +1300
Subject: [PATCH 3384/4088] aerc: update to 0.6.0.

The original upstream maintainer, Drew Devault, has stepped down and a
fork was created (with Drew's approval) under the same name. The fork
has patched in a large backlog of crashes and bug fixes and put out a
new version 0.6.0 recently. I think now that the aerc community has
consolidated on this fork it would be appropriate to update out package
to the new upstream.

More info about the fork and new maintainer can be found in this
discussion: https://lists.sr.ht/~sircmpwn/aerc/%3CCFBVJ3G1Y4YB.ZI6C02D0MS0S%40diabtop%3E
---
 srcpkgs/aerc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 08c81ef0d4eb..989a400caa90 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,6 +1,6 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 hostmakedepends="scdoc git"
@@ -9,8 +9,8 @@ short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
-distfiles="https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"
-checksum=87b922440e53b99f260d2332996537decb452c838c774e9340b633296f9f68ee
+distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
+checksum=ec4565609938b314f0343d85dfdab1cb0659c07c2845369ff7cf0132c5faed6e
 
 do_configure() {
 	:

From cda18b3cf449e4932975de26b506e4d29e1c8a3b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Dec 2021 16:22:07 +0100
Subject: [PATCH 3385/4088] golly: update to 4.1.

---
 srcpkgs/golly/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template
index 614c13b3be51..ee2876689ad3 100644
--- a/srcpkgs/golly/template
+++ b/srcpkgs/golly/template
@@ -1,6 +1,6 @@
 # Template file for 'golly'
 pkgname=golly
-version=4.0
+version=4.1
 revision=1
 wrksrc="${pkgname}-${version}-src"
 build_wrksrc="gui-wx"
@@ -10,13 +10,13 @@ make_build_args="-f makefile-gtk GOLLYDIR=/usr/share/golly LUALIB=-llua5.4
 make_install_args="${make_build_args}"
 hostmakedepends="python3"
 makedepends="MesaLib-devel glu-devel lua54-devel python3-devel wxWidgets-devel
- zlib-devel"
+ zlib-devel SDL2-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=6c655a6ce2fd75c6ae7289da39d084162c6ed887a01c21c3760872e3ff6d60c8
 
 CXXFLAGS="-I../gollybase"
 
@@ -27,7 +27,7 @@ post_extract() {
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i "s,\(PYTHON_INCLUDE\) =.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python3.9,g" makefile-gtk
+		vsed -i "s,\(PYTHON_INCLUDE\) =.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python3.10,g" makefile-gtk
 	fi
 }
 

From 07674d8cd43e75723c825fed7e9ca49ee0df59fb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Dec 2021 18:16:57 +0100
Subject: [PATCH 3386/4088] sbcl: update to 2.1.11.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 5225f4ae682c..524d66eb8d05 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.10
+version=2.1.11
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=eb183f0f59a5cb2cbed762ec062bc34b9b6214b65402660784ef54838884b138
+checksum=bfc1481de7fdbdfaeef2ab0f0e8e84efd343433dea8d21cfbea8b0146cbdfefd
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 5b23e9527d5a451bff8a78d08650122a7c4bf7d34b73fa7c8e712670fadc28ff"
+	checksum+=" e9605c843776470d8f81000b732b0a672ec355c0e3d6bbebfb900eddeb86c440"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From e2c60b92946472a8d20db0d868c6f6a18a6a90fe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 2 Dec 2021 16:32:37 +0100
Subject: [PATCH 3387/4088] python3-md2gemini: remove site-packages/tests

---
 srcpkgs/python3-md2gemini/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-md2gemini/template b/srcpkgs/python3-md2gemini/template
index 508f152fa939..4b4f88c7233d 100644
--- a/srcpkgs/python3-md2gemini/template
+++ b/srcpkgs/python3-md2gemini/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-md2gemini'
 pkgname=python3-md2gemini
 version=1.8.1
-revision=1
+revision=2
 wrksrc="md2gemini-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-mistune2 python3-cjkwrap
@@ -14,3 +14,8 @@ license="LGPL-3.0-only"
 homepage="https://github.com/makeworld-the-better-one/md2gemini"
 distfiles="${PYPI_SITE}/m/md2gemini/md2gemini-${version}.tar.gz"
 checksum=3ef2bd2d9e2b4968a844a2858f721348429f3a0b5976bd1c324198538103ca55
+
+post_install() {
+	# remove tests directory polluting site-packages
+	rm -r $DESTDIR/usr/lib/python*/site-packages/tests
+}

From 02313c85b50b886f0b46525f0beedd67aae4e51c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 2 Dec 2021 16:32:42 +0100
Subject: [PATCH 3388/4088] python3-pykeepass: remove site-packages/tests

---
 srcpkgs/python3-pykeepass/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index 532f3a77a13c..5571c1a18dbe 100644
--- a/srcpkgs/python3-pykeepass/template
+++ b/srcpkgs/python3-pykeepass/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pykeepass'
 pkgname=python3-pykeepass
 version=4.0.1
-revision=1
+revision=2
 wrksrc="pykeepass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,3 +15,8 @@ homepage="https://github.com/libkeepass/pykeepass"
 changelog="https://raw.githubusercontent.com/libkeepass/pykeepass/master/CHANGELOG.rst"
 distfiles="https://github.com/libkeepass/pykeepass/archive/refs/tags/${version}.tar.gz"
 checksum=ac5966ede4fae1a0d3ea1997468a14b893a8f8dab136b1c14425b3b2763e68e3
+
+post_install() {
+	# remove tests directory polluting site-packages
+	rm -r $DESTDIR/usr/lib/python*/site-packages/tests
+}

From 85f981b91f5e8ba2a9006a9d58bdb4b235001b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 2 Dec 2021 11:41:52 +0100
Subject: [PATCH 3389/4088] age: set version information

---
 srcpkgs/age/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index a3284c8d0c69..cf7754da9b03 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,10 +1,11 @@
 # Template file for 'age'
 pkgname=age
 version=1.0.0
-revision=1
+revision=2
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."
+go_ldflags="-X main.Version=${version}"
 short_desc="Simple, modern and secure encryption tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From eadfceb887383b7a8ebd2ef15b31070c1ba9e13c Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Thu, 2 Dec 2021 07:53:35 -0600
Subject: [PATCH 3390/4088] nss: update to 3.73.

critical security fix
https://www.mozilla.org/en-US/security/advisories/mfsa2021-51/
---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 968500eb758e..8f70796361e5 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.72
+version=3.73
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=6ea60a9ff113e493ea2ab25f41ea75a9fbd10af7903f26f703dac8680732d02e
+checksum=566d3a68da9b10d7da9ef84eb4fe182f8f04e20d85c55d1bf360bb2c0096d8e5
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From dfa800b25ad5ddcd5b5e0b21a43a22343e1cdea1 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Thu, 2 Dec 2021 19:16:19 +0700
Subject: [PATCH 3391/4088] vivaldi: update to 5.0.2497.24

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 98a12ab05eba..1ef2335e9ebe 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=4.3.2439.65
+version=5.0.2497.24
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=42d6a7568b7b45c3b3d5a47e0ff51c46b80eab00645a17961be32f5320df10d1
+checksum=40f1cf35e6bd0e04e6bf9360f5179c85c68af403562a46358ea306e18080b32d
 repository=nonfree
 restricted=yes
 nostrip=yes

From 4cefb074d01ade0053dd462ab2bd8b6f4b9bfd92 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Thu, 2 Dec 2021 13:22:19 +0100
Subject: [PATCH 3392/4088] gnome-robots: update to 40.0

---
 srcpkgs/gnome-robots/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 1d85efb012db..369474709a8d 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-robots'
 pkgname=gnome-robots
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel
+hostmakedepends="gettext glib-devel itstool pkg-config vala"
+makedepends="gsound-devel gtk4-devel libcanberra-devel librsvg-devel
  libglib-devel libgnome-games-support-devel"
 short_desc="GNOME classic robots game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Robots"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1fe8694aa7d4f86e77770649fcd8944b00535913cb5975bcd3adc424bdbeffe2
+checksum=6fbf2f885750f1a5110a724f8f35addd9bc61184ee31cf0c0cb89953e4f4cb11

From 07bf4d797264785a5193c360d3f981b96d8b512f Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Wed, 1 Dec 2021 09:21:22 +0100
Subject: [PATCH 3393/4088] Rocket.Chat-Desktop: update to 3.7.0.

---
 srcpkgs/Rocket.Chat-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index a01959934521..58f2eed1d9ba 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.6.0
+version=3.7.0
 revision=1
 _electron_ver=13
 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=1b867f55c32f24124f5aaf6ce3dcd805a5aab29c63582a4b5a8730420af5cc1d
+checksum=328707d85b847214e0fe92bd3e45d757c7a27f24532c2f6d353dd045458fee80
 
 export USE_SYSTEM_APP_BUILDER=true
 

From a0c82bb6eb471c6e4e1553c991cf6a92b3a2a5d9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Dec 2021 15:58:47 +0100
Subject: [PATCH 3394/4088] knot-resolver: update to 5.4.3.

---
 srcpkgs/knot-resolver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index fc56c00f9742..56fd104bc0f0 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.2
+version=5.4.3
 revision=1
 build_style=meson
 configure_args="
@@ -19,7 +19,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b
+checksum=488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From 92e80fcb01a40308d6760c461b7f18c285da856e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Dec 2021 16:00:34 +0100
Subject: [PATCH 3395/4088] logswan: update to 2.1.12.

---
 srcpkgs/logswan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/logswan/template b/srcpkgs/logswan/template
index e6a18fe21159..4436b23cac97 100644
--- a/srcpkgs/logswan/template
+++ b/srcpkgs/logswan/template
@@ -1,6 +1,6 @@
 # Template file for 'logswan'
 pkgname=logswan
-version=2.1.11
+version=2.1.12
 revision=1
 build_style=cmake
 makedepends="jansson-devel libmaxminddb-devel"
@@ -10,7 +10,7 @@ license="BSD-2-clause"
 homepage="https://www.logswan.org/"
 changelog="https://github.com/fcambus/logswan/raw/master/ChangeLog"
 distfiles="https://github.com/fcambus/logswan/archive/${version}.tar.gz"
-checksum=a031b04c2dcfe8195e4225b8dd5781fc76098b9d19d0e4a9cbe1da76a4928eea
+checksum=8e954fcf5319b83f184b1a91d0af12c58bb90ab0f322f42ea6ad36fb05d57894
 
 post_install() {
 	vlicense LICENSE

From 17d03d9a4a4a7fb7515950ad2686faeb4a872b74 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Dec 2021 16:10:05 +0100
Subject: [PATCH 3396/4088] poke: update to 1.4.

---
 srcpkgs/poke/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poke/template b/srcpkgs/poke/template
index c1876c668059..dbb3543855e8 100644
--- a/srcpkgs/poke/template
+++ b/srcpkgs/poke/template
@@ -1,6 +1,6 @@
 # Template file for 'poke'
 pkgname=poke
-version=1.3
+version=1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.jemarch.net/poke.html"
 changelog="https://www.jemarch.net/poke-${version}-relnotes.html"
 distfiles="${GNU_SITE}/poke/poke-${version}.tar.gz"
-checksum=ba7863034a1b08004b0ee8f88bda94160707e9a781d5556f555b507583cf0f1b
+checksum=ce054df29560c921230132703ee449fe130b6e25ab03aa6cc796bb401506aa24
 
 poke-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6d73d5e5394bb3af8d2d752d040b2ffd53b964f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Dec 2021 17:50:39 +0100
Subject: [PATCH 3397/4088] youtube-dl: orphan package

---
 srcpkgs/youtube-dl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 72c70a4ee4b4..b83c6c887ab0 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
 checkdepends="flake8 python3-nose"
 short_desc="CLI program to download videos from YouTube and other sites"
-maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unlicense"
 homepage="https://yt-dl.org"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"

From 2cd774fe2772dcd869306bb278097e891beba052 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 3 Dec 2021 20:06:41 +0400
Subject: [PATCH 3398/4088] calibre: update to 5.33.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index fcf45f5bb183..f96c9329ace6 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.32.0
+version=5.33.0
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=3571efc1cc773e453b459096a38b141fd0c7784fb9611505a1f9a55648f47e5e
+checksum=5c32cdd9cb7feecb125131842e3f66a8c9e838d7c5be6f016367de1a1d1f78fd
 lib32disabled=yes
 nocross=yes
 

From 79524a9d8d8181271776eddbe55c1314028476a3 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Fri, 3 Dec 2021 01:11:32 -0800
Subject: [PATCH 3399/4088] CLion: update to 2021.3.

---
 srcpkgs/CLion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a7779c295f13..76f9dd3f1e8c 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2.3
+version=2021.3
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=25c3968c72976b2de5e3e8f39b242702c4ec25b32268022cd16590e9fbfc0b27
+checksum=4968657ad64d55da794bcf9b878fdd36ed233014152930058f761296d2047867
 repository=nonfree
 restricted=yes
 nopie=yes

From 8cd21866c7c211e74e05a28805f2f2279f193416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 3 Dec 2021 08:46:36 +0100
Subject: [PATCH 3400/4088] doomretro: update to 4.4.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 2df391db530b..d0a7996ac62b 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.3
+version=4.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=99e48dc66e8d69a806372643db3aa1ea3b1a68dcf891ec79b9c3261484e3181e
+checksum=f28e439498de97a38decafd924d06e72ec247efca82719afca17d0532170be3b

From 609000c3fefcb5a79b696831ca3beb4e6a21ae81 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Thu, 2 Dec 2021 12:13:03 +0100
Subject: [PATCH 3401/4088] gnome-sudoku: update to 40.2

---
 srcpkgs/gnome-sudoku/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index 86c314e7f147..ed1759478ab5 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-sudoku'
 pkgname=gnome-sudoku
-version=3.38.0
+version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
+makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel"
 short_desc="GNOME Sudoku Japanese logic game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Sudoku"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=38731d0cc6d56a21dbdc89409cc5bb3d08e1c02cd9009f4d57f5b34887e9fd32
+checksum=36120531e3c7139581ea3800fbfe3c2b31694c440145ecc897ac34e562d754a3

From 97e86a8b4168113ec91dfbea33f37786efe621f6 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Thu, 2 Dec 2021 11:50:02 +0100
Subject: [PATCH 3402/4088] gnome-chess: update to 41.1

---
 srcpkgs/gnome-chess/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template
index 4ed9e8bc914e..629a10229d9d 100644
--- a/srcpkgs/gnome-chess/template
+++ b/srcpkgs/gnome-chess/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-chess'
 pkgname=gnome-chess
-version=3.38.1
+version=41.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala glib-devel itstool librsvg-devel"
-makedepends="gtk+3-devel librsvg-devel"
+makedepends="gtk4-devel librsvg-devel"
 depends="gnuchess"
 short_desc="GNOME chess user interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Chess"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1470f037c0dffe0285c121f7b6655e1245761f99a9974ab3c04dee5d6e89f5ae
+checksum=eb619886596396b4033a3f28a3c2e3004b54ebe1b38b40d6422c17b9f2cc17d0

From 570c149160bd22f2f0edbede84008ca006e7a3c1 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Thu, 2 Dec 2021 13:51:15 +0100
Subject: [PATCH 3403/4088] hitori: update to 3.38.3

---
 srcpkgs/hitori/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index 8a50efea3e63..b5fc5662126e 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -1,6 +1,6 @@
 # Template file for 'hitori'
 pkgname=hitori
-version=3.38.1
+version=3.38.3
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel intltool itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02bd2c421d4e2180265714e854bd12efd3c6d156ddf21f79e7df60011d4e4184
+checksum=f7d7103cb0633fb013730131a98c3ae3a2162b9fb9499fc7f19512d581bf6569

From bff3fb0d1ebff34e2a399dbcb831a176f8e18cbf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 2 Dec 2021 08:06:48 -0500
Subject: [PATCH 3404/4088] borgmatic: update to 1.5.21, adopt.

---
 srcpkgs/borgmatic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 523fbf23951c..047883dcc530 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,6 +1,6 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
-version=1.5.20
+version=1.5.21
 revision=1
 build_style=python3-module
 # runs not yet installed self
@@ -10,12 +10,12 @@ depends="borg python3-setuptools python3-ruamel.yaml python3-jsonschema
  python3-colorama python3-requests"
 checkdepends="${depends} python3-pytest-cov python3-flexmock"
 short_desc="Wrapper script for the Borg backup software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://torsion.org/borgmatic/"
 changelog="https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/NEWS"
 distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz"
-checksum=0aa6705cd72c6bd8fec94ba9e5e13ba9e90e6671799af2f2f5cb91186b90b7e5
+checksum=b8aa9dbf250b95b829827310c9638a17cd52fee160a437283eed23bffcae83cf
 
 post_install() {
 	# remove tests directory polluting site-packages

From 26086a99400c24cf963f102c9660d35a88779d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 2 Dec 2021 17:42:47 +0100
Subject: [PATCH 3405/4088] mpd: update to 0.23.5.

---
 srcpkgs/mpd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 144dfdf9ec43..fc9c4153e284 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.4
+version=0.23.5
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -22,7 +22,7 @@ hostmakedepends="pkg-config python3-Sphinx"
 makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
- libnpupnp-devel mpg123-devel opus-devel yajl-devel
+ libnpupnp-devel mpg123-devel opus-devel yajl-devel pcre2-devel icu-devel
  zziplib-devel libsoxr-devel audiofile-devel twolame-devel fmt-devel
  $(vopt_if io_uring 'liburing-devel') $(vopt_if pipewire 'pipewire-devel')
  $(vopt_if cdio 'libcdio-paranoia-devel') $(vopt_if shoutcast 'libshout-devel')
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=2f359d30dd980f762d2bc324d916e48b731e8a4d456d01d120c61ad657e4c754
+checksum=f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From 04b00180ce6ab20c54d2e60a9e9f2d35b5835e68 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Thu, 2 Dec 2021 15:51:18 +0600
Subject: [PATCH 3406/4088] txr: update to 272.

---
 srcpkgs/txr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index 1136f6b7b026..68af47b7e693 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,6 +1,6 @@
 # Template file for 'txr'
 pkgname=txr
-version=270
+version=272
 revision=1
 archs="x86_64* i686* aarch64* arm* ppc64* mips*"
 build_style=configure
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="http://www.nongnu.org/txr/"
 changelog="http://www.kylheku.com/cgit/txr/tree/RELNOTES"
 distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=6e0fe840ee91430888a08db8ef7739b1884fa43e8b2b5e173e6ae3eda3150291
+checksum=b3c2a82198dc97633aa40ced6fff6fec39c78a905b06dc08e7b74176bda03543
 nopie=yes
 
 if [ "$CROSS_BUILD" ]; then

From 0df2ac61bad95e91d88adb41d9f98a0424931f66 Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Wed, 1 Dec 2021 19:30:32 +0100
Subject: [PATCH 3407/4088] ART: update to 1.11.

---
 srcpkgs/ART/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
index 31370020a225..671695939be7 100644
--- a/srcpkgs/ART/template
+++ b/srcpkgs/ART/template
@@ -1,6 +1,6 @@
 # Template file for 'ART'
 pkgname=ART
-version=1.10.1
+version=1.11
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agriggio/art/wiki/Home"
 distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=e20b73de6be55bbb5924d1bc194ecd7f0bf26d581bd9b8b7d8a1af70ea85483e
+checksum=6458cdb7b8aa1afdb767c3aaaf5549e8892e2d6ecf0d29029fa32f82078dd568

From ae10db26541ab0cb107b12e3b1f75dfa48277e89 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Wed, 1 Dec 2021 23:02:20 +0000
Subject: [PATCH 3408/4088] git-filter-repo: update to 2.34.0.

---
 srcpkgs/git-filter-repo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-filter-repo/template b/srcpkgs/git-filter-repo/template
index 073dd6f75fe1..a81d612705a5 100644
--- a/srcpkgs/git-filter-repo/template
+++ b/srcpkgs/git-filter-repo/template
@@ -1,7 +1,7 @@
 # Template file for 'git-filter-repo'
 pkgname=git-filter-repo
-version=2.33.0
-revision=2
+version=2.34.0
+revision=1
 depends="git python3"
 checkdepends="git python3 perl rsync dos2unix"
 short_desc="Versatile tool for rewriting git history"
@@ -9,7 +9,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://github.com/newren/git-filter-repo/"
 distfiles="https://github.com/newren/git-filter-repo/releases/download/v${version}/git-filter-repo-${version}.tar.xz"
-checksum=7bcf11da134bbd82a4171f7fb28a3ab7bc4d478fe8ec3a3d9580e4bbdc32e6e9
+checksum=b1bf46af1e6a91a54056d0254e480803db8e40f631336c559a1a94d2a08389c4
 
 do_check() {
 	t/run_tests

From ffd0de1935a5bf3b69f613ee4b0ab5530d9c9cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Dec 2021 18:15:07 +0100
Subject: [PATCH 3409/4088] glances: update to 3.2.4.2.

---
 srcpkgs/glances/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index f7814f03d996..e329bcbf6858 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,7 +1,7 @@
 # Template file for 'glances'
 pkgname=glances
-version=3.2.2
-revision=2
+version=3.2.4.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-psutil python3-defusedxml"
@@ -11,7 +11,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/nicolargo/glances"
 distfiles="https://github.com/nicolargo/glances/archive/v${version}.tar.gz"
-checksum=7a96f16b09e30765a7a5b0e8d02dda20ac8ff1f144e6586d1f17ff7a80f5480f
+checksum=88ac8103d777b2a55cee9418a5940269c640c3ad964ec44de0e9bb80cdbead37
 
 post_install() {
 	vsconf conf/glances.conf

From d75ea3715c6f2d3d687d1debdcd7efed798d0616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Dec 2021 11:49:02 +0100
Subject: [PATCH 3410/4088] zoom: update to 5.8.6.739.

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index c6d57a36e361..e5ab0c169fd5 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.8.4.210
+version=5.8.6.739
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=b3fc9eef929d418873bdf3cc6df38297b86deaf330259e633d17459ec8718034
+checksum=a57d03456a6a92f5ab01e342443edc1824b043837f23a8d4027cd8b5831c0f11
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 23114703e980355b854e2d6865fdb9d125dec379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Dec 2021 18:01:09 +0100
Subject: [PATCH 3411/4088] yt-dlp: update to 2021.12.01.

---
 srcpkgs/yt-dlp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 9432641a5e73..5e0e5fe9e2e0 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,19 +1,19 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2021.11.10.1
-revision=2
+version=2021.12.01
+revision=1
 wrksrc="$pkgname"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-checkdepends="python3-pytest flake8 python3-nose"
 depends="python3"
+checkdepends="python3-pytest flake8 python3-nose"
 short_desc="CLI program to download videos from YouTube and other sites"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=2eb1c67e095ded9d328eaa0e6e26952248b55dd1031a3751c6d60b759aefa16a
+checksum=bf0cc22d17ffbe59c0d0378026ff135a996b86c546ec9713d838f952dea61e0f
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 2d755a44ee8bbb1b49b02086717e0eeb71f2edf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Dec 2021 11:53:08 +0100
Subject: [PATCH 3412/4088] scrcpy: update to 1.21.

---
 srcpkgs/scrcpy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 1fe5ac7102c6..764649fafa4a 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,6 +1,6 @@
 # Template file for 'scrcpy'
 pkgname=scrcpy
-version=1.20
+version=1.21
 revision=1
 build_style=meson
 configure_args="-Dcompile_server=false
@@ -14,8 +14,8 @@ license="Apache-2.0"
 homepage="https://github.com/Genymobile/scrcpy"
 distfiles="${homepage}/archive/v${version}.tar.gz
  ${homepage}/releases/download/v${version}/scrcpy-server-v${version}"
-checksum="0c667e7de043a67a740be99d3f236a7aa4107ff62c408e7c462f4fe291f045a7
- b20aee4951f99b060c4a44000ba94de973f9604758ef62beb253b371aad3df34"
+checksum="76e16a894bdb483b14b7ae7dcc1be8036ec17924dfab070cf0cb3b47653a6822
+ dbcccab523ee26796e55ea33652649e4b7af498edae9aa75e4d4d7869c0ab848"
 skip_extraction="scrcpy-server-v${version}"
 
 post_install() {

From 14172a3741bfe06aae10f320292bf4fade077d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Dec 2021 18:45:41 +0100
Subject: [PATCH 3413/4088] fdupes: update to 2.1.2.

---
 srcpkgs/fdupes/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/fdupes/template b/srcpkgs/fdupes/template
index 4b409f902b73..1bfa0a775980 100644
--- a/srcpkgs/fdupes/template
+++ b/srcpkgs/fdupes/template
@@ -1,20 +1,15 @@
 # Template file for 'fdupes'
 pkgname=fdupes
-version=2.1.1
+version=2.1.2
 revision=1
 build_style=gnu-configure
-hostmakedepends="autoconf automake"
 makedepends="ncurses-devel pcre2-devel"
 short_desc="Identify or delete duplicate files within specified directories"
 maintainer="Steven R <dev@styez.com>"
 license="MIT"
 homepage="https://github.com/adrianlopezroche/fdupes"
-distfiles="https://github.com/adrianlopezroche/fdupes/archive/v${version}.tar.gz"
-checksum=37b1a499f6eb8b625b45641a2600be69ef591cd1e737e75afd50aa72ac215ea4
-
-pre_configure() {
-	autoreconf --install
-}
+distfiles="https://github.com/adrianlopezroche/fdupes/releases/download/v${version}/fdupes-${version}.tar.gz"
+checksum=cd5cb53b6d898cf20f19b57b81114a5b263cc1149cd0da3104578b083b2837bd
 
 post_install() {
 	vlicense README

From 01d1338d8fbe88bbd8cc8b4895e86acdfbdbf1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 3 Dec 2021 15:44:13 -0300
Subject: [PATCH 3414/4088] Rocket.Chat-Desktop: fix checksum.

---
 srcpkgs/Rocket.Chat-Desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index 58f2eed1d9ba..6d87c8b6945b 100644
--- a/srcpkgs/Rocket.Chat-Desktop/template
+++ b/srcpkgs/Rocket.Chat-Desktop/template
@@ -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=328707d85b847214e0fe92bd3e45d757c7a27f24532c2f6d353dd045458fee80
+checksum=5b37d497f1985ca74b6a7971ae54a2741e9214c4e83cf754177f2fa444824f12
 
 export USE_SYSTEM_APP_BUILDER=true
 

From afe742c6fc7bb8106481c775278de9d79cb22d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 14:57:04 -0300
Subject: [PATCH 3415/4088] libreoffice: update to 7.2.3.2.

- remove VLC entirely (deprecated by upstream)
- update vendored tarballs
- add zxing and cmis tarballs (zxing isn't packaged by void, cmis
  upstream doesn't make releases with the necessary changes, see [1])
- builds were erroring out if the translation, dictionaries and help
  tarballs weren't unpacked, so remove them from the skip_extraction
  list, but still symlink them into the external dir so the build system
  doesn't try to download them
- move most subpackages to depend on writer, since it contains some of
  the needed pieces for them. This closes #34304
- remove outdated permission fix for soffice

[1] https://github.com/tdf/libcmis/issues/42
---
 .../libreoffice/patches/fix-vlc-backend.patch | 20 -----
 srcpkgs/libreoffice/template                  | 84 ++++++++++---------
 2 files changed, 43 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/libreoffice/patches/fix-vlc-backend.patch

diff --git a/srcpkgs/libreoffice/patches/fix-vlc-backend.patch b/srcpkgs/libreoffice/patches/fix-vlc-backend.patch
deleted file mode 100644
index 2c121c8ad2c6..000000000000
--- a/srcpkgs/libreoffice/patches/fix-vlc-backend.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- vcl: fix build with vlc backend enabled
- 
- avmedia/source/vlc/vlcplayer.cxx tries to access the aWindow member
- directly, which leads to a compilation failure, since it's private.
-
-diff --git include/vcl/sysdata.hxx include/vcl/sysdata.hxx
-index 63b7c810de3d..0cd0e037c823 100644
---- a/include/vcl/sysdata.hxx
-+++ b/include/vcl/sysdata.hxx
-@@ -73,9 +73,8 @@ struct VCL_DLLPUBLIC SystemEnvData
-     // however, the GTK3 vclplug wants to store pointers in here!
-     sal_IntPtr          aShellWindow;   // the window of the frame's shell
-     Platform            platform;       // the windowing system in use
--private:
--    sal_uIntPtr         aWindow;        // the window of the object
- public:
-+    sal_uIntPtr         aWindow;        // the window of the object
- 
-     void SetWindowHandle(sal_uIntPtr nWindow)
-     {
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6ea455c5c0cb..9e3208ccf364 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=7.1.3.2
-revision=4
+version=7.2.3.2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
@@ -12,14 +12,14 @@ hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gette
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
  gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
- libatomic_ops-devel libbluetooth-devel libcdr-devel libcmis-devel libe-book-devel
+ libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
  libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel libfreehand-devel
  libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-devel
  libmwaw-devel libnumbertext-devel libodfgen-devel liborcus-devel
  libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel
  libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel
  postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel
- telepathy-glib-devel unixodbc-devel vigra-devel vlc-devel libcppunit-devel
+ telepathy-glib-devel unixodbc-devel vigra-devel libcppunit-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel"
 depends="libreoffice-common>=${version}_${revision}"
 depends+=" libreoffice-base>=${version}_${revision}"
@@ -59,18 +59,20 @@ distfiles="
  ${_baseurl}/${pkgname}-translations-${version}.tar.xz
  ${_addurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
  ${_addurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- ${_addurl}/language-subtag-registry-2019-04-03.tar.bz2
+ ${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${_addurl}/language-subtag-registry-2021-03-05.tar.bz2
  ${_addurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
  ${_addurl}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
  ${_addurl}/box2d-2.3.1.tar.gz
+ ${_addurl}/libcmis-0.5.2.tar.xz
  ${_addurl}/libstaroffice-0.0.7.tar.xz
  ${_addurl}/libzmf-0.0.2.tar.xz
- ${_addurl}/pdfium-4306.tar.bz2
+ ${_addurl}/pdfium-4500.tar.bz2
  ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
  ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
- ${_exturl}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
+ ${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
  ${_exturl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
  ${_addurl}/commons-logging-1.2-src.tar.gz
  ${_addurl}/dtoa-20180411.tgz
@@ -87,45 +89,48 @@ distfiles="
  ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
  ${_addurl}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- ${_addurl}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
+ ${_addurl}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
  ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
  ${_addurl}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
  ${_addurl}/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
  ${_addurl}/liberation-narrow-fonts-ttf-1.07.6.tar.gz
- ${_addurl}/liberation-fonts-ttf-2.00.4.tar.gz
+ ${_addurl}/liberation-fonts-ttf-2.1.4.tar.gz
  ${_addurl}/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
  ${_addurl}/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
  ${_addurl}/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
  ${_addurl}/source-serif-pro-3.000R.tar.gz
  ${_addurl}/EmojiOneColor-SVGinOT-1.3.tar.gz
  ${_addurl}/noto-fonts-20171024.tar.gz
- ${_addurl}/culmus-0.131.tar.gz
+ ${_addurl}/culmus-0.133.tar.gz
  ${_addurl}/libre-hebrew-1.0.tar.gz
  ${_addurl}/alef-1.001.tar.gz
  ${_addurl}/ttf-kacst_2.01+mry.tar.gz
+ ${_addurl}/zxing-cpp-1.1.1.tar.gz
  ${_addurl}/Amiri-0.111.zip
  ${_addurl}/ReemKufi-0.7.zip
  ${_addurl}/Scheherazade-2.100.zip
 "
-checksum="35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf
- 66dc5fd4253f6b956b8fdde0d741ef7d85f12647db235642eb74f3d0a44d404e
- e0f14b4db1585506761ad2ceeb43850cb594f2ec8a20fc9ca7bcb95e77408935
- 86138935d274d46d27e4ce92a72d759e7d4491d7b227be952e05735ba5c9b327
+checksum="56c97374956d98c8efcd6d58771c0950c8a641ed84fd64db66382884c4c3b451
+ 41ca87cf71842696c9e21c6c01eb6ade5018a5e07f7cd8745c694b74ba3a185b
+ 087e1444294afe5ab49ea37a2c78c055c2a39000e8979017dd6bb2025d2cae79
+ 07f51594fcb32fb3373e94304bade1b91b6d8b5551f8e688da777e4f520448ec
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
- a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d
+ 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
+ ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a
  d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
  48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
  58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c
+ d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
  f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
  27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
- eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8
+ 26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304
  d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
  f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
- 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
+ d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
  eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
  49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
  0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
@@ -142,44 +147,44 @@ checksum="35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf
  05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
  a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
  085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
- f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301
+ abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d
  c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
  4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
  7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a
  2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc
  8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
- c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45
+ 26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef
  54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
  09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
  e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
  826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
  d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
  29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
- dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b
+ c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
  f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
  b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
  dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
+ e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86
  1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
  f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f
  251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"
 skip_extraction="
- ${pkgname}-dictionaries-${version}.tar.xz
- ${pkgname}-help-${version}.tar.xz
- ${pkgname}-translations-${version}.tar.xz
  798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- language-subtag-registry-2019-04-03.tar.bz2
+ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ language-subtag-registry-2021-03-05.tar.bz2
  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
  b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
  box2d-2.3.1.tar.gz
+ libcmis-0.5.2.tar.xz
  libstaroffice-0.0.7.tar.xz
  libzmf-0.0.2.tar.xz
- pdfium-4306.tar.bz2
+ pdfium-4500.tar.bz2
  bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
  8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
- odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
+ odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
  185d60944ea767075d27247c3162b3bc-unowinreg.dll
  commons-logging-1.2-src.tar.gz
  dtoa-20180411.tgz
@@ -196,23 +201,24 @@ skip_extraction="
  f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
  7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
+ skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
  368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
  33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
  1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
  liberation-narrow-fonts-ttf-1.07.6.tar.gz
- liberation-fonts-ttf-2.00.4.tar.gz
+ liberation-fonts-ttf-2.1.4.tar.gz
  e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
  907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
  edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
  source-serif-pro-3.000R.tar.gz
  EmojiOneColor-SVGinOT-1.3.tar.gz
  noto-fonts-20171024.tar.gz
- culmus-0.131.tar.gz
+ culmus-0.133.tar.gz
  libre-hebrew-1.0.tar.gz
  alef-1.001.tar.gz
  ttf-kacst_2.01+mry.tar.gz
+ zxing-cpp-1.1.1.tar.gz
  Amiri-0.111.zip
  ReemKufi-0.7.zip
  Scheherazade-2.100.zip
@@ -394,7 +400,7 @@ _add_lang zu		"Zulu"
 post_fetch() {
 	local srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} pkg
 	mkdir -p ${wrksrc}/external/tarballs
-	for pkg in ${skip_extraction}; do
+	for pkg in ${skip_extraction} libreoffice-{dictionaries,help,translations}-${version}.tar.xz ; do
 		if [ "${pkg%.dll}" != "${pkg}" ]; then
 			# The dll needs to be copied instead of symlinked
 			cp -v ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
@@ -454,7 +460,6 @@ do_configure() {
 	opts+=" --enable-gtk3"
 	opts+=" --enable-qt5"
 	opts+=" --enable-kf5"
-	opts+=" --enable-vlc"
 	opts+=" --disable-dependency-tracking"
 	opts+=" --enable-release-build"
 	opts+=" --enable-split-app-modules"
@@ -488,12 +493,14 @@ do_configure() {
 	fi
 	opts+=" --with-tls=nss"
 	opts+=" --without-system-box2d"
+	opts+=" --without-system-libcmis"
 	opts+=" --without-system-libzmf"
 	opts+=" --without-system-libstaroffice"
 	opts+=" --without-system-libtommath"
 	opts+=" --without-system-jfreereport"
 	opts+=" --without-system-apache-commons"
 	opts+=" --without-system-beanshell"
+	opts+=" --without-system-zxing"
 	# opts+=" --without-system-glm"
 	opts+=" --with-myspell-dicts"
 	opts+=" --with-system-icu-for-build=yes"
@@ -515,11 +522,6 @@ do_configure() {
 do_build() {
 	make ${makejobs} ${make_build_target}
 	make ${makejobs} -C libreofficekit
-
-	# on some platforms (32-bit ppc at least), this single file has
-	# incorrect (non-executable) permissions, so fix it here
-	# only this file is affected and i have no idea why...
-	chmod 755 ${wrksrc}/instdir/program/soffice
 }
 
 do_install() {
@@ -540,7 +542,7 @@ libreoffice-common_package() {
 
 libreoffice-base_package() {
 	short_desc+=" - Database frontend"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split base
@@ -549,7 +551,7 @@ libreoffice-base_package() {
 
 libreoffice-calc_package() {
 	short_desc+=" - Spreadsheet"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split calc
@@ -558,7 +560,7 @@ libreoffice-calc_package() {
 
 libreoffice-draw_package() {
 	short_desc+=" - Drawing application"
-	depends="sane libreoffice-common>=${version}_${revision}"
+	depends="sane libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split draw
@@ -585,7 +587,7 @@ libreoffice-gnome_package() {
 
 libreoffice-impress_package() {
 	short_desc+=" - Presentation application"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split impress
@@ -616,7 +618,7 @@ libreoffice-kit_package() {
 
 libreoffice-math_package() {
 	short_desc+=" - Equation editor"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split math

From 1b44e60ef8adab6425095910e66cea4d383081f3 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 2 Dec 2021 13:04:03 +0100
Subject: [PATCH 3416/4088] sqlite: update to 3.37.0

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 5a2c6dfcca5f..cf993a2c88fe 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.36.0
+version=3.37.0
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,7 +13,7 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2021/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3
+checksum=731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

From 4fbf00ad82e13f517a0920e6b3273ba39008c9fd Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 2 Dec 2021 13:07:51 +0100
Subject: [PATCH 3417/4088] fossil: update to 2.17

---
 srcpkgs/fossil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 674bfc2d632e..63323b9f1f02 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,6 +1,6 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.16
+version=2.17
 revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 changelog="https://www.fossil-scm.org/home/doc/trunk/www/changes.wiki"
 distfiles="https://fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"
-checksum=1eab740b04d98d2c35776fea65eba86007ea1441d2116943eb0a67e18a88b2fc
+checksum=21d6ee5187775113f74e55ab5ebcb1764f7226a8e59be1b2c7896cbe9dce6914
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

From ec069fd80d6c722932f9606d83f2e1b1c9616cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 27 Nov 2021 13:45:35 +0100
Subject: [PATCH 3418/4088] fd: update to 8.3.0.

---
 srcpkgs/fd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fd/template b/srcpkgs/fd/template
index f7d5cfc6b0c7..7b8fe10e0a50 100644
--- a/srcpkgs/fd/template
+++ b/srcpkgs/fd/template
@@ -1,6 +1,6 @@
 # Template file for 'fd'
 pkgname=fd
-version=8.2.1
+version=8.3.0
 revision=1
 build_style=cargo
 short_desc="Simple, fast and user-friendly alternative to find"
@@ -9,7 +9,7 @@ license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/fd"
 changelog="https://raw.githubusercontent.com/sharkdp/fd/master/CHANGELOG.md"
 distfiles="https://github.com/sharkdp/fd/archive/v${version}.tar.gz"
-checksum=429de7f04a41c5ee6579e07a251c72342cd9cf5b11e6355e861bb3fffa794157
+checksum=3c5a8a03c4f6ade73b92432ed0ba51591db19b0d136073fa3ccfa99d63403d52
 
 post_install() {
 	vman doc/fd.1

From 3ca8154e143626027a71fd843b96a22be879047a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 3 Dec 2021 16:53:50 +0100
Subject: [PATCH 3419/4088] isync: update to 1.4.4.

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..e72235d5b77e 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=7c3273894f22e98330a330051e9d942fd9ffbc02b91952c2f1896a5c37e700ff
 
 post_install() {
 	vsconf src/mbsyncrc.sample

From 6486f86107a1ec6f2229446037e94a86f35d13f8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 3 Dec 2021 16:55:01 +0100
Subject: [PATCH 3420/4088] janet: update to 1.19.0.

---
 common/shlibs          | 2 +-
 srcpkgs/janet/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ad60646030fe..abdf7b261f8a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,7 +3889,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.9 libcbor-0.9.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.18 janet-1.18.0_1
+libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 373b1475e233..c36e4a4e97ab 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.18.1
+version=1.19.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=bfc29c11a070cc175666f74eb99ea992276d6e269701ba9558a72cef05ac80b4
+checksum=613f08613d524349bea9777d9f4f930252a0f035332da113c993153fe5284ef2
 
 post_install() {
 	vlicense LICENSE

From 6ed1cfccd129d522da1d6c441a25acdfbc652fa5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 3 Dec 2021 16:55:34 +0100
Subject: [PATCH 3421/4088] ugrep: update to 3.3.10.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 39891a0af99f..75826fd725ac 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.8
+version=3.3.10
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=1bdc73ca5fc12a41c2f7949900edee0972ca3e5f39066c8d68449846df4cf1d7
+checksum=8cf74bdf254bac78c19385028bbf8678d83be35522d452b71d16105a1c4c57b8
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From b613fd6e3ef09a039ccf3b179324290e118ccfc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 3 Dec 2021 18:04:38 +0100
Subject: [PATCH 3422/4088] z3: update to 4.8.13.

---
 srcpkgs/z3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index bca042082b3f..fb8aca291c2b 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,6 +1,6 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.12
+version=4.8.13
 revision=4
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=e3aaefde68b839299cbc988178529535e66048398f7d083b40c69fe0da55f8b7
+checksum=59a0b35711fa7ae48dd535116d2067a6a16955fcbf2623c516a3f630cd2832d8
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From 28193a23df2b17fc63a550e4ea1f7901de477904 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 3 Dec 2021 23:07:07 +0100
Subject: [PATCH 3423/4088] pymol: update to 2.5.0.

---
 srcpkgs/pymol/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pymol/template b/srcpkgs/pymol/template
index 75b78380572c..659dea5d368c 100644
--- a/srcpkgs/pymol/template
+++ b/srcpkgs/pymol/template
@@ -1,12 +1,12 @@
 # Template file for 'pymol'
 pkgname=pymol
-version=2.4.0
-revision=3
+version=2.5.0
+revision=1
 wrksrc=${pkgname}-open-source-${version}
 build_style="python3-module"
 build_helper="numpy"
-makedepends="msgpack-devel freetype-devel libfreeglut-devel netcdf-devel
- glew-devel glm python3-devel libxml2-devel python3-PyQt5 mmtf-cpp"
+makedepends="freetype-devel glew-devel glm libfreeglut-devel libgomp-devel
+ libxml2-devel mmtf-cpp msgpack-devel netcdf-devel python3-PyQt5 python3-devel"
 depends="python3-numpy tcsh python3-pmw python3-tkinter python3-PyQt5"
 short_desc="PyMOL molecular visualization system"
 maintainer="Brenton Horne <brentonhorne77@gmail.com>"
@@ -14,7 +14,7 @@ license="custom:PyMOL"
 homepage="https://pymol.org/"
 distfiles="https://github.com/schrodinger/pymol-open-source/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz
  https://c.fsdn.com/allura/p/${pkgname}/icon>${pkgname}.png"
-checksum="5ede4ce2e8f53713c5ee64f5905b2d29bf01e4391da7e536ce8909d6b9116581
+checksum="aa828bf5719bd9a14510118a93182a6e0cadc03a574ba1e327e1e9780a0e80b3
  0ea81faaf336becc669a193777d0dca55475d303d1236b57df25cf67ff7c2bcd"
 skip_extraction="${pkgname}.png"
 

From 56a978abcd0b3ec13005b9d1c9f3ef18947983c6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 26 Nov 2021 23:45:32 -0800
Subject: [PATCH 3424/4088] New package: webp-pixbuf-loader-0.0.3

---
 srcpkgs/webp-pixbuf-loader/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/webp-pixbuf-loader/template

diff --git a/srcpkgs/webp-pixbuf-loader/template b/srcpkgs/webp-pixbuf-loader/template
new file mode 100644
index 000000000000..189889b62896
--- /dev/null
+++ b/srcpkgs/webp-pixbuf-loader/template
@@ -0,0 +1,13 @@
+# Template file for 'webp-pixbuf-loader'
+pkgname=webp-pixbuf-loader
+version=0.0.3
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gdk-pixbuf"
+makedepends="gdk-pixbuf-devel libwebp-devel"
+short_desc="WebP Image format loader for GdkPixbuf"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/aruiz/webp-pixbuf-loader"
+distfiles="https://github.com/aruiz/webp-pixbuf-loader/archive/refs/tags/${version}.tar.gz"
+checksum=e2ba11afcd1272f26147214659bcf2462066a840ecb9ba2776c85abd0ec43cbe

From 50d297e3af6fc53d8bffad3cd5dc28a2ea4c7c88 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 3 Dec 2021 23:24:52 +0100
Subject: [PATCH 3425/4088] s: update to 0.6.2.

---
 srcpkgs/s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index e55d22e4d3d5..cb9c4fc4e4ca 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,6 +1,6 @@
 # Template file for 's'
 pkgname=s
-version=0.6.1
+version=0.6.2
 revision=1
 build_helper=qemu
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=8f5f3e9503edcf9eb4792379f93c1e08806b8b9699121a72745d1d63c91a0426
+checksum=acc38953fcb21e1dd2cd761b9d2bf8272aa6aa30fed2adb657f2dba7e4df872f
 
 post_build() {
 	s_cli=$(find $GOPATH/bin -name s)

From f2229f12098b7bd65b987c01a18b3b974a6bc467 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 3 Dec 2021 23:26:23 +0100
Subject: [PATCH 3426/4088] hivemind: update to 1.1.0.

---
 srcpkgs/hivemind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index 935d852b4a5c..ad154844be35 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,6 +1,6 @@
 # Template file for 'hivemind'
 pkgname=hivemind
-version=1.0.6
+version=1.1.0
 revision=1
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/DarthSim/hivemind"
 distfiles="https://github.com/DarthSim/hivemind/archive/v${version}.tar.gz"
-checksum=8ca7884db49268b7938d0503e7e95443cb3a56696478d5dcc2b9813705525a39
+checksum=b4f7259663ef5b99906af0d98fe4b964d8f9a4d86a8f5aff30ab8df305d3a996
 
 post_install() {
 	vlicense LICENSE

From 55f6a69934b6a324d303363a6f1ac3d2134225b3 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 4 Dec 2021 00:01:44 +0100
Subject: [PATCH 3427/4088] go: update URLs and install VERSION file

---
 srcpkgs/go/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9aa551c74c53..cc66dc6c7f46 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,16 +1,16 @@
 # Template file for 'go'
 pkgname=go
 version=1.17.2
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=go
 hostmakedepends="go1.12-bootstrap"
 short_desc="Go Programming Language"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://golang.org/"
-changelog="https://golang.org/doc/devel/release.html"
-distfiles="https://golang.org/dl/go${version}.src.tar.gz"
+homepage="https://go.dev/"
+changelog="https://go.dev/doc/devel/release.html"
+distfiles="https://go.dev/dl/go${version}.src.tar.gz"
 checksum=2255eb3e4e824dd7d5fcdc2e7f84534371c186312e546fb1086a34c17752f431
 nostrip=yes
 noverifyrdeps=yes
@@ -63,6 +63,7 @@ do_install() {
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
+	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
 
 	# This is to make go get code.google.com/p/go-tour/gotour and
 	# then running the gotour executable work out of the box.

From df809abf6317e4d205642f35fed128e5570095f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Dec 2021 12:02:29 +0100
Subject: [PATCH 3428/4088] dunst: update to 1.7.2.

---
 srcpkgs/dunst/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index 1b80bf0d1987..3c3d9f5107bd 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,21 +1,24 @@
 # Template file for 'dunst'
 pkgname=dunst
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-makefile
+make_check_target=test
 make_use_env=yes
-make_build_args="SYSTEMD=0 WAYLAND=$(vopt_if wayland 1 0)"
+make_build_args="SYSTEMD=0 WAYLAND=$(vopt_if wayland 1 0) SYSCONFDIR=/etc"
 make_install_args="$make_build_args"
 hostmakedepends="perl pkg-config"
-makedepends="gtk+-devel libXScrnSaver-devel libXinerama-devel libXrandr-devel
+makedepends="gdk-pixbuf-devel libXScrnSaver-devel libXinerama-devel libXrandr-devel
  libxdg-basedir-devel libnotify-devel $(vopt_if wayland 'wayland-devel wayland-protocols')"
+checkdepends="dbus"
+conf_files="/etc/dunst/dunstrc"
 short_desc="Lightweight and customizable notification daemon"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="BSD-3-Clause"
 homepage="https://dunst-project.org"
 changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
 distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=f61ed3280aee9ec2aac07c44cf3d147df8fe8a6d7b92b6e8ab04e546bff1adce
+checksum=e4fa376d327e8a4cd375d00d4c318c93cc0968d4f184ab40da94ca6b30477181
 
 build_options="wayland"
 build_options_default="wayland"

From c347cb124c687ab7b9e0b6c41dcd05deb0810ccb Mon Sep 17 00:00:00 2001
From: Tomasz Kramkowski <tk@the-tk.com>
Date: Tue, 16 Nov 2021 20:26:26 +0000
Subject: [PATCH 3429/4088] nim: update to 1.6.0 (and fixes + cleanup)

Version bump to 1.6.0 including the following changes:

- Nim now comes with testament
- Fusion library is no longer bundled with nim
- Examples no longer come with nim
- FIX - non-x86_64/i686 nim.cfg compiler configuration
  Non-x86_64/i686 builds no longer end up with a broken nim.cfg which
  will try to use the package build time $CC to build packages for the
  package architecture as well as a bunch of others (which will simply
  not work).
- FIX - arm nim.cfg compiler configuration
  The default arm.linux.gcc.(linker)?exe variables are now commented on
  non-x86_64/i686 builds to ensure that arm packages don't end up with
  the same issue as above.
- CLEANUP - use koch to build non-x86_64/i686 tools
  The loop was unnecessary.
  - note: This means nimsuggest is now built without -d:release on all
    builds (not just x86_64/i686 builds). I am not sure if this is
    intentional or an upstream bug, should be investigated at some
    point.
- CLEANUP - use make to build the bootstrap compiler
---
 srcpkgs/nim/template | 66 ++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 76a3452c68ab..809627066a68 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,13 +1,11 @@
 # Template file for 'nim'
 pkgname=nim
-version=1.4.8
+version=1.6.0
 revision=1
-_cversion=0.20.0
-_nimbleversion=0.12.0
-_fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
+_c1version=561b417c65791cd8356b5f73620914ceff845d10
+_nimbleversion=0.13.1
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
-hostmakedepends="ed"
 depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
@@ -15,31 +13,27 @@ license="MIT"
 homepage="https://nim-lang.org/"
 _ghsite="https://github.com/nim-lang"
 distfiles="${_ghsite}/Nim/archive/v${version}.tar.gz
- ${_ghsite}/csources/archive/v${_cversion}.tar.gz>csources-${_cversion}.tar.gz
- ${_ghsite}/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz
- ${_ghsite}/fusion/archive/${_fusionversion}.tar.gz>fusion-${_fusionversion}.tar.gz"
-checksum="8a687beb30670dc4eadcfefd1198d4238af283dc716438ac2342a7d65e07d9e9
- 5e6fd15d90df1a8cb7614c4ffc70aa8c4198cd854d7742016202b96dd0228d3c
- 0b88d91a450f31641f85379f2d76afb0a013cf783e62144a6534525b9cb1cbac
- 76d10a2f0f25ba7fb3393bdb800c75e8084758d8ce69e63d07926cd36f555084"
+ ${_ghsite}/csources_v1/archive/${_c1version}.tar.gz>csources_v1-${_c1version}.tar.gz
+ ${_ghsite}/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
+checksum="c202cfd24a24480da1cf851e1265b87edb22710bb42286a57b1a99c83b6a8315
+ 71c823444c794a12da9027d19d6a717dd7759521ecbbe28190b08372142607ec
+ e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d"
 
 post_extract() {
-	mv csources-$_cversion $build_wrksrc/csources
+	mv csources_v1-$_c1version $build_wrksrc/csources_v1
 	mkdir $build_wrksrc/dist
 	mv nimble-$_nimbleversion $build_wrksrc/dist/nimble
-	mv fusion-$_fusionversion $build_wrksrc/dist/fusion
 }
 
 do_build() {
-	cd csources
 	case "$XBPS_TARGET_MACHINE" in
 		i686*)
 			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
-			sh build.sh --cpu i686;;
+			make -C csources_v1 ucpu=i686 ${makejobs};;
 		*)
-			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= sh build.sh;;
+			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
+			make -C csources_v1 ${makejobs};;
 	esac
-	cd ..
 
 	bin/nim c koch
 	./koch boot -d:release -d:danger
@@ -54,32 +48,15 @@ do_build() {
 
 	case "$XBPS_TARGET_MACHINE"
 	in arm*|aarch64*|ppc*)
-		ed config/nim.cfg <<-EDIT
-			,s/^arm.linux.gcc.exe .*/arm.linux.gcc.exe = "$CC"/
-			,s/^arm.linux.gcc.linkerexe .*/arm.linux.gcc.linkerexe = "$CC"/
-			a
-			arm64.linux.gcc.exe = "$CC"
-			arm64.linux.gcc.linkerexe = "$CC"
-			powerpc.linux.gcc.exe = "$CC"
-			powerpc.linux.gcc.linkerexe = "$CC"
-			powerpc64.linux.gcc.exe = "$CC"
-			powerpc64.linux.gcc.linkerexe = "$CC"
-			powerpc64el.linux.gcc.exe = "$CC"
-			powerpc64el.linux.gcc.linkerexe = "$CC"
-			.
-			w
-			q
+		vsed -i config/nim.cfg -e 's/^arm\.linux\.gcc\.\(linker\)\?exe /#&/'
+		cat >>config/nim.cfg <<-EDIT
+		# VOIDLINUX TEMP
+		$_arch.linux.gcc.exe = "$CC"
+		$_arch.linux.gcc.linkerexe = "$CC"
 		EDIT
 		bin/nim c -d:release -d:danger --os:linux --cpu:$_arch --listCmd compiler/nim
-		for _p in \
-			dist/nimble/src/nimble \
-			tools/nimgrep \
-			nimsuggest/nimsuggest \
-			nimpretty/nimpretty
-		do
-			bin/nim c -d:release --os:linux --cpu:$_arch --listCmd $_p
-			mv $_p bin
-		done
+		./koch tools --os:linux --cpu:$_arch --listCmd
+		vsed -i config/nim.cfg -e '/^# VOIDLINUX TEMP$/,$d'
 	;; *)
 		./koch tools
 	esac
@@ -95,14 +72,13 @@ do_install() {
 	vmkdir usr/bin
 	vmkdir usr/share/nim
 	ln -sf /usr/lib/nim/bin/nim ${DESTDIR}/usr/bin/nim
-	for _f in nimble nimsuggest nimgrep nimpretty; do
+	for _f in nimble nimsuggest nimgrep nimpretty testament; do
 		chmod 0755 bin/$_f
 		cp bin/$_f ${DESTDIR}/usr/lib/nim/bin
 		ln -sf /usr/lib/nim/bin/$_f ${DESTDIR}/usr/bin/$_f
 	done
-	cp -r nimsuggest nimpretty doc examples ${DESTDIR}/usr/lib/nim
+	cp -r nimsuggest nimpretty doc ${DESTDIR}/usr/lib/nim
 	ln -sf /usr/lib/nim/doc ${DESTDIR}/usr/share/nim/doc
-	ln -sf /usr/lib/nim/examples ${DESTDIR}/usr/share/nim/examples
 	ln -sf /usr/lib/nim/nimsuggest ${DESTDIR}/usr/share/nim/nimsuggest
 	ln -sf /usr/lib/nim/nimpretty ${DESTDIR}/usr/share/nim/nimpretty
 	vlicense copying.txt

From e11b9557044585748b97f0d3d0c6340c512073b5 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sat, 13 Nov 2021 23:11:21 -0700
Subject: [PATCH 3430/4088] dolphin-emu: update to 5.0.15445.

---
 srcpkgs/dolphin-emu/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c538c4b97548..35ac6a3910df 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,9 +1,9 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.15260
+version=5.0.15445
 revision=1
-_dolphin_commit=207c931a04c8e2629a735bc2b3f36b5c89365ca7
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_dolphin_commit=db02b50d2ecdfbbc21e19aadc57253c353069f77
+_mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
 wrksrc="dolphin-${_dolphin_commit}"
@@ -22,8 +22,8 @@ license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
 distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
  https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="84b21a6a14cf999e8c2bc44175f549aedaa4bd28a79eaa65afddd72f14905a3a
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+checksum="19136c7b1bce2ff444e4a611f56268b371f4fa83a3e3ff5f3d9e2dbb34385692
+ 3cabf00a97cf4fb15fe8524b3d02190acdd003f25967cdbbf8de958649b8061b"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in

From bcc4c2317cc9e3cd33471accb0506ed812ca3c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 4 Dec 2021 01:29:26 -0300
Subject: [PATCH 3431/4088] ImageMagick: update to 7.1.0.15.

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4648abfb476c..356015153e80 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.0.10
+version=7.1.0.15
 revision=1
 _majorver=${version%.*}
 _patchver=${version##*.}
@@ -20,7 +20,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=a2139da9a7c2e97f28861dfb18986f1d03435cf72e8ee4cc720a4997b5fa8d66
+checksum=0b0272b8bbdeb31b15c06f75764b93b22198453ef7fceabbc07655e90f3c73c2
 
 subpackages="libmagick libmagick-devel"
 

From 9d9ac2ecb258ae0f91a6d2ae09a0f828bbf8bd56 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 4 Dec 2021 08:20:48 -0500
Subject: [PATCH 3432/4088] maturin: update to 0.12.3.

---
 srcpkgs/maturin/patches/edition2018.patch | 18 ------------------
 srcpkgs/maturin/template                  |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/maturin/patches/edition2018.patch

diff --git a/srcpkgs/maturin/patches/edition2018.patch b/srcpkgs/maturin/patches/edition2018.patch
deleted file mode 100644
index 7e6b267507b4..000000000000
--- a/srcpkgs/maturin/patches/edition2018.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Void can't yet compile with edition2021 and there seems to be no reason to
-demand it, so partially revert
-
-    https://github.com/PyO3/maturin/commit/4d51112a18a331248bb36c0cb5b4c60c6fe0091a
-
-and make maturin work.
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -10,7 +10,7 @@
- license = "MIT OR Apache-2.0"
- keywords = ["python", "cffi", "packaging", "pypi", "pyo3"]
- categories = ["api-bindings", "development-tools::ffi", "command-line-utilities"]
--edition = "2021"
-+edition = "2018"
- 
- [badges]
- travis-ci = { repository = "PyO3/maturin" }
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index d5eb458e50a5..1556fa8f98c2 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.2
+version=0.12.3
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="d66d21703a78d71061b279b97fb7dd15a925474da19bce9928d87f1c22550ed6
+checksum="9a6ee17bdee33aa319941ca5000016397a2d5343a17341406150c4015aa81b75
  b6c2ddab7498cf6eab8e637a5b7895f3170b2f9ef989861d1ff33af6c8459b27"
 # Tests use unstable features and fail to build
 make_check=no

From c68a9ad40ad6175344e0b7b4f9c0c2491a570a8f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 4 Dec 2021 08:20:59 -0500
Subject: [PATCH 3433/4088] python3-setuptools-rust: update to 1.1.1.

---
 srcpkgs/python3-setuptools-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 85c562f33602..1811ad4be88e 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=1.0.0
+version=1.1.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/PyO3/setuptools-rust"
 changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=eb6e6d41f01e63d042288e5c609684adf93426c10ea745ec324263f3fcbf27e9
+checksum=dc04afb52a70e56f5d6800a7ed9c45ad5937ba95e51a042b9096459edc038ad6
 # Tests have unpackaged dependencies
 make_check=no
 

From bdb945d7b768b8c883a682509d5e4b99eb092648 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 4 Dec 2021 08:22:34 -0500
Subject: [PATCH 3434/4088] python3-adblock: update to 0.5.1.

---
 srcpkgs/python3-adblock/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index 0d8832be8111..f24a681be0b9 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
-version=0.5.0
-revision=2
+version=0.5.1
+revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
@@ -16,7 +16,7 @@ license="Apache-2.0, MIT"
 homepage="https://github.com/ArniDagur/python-adblock"
 changelog="https://raw.githubusercontent.com/ArniDagur/python-adblock/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=35ab20170bcfe447efee4d988508d99477cc23b95a901383bf606ca2960148a3
+checksum=d24ef42c8532cab2970d1c3af116ee4d0fa595e23fbeabb3ba0f5dfa0a67eae1
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="compiler throws SIGABRT on the psl crate" ;;

From 4a1e45687704f208ee8d974a1be28e40bc84d7e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 4 Dec 2021 08:29:12 -0500
Subject: [PATCH 3435/4088] python3-hypothesis: update to 6.30.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 460af8b6cc06..9c88772dc4e8 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.28.0
+version=6.30.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=34a4e30f9a0a88bb48c2faf6d78512fb7978e03e152026e00210245b20356d70
+checksum=d10473a0b5a87eadd8e978067e4e18215cc69f40c1fdcaeedcd0ef89648c8f61
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From bcd0ef5341efb9bcd149c599fa042b133cda4c98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 4 Dec 2021 08:30:22 -0500
Subject: [PATCH 3436/4088] python3-imageio: update to 2.13.1.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 21b0e0981e11..00e60a63af44 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.12.0
+version=2.13.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e7d1e7b135415db608f32c2feebd139afb9b8379dd4e49c661578f999dfc2cea
+checksum=00c843712d00d075a87bc9eb37c1b6ffe2b210327d8fbaabd52759a961b5b4bd
 
 post_install() {
 	vlicense LICENSE

From c749fd69efe3384ac678cf42d256095eeb866796 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 4 Dec 2021 08:31:58 -0500
Subject: [PATCH 3437/4088] python3-ipython: update to 7.30.1.

---
 srcpkgs/python3-ipython/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 85a1ae2e64c5..f2eed91a2d1f 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.30.0
+version=7.30.1
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=d41f8e80b99690122400f9b2069b12f670246a1b4cc5d332bd6c4e2500e6d6fb
+checksum=cb6aef731bf708a7727ab6cde8df87f0281b1427d41e65d62d4b68934fa54e97
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From 5e77838012e9432b0c0546af4c52ed7f03088212 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 4 Dec 2021 08:46:54 -0500
Subject: [PATCH 3438/4088] python3-parso: update to 0.8.3.

---
 srcpkgs/python3-parso/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template
index 5fb79d8baaad..16b67897a9d7 100644
--- a/srcpkgs/python3-parso/template
+++ b/srcpkgs/python3-parso/template
@@ -1,9 +1,11 @@
 # Template file for 'python3-parso'
 pkgname=python3-parso
-version=0.8.2
-revision=2
+version=0.8.3
+revision=1
 wrksrc="parso-${version}"
 build_style=python3-module
+# Several error messages changed form and trigger inappropriate failures
+make_check_args="--ignore=test/test_python_errors.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest"
@@ -12,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/davidhalter/parso"
 distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=12b83492c6239ce32ff5eed6d3639d6a536170723c6f3f1506869f1ace413398
+checksum=8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0
 
 post_install() {
 	vlicense LICENSE.txt

From c9c8690cac47f04af150021bc262ca1fcea2df9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 4 Dec 2021 09:21:39 -0500
Subject: [PATCH 3439/4088] python3-scikit-image: update to 0.19.0.

---
 .../patches/no-pythran.patch                  | 60 +++++++++++++++++++
 srcpkgs/python3-scikit-image/template         | 13 ++--
 2 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-scikit-image/patches/no-pythran.patch

diff --git a/srcpkgs/python3-scikit-image/patches/no-pythran.patch b/srcpkgs/python3-scikit-image/patches/no-pythran.patch
new file mode 100644
index 000000000000..a2a1bf479ead
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/no-pythran.patch
@@ -0,0 +1,60 @@
+Disable optional Pythran support that is hard-required during build.
+
+--- a/setup.py
++++ b/setup.py
+@@ -6,7 +6,7 @@
+ import shutil
+ import builtins
+ import textwrap
+-from numpy.distutils.command.build_ext import build_ext as npy_build_ext
++from numpy.distutils.command.build_ext import build_ext
+ 
+ import setuptools
+ from setuptools.command.build_py import build_py
+@@ -17,7 +17,13 @@
+     # can remove this except case once we require setuptools>=59.0
+     from distutils.errors import CompileError, LinkError
+ 
+-from pythran.dist import PythranBuildExt as pythran_build_ext
++try:
++    from pythran.dist import PythranBuildExt as pythran_build_ext
++except ImportError:
++    pass
++else:
++    # Replace numpy extension builder with pythran version
++    build_ext = pythran_build_ext[build_ext]
+ 
+ DISTNAME = 'scikit-image'
+ DESCRIPTION = 'Image processing in Python'
+@@ -60,7 +66,7 @@
+ 
+ # Support for openmp
+ 
+-class ConditionalOpenMP(pythran_build_ext[npy_build_ext]):
++class ConditionalOpenMP(build_ext):
+ 
+     def can_compile_link(self, compile_flags, link_flags):
+ 
+--- a/skimage/feature/setup.py
++++ b/skimage/feature/setup.py
+@@ -2,7 +2,7 @@
+ 
+ import os
+ from skimage._build import cython
+-import pythran, logging
++import logging
+ 
+ base_path = os.path.abspath(os.path.dirname(__file__))
+ 
+@@ -43,6 +43,11 @@
+     config.add_extension('_sift', sources=['_sift.c'],
+                          include_dirs=[get_numpy_include_dirs(), '../_shared'])
+ 
++    try:
++        import pythran
++    except ImportError:
++        return config
++
+     # pythran submodules
+     pythran.config.logger.setLevel(logging.INFO)
+     ext = pythran.dist.PythranExtension(
diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index 49b214c11aef..b1d87f9d2c26 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,21 +1,22 @@
 # Template file for 'python3-scikit-image'
 pkgname=python3-scikit-image
-version=0.18.3
-revision=2
+version=0.19.0
+revision=1
 _pkgname="${pkgname#python3-}"
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 build_helper="numpy"
-hostmakedepends="python3-setuptools python3-Cython"
+hostmakedepends="python3-Cython python3-wheel python3-numpy
+ python3-packaging python3-setuptools"
 makedepends="python3-devel"
-depends="python3-scipy python3-matplotlib python3-networkx
- python3-imageio python3-tifffile python3-pywt"
+depends="python3-scipy python3-numpy python3-imageio python3-matplotlib
+ python3-networkx python3-tifffile python3-pywt python3-packaging"
 short_desc="Image processing in Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://scikit-image.org/"
 distfiles="https://github.com/${_pkgname}/${_pkgname}/archive/v${version}.tar.gz"
-checksum=a8d1c7473fc9399447a4cd5718c90338fffd543622d9e6f3d9feca43f1a9cb15
+checksum=5a0d6ad80ed3a389c19a8603391bbc1dd8e81239c2ef5ca6c274886db3087ec5
 # Tests require data files and unpackaged dependencies
 make_check=no
 

From 058dc385d8d2c47efb51988582256e8ee4e0446d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 4 Dec 2021 18:02:09 +0100
Subject: [PATCH 3440/4088] alpine: update to 2.25.1.

---
 srcpkgs/alpine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 6fdbf75afcaf..2ab186c938af 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,8 +1,8 @@
 # Template file for 'alpine'
 pkgname=alpine
-version=2.25
+version=2.25.1
 revision=1
-_githash=465e23b898e5a3393b9ae52fc7620002541b2e75
+_githash=a4717516707498544201c2e03286142c9abb2539
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://repo.or.cz/alpine.git"
 distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
-checksum=ba0856bcc863b70dd0c2f06cdeda720332c2d136d49154d78450932cd9e0900a
+checksum=e1855467f8dbf21879e3a6fa959998ffb68a6d5221ee7d6cc2fc3de95ee0759a
 
 post_extract() {
 	sed -i -e '/run test program/s/^/: /' \

From c4d5feab68799c3e9ed7d2fc16ea47f5a586fd2d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 4 Dec 2021 18:02:10 +0100
Subject: [PATCH 3441/4088] netpbm: update to 10.96.04.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index a1fb5f6d9966..f49b1bb66e5f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.96.03
+version=10.96.04
 revision=1
-_githash=54081f1e108cb4a385f951cbc293368829e39320
-_githash_guide=54910a3304543a702b0720c3b9c6d6be4ba12100
+_githash=3c556d3931167936ef5bfb3ba1ff569049aa1b87
+_githash_guide=913c540e85e33b07c2dbc551ef4092126ab3ed55
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="b2184c438d2e9e7a7f99123196719b8a1d1d55a7d28607afb4842ba1ab550cbc
- b966580dcf5d72fc6a3cfa6c95d46206b9b4c252ec911e14633113c45cb49626"
+checksum="c65fcad80229c8ac2999a6ee10709c8ee4f1f73995e0a4423029250c21233756
+ 74ae5c9df00f1654eea60913cd11e7347df111032afc09b315b0567b54bf0b8f"
 
 post_extract() {
 	cd $build_wrksrc

From f53629516022a31fa405a53d86e14825ee001b41 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 4 Dec 2021 18:02:12 +0100
Subject: [PATCH 3442/4088] ldns: update to 1.8.1.

---
 srcpkgs/ldns/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 376777cfc423..4e7bcd1f2154 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,7 +1,7 @@
 # Template file for 'ldns'
 pkgname=ldns
-version=1.7.1
-revision=5
+version=1.8.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://www.nlnetlabs.nl/projects/ldns/"
 distfiles="http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
+checksum=958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3
 
 post_install() {
 	vsed -i -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" ${DESTDIR}/usr/bin/ldns-config

From 1994d406cdc69b3701f99fb4c012cb0edab2d1d4 Mon Sep 17 00:00:00 2001
From: Demedim <40205709+Demedim@users.noreply.github.com>
Date: Sat, 4 Dec 2021 13:05:40 +0100
Subject: [PATCH 3443/4088] aircrack-ng: add libcap to enable more utilities

Closes: #34380 [via git-merge-pr]
---
 srcpkgs/aircrack-ng/patches/getopt.patch | 14 ++++++++++++++
 srcpkgs/aircrack-ng/template             |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/aircrack-ng/patches/getopt.patch

diff --git a/srcpkgs/aircrack-ng/patches/getopt.patch b/srcpkgs/aircrack-ng/patches/getopt.patch
new file mode 100644
index 000000000000..7f57f30e6a3c
--- /dev/null
+++ b/srcpkgs/aircrack-ng/patches/getopt.patch
@@ -0,0 +1,14 @@
+argv[1] is a file name argument, musl getopt_long will permute it
+to a later position, so skip it for argument parsing.
+
+--- aircrack-ng-1.6/src/airolib-ng/airolib-ng.c.orig
++++ aircrack-ng-1.6/src/airolib-ng/airolib-ng.c
+@@ -1309,7 +1309,7 @@
+ 	signal(SIGTERM, sighandler);
+ 
+ 	option = getopt_long(
+-		argc, argv, "bc:d:e:hi:s:t:v:", long_options, &option_index);
++		argc-1, argv+1, "bc:d:e:hi:s:t:v:", long_options, &option_index);
+ 
+ 	if (option > 0)
+ 	{
diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index 604bcefb5a34..ef5d46cebac1 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel libcap-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 6b5bfbba74591f6be6a6b800261cd36787151c42 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 4 Dec 2021 12:01:57 +0100
Subject: [PATCH 3444/4088] foot: update to 1.10.2.

---
 srcpkgs/foot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index b3cc9af397a9..3e5a04bfc7bb 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.10.1
+version=1.10.2
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/foot"
 changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=40aaf4ba96aa0cc977b7c3916b79fd5455cefea76c5c07cad43ff7aaf06fc1bd
+checksum=49ad179d5815bf76f8ccdd869b28ce56e3cb5aab8e73e45b09c7510d4a5086d7
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE

From a268f7986224600afee83b281924a78e3b7ce3dd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 4 Dec 2021 21:13:54 +0100
Subject: [PATCH 3445/4088] New package: cmark-gfm-0.29.0.gfm.2

---
 srcpkgs/cmark-gfm-devel    |  1 +
 srcpkgs/cmark-gfm/template | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/cmark-gfm-devel
 create mode 100644 srcpkgs/cmark-gfm/template

diff --git a/srcpkgs/cmark-gfm-devel b/srcpkgs/cmark-gfm-devel
new file mode 120000
index 000000000000..bad5a89ab151
--- /dev/null
+++ b/srcpkgs/cmark-gfm-devel
@@ -0,0 +1 @@
+cmark-gfm
\ No newline at end of file
diff --git a/srcpkgs/cmark-gfm/template b/srcpkgs/cmark-gfm/template
new file mode 100644
index 000000000000..ebd19864cedc
--- /dev/null
+++ b/srcpkgs/cmark-gfm/template
@@ -0,0 +1,34 @@
+# Template file for 'cmark-gfm'
+pkgname=cmark-gfm
+version=0.29.0.gfm.2
+revision=1
+build_style=cmake
+short_desc="GitHub's fork of cmark, a CommonMark markdown renderer"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/github/cmark-gfm"
+distfiles="https://github.com/github/cmark-gfm/archive/${version}.tar.gz"
+checksum=66d92c8bef533744674c5b64d8744227584b12704bcfebbe16dab69f81e62029
+
+pre_configure() {
+	# Fix the SONAME version to use just the major number
+	vsed -i -e 's;\(SOVERSION ${PROJECT_VERSION_MAJOR}\).*;\1;' \
+		 src/CMakeLists.txt extensions/CMakeLists.txt
+}
+
+post_install() {
+	vlicense COPYING
+}
+
+cmark-gfm-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove usr/share/man/man3
+	}
+}

From 8b78a0112208289957083e3679caab786bb66701 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 5 Dec 2021 09:16:16 +0100
Subject: [PATCH 3446/4088] linux5.4: update to 5.4.163.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index e3e45c5e490a..0d10710d41c2 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.161
+version=5.4.163
 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=3149c6b52a3079218a60bd369a80d18275b574d84908ffee32a0a8f9ddf939a7
+checksum=6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From bbd2be27973e8ed850ddac8034cdd502b0e9dd04 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 5 Dec 2021 09:23:38 +0100
Subject: [PATCH 3447/4088] linux4.19: update to 4.19.219.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 721de52fc67b..2d239d61d715 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.217
+version=4.19.219
 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=8551110cc7184b1402a21b42e498088c5b0bb824a658c5fab173c12d9904a004
+checksum=8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 0a864442d04e9dfb221ec17818a735af8a0a8dca Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 5 Dec 2021 09:25:15 +0100
Subject: [PATCH 3448/4088] perl-Locale-Codes: update to 3.69.

---
 srcpkgs/perl-Locale-Codes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Locale-Codes/template b/srcpkgs/perl-Locale-Codes/template
index d3996f5a19e9..89f2ff0ba56a 100644
--- a/srcpkgs/perl-Locale-Codes/template
+++ b/srcpkgs/perl-Locale-Codes/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Locale-Codes'
 pkgname=perl-Locale-Codes
-version=3.68
+version=3.69
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Locale-Codes"
 distfiles="${CPAN_SITE}/Locale/${pkgname/perl-/}-${version}.tar.gz"
-checksum=090c1fbd1d62d2ffc6b56699173d04874262dfb0d22943b0abe434c97ce79787
+checksum=55903f2be5027209cfa5a8579c097f6d9c1ee6f00eb1fdd75e065d002c1e1e18

From ab0b0515ad3d794c9fedc540e3244949e1d28a20 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 5 Dec 2021 09:44:43 +0100
Subject: [PATCH 3449/4088] warzone2100: update to 4.2.3.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8331448ee4bc..2cde234ff2d3 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.2.2
+version=4.2.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=17b4e59e541e11f1a9d4805795f2948082caba4510c41164a2a5d89b17d03a99
+checksum=9e61e5fd093c2a7724f640c5f1cb8f533394c4d371d1593f835356fc7f36be8d
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 92db9ef5c19a8bb83e6441ccbf8b4ff872d62641 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 5 Dec 2021 11:17:27 +0100
Subject: [PATCH 3450/4088] wine: update to 6.23.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 7b1ca3143002..9bcc16c8ce88 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-6.22/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-6.22/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-6.23/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-6.23/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index e836d0ed7d7d..2753c2720e3f 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-6.22/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-6.22/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-6.23/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-6.23/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 73baa5c79e70..452ad47c07c5 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.22
+version=6.23
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="826042a181a9879732a3dacbbf8167605f305291bfcfaaf5eaa0ec9525d764ef
- a74fd4343dca709918830b7393cb1f4e0ae29fce731c55f702905f126a9dced7"
+checksum="d96c7f31741e4251fb50f919309c604665267cfacee13f8f450a30c953620e0d
+ 1b996e7a0ce0f0015bae1a465aa55787edff3bc9edf1c7164dd264872cc7f3f6"
 
 build_options="mingw staging"
 build_options_default="mingw"

From d9fb1da60b083ebac02f19f863e4642c3380ee73 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 1 Dec 2021 11:03:57 -0500
Subject: [PATCH 3451/4088] libvirt: update to 7.10.0, add modular services

For awhile, libvirt has moved away from the monolithic libvirtd in favor
of modular virt${DRIVER}d daemons that each manage a specific function.
This is the default behavior for per-user "session" instances that
launch on demand. We still provide a legacy libvirtd service, but let's
add services for the modular daemons favored by upstream.
---
 srcpkgs/libvirt/files/libvirt-generic/log/run |  7 +++++
 srcpkgs/libvirt/files/libvirt-generic/run     | 10 +++++++
 srcpkgs/libvirt/files/libvirtd/log/run        |  3 +-
 srcpkgs/libvirt/files/libvirtd/run            |  5 +---
 srcpkgs/libvirt/files/virtinterfaced/log/run  |  1 +
 srcpkgs/libvirt/files/virtinterfaced/run      |  1 +
 srcpkgs/libvirt/files/virtlockd/log/run       |  1 +
 srcpkgs/libvirt/files/virtlockd/run           |  3 +-
 srcpkgs/libvirt/files/virtlogd/log/run        |  1 +
 srcpkgs/libvirt/files/virtlogd/run            |  4 +--
 srcpkgs/libvirt/files/virtlxcd/log/run        |  1 +
 srcpkgs/libvirt/files/virtlxcd/run            |  1 +
 srcpkgs/libvirt/files/virtnetworkd/log/run    |  1 +
 srcpkgs/libvirt/files/virtnetworkd/run        |  1 +
 srcpkgs/libvirt/files/virtnodedevd/log/run    |  1 +
 srcpkgs/libvirt/files/virtnodedevd/run        |  1 +
 srcpkgs/libvirt/files/virtnwfilterd/log/run   |  1 +
 srcpkgs/libvirt/files/virtnwfilterd/run       |  1 +
 srcpkgs/libvirt/files/virtproxyd/log/run      |  1 +
 srcpkgs/libvirt/files/virtproxyd/run          |  1 +
 srcpkgs/libvirt/files/virtqemud/log/run       |  1 +
 srcpkgs/libvirt/files/virtqemud/run           |  1 +
 srcpkgs/libvirt/files/virtsecretd/log/run     |  1 +
 srcpkgs/libvirt/files/virtsecretd/run         |  1 +
 srcpkgs/libvirt/files/virtstoraged/log/run    |  1 +
 srcpkgs/libvirt/files/virtstoraged/run        |  1 +
 srcpkgs/libvirt/files/virtvboxd/log/run       |  1 +
 srcpkgs/libvirt/files/virtvboxd/run           |  1 +
 srcpkgs/libvirt/files/virtxend/log/run        |  1 +
 srcpkgs/libvirt/files/virtxend/run            |  1 +
 srcpkgs/libvirt/template                      | 28 +++++++++++--------
 31 files changed, 61 insertions(+), 23 deletions(-)
 create mode 100644 srcpkgs/libvirt/files/libvirt-generic/log/run
 create mode 100644 srcpkgs/libvirt/files/libvirt-generic/run
 mode change 100755 => 120000 srcpkgs/libvirt/files/libvirtd/log/run
 mode change 100644 => 120000 srcpkgs/libvirt/files/libvirtd/run
 create mode 120000 srcpkgs/libvirt/files/virtinterfaced/log/run
 create mode 120000 srcpkgs/libvirt/files/virtinterfaced/run
 create mode 120000 srcpkgs/libvirt/files/virtlockd/log/run
 mode change 100644 => 120000 srcpkgs/libvirt/files/virtlockd/run
 create mode 120000 srcpkgs/libvirt/files/virtlogd/log/run
 mode change 100644 => 120000 srcpkgs/libvirt/files/virtlogd/run
 create mode 120000 srcpkgs/libvirt/files/virtlxcd/log/run
 create mode 120000 srcpkgs/libvirt/files/virtlxcd/run
 create mode 120000 srcpkgs/libvirt/files/virtnetworkd/log/run
 create mode 120000 srcpkgs/libvirt/files/virtnetworkd/run
 create mode 120000 srcpkgs/libvirt/files/virtnodedevd/log/run
 create mode 120000 srcpkgs/libvirt/files/virtnodedevd/run
 create mode 120000 srcpkgs/libvirt/files/virtnwfilterd/log/run
 create mode 120000 srcpkgs/libvirt/files/virtnwfilterd/run
 create mode 120000 srcpkgs/libvirt/files/virtproxyd/log/run
 create mode 120000 srcpkgs/libvirt/files/virtproxyd/run
 create mode 120000 srcpkgs/libvirt/files/virtqemud/log/run
 create mode 120000 srcpkgs/libvirt/files/virtqemud/run
 create mode 120000 srcpkgs/libvirt/files/virtsecretd/log/run
 create mode 120000 srcpkgs/libvirt/files/virtsecretd/run
 create mode 120000 srcpkgs/libvirt/files/virtstoraged/log/run
 create mode 120000 srcpkgs/libvirt/files/virtstoraged/run
 create mode 120000 srcpkgs/libvirt/files/virtvboxd/log/run
 create mode 120000 srcpkgs/libvirt/files/virtvboxd/run
 create mode 120000 srcpkgs/libvirt/files/virtxend/log/run
 create mode 120000 srcpkgs/libvirt/files/virtxend/run

diff --git a/srcpkgs/libvirt/files/libvirt-generic/log/run b/srcpkgs/libvirt/files/libvirt-generic/log/run
new file mode 100644
index 000000000000..fe803f0a723c
--- /dev/null
+++ b/srcpkgs/libvirt/files/libvirt-generic/log/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Take daemon name from parent of the log subservice
+daemon="${PWD%/*}"
+daemon="${daemon##*/}"
+
+exec logger -t "$daemon" -p daemon.info
diff --git a/srcpkgs/libvirt/files/libvirt-generic/run b/srcpkgs/libvirt/files/libvirt-generic/run
new file mode 100644
index 000000000000..93b8a31ae81e
--- /dev/null
+++ b/srcpkgs/libvirt/files/libvirt-generic/run
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+sv check dbus >/dev/null || exit 1
+
+# Take daemon name from service name
+daemon="${PWD##*/}"
+
+[ -f ./conf ] && . ./conf
+
+exec "$daemon" $OPTS 2>&1
diff --git a/srcpkgs/libvirt/files/libvirtd/log/run b/srcpkgs/libvirt/files/libvirtd/log/run
deleted file mode 100755
index a4cd886e5de2..000000000000
--- a/srcpkgs/libvirt/files/libvirtd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t libvirtd -p daemon.info
diff --git a/srcpkgs/libvirt/files/libvirtd/log/run b/srcpkgs/libvirt/files/libvirtd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/libvirtd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/libvirtd/run b/srcpkgs/libvirt/files/libvirtd/run
deleted file mode 100644
index a224135e5bad..000000000000
--- a/srcpkgs/libvirt/files/libvirtd/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-sv check dbus >/dev/null || exit 1
-[ -f ./conf ] && . ./conf
-exec libvirtd $OPTS 2>&1
diff --git a/srcpkgs/libvirt/files/libvirtd/run b/srcpkgs/libvirt/files/libvirtd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/libvirtd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtinterfaced/log/run b/srcpkgs/libvirt/files/virtinterfaced/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtinterfaced/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtinterfaced/run b/srcpkgs/libvirt/files/virtinterfaced/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtinterfaced/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlockd/log/run b/srcpkgs/libvirt/files/virtlockd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtlockd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlockd/run b/srcpkgs/libvirt/files/virtlockd/run
deleted file mode 100644
index ae1163c12720..000000000000
--- a/srcpkgs/libvirt/files/virtlockd/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec virtlockd 2>&1
diff --git a/srcpkgs/libvirt/files/virtlockd/run b/srcpkgs/libvirt/files/virtlockd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtlockd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlogd/log/run b/srcpkgs/libvirt/files/virtlogd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtlogd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlogd/run b/srcpkgs/libvirt/files/virtlogd/run
deleted file mode 100644
index e27f13f0aef1..000000000000
--- a/srcpkgs/libvirt/files/virtlogd/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-sv check dbus >/dev/null || exit 1
-exec virtlogd 2>&1
diff --git a/srcpkgs/libvirt/files/virtlogd/run b/srcpkgs/libvirt/files/virtlogd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtlogd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlxcd/log/run b/srcpkgs/libvirt/files/virtlxcd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtlxcd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlxcd/run b/srcpkgs/libvirt/files/virtlxcd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtlxcd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnetworkd/log/run b/srcpkgs/libvirt/files/virtnetworkd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtnetworkd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnetworkd/run b/srcpkgs/libvirt/files/virtnetworkd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtnetworkd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnodedevd/log/run b/srcpkgs/libvirt/files/virtnodedevd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtnodedevd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnodedevd/run b/srcpkgs/libvirt/files/virtnodedevd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtnodedevd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnwfilterd/log/run b/srcpkgs/libvirt/files/virtnwfilterd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtnwfilterd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnwfilterd/run b/srcpkgs/libvirt/files/virtnwfilterd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtnwfilterd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtproxyd/log/run b/srcpkgs/libvirt/files/virtproxyd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtproxyd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtproxyd/run b/srcpkgs/libvirt/files/virtproxyd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtproxyd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtqemud/log/run b/srcpkgs/libvirt/files/virtqemud/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtqemud/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtqemud/run b/srcpkgs/libvirt/files/virtqemud/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtqemud/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtsecretd/log/run b/srcpkgs/libvirt/files/virtsecretd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtsecretd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtsecretd/run b/srcpkgs/libvirt/files/virtsecretd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtsecretd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtstoraged/log/run b/srcpkgs/libvirt/files/virtstoraged/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtstoraged/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtstoraged/run b/srcpkgs/libvirt/files/virtstoraged/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtstoraged/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtvboxd/log/run b/srcpkgs/libvirt/files/virtvboxd/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtvboxd/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtvboxd/run b/srcpkgs/libvirt/files/virtvboxd/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtvboxd/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtxend/log/run b/srcpkgs/libvirt/files/virtxend/log/run
new file mode 120000
index 000000000000..5c7df1c93a45
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtxend/log/run
@@ -0,0 +1 @@
+../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtxend/run b/srcpkgs/libvirt/files/virtxend/run
new file mode 120000
index 000000000000..0a412ef6f00f
--- /dev/null
+++ b/srcpkgs/libvirt/files/virtxend/run
@@ -0,0 +1 @@
+../libvirt-generic/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 0ff0509b90f4..863e69bb5021 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.9.0
+version=7.10.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
@@ -20,7 +20,9 @@ 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=829cf2b5f574279c40f0446e1168815d3f36b89710560263ca2ce70256f72e8c
+checksum=cb318014af097327928c6e3d72922e3be02a3e6401247b2aa52d9ab8e0b480f9
+# At least one test times out on CI but works locally
+make_check=ci-skip
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
@@ -33,9 +35,6 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 case "$XBPS_TARGET_MACHINE" in
-	armv7l-musl)
-		broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/36531/steps/shell_3/logs/stdio"
-		;;
 	*-musl) ;;
 	*)
 		# LTO apparently causes the linker to confuse the glibc symbol
@@ -75,6 +74,7 @@ post_patch() {
 pre_build() {
 	# racey custom targets; prevent parallelism issues
 	ninja -C build \
+		src/remote/lxc_protocol.h \
 		src/remote/qemu_protocol.h \
 		src/remote/remote_protocol.h \
 		src/util/virkeycodetable_linux.h \
@@ -86,18 +86,22 @@ pre_build() {
 }
 
 post_install() {
-	# runit services
-	vsv libvirtd
-	vsv virtlockd
-	vsv virtlogd
+	local _services _srv
+
+	# runit services; libvirtd is for legacy use
+	_services="libvirt-generic libvirtd virtqemud virtvboxd virtxend
+	 virtlxcd virtlockd virtlogd virtproxyd virtinterfaced virtnetworkd
+	 virtnodedevd virtnwfilterd virtsecretd virtstoraged"
+	for _srv in $_services; do
+		vsv $_srv
+	done
 
-	rm -rf ${DESTDIR}/etc/sysconfig
 	# Remove unused stuff.
+	rm -rf ${DESTDIR}/etc/sysconfig
 	rm -rf ${DESTDIR}/var/log
 
 	# workaround for musl not providing an utmpx implementation
-	if [ "$XBPS_TARGET_LIBC" = "musl" ];
-	then
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		echo "remember_owner = 0" >> ${DESTDIR}/etc/libvirt/qemu.conf
 	fi
 }

From 970b0786876bcdf70f9fc52d376e83197a58a7e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 1 Dec 2021 11:18:30 -0500
Subject: [PATCH 3452/4088] libvirt-python3: update to 7.10.0.

---
 srcpkgs/libvirt-python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 672cca09e742..faa9345aaef4 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.9.0
+version=7.10.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ 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=8535cffa5fbf05185648f9f57a2f71899c3bc12c897d320351c53725a48e5359
+checksum=267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 2a54955c62419212dc47668428c18d5d68c8f1af Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 5 Dec 2021 16:51:03 +0100
Subject: [PATCH 3453/4088] wine: add SDL2 as dependency

and remove system libraries that are no longer used.
closes #34201
---
 srcpkgs/wine/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 452ad47c07c5..a4a50d266852 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.23
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -35,19 +35,18 @@ fi
 hostmakedepends="pkg-config flex gettext
  $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
  $(vopt_if staging 'autoconf')"
-makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
- glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
- libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
+makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
+ libXext-devel libX11-devel libXpm-devel libXinerama-devel
+ libXcomposite-devel libXmu-devel libXxf86vm-devel
  libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel
- libldap-devel alsa-lib-devel libgphoto2-devel libxml2-devel
- libxslt-devel glib-devel freetype-devel pulseaudio-devel
- mpg123-devel libgsm-devel libopenal-devel giflib-devel libpng-devel
+ libldap-devel alsa-lib-devel libgphoto2-devel glib-devel
+ freetype-devel pulseaudio-devel libopenal-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader vkd3d-devel
- FAudio-devel gst-plugins-base1-devel"
+ gst-plugins-base1-devel SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls wine-common>=${version}_${revision} libwine>=${version}_${revision}"
+ gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"
 make_check=extended
 
 case $XBPS_TARGET_MACHINE in

From 4f75f727f23558c2932328f611f1b25db7f4b690 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 5 Dec 2021 16:29:25 +0100
Subject: [PATCH 3454/4088] graphviz: update to 2.50.0.

---
 srcpkgs/graphviz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index f0fb1860101a..b3331462e6b4 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,6 +1,6 @@
 # Template file for 'graphviz'
 pkgname=graphviz
-version=2.49.3
+version=2.50.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-lefty"
@@ -16,7 +16,7 @@ license="EPL-1.0"
 homepage="http://www.graphviz.org"
 changelog="https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md"
 distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz"
-checksum=5801664769ab88c2fb8ccb6ab0957cceabe6d4632b193041440e97790f53a9df
+checksum=afa48581f764a35e148909cc96a0308ec2356b5225b64af12492f3392f20ef1c
 
 # `make check` is broken:
 # https://gitlab.com/graphviz/graphviz/-/issues/2112

From 9283f425b2896e89e25d045e666f2fb8ee26d0fc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 5 Dec 2021 22:34:06 +0100
Subject: [PATCH 3455/4088] nim: fix build on ppc32

---
 srcpkgs/nim/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 809627066a68..d7534c97c223 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -30,6 +30,9 @@ do_build() {
 		i686*)
 			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
 			make -C csources_v1 ucpu=i686 ${makejobs};;
+		ppc|ppc-musl)
+			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
+			make -C csources_v1 ucpu=powerpc ${makejobs};;
 		*)
 			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
 			make -C csources_v1 ${makejobs};;

From afe186e23fbb7bd8805a77a10dbc88f2689aaafa Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 5 Dec 2021 22:34:20 +0100
Subject: [PATCH 3456/4088] webkit2gtk: update to 2.34.2

---
 srcpkgs/webkit2gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index bc04fe3f0ca6..f4e30d5f5ab2 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.34.0
+version=2.34.2
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -37,7 +37,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34
+checksum=584677d6e7cae12e27cdcc8e05b4cf73b54849a24afc3d7a40cec91016deff00
 make_check=no
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser

From 8dee34f22ce476dcf5ddb029f20cd3d13d0d4469 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Thu, 2 Dec 2021 02:31:48 -0500
Subject: [PATCH 3457/4088] lighttpd: update to 1.4.63

use pcre2-devel instead of pcre-devel
---
 srcpkgs/lighttpd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index d0ebf6677418..a9aa5ff06e4a 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,26 +1,26 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.61
+version=1.4.63
 revision=1
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=false
  -Dwith_libunwind=false -Dwith_lua=true -Dwith_memcached=true
- -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre=true -Dwith_pgsql=false
+ -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre2=true -Dwith_pgsql=false
  -Dwith_sasl=false -Dwith_webdav_props=true -Dwith_webdav_locks=true
  -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false -Dwith_dbi=false
  -Dmoduledir=lib/lighttpd/modules"
 hostmakedepends="pkg-config"
 makedepends="gdbm-devel libmemcached-devel
- libxml2-devel lua53-devel mit-krb5-devel pcre-devel sqlite-devel"
+ libxml2-devel lua53-devel mit-krb5-devel pcre2-devel sqlite-devel"
 checkdepends="perl"
 short_desc="Secure, fast, compliant and very flexible web-server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432
+checksum=2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

From df536b5dd6a48fe23fb86fe4073e911f1e13da57 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 4 Dec 2021 19:11:29 +0100
Subject: [PATCH 3458/4088] evolution-data-server: fix patch whitespace

---
 .../patches/gen-tables.patch                  | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/srcpkgs/evolution-data-server/patches/gen-tables.patch b/srcpkgs/evolution-data-server/patches/gen-tables.patch
index d21fa8c617cd..f111ef2625ab 100644
--- a/srcpkgs/evolution-data-server/patches/gen-tables.patch
+++ b/srcpkgs/evolution-data-server/patches/gen-tables.patch
@@ -1,64 +1,64 @@
 camel-gen-tables and gen-western-table are executed in the build process so
 they need to be built for the host architecture
 
---- a/src/camel/CMakeLists.txt.orig       2018-10-27 15:24:42.168166299 +0200
-+++ b/src/camel/CMakeLists.txt    2018-10-27 15:37:04.341765727 +0200
-@@ -1,17 +1,10 @@
- glib_mkenums(camel-enumtypes camel-enums.h CAMEL_ENUMTYPES_H)
-
+--- a/src/camel/CMakeLists.txt
++++ b/src/camel/CMakeLists.txt
+@@ -7,18 +7,10 @@ glib_mkenums_multiple(camel-enumtypes CAMEL_ENUMTYPES_H
+ 	camel-url.h
+ )
+ 
 -add_executable(camel-gen-tables
--       camel-gen-tables.c
+-	camel-gen-tables.c
 -)
 -
 -target_include_directories(camel-gen-tables PUBLIC
--       ${CMAKE_BINARY_DIR}
+-	${CMAKE_BINARY_DIR}
 -)
-
+-
  add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
--       COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
--       DEPENDS camel-gen-tables
-+       COMMAND /usr/bin/gcc ${CMAKE_CURRENT_SOURCE_DIR}/camel-gen-tables.c -I${CMAKE_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables
-+               && ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
+-	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
+-	DEPENDS camel-gen-tables
++	COMMAND /usr/bin/gcc ${CMAKE_CURRENT_SOURCE_DIR}/camel-gen-tables.c -I${CMAKE_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables
++		&& ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
  )
-
+ 
  set(SOURCES
-
---- a/src/addressbook/libebook-contacts/CMakeLists.txt.orig       2018-10-27 15:42:14.644088211 +0200
-+++ b/src/addressbook/libebook-contacts/CMakeLists.txt    2018-10-27 15:45:43.359285829 +0200
-@@ -2,31 +2,12 @@
-
+--- a/src/addressbook/libebook-contacts/CMakeLists.txt
++++ b/src/addressbook/libebook-contacts/CMakeLists.txt
+@@ -2,31 +2,12 @@ glib_mkenums(e-book-contacts-enumtypes e-book-contacts-enums.h E_BOOK_CONTACTS_E
+ 
  add_pkgconfig_file(libebook-contacts.pc.in libebook-contacts-${API_VERSION}.pc)
-
+ 
 -add_executable(gen-western-table
--       gen-western-table.c
+-	gen-western-table.c
 -)
 -
 -target_compile_definitions(gen-western-table PRIVATE
--       -DG_LOG_DOMAIN=\"gen-western-table\"
+-	-DG_LOG_DOMAIN=\"gen-western-table\"
 -)
 -
 -target_compile_options(gen-western-table PUBLIC
--       ${GNOME_PLATFORM_CFLAGS}
+-	${GNOME_PLATFORM_CFLAGS}
 -)
 -
 -target_include_directories(gen-western-table PUBLIC
--       ${CMAKE_BINARY_DIR}
--       ${GNOME_PLATFORM_INCLUDE_DIRS}
+-	${CMAKE_BINARY_DIR}
+-	${GNOME_PLATFORM_INCLUDE_DIRS}
 -)
 -
 -target_link_libraries(gen-western-table
--       ${GNOME_PLATFORM_LDFLAGS}
+-	${GNOME_PLATFORM_LDFLAGS}
 -)
 -
  add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
--       COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
--       DEPENDS gen-western-table e-name-western-tables.h.in
-+       COMMAND /usr/bin/gcc ${CMAKE_CURRENT_SOURCE_DIR}/gen-western-table.c -I${CMAKE_BINARY_DIR}
-+               -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -lglib-2.0 -o ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table
-+               && ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
-+       DEPENDS e-name-western-tables.h.in
+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
+-	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
+-	DEPENDS gen-western-table e-name-western-tables.h.in
++	COMMAND /usr/bin/gcc ${CMAKE_CURRENT_SOURCE_DIR}/gen-western-table.c -I${CMAKE_BINARY_DIR}
++		-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -lglib-2.0 -o ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table
++		&& ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
++	DEPENDS e-name-western-tables.h.in
  )
-
+ 
  set(DEPENDENCIES

From 9c3b808f150e0b54341d2fd2fa50cf49066dd465 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 26 Nov 2021 00:26:34 +0100
Subject: [PATCH 3459/4088] snowball: update to 2.2.0.

---
 .../snowball/patches/libstemmer-library.patch | 22 +++++++++----------
 srcpkgs/snowball/template                     |  9 +++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
index 4dbb89061bee..6e62d55065de 100644
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -3,24 +3,24 @@ https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8
 
 --- a/GNUmakefile
 +++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
+@@ -175,7 +175,7 @@
  
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ INCLUDES=-Iinclude
  
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt
+ 	libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt
+@@ -225,6 +225,9 @@
+ libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
  	$(AR) -cru $@ $^
  
 +libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
 +	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
 +
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ examples/%.o: examples/%.c
+ 	$(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
  
 --- /dev/null
 +++ b/libstemmer/symbol.map
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
index 784d281e1453..4ae63201d435 100644
--- a/srcpkgs/snowball/template
+++ b/srcpkgs/snowball/template
@@ -1,6 +1,6 @@
 # Template file for 'snowball'
 pkgname=snowball
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=gnu-makefile
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="BSD-3-Clause"
 homepage="https://snowballstem.org/"
 distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+checksum=425cdb5fba13a01db59a1713780f0662e984204f402d3dae1525bda9e6d30f1a
 
 post_patch() {
 	if [ -n "$CROSS_BUILD" ]; then
@@ -25,14 +25,11 @@ do_install() {
 	vbin stemwords
 
 	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.a 644 usr/lib
 	vinstall libstemmer.so.$version 644 usr/lib
 	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
 	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
 
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
 	vlicense COPYING
 }
 

From 037b63621e793e7a21a082519685b7a07157724f Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 6 Dec 2021 11:25:13 +0100
Subject: [PATCH 3460/4088] jrnl: update to 2.8.3

---
 srcpkgs/jrnl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index b6ea40ee345e..a0bef327559a 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,7 +1,7 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
-revision=2
+version=2.8.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ansiwrap python3-asteval python3-colorama python3-cryptography
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=089c7f2e61c31809b96efc4e3d3ae9fcc6354257e27406754f3a4a1a37029574
 # Tarball provides no tests
 make_check=no

From f0e6588f7c339b15d8779f888ae5868ecc42e55d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Dec 2021 09:01:45 -0500
Subject: [PATCH 3461/4088] New package: python3-gast-0.5.3

---
 srcpkgs/python3-gast/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-gast/template

diff --git a/srcpkgs/python3-gast/template b/srcpkgs/python3-gast/template
new file mode 100644
index 000000000000..787d9ff0c0c9
--- /dev/null
+++ b/srcpkgs/python3-gast/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-gast'
+pkgname=python3-gast
+version=0.5.3
+revision=1
+wrksrc="gast-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python AST that abstracts the underlying Python version"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/serge-sans-paille/gast"
+distfiles="${PYPI_SITE}/g/gast/gast-${version}.tar.gz"
+checksum=cfbea25820e653af9c7d1807f659ce0a0a9c64f2439421a7bba4f0983f532dea
+
+post_install() {
+	vlicense LICENSE
+}

From 6307d42062449340b12069715014c08ab47c5ba3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Dec 2021 09:07:09 -0500
Subject: [PATCH 3462/4088] New package: python3-beniget-0.4.1

---
 srcpkgs/python3-beniget/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-beniget/template

diff --git a/srcpkgs/python3-beniget/template b/srcpkgs/python3-beniget/template
new file mode 100644
index 000000000000..7c165d12abba
--- /dev/null
+++ b/srcpkgs/python3-beniget/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-beniget'
+pkgname=python3-beniget
+version=0.4.1
+revision=1
+wrksrc="beniget-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-gast"
+depends="python3-gast"
+checkdepends="python3-pytest $depends"
+short_desc="Extract semantic information about static Python code"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/serge-sans-paille/beniget"
+distfiles="${PYPI_SITE}/b/beniget/beniget-${version}.tar.gz"
+checksum=75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c
+
+do_check() {
+	python3 -m pytest tests/*
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 2b2aa20b5d63b42cc2e15fb4879d46eeae23891e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Dec 2021 09:11:56 -0500
Subject: [PATCH 3463/4088] New package: pythran-0.10.0

---
 srcpkgs/pythran/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/pythran/template

diff --git a/srcpkgs/pythran/template b/srcpkgs/pythran/template
new file mode 100644
index 000000000000..08e3af42085a
--- /dev/null
+++ b/srcpkgs/pythran/template
@@ -0,0 +1,19 @@
+# Template file for 'pythran'
+pkgname=pythran
+version=0.10.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-ply python3-gast python3-beniget python3-numpy"
+short_desc="Ahead-of-time compiler for numeric kernels"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://pythran.readthedocs.io/"
+distfiles="${PYPI_SITE}/p/pythran/pythran-${version}.tar.gz"
+checksum=9dac8e1d50f33d4676003e350b1f0c878ce113e6f907920e92dc103352cac5bf
+# Upstream defines no tests
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 233372fed2d139337c51a8df90d382814748edcf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Dec 2021 09:13:28 -0500
Subject: [PATCH 3464/4088] python3-scikit-image: use pythran to build
 extensions

---
 .../patches/no-pythran.patch                  | 60 -------------------
 srcpkgs/python3-scikit-image/template         |  4 +-
 2 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/python3-scikit-image/patches/no-pythran.patch

diff --git a/srcpkgs/python3-scikit-image/patches/no-pythran.patch b/srcpkgs/python3-scikit-image/patches/no-pythran.patch
deleted file mode 100644
index a2a1bf479ead..000000000000
--- a/srcpkgs/python3-scikit-image/patches/no-pythran.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Disable optional Pythran support that is hard-required during build.
-
---- a/setup.py
-+++ b/setup.py
-@@ -6,7 +6,7 @@
- import shutil
- import builtins
- import textwrap
--from numpy.distutils.command.build_ext import build_ext as npy_build_ext
-+from numpy.distutils.command.build_ext import build_ext
- 
- import setuptools
- from setuptools.command.build_py import build_py
-@@ -17,7 +17,13 @@
-     # can remove this except case once we require setuptools>=59.0
-     from distutils.errors import CompileError, LinkError
- 
--from pythran.dist import PythranBuildExt as pythran_build_ext
-+try:
-+    from pythran.dist import PythranBuildExt as pythran_build_ext
-+except ImportError:
-+    pass
-+else:
-+    # Replace numpy extension builder with pythran version
-+    build_ext = pythran_build_ext[build_ext]
- 
- DISTNAME = 'scikit-image'
- DESCRIPTION = 'Image processing in Python'
-@@ -60,7 +66,7 @@
- 
- # Support for openmp
- 
--class ConditionalOpenMP(pythran_build_ext[npy_build_ext]):
-+class ConditionalOpenMP(build_ext):
- 
-     def can_compile_link(self, compile_flags, link_flags):
- 
---- a/skimage/feature/setup.py
-+++ b/skimage/feature/setup.py
-@@ -2,7 +2,7 @@
- 
- import os
- from skimage._build import cython
--import pythran, logging
-+import logging
- 
- base_path = os.path.abspath(os.path.dirname(__file__))
- 
-@@ -43,6 +43,11 @@
-     config.add_extension('_sift', sources=['_sift.c'],
-                          include_dirs=[get_numpy_include_dirs(), '../_shared'])
- 
-+    try:
-+        import pythran
-+    except ImportError:
-+        return config
-+
-     # pythran submodules
-     pythran.config.logger.setLevel(logging.INFO)
-     ext = pythran.dist.PythranExtension(
diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index b1d87f9d2c26..5aaa9dbe6e39 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-scikit-image'
 pkgname=python3-scikit-image
 version=0.19.0
-revision=1
+revision=2
 _pkgname="${pkgname#python3-}"
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 build_helper="numpy"
 hostmakedepends="python3-Cython python3-wheel python3-numpy
- python3-packaging python3-setuptools"
+ python3-packaging python3-setuptools pythran"
 makedepends="python3-devel"
 depends="python3-scipy python3-numpy python3-imageio python3-matplotlib
  python3-networkx python3-tifffile python3-pywt python3-packaging"

From fb4f8d2e21b599bf86b763eb3b368145749c6ae0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:05:15 +0100
Subject: [PATCH 3465/4088] gstreamer1: update to 1.18.5

---
 srcpkgs/gstreamer1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 8532268d9ed8..9c3f8bbde9bb 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,7 +1,7 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.18.4
-revision=2
+version=1.18.5
+revision=1
 wrksrc="gstreamer-${version}"
 build_style=meson
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5
+checksum=55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a
 
 pre_check() {
 	# gst_gstdatetime is known to fail according to LFS

From 5ac2d77e2bfc08d0f4e177384a580a2d4b218a9e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:07:21 +0100
Subject: [PATCH 3466/4088] gstreamer-vaapi: update to 1.18.5

---
 srcpkgs/gstreamer-vaapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index f4d271f8b37f..90a3a0a7579b 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=1.18.4
+version=1.18.5
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
 distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=92db98af86f3150d429c9ab17e88d2364f9c07a140c8f445ed739e8f10252aea
+checksum=4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b
 
 pre_check() {
 	# Seems to need certain hardware to pass

From 54e642b3c76d694ef4d3a91a8a04bda48a3ee2e6 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:07:44 +0100
Subject: [PATCH 3467/4088] gst1-editing-services: update to 1.18.5

---
 srcpkgs/gst1-editing-services/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 457dec0424cf..f06a4d294879 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
-version=1.18.4
+version=1.18.5
 revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
-checksum=4687b870a7de18aebf50f45ff572ad9e0138020e3479e02a6f056a0c4c7a1d04
+checksum=8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5
 
 do_check() {
 	: # Tests fail in older versions as well

From 5ac04d5d1dbb91dbdf5785eff5deb88a24aa1c07 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:08:01 +0100
Subject: [PATCH 3468/4088] gst1-python3: update to 1.18.5

---
 srcpkgs/gst1-python3/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index bc826060b984..5f2fe61a6968 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,7 +1,7 @@
-# Template file for 'gst1-python3'.
+# Template file for 'gst1-python3'
 pkgname=gst1-python3
-version=1.18.4
-revision=2
+version=1.18.5
+revision=1
 wrksrc="gst-python-${version}"
 build_style=meson
 hostmakedepends="pkg-config python3"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=cb68e08a7e825e08b83a12a22dcd6e4f1b328a7b02a7ac84f42f68f4ddc7098e
+checksum=533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52

From 06d812942db56dfb10b3537c926bf28903c0ee1f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:08:16 +0100
Subject: [PATCH 3469/4088] gst-libav: update to 1.18.5

---
 srcpkgs/gst-libav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 33d4087442ab..dc77de85702b 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-libav'
 pkgname=gst-libav
-version=1.18.4
+version=1.18.5
 revision=1
 wrksrc="${pkgname}-${version}"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396
+checksum=822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2

From 6f775a58d8546adc6a140954a45f7c1bae998f9e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:08:30 +0100
Subject: [PATCH 3470/4088] gst-omx: update to 1.18.5

---
 srcpkgs/gst-omx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index 98dccd403932..5e78c4c68549 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
-version=1.18.4
+version=1.18.5
 revision=1
 build_style=meson
 configure_args="-Dexamples=disabled -Dtarget=generic"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=e35051cf891eb2f31d6fcf176ff37d985f97f33874ac31b0b3ad3b5b95035043
+checksum=2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42

From c1c5491a75ea21ef69ead8c01ee12d16d2f713bd Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:08:45 +0100
Subject: [PATCH 3471/4088] gst-plugins-bad1: update to 1.18.5

---
 srcpkgs/gst-plugins-bad1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..1157ba3e7ded 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
-version=1.18.4
-revision=4
+version=1.18.5
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -36,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f
+checksum=a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e
 
 build_options="gir gme"
 build_options_default="gir"

From 58438ff6e16e724f43e1d62ead7d2947640ad01f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:08:57 +0100
Subject: [PATCH 3472/4088] gst-plugins-base1: update to 1.18.5

---
 srcpkgs/gst-plugins-base1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 050521f071c3..3e22f2d1bf48 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
-version=1.18.4
+version=1.18.5
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323
+checksum=960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3
 
 build_options="cdparanoia gir sndio"
 build_options_default="cdparanoia gir"

From f2cd899c87468d47f9f5355e5dfe2ee2f8bb568b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:09:09 +0100
Subject: [PATCH 3473/4088] gst-plugins-good1: update to 1.18.5

---
 srcpkgs/gst-plugins-good1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 8c97c1415191..974cdbc22c41 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
-version=1.18.4
+version=1.18.5
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0
+checksum=3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b
 
 build_options="gtk3"
 build_options_default="gtk3"

From 7a220e3d5cab54c0efc8805b7e3fccc03c740e75 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 9 Nov 2021 19:09:21 +0100
Subject: [PATCH 3474/4088] gst-plugins-ugly1: update to 1.18.5

---
 srcpkgs/gst-plugins-ugly1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index 09c5eeceabf3..8f3e16d98f81 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-ugly1'
 pkgname=gst-plugins-ugly1
-version=1.18.4
-revision=2
+version=1.18.5
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c
+checksum=df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9

From 2a05bdd834fd74c545fa10676852300d2daa02c9 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 6 Dec 2021 08:43:46 +0100
Subject: [PATCH 3475/4088] badwolf: update to 1.2.2

---
 srcpkgs/badwolf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 0397fe5aa59a..87226ec7a040 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,6 +1,6 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=configure
 make_check_target=test
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=7a658908551bc0389fc43bd04a9decfef3815d28ff2097957bf6ab186a05ffd2
+checksum=fcdf1b0d7111071db53f785cd3cecfb4c7ba852403a5697037b281e7fe262a4b
 
 pre_configure() {
 	export PREFIX=/usr

From 445b422845344fb1fb1b14a5467e7b9d1be28230 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:03:55 +0100
Subject: [PATCH 3476/4088] bluedevil: update to 5.23.4.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 3bef77e03a5b..d50acb74fd7a 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1d616b4af1141ae3e184a4430bf80092ede05c2f0f68087605741ff34915d0d8
+checksum=5b91379a2968345fa257ff33e8cbded0b77f2d12044d2847d0dcbea3a7e65d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From df095be34f92bf5bc4a3810752f20452f37e31bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:03:57 +0100
Subject: [PATCH 3477/4088] breeze-gtk: update to 5.23.4.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 03af59a2808f..e01ce61d508f 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=76bf9712d45b6f821b9174de283e2d2c3ed202ce375cd306d7d41ea9e8080373
+checksum=f8a66f39a619854f00f8d631835f8a9f41d92dffa17bc1c1a46f537e3c31604b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 95fa3774a725c576a54ea25c19bc3317f9b5b2a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:14 +0100
Subject: [PATCH 3478/4088] breeze: update to 5.23.4.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 19d023705db6..75df750022ba 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bb4af2a3221c5486bb90202213f2c662727d5a2946c228a90d872d5126f12494
+checksum=e2903bfd30a4ead6cec5f846c95194ee653031c4a0ac08f866dc3df1528e70f1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 64c4d526321119fa36244a51fb011d5f09a28549 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:16 +0100
Subject: [PATCH 3479/4088] kactivitymanagerd: update to 5.23.4.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index f4d32ec512a1..d1d55f2e7c4a 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ab702c990b61967d117af3e0ea9cbf9928802ee37a1f2873f518a7b00b983f66
+checksum=7feda23f82e8da0178036d1ec0aa3fa074c484dd6108b7b6fb93eb79d15e19d4

From 8a85978770e7ca202657a97e6b1a2d9c19d3bd3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:17 +0100
Subject: [PATCH 3480/4088] kde-cli-tools: update to 5.23.4.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 378aa796bb31..df0bf8b78b8f 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4069a881b04f065bb56d5eae8ac2499fe276071e9350e23d919d4e62cd521c39
+checksum=f20583c7999014067613a63cd4f299b75eddd77c56e6d0506391f6381610c32b
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 54be25b82fa385e898a903fe0d96c33973049df4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:19 +0100
Subject: [PATCH 3481/4088] kde-gtk-config5: update to 5.23.4.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 7ea95f9f1359..5a33f22b4a7b 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.23.3
+version=5.23.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=6bea99fa332317845e0d7345885265342a802a326cbcc1c3132c8d58c196828b
+checksum=c9e7a57dbbca915d2ab7d47cd0cc6caea8bcd0707a4e0ca83cffedc6c9dc6714
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 87476f5907bf89e467abac653d5487b5fc211920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:20 +0100
Subject: [PATCH 3482/4088] kdecoration: update to 5.23.4.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 15539eb4bf34..6f947d723afa 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8839ea0327236a7fe21b36d79bf77924e26a4c0b2ea8a20401742f41cbad928c
+checksum=3ab5b5cc8030552215845690fb7107764e59ead9ce9b5a50f6a810b5166c0069
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 77e26ebb13ee76fb878c6d3f042ad7f43f7ed4ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:22 +0100
Subject: [PATCH 3483/4088] kdeplasma-addons5: update to 5.23.4.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 825dfabfa653..7a619250e402 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.23.3
+version=5.23.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=bc0d4ab840e853a8839c2c8c405c03ace1d2d4d04a9300cca862cc20a4fb3c8d
+checksum=90dc3540fad81f57cc933b28ba4aa7e73c2c956f1486047532b12385ae68fdc8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 3f2095928f0681547923bf991641c9bd6dcdf634 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:24 +0100
Subject: [PATCH 3484/4088] kgamma5: update to 5.23.4.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index fc83d612caa8..f6b50ef7b708 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c5032a0576542d818200087279d70ac6c9f4b0a1623c6cf4e0b7782cf5659f1b
+checksum=d3cf26446b29dbb995926c4a24f0ac21615e6f66a81663dc03cab3de454075ac

From 0a2727c8b8c8f460809d3c8c9792f5298d6b1c7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:26 +0100
Subject: [PATCH 3485/4088] khotkeys: update to 5.23.4.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 7f207c2781d2..23d43b9a8259 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=066dffcc6f3980d10c6979a7fadb8e70b7ac54cb8b83016bab55d38047a692b1
+checksum=e8b95f5a5e5a3dd25ebff200402ac5007f4888f898c7622e1fe67c73d9a054bb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 9012a2d9cdff03223d83e5d034386ba79ceb804a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:28 +0100
Subject: [PATCH 3486/4088] kinfocenter: update to 5.23.4.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 7c09046838b5..58a0f2ea5436 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb11f9ec45db2b7e609d7391b7a8f05f21a78eff28c8341e0bfa7dfef32bdf27
+checksum=4d2ddff4b11a900fb0098e347955a83d7a5613e927beaa81ed2c4f890be6707c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From d750ae13392aa367c26dd7e958f23cc7b5a96321 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:30 +0100
Subject: [PATCH 3487/4088] kmenuedit: update to 5.23.4.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 0da0689972cf..efc779b9eac3 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a5e02eff9bb2b9d6b7a49693a4030d4b177e192f69c330238be4f22fcf9bd300
+checksum=935904107c22af3d54951c6d088fde485d774e3df49b0bbd88e2ed092d6f34c6

From 6675a370593e52e28ab7e1b92c0cca605df07dcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:32 +0100
Subject: [PATCH 3488/4088] kscreen: update to 5.23.4.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0b13d18616d0..b2806ded4f3a 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1c2e0502a2133f84a1d154828c1c9a7cf3edaa93d9fb3fb419bcb7b098a798f4
+checksum=c58eed6348df77cd0ebd972b5fa615f6200c831c75096bb14a8609f2fdee4969
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 2dd94c18cbb9df268ba9c4c3b2780cd3f9d7d256 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:33 +0100
Subject: [PATCH 3489/4088] kscreenlocker: update to 5.23.4.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 506ce30ff9da..6d98a21b365c 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6464699a766a40187824b9eb2e78028c8249aa1c1f449e3e1ea3e0d167cc4c72
+checksum=aefa7dd1007688124af48b303e895c32a15c302029adb9b6036642721c9b8fd8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From df017dd25dab65d90a2db4dbc2aa3dc69309c63e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:35 +0100
Subject: [PATCH 3490/4088] ksshaskpass: update to 5.23.4.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 18c849dfbfbf..73c43251d126 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1d6efbaea8b504694176f7a28688d1309623bf5b97431a7cc50e6df60b649e35
+checksum=93068fe830c56ae4f181fd0cb304ff469853981bc685d26ac9cf1d83a85b3ce9
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 0f71168ad79422c7eab62f50e0f8fb387f30d77e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:36 +0100
Subject: [PATCH 3491/4088] ksystemstats: update to 5.23.4.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 83b1e91cde06..ff6c7c2fb19a 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=74c0bbaaa935710062793498b75f3eb1759d426c897cf079833d03444c60518e
+checksum=ff0d79381c2a0425316141b4bbc08a62fafc83f4d204a897126553dc65387a03

From 38d20e2f6cee44c968a8b4cacf04917c64aa86d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:37 +0100
Subject: [PATCH 3492/4088] kwallet-pam: update to 5.23.4.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index db84cac98789..e22a51126eb8 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a8cde66c8020a8d7cc7ad503627d7844aacfd79755c04e212c7696fbf599bd2b
+checksum=a76fa2db804b99c0e71135ccb0a48262b4c8ab8ac1d411ff6b1f0e657db4cc23

From aa2c9d2b03b1b410624efa0a697d8e929e19640f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:39 +0100
Subject: [PATCH 3493/4088] kwayland-integration: update to 5.23.4.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index f1d2422e130f..2d2d3f31bcc0 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30f666ffe0c7e6633925790156bf723449a6d1724a4b6c6d842c0a8561ff505
+checksum=2fcda390016879f99f277d0434685e6d83e86c135799748683bed539158f4692

From 810a058accdad85e87fd7ffe6e5cf6ac16af1e4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:40 +0100
Subject: [PATCH 3494/4088] kwayland-server: update to 5.23.4.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 47b0359b4769..e01856083520 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fd8d071b12b729d6da6014128e3304866d0d49ad4e78bc926b7e7c15d11150c2
+checksum=35db954b6d919cb20cf02d0956170765b09f04c7849d6e1bb3846b1f22e19b8d
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e77762914d832438f29f7938b3cf41cbd10ab228 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:43 +0100
Subject: [PATCH 3495/4088] kwin: update to 5.23.4.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index b8033a470d1c..20fc7cef7994 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7fb1daac298d1198f3c45b38d3b58219f72dbb7fcb11176478a9fd3cbedd8813
+checksum=4cefaf0c02c19d73417f4bcafd1354966914fefdc4e3cdab41689e0caea91167
 
 build_options="pipewire"
 build_options_default="pipewire"

From 15508f772722365f5a5c3824336a8af28e7047b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:44 +0100
Subject: [PATCH 3496/4088] kwrited: update to 5.23.4.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 7b81849fc9e2..4dd55d630c71 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8498568bee3e2ea4006f7359a382bb4f1ad5a7359fe5dccdd100cf6695d7a604
+checksum=337adb66bb3c847442127b4ab2aa330b40476207024978c096219658e6ea5197

From cdf89fdf654652053b65cf0b2625a05bfac887dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:45 +0100
Subject: [PATCH 3497/4088] layer-shell-qt: update to 5.23.4.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index e496f8b4f283..d3336f0b2d38 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4a84038847e95559ecd0258e715e5c7b51dd758ed8676d3b56e99c5414b8c797
+checksum=53c4106dbba50ace8c4c0e1e2739a1b190797e2b0a48725b88bdcbd1f9d1e428
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ac62eb643e216df12c6a383d65a67f28e9a1d9de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:47 +0100
Subject: [PATCH 3498/4088] libkscreen: update to 5.23.4.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 0b78c01ebac1..a47d73d62445 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8d57ee450b0bd95f879c8bb01a89aa993c10e60e152111a7df64c0b95de5f4d
+checksum=57ccef513ec0e57271e2de43239253ab16d057f6fa8399d2d2c7c2a52a7c3d58
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 16b9dbc4a41f1d235c719f043070a3b473a6e3ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:49 +0100
Subject: [PATCH 3499/4088] libksysguard: update to 5.23.4.

---
 srcpkgs/libksysguard/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 85d134a92d0e..ee8cb8466301 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,9 +1,10 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
+ kpackage"
 makedepends="plasma-framework-devel qt5-webchannel-devel knewstuff-devel
  libcap-devel libnl3-devel libsensors-devel
  $(vopt_if webengine 'qt5-webengine-devel qt5-location-devel')"
@@ -12,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40c17c3fb7c14665379b03d16a912c9f40c74f64f925b8a3210e480438584455
+checksum=9c1e08cb9a30a23be0485bb015515b271ebbba9a8a00f4a635a226ce152e33f6
 
 build_options="webengine"
 

From 382d5c03a0e452070f57860f7f0a7b02b89f4768 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:50 +0100
Subject: [PATCH 3500/4088] milou: update to 5.23.4.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index c03b8e937b47..ce912c1fe3b0 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d588be998ff30614b3194169c41aa4cfcb256e511fba3a86309053c57aadb57
+checksum=c8a1e20384e0581390e422ebf2514570227c082ab4e7693cdd30df9fa48a9697
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 8ef3200ec639e4ede243cccfc16681b6b5b36e14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:53 +0100
Subject: [PATCH 3501/4088] oxygen: update to 5.23.4.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 8a0930f9a24a..8b8b2e4c6747 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1fb877d5abbc05183f30ad0b26dd1002386261f31c1d1fbfb6849eb79beae964
+checksum=bfaf8b86f243d4f390f631ea28ec1125bbf95cc4f011dec7e95002509283992c

From eb9ba155b90cd1856585bcf0f7e7699def5f3071 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:54 +0100
Subject: [PATCH 3502/4088] plasma-browser-integration: update to 5.23.4.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 786bad2750df..6d88031161a2 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27b9969c64652184bea2223be6c5e564a2ea17458eb8d6ac21c2e271b8c17a64
+checksum=09a418c5937357ae437b8d2baec9f183126ff5d13c94a05ed80f4480b4018400
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From be17fcb1862c18d41c09cc0b275c94f6ef40acad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:04:58 +0100
Subject: [PATCH 3503/4088] plasma-desktop: update to 5.23.4.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 72c78c2f5446..a4706e7a24f7 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=43435a514eb66965e52af49aa033ebc813db42a10ad66cd5656f7466f14d4504
+checksum=5a8970cb0610296c493e35b509fdfbcb253539423dff14b38f4165ff0dd588dc
 replaces="user-manager>=0"
 python_version=3

From 20164e52ee586f9005051d1c5e62bf0be09ebad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:00 +0100
Subject: [PATCH 3504/4088] plasma-disks: update to 5.23.4.

---
 srcpkgs/plasma-disks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 6480f8cd2f90..b1e30d086de8 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools
- gettext kcoreaddons kauth"
+ kpackage gettext kcoreaddons kauth"
 makedepends="plasma-framework-devel"
 depends="smartmontools"
 short_desc="Hard disk health monitoring for KDE Plasma"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ab00951001450d4347c0c17c523b77b4204df746df907d0554c6325fb5829de3
+checksum=b1b61b6add0811ef0447f727db86d507fde35e1c3dda21b469368d623de6ee69

From 601e9826e22e94b9f4d900fba4d3139e75aa6a87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:01 +0100
Subject: [PATCH 3505/4088] plasma-firewall: update to 5.23.4.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 132848ccb8fb..44dff5d8a86f 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18734bd949d6a350b4a7d9f570573982f45ad2b6bfd63c48c0cf40edbb3e0b4f
+checksum=5c2504836b28c95edcbe048b937db400ac39b4398590434ba200e6426b411c10

From e4ecc5b698c14ea09e4345846fd41f127b7b3053 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:03 +0100
Subject: [PATCH 3506/4088] plasma-integration: update to 5.23.4.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index c4e9c3975f07..e4a7223e8d03 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=36c31a474bdbb1f7f37996236bcce4cac68251172cd68be9be4117ea0759a360
+checksum=63780f6a20bbe23c33a7332a6ac7319ccbdb9ec4e906b4d4dbaf03d2acdb992c

From 60044f6bc294b663ffafd1a35da62726869f5ad6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:04 +0100
Subject: [PATCH 3507/4088] plasma-nm: update to 5.23.4.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index cd3048598ea3..0a894bffb889 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eec18c4addba69313f1372f05bf9fc713960186f8e53905dc321af115ba5ea94
+checksum=24893ef9b16b14247d934a451a80d296291e4cebb59cbf65f7c730f57d738f30
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 2a229111b35f83d06696209baee7668db929925e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:06 +0100
Subject: [PATCH 3508/4088] plasma-pa: update to 5.23.4.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 6f8ff0380c9b..0b92288d1d99 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=13771e6d12d7033b96d5ae89fbbbb62d6e38a4b15e57226dc3c43a17c5daa355
+checksum=4701dc362e615d321c1cc7b94240ab5b23898d7db8ec1a4ed49d84ac8907983c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 18ae0ef6e7548fcb4d53d25d0d8ca97c3e714bd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:07 +0100
Subject: [PATCH 3509/4088] plasma-sdk: update to 5.23.4.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 3dd2e1e0cb6d..1baa06d0dcab 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=716dcf93d9339a0ec5c14e455f27cfe71974bb855e26840c34ad2b0db7796939
+checksum=f3fa4063d3fe8073952b013409369f3f0f94df0f35b5bfd0a472f4e4a59e7ab1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 4bf26f8fa437a4e0573cc5254a52b68f88d935a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:08 +0100
Subject: [PATCH 3510/4088] plasma-systemmonitor: update to 5.23.4.

---
 srcpkgs/plasma-systemmonitor/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3e6a484bb1f4..aca4e9410b95 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,10 +1,10 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
- kconfig kcoreaddons"
+ kpackage kconfig kcoreaddons"
 makedepends="kirigami2-devel libksysguard-devel kitemmodels-devel"
 depends="kirigami2 qqc2-desktop-style kquickcharts ksystemstats"
 short_desc="Application for monitoring system resources"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=17fd59d0cff3c155cea48687cb1e566981d3bcec1f8a1557ea051dde66768fca
+checksum=61c891537ff2bdc3e011d158b188b73aa5ca88560bf7d265a2bec385eabf6e9a

From 4fae236d3a822b862a18a985bb46206bf3158c5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:10 +0100
Subject: [PATCH 3511/4088] plasma-thunderbolt: update to 5.23.4.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index 85a5ceca2773..d0d752de2fac 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5bad78bc330a5111f326ee9d68f5bef5ce43743c8f82818024e2e968a8feed6f
+checksum=ff8382767c997952f2f77799eac007364f60a190a691f0323acd9bca3111b63c
 
 do_check() {
 	: # Requires running dbus and bolt services

From c912d2a7eb18ec5762d8c5fbc4df75b8b6b3d7e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:11 +0100
Subject: [PATCH 3512/4088] plasma-vault: update to 5.23.4.

---
 srcpkgs/plasma-vault/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 5ad25e6d0247..4a06d9e3f798 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,20 +1,17 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
+configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
+ -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
- gettext"
+ pkg-config gettext kpackage-devel kconfig-devel kcoreaddons-devel
+ plasma-framework"
 makedepends="plasma-framework-devel libksysguard-devel networkmanager-qt5-devel"
 short_desc="Plasma applet and services for creating encrypted vaults"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a27a13fe0a2d316045e1063215e301b192defe5a93b04baaaa4a855f01c03f18
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
-	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
-	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-fi
+checksum=c627e8872b2f3847c77451c07f64ebfa3774574f37871af879b8acb7e6e9c9ab

From 8ad7ffe81a9fb7ebfb400857acfe12e8c07ec9c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:24 +0100
Subject: [PATCH 3513/4088] plasma-workspace-wallpapers: update to 5.23.4.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index c92840b6334c..04fd052065b7 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5a9432073012423531f311a2ba441c03242625b04dbd8a2b0f175afe3eeee4cf
+checksum=cca6fe5e76ed2fa7734ab89bd3446937571ce6f5fd6d7670cf2aed05485cf394

From 9c01efab5fb745126642a719eb9eebeac99f7b60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:27 +0100
Subject: [PATCH 3514/4088] plasma-workspace: update to 5.23.4.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 4d34ae156675..3d851b3b4fe2 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=86802e3305bd91faef25c1876e333ad22ae751e556e8503945481b52ad52e257
+checksum=13ec4eedfaae97fe441aaad57cdd6bf949d06d42370e15e3426e41f49c3ea34d
 
 build_options="pipewire"
 build_options_default="pipewire"

From 67fb7996996af8574c114f9b462eeefd228b4a14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:28 +0100
Subject: [PATCH 3515/4088] polkit-kde-agent: update to 5.23.4.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 412297fc48ee..dc5252a54522 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.23.3
+version=5.23.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=79b8cc2f684ada6667085f604e642038191e9c01d2691e87c53de5227fc7bae4
+checksum=10112e862879d5e9ea36931cc12ecf0daa4c5220c25d09e67d1b40c10efa121b

From 65556cebbf4d402b8937d3f50e482b8c521227c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:30 +0100
Subject: [PATCH 3516/4088] powerdevil: update to 5.23.4.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 8bc8d336915d..f24d18526ae7 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eb57941e0381b6dc4a27c31d7210d895c250eaafcab43a66fe5443e29b108b41
+checksum=4ef36bf3c3010737f7005621f88229b84d426ed2874f41455f2bd222ea1686ea

From f9066a3134cfdcfb3116fb7930ab32c1f6f56c1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:31 +0100
Subject: [PATCH 3517/4088] sddm-kcm: update to 5.23.4.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 07f044925104..afee753a62ee 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9e25d97ec255097c4974f0c1ee4aaca3f12a0fcce09674567d229b89ad46969
+checksum=e29919da2f58a277013f1d8fee51410a6d846fa79c9f6d3850153ae254721b91

From 7503610c38aa890854eeabb5514ee4e65d8f8731 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:32 +0100
Subject: [PATCH 3518/4088] systemsettings: update to 5.23.4.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index f945dba5f2f9..eddbeb0c07b5 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=015ea04084b144821db7a5c7f4a4d029075bc7693dfec77679a3c9927c601b45
+checksum=bcad3f487498d30b442d16c2abae63e279aa74199186c779e9f610fdfa2f5c59

From 91cc96dcf30410739f6bf2961a29ff6c9fffd516 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:05:34 +0100
Subject: [PATCH 3519/4088] xdg-desktop-portal-kde: update to 5.23.4.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 1ebad4750404..94cc5778253c 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.23.3
+version=5.23.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffe6b1445901a62ef7bad576d33d0f43f80845eed104a012a9e907cad8a352a9
+checksum=567199138cb106d4299b29be7aa965786c7a9a7858607de5b111892a3369c59e

From 05a4fbd5c07e6af966b0360dcfd9fc389ba56405 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:07:24 +0100
Subject: [PATCH 3520/4088] telegram-desktop: update to 3.2.5.

---
 srcpkgs/telegram-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 664c58842e70..79ef99c187fd 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=3.2.2
+version=3.2.5
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=f9b82a2133f8811ba465a54c70335b14c281eefe55668a7670522f3c5719fb9d
+checksum=48b09d0b179e8652d1da8f1d3acf4911896afa5bc58ed41d92c14bf2ec45a346
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 86b197175c7a8a916f58d519780cf1ed199657d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:09:48 +0100
Subject: [PATCH 3521/4088] ksnip: update to 1.9.2.

---
 srcpkgs/ksnip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksnip/template b/srcpkgs/ksnip/template
index 33857115c97e..1396b127b338 100644
--- a/srcpkgs/ksnip/template
+++ b/srcpkgs/ksnip/template
@@ -1,6 +1,6 @@
 # Template file for 'ksnip'
 pkgname=ksnip
-version=1.9.1
+version=1.9.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/DamirPorobic/ksnip"
 distfiles="https://github.com/DamirPorobic/ksnip/archive/v${version}.tar.gz"
-checksum=6f78bfe85df8016155951bb028abd395f70328c78457ec3b3133277929c12706
+checksum=a768509febb58b1332a2005ac90ad83c209a2da19b224dbf8995bb4fcbb9d485

From 6f17e86f17523527183c4c9e994ff88f590537be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 4 Dec 2021 20:17:42 +0100
Subject: [PATCH 3522/4088] kImageAnnotator: update to 0.5.3.

---
 srcpkgs/kImageAnnotator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kImageAnnotator/template b/srcpkgs/kImageAnnotator/template
index 4e7d3f1df1be..5b6af37d9df4 100644
--- a/srcpkgs/kImageAnnotator/template
+++ b/srcpkgs/kImageAnnotator/template
@@ -1,6 +1,6 @@
 # Template file for 'kImageAnnotator'
 pkgname=kImageAnnotator
-version=0.5.2
+version=0.5.3
 revision=1
 build_style=cmake
 # XXX: Tests don't build
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/DamirPorobic/kImageAnnotator"
 distfiles="https://github.com/DamirPorobic/kImageAnnotator/archive/v${version}.tar.gz"
-checksum=7940ab37d823809ddd527d8ebe59db2b99bfeb665e5041d71d70dec4f61041f0
+checksum=afb8d93b36dae06c9ccd5cdba1640bcd1d8f06607a2ed9f37f885d491377d5a8
 
 kImageAnnotator-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 5d4d2adf19db8e7dd53469b0dc08ec4dc040369c Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Sat, 4 Dec 2021 21:07:39 +0100
Subject: [PATCH 3523/4088] python3-Werkzeug: update to 2.0.2.

---
 srcpkgs/python3-Werkzeug/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
index 54ed4fbed49b..e2b947031bb4 100644
--- a/srcpkgs/python3-Werkzeug/template
+++ b/srcpkgs/python3-Werkzeug/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Werkzeug'
 pkgname=python3-Werkzeug
-version=2.0.1
-revision=2
+version=2.0.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Markus Berger <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/werkzeug/"
 distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz"
-checksum=1de1db30d010ff1af14a009224ec49ab2329ad2cde454c8a708130642d579c42
+checksum=aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a
 
 do_check() {
 	# Tests depend on xprocess and pytest-timeout, which aren't packaged

From d1320afe5cf25f81737b20ce7f47d718e6cd3cd4 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Sat, 4 Dec 2021 21:13:49 +0100
Subject: [PATCH 3524/4088] python3-Flask: update to 2.0.2.

---
 srcpkgs/python3-Flask/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Flask/template b/srcpkgs/python3-Flask/template
index 1d014901d3b2..df0a434c693a 100644
--- a/srcpkgs/python3-Flask/template
+++ b/srcpkgs/python3-Flask/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask'
 pkgname=python3-Flask
-version=2.0.1
-revision=2
+version=2.0.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Markus Berger <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="http://flask.pocoo.org"
 distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz"
-checksum=1c4c257b1892aec1398784c63791cbaa43062f1f7aeb555c4da961b20ee68f55
+checksum=7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2
 conflicts="python-Flask>=0"
 
 post_install() {

From f983cc978f1d2be65c7dcf33f79f5da334569d4e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 2 Dec 2021 07:29:33 -0500
Subject: [PATCH 3525/4088] python3-pyppmd: update to 0.17.3.

---
 srcpkgs/python3-pyppmd/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
index 6449ad14345f..4034cde05478 100644
--- a/srcpkgs/python3-pyppmd/template
+++ b/srcpkgs/python3-pyppmd/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyppmd'
 pkgname=python3-pyppmd
-version=0.17.1
+version=0.17.3
 revision=1
 wrksrc="pyppmd-${version}"
 build_style=python3-module
@@ -11,7 +11,8 @@ short_desc="Python interface for PPM variation H and I.2"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/miurahr/pyppmd"
+changelog="https://raw.githubusercontent.com/miurahr/pyppmd/main/Changelog.rst"
 distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
-checksum=ebc65d393d58b5463fdfbdf9b27e51b6aef9a9142052a50685a5dfdba91f5808
+checksum=05a4765833623d5cc1c9afc27d9b05fb64f0319711beffe0b44d9695eb1beb0a
 # testing requires unpackaged plugin pytest-benchmark
 make_check=no

From 1731b4379402fc0624b2056c59df84f2dd3b1508 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 2 Dec 2021 07:29:28 -0500
Subject: [PATCH 3526/4088] python3-py7zr: update to 0.16.4.

---
 srcpkgs/python3-py7zr/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index 674347e85cc9..ecd53ab39117 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
-version=0.16.2
+version=0.16.4
 revision=1
 wrksrc="py7zr-${version}"
 build_style=python3-module
@@ -12,8 +12,9 @@ short_desc="7zip in python3 with various compressions, and AES encryption"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/py7zr"
+changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst"
 distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
-checksum=e741f0271ebb12551e4a4b57bf01fca226e7136ff301d15c083cd262f8c4a0d6
+checksum=9b584dcd71b0e8c385cc66ae8e370bdbc29d1f07139d5cee770dc221fa338cf9
 # testing requires unpackaged modules:
 # pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
 make_check=no

From 413235211b5dfe23e3ddfa33ada493ebfae2085d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 2 Dec 2021 07:28:08 -0500
Subject: [PATCH 3527/4088] python3-responses: update to 0.16.0.

---
 srcpkgs/python3-responses/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
index feb108d12155..f788069a9fd2 100644
--- a/srcpkgs/python3-responses/template
+++ b/srcpkgs/python3-responses/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-responses'
 pkgname=python3-responses
-version=0.14.0
+version=0.16.0
 revision=1
 wrksrc="responses-${version}"
 build_style=python3-module
@@ -10,7 +10,8 @@ short_desc="Utility for mocking out the Python Requests library"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/getsentry/responses"
+changelog="https://raw.githubusercontent.com/getsentry/responses/master/CHANGES"
 distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
-checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+checksum=a2e3aca2a8277e61257cd3b1c154b1dd0d782b1ae3d38b7fa37cbe3feb531791
 # testing requires unpackaged plugin pytest-localserver
 make_check=no

From 3991891d16b768cd37a3d6084699f855b0c5e785 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 2 Dec 2021 07:23:52 -0500
Subject: [PATCH 3528/4088] python3-jellyfish: update to 0.8.9.

---
 srcpkgs/python3-jellyfish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index 61a15e15e861..5ad74f36794d 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.8.8
+version=0.8.9
 revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
@@ -12,8 +12,9 @@ short_desc="Python3 library for approximate and phonetic matching of strings"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
+changelog="https://raw.githubusercontent.com/jamesturk/jellyfish/main/docs/changelog.md"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c
+checksum=90d25e8f5971ebbcf56f216ff5bb65d6466572b78908c88c47ab588d4ea436c2
 
 post_install() {
 	vlicense LICENSE

From cd54321e8333ad4decd3c13e82b8616116f1229a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 2 Dec 2021 07:24:14 -0500
Subject: [PATCH 3529/4088] python3-mediafile: update to 0.9.0.

---
 srcpkgs/python3-mediafile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
index 62b47885bba8..594e0c6a3029 100644
--- a/srcpkgs/python3-mediafile/template
+++ b/srcpkgs/python3-mediafile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mediafile'
 pkgname=python3-mediafile
-version=0.8.1
+version=0.9.0
 revision=1
 wrksrc="mediafile-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/beetbox/mediafile"
 distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
-checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+checksum=93ccef3fbb7d4554a0e7689d41236cd5686a2f2f17493098622b8344cf83df9a
 
 post_install() {
 	vlicense LICENSE

From ddb6c2024f15204f7d3d9e00049d6e9620f862e8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 2 Dec 2021 07:24:39 -0500
Subject: [PATCH 3530/4088] python3-confuse: update to 1.7.0.

---
 srcpkgs/python3-confuse/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
index b12a34c13792..05a9764fa7e5 100644
--- a/srcpkgs/python3-confuse/template
+++ b/srcpkgs/python3-confuse/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-confuse'
 pkgname=python3-confuse
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="confuse-${version}"
 build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="Painless YAML config files for Python"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/beetbox/confuse"
+changelog="https://raw.githubusercontent.com/beetbox/confuse/master/docs/changelog.rst"
 distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
-checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+checksum=c9fe8474516a62397f8e52fcf89547bb2f2737b1a4a6f6dec11a286f0b3a7401
 
 post_install() {
 	vlicense LICENSE

From 56906a86b9a6fa62cfa284c2854b4906481f290e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 2 Dec 2021 07:22:33 -0500
Subject: [PATCH 3531/4088] beets: update to 1.6.0, adopt.

---
 srcpkgs/beets/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index e5a05f6c687e..6d4a890a1d4f 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,6 +1,6 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,11 +11,12 @@ checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
  python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
  python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
-homepage="http://beets.radbox.org/"
+homepage="https://beets.io"
+changelog="https://raw.githubusercontent.com/beetbox/beets/master/docs/changelog.rst"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+checksum=aa6fb734e44afc9b039c0abd0edd4c7706df00d4eb4aae7afa9ff4b6bb15525d
 make_check=ci-skip # tests don't work as root
 
 post_install() {

From a8f3042ee67fbca6abf5fa0ed09f2e20404f6ad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:08:04 +0100
Subject: [PATCH 3532/4088] DarkRadiant: update to 2.14.0.

---
 srcpkgs/DarkRadiant/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 6741fc8bae37..53e86a849d83 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
-version=2.13.0
-revision=2
+version=2.14.0
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config ruby-asciidoctor"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/codereader/DarkRadiant/"
 distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz"
-checksum=a95488989dfce5c1e366059d6ca22ee144fe86583dd55285e5ecba612b1b93c2
+checksum=cc7802cb362c6b66d0dbd4a5798ebe8d0e069d0e7a05b6f4ab679c167a1d7621
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/lib/wx/include/gtk3-unicode-3.0"
 

From 442f8ba37acf698c7f4ebae86d9583ce455e5464 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:10:16 +0100
Subject: [PATCH 3533/4088] nuspell: update to 5.0.1.

---
 srcpkgs/nuspell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index a4ceeafe79e8..d83bab0e2a18 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,6 +1,6 @@
 # Template file for 'nuspell'
 pkgname=nuspell
-version=5.0.0
+version=5.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://nuspell.github.io/"
 distfiles="https://github.com/nuspell/nuspell/archive/v${version}.tar.gz"
-checksum=855d4771d225dcce1e48d098be6a2d69629c635b79b53f9e095a35adc68f0ea1
+checksum=a48d9b0297f9c87d8e3231b2662786c5380634cd2b2e0005c55709caefdaa032
 
 libnuspell_package() {
 	pkg_install() {

From 36541fa64cffdc814efef402306adc2017f33f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 8 Nov 2021 11:59:54 +0100
Subject: [PATCH 3534/4088] tarpaulin: update to 0.18.5.

Closes: #33953 [via git-merge-pr]
---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index 0de59100dbb1..d983c3fadbd1 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,6 +1,6 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
-version=0.18.2
+version=0.18.5
 revision=1
 archs="x86_64*"
 build_style=cargo
@@ -12,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/xd009642/tarpaulin"
 distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
-checksum=f60e613d866c76153729f2e2f39821da00995663dd3706e8af7e08850069dd94
+checksum=08b9ac70a6e857fe9b2d39db39a7f3b67f2934be873fa44de405a9d206df4eb7
 
 post_install() {
 	vlicense LICENSE-MIT

From 959e2ce5d9922610f374b7b0fc7447062ef3f52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Fri, 3 Dec 2021 14:40:20 +0000
Subject: [PATCH 3535/4088] soju: add logging service.

---
 srcpkgs/soju/files/soju/log/run | 2 ++
 srcpkgs/soju/files/soju/run     | 1 +
 srcpkgs/soju/template           | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/soju/files/soju/log/run

diff --git a/srcpkgs/soju/files/soju/log/run b/srcpkgs/soju/files/soju/log/run
new file mode 100755
index 000000000000..e3e1d1b70f91
--- /dev/null
+++ b/srcpkgs/soju/files/soju/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t soju -p daemon
diff --git a/srcpkgs/soju/files/soju/run b/srcpkgs/soju/files/soju/run
index 3b00ad02fb07..71054f810769 100755
--- a/srcpkgs/soju/files/soju/run
+++ b/srcpkgs/soju/files/soju/run
@@ -1,3 +1,4 @@
 #!/bin/sh
+exec 2>&1
 [ -r conf ] && . ./conf
 exec chpst -u _soju soju ${OPTS:- -config /etc/soju/config}
diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 9d3eddfea050..733636d4a288 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/soju ./cmd/sojuctl"

From 9662a1c6f326f3fbf29a4c14bcd4522242ebec00 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 28 Nov 2021 21:38:21 +0100
Subject: [PATCH 3536/4088] freeplane: update to 1.9.11.

---
 srcpkgs/freeplane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 9d7210a3ccbb..8a11fe87bbf3 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.10
+version=1.9.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=be9686a5b3b0642215676c9771f30738e1bf6f10661f241559334ec4ef32cf87
+checksum=a1cd3ae94116ea3ccfdf90a853f796722850aab4537039667c514902ab813e32
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From 6ed365ab6ce3c4b0f2505b441b0d28b1af393221 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 6 Dec 2021 23:49:04 +0100
Subject: [PATCH 3537/4088] kubernetes: update to 1.22.4.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index a4c324c19caf..2c297bf071b0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.22.3
+version=1.22.4
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=c1b20d29a25c7eb4a294e29196cfe78c594f61b60c49b5337715f45b3fa6efd9
+checksum=7afd37bc86e0d2b42b2902aa31dda1352244486c6bec13f8018a4ee81ef526ea
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From 6430d9cf4e66c9fce240ecaff30114e1ff41483c Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 6 Dec 2021 23:58:53 +0100
Subject: [PATCH 3538/4088] vagrant: update to 2.2.19.

---
 srcpkgs/vagrant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 1ac10dc90d8f..05139891c1b4 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,6 +1,6 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.2.18
+version=2.2.19
 revision=1
 archs="i686 x86_64*"
 hostmakedepends="ruby"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://www.vagrantup.com/"
 distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz"
-checksum=3508b0906b832d7317c8d36220798ec274b721e7ef63d0cf991c68f19d9dae90
+checksum=4f0e6b1d466e26dead682c4d4843e8f64a012eba4be91506ae6c6d34d3d9c8f9
 nocross=yes
 
 post_extract() {

From e2782ee9082ba9b0af492dcbad8acf445f5cf44f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 6 Dec 2021 16:28:31 +0100
Subject: [PATCH 3539/4088] lilypond: update to 2.23.5

---
 srcpkgs/lilypond/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index b600f727146a..66d452bd7771 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.4
+version=2.23.5
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -17,7 +17,7 @@ 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.23/lilypond-${version}.tar.gz"
-checksum=e300cfd7b94d81f1fb782ffee2aca8249002ece2f4868004274cebde32764b1e
+checksum=53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then

From 47265e3bb32b291566834a8c3843ad273aef7b2e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 6 Dec 2021 16:28:49 +0100
Subject: [PATCH 3540/4088] lilypond-doc: update to 2.23.5

---
 srcpkgs/lilypond-doc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index a4d97e19b579..89aa80f23fe4 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.23.4
+version=2.23.5
 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="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=b53eed66e8797e45743e3cf507d8395e597f1b4549e8cf2de1804edbbb456a04
+checksum=e2b528b3ce70058b634fd76b097f975760c0ad86148d9ec63b66c73a941b0afd
 
 do_install() {
 	vmkdir usr

From 2eaf304a2440483cdcfeb84097260c6ac4aeadcc Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 6 Dec 2021 16:26:31 +0100
Subject: [PATCH 3541/4088] praat: update to 6.2.03

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 7a3c99e70ba0..64ebebb04ab0 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.01
+version=6.2.03
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=c029607f646642bbb945d622f9b58261ba403e72a438e7cbebc281db6171bca2
+checksum=c15c1d1500e13cc98f757bf2de04901d41d7310e774df435d3a0c8b8b0f471c6
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From 0d91b49dd8a6d662ba25326e9f8227950a2c76cf Mon Sep 17 00:00:00 2001
From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com>
Date: Mon, 27 Jul 2020 15:27:08 +0000
Subject: [PATCH 3542/4088] New package: pyliblo-0.10.0.

Needed for Carla's carla-control program.
---
 srcpkgs/pyliblo/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/pyliblo/template

diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template
new file mode 100644
index 000000000000..d83804d7c05c
--- /dev/null
+++ b/srcpkgs/pyliblo/template
@@ -0,0 +1,15 @@
+# Template file for 'pyliblo'
+pkgname=pyliblo
+version=0.10.0
+revision=1
+wrksrc="pyliblo-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel liblo-devel"
+short_desc="Python bindings for the liblo OSC library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="http://das.nasophon.de/pyliblo/"
+distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz"
+checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f
+make_check=ci-skip # fails "test.test_liblo.ServerCreationTestCase" due to root

From 551bc9905685bfe306bffd4e478373630aaa1d20 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH 3543/4088] Carla: update to 2.4.1.

musl patch: we disable backtrace functionality unconditionally.

Add pyliblo to depends to fix the carla-control program.
---
 srcpkgs/Carla/patches/libmagic.patch   | 14 -----
 srcpkgs/Carla/patches/musl.patch       | 73 ++++++++++++++++++++++++++
 srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----
 srcpkgs/Carla/template                 |  8 +--
 4 files changed, 77 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/Carla/patches/libmagic.patch
 create mode 100644 srcpkgs/Carla/patches/musl.patch
 delete mode 100644 srcpkgs/Carla/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch
deleted file mode 100644
index f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/source/Makefile.mk
-@@ -233,10 +233,7 @@
- # Check for optional libs (special non-pkgconfig tests)
- 
- ifneq ($(WIN32),true)
--
--# libmagic doesn't have a pkg-config file, so we need to call the compiler to test it
--HAVE_LIBMAGIC = $(shell echo '\#include <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
--
-+HAVE_LIBMAGIC = true
- endif
- 
- # ---------------------------------------------------------------------------------------------------------------------
diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch
new file mode 100644
index 000000000000..7914395ba4e1
--- /dev/null
+++ b/srcpkgs/Carla/patches/musl.patch
@@ -0,0 +1,73 @@
+diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+index 3a9373893..6e1599345 100644
+--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
++++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ 	#define SMTG_OS_LINUX	1
+ 	#define SMTG_OS_MACOS	0
+ 	#define SMTG_OS_WINDOWS	0
+diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
+index 914cae680..4b1f20b00 100644
+--- a/source/modules/juce_core/juce_core.cpp
++++ b/source/modules/juce_core/juce_core.cpp
+@@ -90,10 +90,6 @@
+  #include <sys/time.h>
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+-
+- #if ! JUCE_ANDROID
+-  #include <execinfo.h>
+- #endif
+ #endif
+ 
+ #if JUCE_MAC || JUCE_IOS
+diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+index cd3068e6e..607ed29c0 100644
+--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()     { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()       { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
++String SystemStats::getUserLanguage()
++{
++#if defined(_NL_IDENTIFICATION_LANGUAGE)
++	return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
++#else
++	return "";
++#endif
++}
++
++String SystemStats::getUserRegion()
++{
++#if defined(_NL_IDENTIFICATION_TERRITORY)
++	return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
++#else
++	return "";
++#endif
++}
++
+ String SystemStats::getDisplayLanguage()  { return getUserLanguage() + "-" + getUserRegion(); }
+ 
+ //==============================================================================
+diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
+index 847127162..815ead97c 100644
+--- a/source/modules/juce_core/system/juce_SystemStats.cpp
++++ b/source/modules/juce_core/system/juce_SystemStats.cpp
+@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++// #if JUCE_ANDROID || JUCE_MINGW
++   #if 1
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS
diff --git a/srcpkgs/Carla/patches/qt5-5.15.0.patch b/srcpkgs/Carla/patches/qt5-5.15.0.patch
deleted file mode 100644
index ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp	2020-04-13 05:29:06.000000000 +0200
-+++ b/source/theme/CarlaStyle.cpp	2020-08-23 20:32:26.157269175 +0200
-@@ -22,6 +22,7 @@
- 
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
- # include <QtGui/QPainter>
-+# include <QtGui/QPainterPath>
- # include <QtGui/QPixmapCache>
- # include <QtWidgets/qdrawutil.h>
- # include <QtWidgets/QApplication>
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 7ab456abe988..1562e0fb20e4 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
-revision=4
+version=2.4.1
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
@@ -10,13 +10,13 @@ makedepends="python3-PyQt5 libmagic file-devel libsndfile-devel
  liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
  gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
  python3-rdflib"
-depends="python3 python3-PyQt5 python3-PyQt5-svg which"
+depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which"
 short_desc="Audio plugin host"
 maintainer="nutcase84 <nutcase84@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
+checksum=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

From 2a54ad0377f68214f6c665321251e610a0d0da05 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Mon, 6 Dec 2021 12:05:49 -0700
Subject: [PATCH 3544/4088] protonmail-bridge: update to 1.8.12.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/protonmail-bridge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index d17fa7a7a66d..05cb9f62a13a 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,6 +1,6 @@
 # Template file for 'protonmail-bridge'
 pkgname=protonmail-bridge
-version=1.8.7
+version=1.8.12
 revision=1
 archs="x86_64"
 build_style=fetch
@@ -10,7 +10,7 @@ maintainer="Rich G <rich@richgannon.net>"
 license="GPL-3.0-or-later"
 homepage="https://protonmail.com/bridge"
 distfiles="https://protonmail.com/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=8b1e56cd16f625ae285f8a2d6ff11840973e606520059d79ebd20d050cd03bb8
+checksum=90eff7d27e4835e3a204019cafa7062467ec45688a1a6d407896976bdeb1f8ea
 
 restricted=yes
 noverifyrdeps=yes

From bcb6f4c1e04018650b58d91248bd6b75d06f71a3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 2 Dec 2021 22:29:05 -0500
Subject: [PATCH 3545/4088] New package: darktile-0.0.10

---
 srcpkgs/darktile/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/darktile/template

diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
new file mode 100644
index 000000000000..053eb8c2e68e
--- /dev/null
+++ b/srcpkgs/darktile/template
@@ -0,0 +1,21 @@
+# Template file for 'darktile'
+pkgname=darktile
+version=0.0.10
+revision=1
+build_style=go
+go_import_path=github.com/liamg/darktile
+go_package="${go_import_path}/cmd/darktile"
+go_ldflags="-X github.com/liamg/darktile/internal/app/darktile/version.Version=${version}"
+hostmakedepends="pkg-config"
+makedepends="libglvnd-devel libX11-devel libXcursor-devel libXi-devel
+ libXinerama-devel libXrandr-devel libXxf86vm-devel"
+short_desc="GPU rendered terminal emulator designed for tiling window managers"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/liamg/darktile"
+distfiles="https://github.com/liamg/darktile/archive/refs/tags/v${version}.tar.gz"
+checksum=781aef00959abc0047df0eb627c73f012a709f23c2642c34b7a282f485d6e19c
+
+post_install() {
+	vlicense LICENSE
+}

From 1c54b37cf49bfe41c8aa3ca4abab4c2ad52eb002 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 2 Dec 2021 22:39:19 -0500
Subject: [PATCH 3546/4088] aminal: change to dummy package providing darktile

darktile is the successor project to aminal; the
link to aminal redirects there now.

Closes: #34360 [via git-merge-pr]
---
 srcpkgs/aminal/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/aminal/template b/srcpkgs/aminal/template
index 4a3594866e80..9ed2d8b5ac70 100644
--- a/srcpkgs/aminal/template
+++ b/srcpkgs/aminal/template
@@ -1,14 +1,10 @@
 # Template file for 'aminal'
 pkgname=aminal
 version=0.8.7
-revision=1
-build_style=go
-go_import_path=github.com/liamg/aminal
-makedepends="MesaLib-devel libX11-devel libXcursor-devel libXrandr-devel
- libXinerama-devel libXi-devel"
-short_desc="Modern terminal emulator implemented in Golang and utilising OpenGL"
-maintainer="SolitudeSF <solitudesf@protonmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/liamg/aminal"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ed59927531e7d585a42366c455e491a846c7e23ae079fa1d10d43fdd3a92eb65
+revision=2
+build_style=meta
+depends="darktile"
+short_desc="Darktile terminal emulator (transitional dummy package)"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="Public Domain"
+homepage="https://github.com/liamg/darktile"

From 09057513c56795bf6be901fe4c5b14f91f81b596 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Dec 2021 13:56:26 +0100
Subject: [PATCH 3547/4088] kde-cli-tools: fix cross

---
 srcpkgs/kde-cli-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index df0bf8b78b8f..e14e18c4530e 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config
- kdoctools kcoreaddons python3 qt5-host-tools qt5-qmake"
+ kpackage kdoctools kcoreaddons python3 qt5-host-tools qt5-qmake"
 makedepends="kactivities5-devel kcmutils-devel kdelibs4support-devel
  kdesu-devel plasma-workspace-devel"
 depends="xdg-utils"

From 87c3d24e8a7875e1cb7ccea419eac5aeee2d0654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Dec 2021 14:05:46 +0100
Subject: [PATCH 3548/4088] DarkRadiant: fix 32bit systems

---
 srcpkgs/DarkRadiant/patches/32.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/DarkRadiant/patches/32.patch

diff --git a/srcpkgs/DarkRadiant/patches/32.patch b/srcpkgs/DarkRadiant/patches/32.patch
new file mode 100644
index 000000000000..24845c30bc72
--- /dev/null
+++ b/srcpkgs/DarkRadiant/patches/32.patch
@@ -0,0 +1,20 @@
+--- DarkRadiant-2.14.0/radiantcore/model/import/openfbx/ofbx.h	2021-10-30 12:57:00.000000000 +0200
++++ -	2021-12-07 14:04:32.530489783 +0100
+@@ -1,5 +1,5 @@
+ #pragma once
+-
++#include <cinttypes>
+ 
+ namespace ofbx
+ {
+@@ -12,8 +12,8 @@
+ 	typedef long long i64;
+ 	typedef unsigned long long u64;
+ #else
+-	typedef long i64;
+-	typedef unsigned long u64;
++	typedef int64_t i64;
++	typedef uint64_t u64;
+ #endif
+ 
+ static_assert(sizeof(u8) == 1, "u8 is not 1 byte");

From fb2375081f607b6f8545a2a2e257bc3dda4ce901 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 7 Dec 2021 14:29:00 +0100
Subject: [PATCH 3549/4088] syncthing: update to 1.18.5.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index db74bf1f9e34..9a456e04bbc2 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.4
+version=1.18.5
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=ec4947d4119f21b50f444a0eb1d054c24db30cde0ac8a95261c8f3d122da4453
+checksum=2abef26c60f012b7dd53553ffe61ee94cc2d0dfe495e615d9520cbce39bcd312
 
 pre_build() {
 	GOARCH= go generate \

From 9b618067356f7d797b0a3de5a90c5a7ba1b3180c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Dec 2021 14:14:24 +0100
Subject: [PATCH 3550/4088] systemsettings: fix cross

---
 srcpkgs/systemsettings/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index eddbeb0c07b5..6294850b212c 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="python3 qt5-qmake qt5-host-tools kconfig
- kcoreaddons kdoctools extra-cmake-modules gettext"
+ kpackage kcoreaddons kdoctools extra-cmake-modules gettext"
 makedepends="kcmutils-devel kdoctools khtml-devel kactivities5-stats-devel
  kirigami2-devel plasma-workspace-devel"
 depends="kirigami2 setxkbmap xrdb"

From 6aa860e366fcc4886cfc4c381ec61e0e3aa8d266 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Dec 2021 14:32:37 +0100
Subject: [PATCH 3551/4088] sddm-kcm: fix cross

---
 srcpkgs/sddm-kcm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index afee753a62ee..e0fff7255c47 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake
- gettext kauth kconfig"
+ kpackage gettext kauth kconfig"
 makedepends="kio-devel xcb-util-image-devel libXcursor-devel
  kcmutils-devel knewstuff-devel"
 depends="sddm"

From 1e3e146feca1fd6a3edfaee843e24e21e76d7330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Dec 2021 14:33:52 +0100
Subject: [PATCH 3552/4088] xdg-desktop-portal-kde: fix cross

---
 srcpkgs/xdg-desktop-portal-kde/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 94cc5778253c..afdb02ce684a 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext
- wayland-devel plasma-wayland-protocols pkg-config qt5-wayland"
+ kpackage wayland-devel plasma-wayland-protocols pkg-config qt5-wayland"
 makedepends="glib-devel kio-devel kwayland-devel libepoxy-devel pipewire-devel
  plasma-framework-devel kdeclarative-devel kirigami2-devel"
 short_desc="Backend implementation for xdg-desktop-portal that is using Qt/KF5"

From 4c6b21722545964fed1891fe8fcd9e4b1282db35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Dec 2021 16:25:59 +0100
Subject: [PATCH 3553/4088] plasma-browser-integration: fix cross

---
 srcpkgs/plasma-browser-integration/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 6d88031161a2..d1d29a97d239 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons qt5-host-tools
- gettext qt5-qmake"
+ kpackage gettext qt5-qmake"
 makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel
  plasma-workspace-devel purpose-devel kfilemetadata5-devel"
 short_desc="Integration of web browsers with the KDE Plasma 5 desktop"

From 112f452841e34884e0882399be71c2d2ba7a666c Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Tue, 7 Dec 2021 13:59:22 +0100
Subject: [PATCH 3554/4088] setzer: update to 0.4.2.

---
 srcpkgs/setzer/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index 6886e65e860c..dbf10bb07705 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,14 +1,14 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.4.1
-revision=2
+version=0.4.2
+revision=1
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-pdfminer.six"
+depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect"
 short_desc="Simple yet full-featured LaTeX editor written in Python with Gtk"
 maintainer="Bleznudd <bleznudd@pm.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cvfosammmm/setzer"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a76182c16a8dc699d6e36f0b330fa498a6b718fe44e0a0959db6ff05362c628f
+checksum=50b5d273120f81b1f0a7efbcc0ce1fb1623518fe18b23ded45a82e8166003d3b

From ec5514ccb877a5d6f2d3b390e543fb5f45abf155 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 7 Dec 2021 13:17:16 +0100
Subject: [PATCH 3555/4088] dbeaver: update to 21.3.0.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 0c9b54ae723a..bca26bae44a7 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.2.5
+version=21.3.0
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=55c5378a3ab3c02d27225dc7ad48d75619c3c84117f4d24e5ccaaa95979b4edd
+checksum=0746eab3ad030d719091281b4cc9db6747b8d627804f5d2e80f594a392a7f3cf
 nopie=true
 
 do_build() {

From 5d43d1f647d0fa2554de8e54ef386ccd99db9410 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 7 Dec 2021 17:39:08 +0100
Subject: [PATCH 3556/4088] volctl: update to 0.9.2.

---
 srcpkgs/volctl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 217720acb79c..ea3713e5912d 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,7 +1,7 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.1
-revision=2
+version=0.9.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-pulsectl"
@@ -10,5 +10,5 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=a04b45b61fe4a7f8375e806f6dbc5bf3c699512e53279ebc6c73bc282e855901
+checksum=8bbd9ec2d6ac0a3aa92c19778855eb156250d05a3e2a1b082fe2ad838aefe70f
 make_check=no # no tests, but check fails with a non-zero return code

From 4ae85b75341f4904bcae0e5e90cda1249db232be Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 7 Dec 2021 09:29:58 +0100
Subject: [PATCH 3557/4088] python3-pikepdf: update to 4.1.0.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 0781c73d5a7a..0e67a53877f4 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=711d07e8c8cc8782563de3b9deb448b96bebe04fbc89d675016f91b3eb5296cb
+checksum=bf31a8ab6b33ea5483c0a4d388e9623ff23f5b60caac9edb73201b2fcac2918c
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 994ac59406d66ee1fdb8d3468d5643fad828bda4 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sun, 5 Dec 2021 13:41:03 +0100
Subject: [PATCH 3558/4088] pekwm: update to 0.2.1

 - adopt
---
 srcpkgs/pekwm/patches/sysconfdir.patch | 29 --------------------------
 srcpkgs/pekwm/template                 |  7 +++----
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/pekwm/patches/sysconfdir.patch

diff --git a/srcpkgs/pekwm/patches/sysconfdir.patch b/srcpkgs/pekwm/patches/sysconfdir.patch
deleted file mode 100644
index b945d0bdcc52..000000000000
--- a/srcpkgs/pekwm/patches/sysconfdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt	2021-03-01 07:37:20.447294425 -0500
-+++ b/CMakeLists.txt	2021-03-01 07:39:40.222030571 -0500
-@@ -10,6 +10,9 @@
- set(pekwm_VERSION_PATCH 18)
- set(pekwm_VERSION "${pekwm_VERSION_MAJOR}.${pekwm_VERSION_MINOR}.${pekwm_VERSION_PATCH}")
- 
-+set(PEKWM_CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/pekwm"
-+  CACHE STRING "Path to pekwm system configuration files")
-+
- # Check for C++11
- check_cxx_compiler_flag(-std=c++11 HAS_CXX11)
- if (HAS_CXX11)
-@@ -94,7 +97,7 @@
- add_definitions(-DVERSION="${pekwm_VERSION}"
-   -DFEATURES="${pekwm_FEATURES}"
-   -DDATADIR="${CMAKE_INSTALL_PREFIX}/share"
--  -DSYSCONFDIR="${CMAKE_INSTALL_PREFIX}/etc/pekwm")
-+  -DSYSCONFDIR="${PEKWM_CONF_DIR}")
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
- 
- # Subdirectories
---- a/data/CMakeLists.txt	2021-03-01 07:39:48.323015276 -0500
-+++ b/data/CMakeLists.txt	2021-03-01 07:40:19.475956467 -0500
-@@ -16,4 +16,4 @@
-   mouse_sloppy
-   start
-   vars
--  DESTINATION etc/pekwm/)
-+  DESTINATION "${PEKWM_CONF_DIR}")
diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template
index 367691f8cb7d..5d975f3ce10f 100644
--- a/srcpkgs/pekwm/template
+++ b/srcpkgs/pekwm/template
@@ -1,17 +1,16 @@
 # Template file for 'pekwm'
 pkgname=pekwm
-version=0.1.18
+version=0.2.1
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=cmake
-configure_args="-DPEKWM_CONF_DIR=/etc/pekwm"
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel libXpm-devel
  libXft-devel fontconfig-devel libXinerama-devel libXrandr-devel"
 short_desc="Window manager based on aewm++"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="biopsin <biopsin@teknik.io>"
 license="GPL-2.0-or-later"
 homepage="https://www.pekwm.se/"
 distfiles="https://github.com/pekdon/pekwm/archive/release-${version}.tar.gz"
-checksum=e04e14ab7b212ec7c3a36e4c24b6228383df4ca3768f9fea7ba22dcd107d5d5a
+checksum=62e858015e1a5a54bbddab202a1fb455c821bda62498e9cadfa1d00a5a2575c3
 conf_files="/etc/pekwm/*"

From 200b5f0ccfba91e12b0daa41b630c0d6ac31024b Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 6 Dec 2021 12:45:39 +0100
Subject: [PATCH 3559/4088] rocksndiamonds: update to 4.3.0.2

---
 srcpkgs/rocksndiamonds/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index b2301018dc39..b3248695b700 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
 # Template file for 'rocksndiamonds'
 pkgname=rocksndiamonds
-version=4.3.0.1
+version=4.3.0.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.artsoft.org/rocksndiamonds"
 distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=997f6cddb2fc48aed6e6b524b150974410f43956b420d37ebc098f40be92807c
+checksum=e4540f9b92b4e31e0a75bf1bf7f12fd0b9ec3c9cea69616a33a0cb88db8da1bf
 replaces="rocksndiamonds-data>=0"
 
 do_build() {

From d719b5407723ee3519ccb481b567dbf15388557c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 7 Dec 2021 22:57:27 +0200
Subject: [PATCH 3560/4088] skype: update to 8.79.0.95.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index c018a5e5031d..d1519a481b57 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.79.0.92
+version=8.79.0.95
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=93b3cfd8fc403fb7b4707579a2f4b068ed7077c257179b7b401612d60b41c8f7
+checksum=a75147a519c9726709e11ab51c33d6a13e8303aa9f24c2e0ac6e39f68a505966
 repository="nonfree"
 nostrip="yes"
 

From c1218af6a7ecf021a81432baae35c0dfc410e03f Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sun, 5 Dec 2021 17:05:26 +0100
Subject: [PATCH 3561/4088] intellij-idea-community-edition: update to 2021.03

---
 srcpkgs/intellij-idea-community-edition/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index e597b68bb6d4..289470b55649 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2021.2.3
+version=2021.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=b9f111cef1eab6ca5b6801abb06fffbc964d39887a9381131ef096f933d28f44
+checksum=db7540407a717f06c03aaaf6dfc9db5cbe2c075de0cfc4ee6c01775ab78c594e
 repository=nonfree
 nopie=yes
 python_version=3
@@ -30,6 +30,9 @@ do_install() {
 	mv LICENSE.txt NOTICE.txt license ${DESTDIR}/usr/share/doc/intellij-idea
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/win -rf
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/mac -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/cwm-plugin/quiche-native/win32-x86-64/ -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/cwm-plugin/quiche-native/darwin-x86-64/ -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/cwm-plugin/quiche-native/darwin-aarch64/ -rf
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows32 -rf
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows64 -rf
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/osx -rf
@@ -49,7 +52,8 @@ do_install() {
 		i686)
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea64.vmoptions
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/libdbm64.so
-		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86_64 -rf
+		rm ${DESTDIR}//usr/lib/intellij-idea/plugins/cwm-plugin/quiche-native/linux-x86-64/ -rf
+		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86-64 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/aarch64 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/mips64el -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf

From 33071fd7c9e514efe32d916d4b22449f442f4707 Mon Sep 17 00:00:00 2001
From: Heinrich Kruger <heindsight@kruger.dev>
Date: Wed, 20 Oct 2021 09:18:02 +0100
Subject: [PATCH 3562/4088] hplip: Update to 3.21.10

Update hplip to latest upstream version and patch to fix Python 3.10
compatibility.
---
 ...Processor-functionality-which-is-clo.patch | 113 ------------------
 srcpkgs/hplip/patches/gzip_text.patch         |  13 ++
 srcpkgs/hplip/patches/pysizet_clean.patch     | 100 ++++++++++++++++
 .../remove-imageprocessing-install.patch      |  37 ++++++
 srcpkgs/hplip/patches/sane.patch              |  31 -----
 srcpkgs/hplip/template                        |   8 +-
 6 files changed, 155 insertions(+), 147 deletions(-)
 delete mode 100644 srcpkgs/hplip/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
 create mode 100644 srcpkgs/hplip/patches/gzip_text.patch
 create mode 100644 srcpkgs/hplip/patches/pysizet_clean.patch
 create mode 100644 srcpkgs/hplip/patches/remove-imageprocessing-install.patch
 delete mode 100644 srcpkgs/hplip/patches/sane.patch

diff --git a/srcpkgs/hplip/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch b/srcpkgs/hplip/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
deleted file mode 100644
index 8d3b4d7bfda2..000000000000
--- a/srcpkgs/hplip/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx@debian.org>
-Date: Tue, 21 Aug 2018 18:18:10 +0200
-Subject: Remove all ImageProcessor functionality, which is closed-source
-
----
- Makefile.am                  | 14 ++------------
- prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
- 2 files changed, 2 insertions(+), 33 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1b097c4f9..8d5d78c9f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
- dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
- endif #HPLIP_CLASS_DRIVER
- 
--dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
-+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
- dist_noinst_SCRIPTS += dat2drv.py install.py  hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
- 
- if !HPLIP_CLASS_DRIVER
-@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
- 	prnt/hpcups/ImageProcessor.h
- 
- hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
--hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
-+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
- #else
- #hpcupsdir = $(cupsfilterdir)
- #hpcups_PROGRAMS = hpcups
-@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER
- 
- install-data-hook:
- if HPLIP_BUILD
--	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
--		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
--		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
--		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
--	fi; \
--	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
--		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
--		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
--		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
--	fi
- if !HPLIP_CLASS_DRIVER
- #	   If scanner build, add hpaio entry to sane dll.conf.
- 	if [ "$(scan_build)" = "yes" ]; then \
-diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
-index 5b282d83f..0bacfafac 100644
---- a/prnt/hpcups/HPCupsFilter.cpp
-+++ b/prnt/hpcups/HPCupsFilter.cpp
-@@ -31,7 +31,6 @@
- \*****************************************************************************/
- 
- #include "HPCupsFilter.h"
--#include "ImageProcessor.h"
- 
- #include <signal.h>
- #include <sys/wait.h>
-@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
- 
- 
-     sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
--    image_processor_t* imageProcessor = imageProcessorCreate();
- 
-     while (cupsRasterReadHeader2(cups_raster, &cups_header))
-     {
- 
--        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
--        if (result != IPE_SUCCESS){
--            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
--        }
--
-         current_page_number++;
- 
-         if (current_page_number == 1) {
-@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
-             color_raster = rgbRaster;
-             black_raster = kRaster;
- 
--            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
--            if (result != IPE_SUCCESS){
--                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
--            }
--
--
-             if ((y == 0) && !is_ljmono) {
-                 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
-                 //may not skip blank lines before actual data
-@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
-             }
-         }  // for() loop end
- 
--        result = imageProcessorEndPage(imageProcessor);
--        if (result != IPE_SUCCESS){
--                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
--        }
--
--
-         m_Job.NewPage();
-         if (err != NO_ERROR) {
-             break;
-@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
-         rgbRaster = NULL;
-     }
- 
--    imageProcessorDestroy(imageProcessor);
--
-     unlink(hpPreProcessedRasterFile);
-     return ret_status;
- }
diff --git a/srcpkgs/hplip/patches/gzip_text.patch b/srcpkgs/hplip/patches/gzip_text.patch
new file mode 100644
index 000000000000..8309415a2a7a
--- /dev/null
+++ b/srcpkgs/hplip/patches/gzip_text.patch
@@ -0,0 +1,13 @@
+Open gzipped PPD file in text mode, otherwise text regex search fails
+
+--- a/setup.py	2021-10-18 18:37:49.795887272 +0100
++++ b/setup.py	2021-10-18 18:37:20.214898473 +0100
+@@ -552,7 +552,7 @@
+                         if os.path.exists(file_path) and os.path.isfile(file_path):
+ 
+                             if file_path.endswith('.gz'):
+-                                nickname = gzip.GzipFile(file_path, 'r').read(4096)
++                                nickname = gzip.open(file_path, 'rt').read(4096)
+                             else:
+                                 nickname = open(file_path, 'r').read(4096)
+ 
diff --git a/srcpkgs/hplip/patches/pysizet_clean.patch b/srcpkgs/hplip/patches/pysizet_clean.patch
new file mode 100644
index 000000000000..38d21f520934
--- /dev/null
+++ b/srcpkgs/hplip/patches/pysizet_clean.patch
@@ -0,0 +1,100 @@
+Based on patch by Zdenek Dohnal obtained from
+https://bugs.launchpad.net/hplip/+bug/1933973
+
+diff -pru hplip-3.21.8/io/mudext/hpmudext.c hplip-3.21.8-patched/io/mudext/hpmudext.c
+--- hplip-3.21.8/io/mudext/hpmudext.c	2021-09-01 16:10:17.000000000 +0100
++++ hplip-3.21.8-patched/io/mudext/hpmudext.c	2021-10-22 08:30:38.600922861 +0100
+@@ -24,6 +24,8 @@ Authors: Don Welch, David Suffield, Naga
+ 
+ \*****************************************************************************/
+ 
++#define PY_SSIZE_T_CLEAN
++
+ #include <Python.h>
+ #include <stdarg.h>
+ #include "hpmud.h"
+@@ -187,14 +189,22 @@ static PyObject *write_channel(PyObject
+     HPMUD_CHANNEL cd;
+     int timeout = 30;
+     char * buf;
+-    int buf_size = 0;
++    Py_ssize_t buf_size = 0;
++    int buf_size_asInt = 0;
+     int bytes_written = 0;
+ 
+     if (!PyArg_ParseTuple(args, "iis#|i", &dd, &cd, &buf, &buf_size, &timeout))
+         return NULL;
+ 
++    if (buf_size < INT_MIN)
++      buf_size_asInt = INT_MIN;
++    else if (buf_size > INT_MAX)
++      buf_size_asInt = INT_MAX;
++    else
++      buf_size_asInt = (int)buf_size;
++
+     Py_BEGIN_ALLOW_THREADS
+-    result = hpmud_write_channel(dd, cd, buf, buf_size,  timeout, &bytes_written);
++    result = hpmud_write_channel(dd, cd, buf, buf_size_asInt,  timeout, &bytes_written);
+     Py_END_ALLOW_THREADS
+ 
+     return Py_BuildValue("(ii)", result, bytes_written);
+@@ -231,14 +241,22 @@ static PyObject *set_pml(PyObject *self,
+     char * oid;
+     int type;
+     char * data;
+-    int data_size;
++    Py_ssize_t data_size = 0;
++    int data_size_asInt = 0;
+     int pml_result;
+ 
+     if (!PyArg_ParseTuple(args, "iisis#", &dd, &cd, &oid, &type, &data, &data_size))
+         return NULL;
+ 
++    if (data_size < INT_MIN)
++      data_size_asInt = INT_MIN;
++    else if (data_size > INT_MAX)
++      data_size_asInt = INT_MAX;
++    else
++      data_size_asInt = (int)data_size;
++
+     Py_BEGIN_ALLOW_THREADS
+-    result = hpmud_set_pml(dd, cd, oid, type, (void *)data, data_size, &pml_result);
++    result = hpmud_set_pml(dd, cd, oid, type, (void *)data, data_size_asInt, &pml_result);
+     Py_END_ALLOW_THREADS
+ 
+     return Py_BuildValue("(ii)", result, pml_result);
+diff -pru hplip-3.21.8/pcard/pcardext/pcardext.c hplip-3.21.8-patched/pcard/pcardext/pcardext.c
+--- hplip-3.21.8/pcard/pcardext/pcardext.c	2021-09-01 16:10:17.000000000 +0100
++++ hplip-3.21.8-patched/pcard/pcardext/pcardext.c	2021-10-22 08:24:11.010798381 +0100
+@@ -24,6 +24,8 @@ Author: Don Welch
+ 
+ \*****************************************************************************/
+ 
++#define PY_SSIZE_T_CLEAN
++
+ #include <Python.h>
+ #include <structmember.h>
+ #include "../fat.h"
+diff -pru hplip-3.21.8/prnt/cupsext/cupsext.c hplip-3.21.8-patched/prnt/cupsext/cupsext.c
+--- hplip-3.21.8/prnt/cupsext/cupsext.c	2021-09-01 16:10:17.000000000 +0100
++++ hplip-3.21.8-patched/prnt/cupsext/cupsext.c	2021-10-22 08:26:30.975843330 +0100
+@@ -73,6 +73,7 @@ Yashwant Kumar Sahu
+ Sanjay Kumar
+ */
+ 
++#define PY_SSIZE_T_CLEAN
+ 
+ #include <Python.h>
+ #include <structmember.h>
+diff -pru hplip-3.21.8/scan/scanext/scanext.c hplip-3.21.8-patched/scan/scanext/scanext.c
+--- hplip-3.21.8/scan/scanext/scanext.c	2021-09-01 16:10:17.000000000 +0100
++++ hplip-3.21.8-patched/scan/scanext/scanext.c	2021-10-21 21:31:23.074739743 +0100
+@@ -45,6 +45,8 @@ PERFORMANCE OF THIS SOFTWARE.
+ *******************************************************************/
+ 
+ 
++#define PY_SSIZE_T_CLEAN
++
+ /* _ScanDevice objects */
+ 
+ #include "Python.h"
diff --git a/srcpkgs/hplip/patches/remove-imageprocessing-install.patch b/srcpkgs/hplip/patches/remove-imageprocessing-install.patch
new file mode 100644
index 000000000000..de0efe17fbda
--- /dev/null
+++ b/srcpkgs/hplip/patches/remove-imageprocessing-install.patch
@@ -0,0 +1,37 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -167,7 +167,7 @@
+ dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
+ endif #HPLIP_CLASS_DRIVER
+ 
+-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
++dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
+ 
+ dist_noinst_DATA += prnt/ipp-usb/HPLIP.conf
+ dist_noinst_SCRIPTS += dat2drv.py install.py  hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
+@@ -597,7 +597,7 @@
+ 	prnt/hpcups/ImageProcessor.h
+ 
+ hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
+-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
++hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
+ #else
+ #hpcupsdir = $(cupsfilterdir)
+ #hpcups_PROGRAMS = hpcups
+@@ -687,16 +687,6 @@
+ 
+ install-data-hook:
+ if HPLIP_BUILD
+-	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
+-	fi; \
+-	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
+-	fi
+ 	if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
+ 		echo "ipp-usb directory exists"; \
+ 		cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \
diff --git a/srcpkgs/hplip/patches/sane.patch b/srcpkgs/hplip/patches/sane.patch
deleted file mode 100644
index d3579638ee97..000000000000
--- a/srcpkgs/hplip/patches/sane.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/scan/sane.py	2020-10-13 22:29:59.456276307 -0400
-+++ b/scan/sane.py	2020-10-13 22:32:44.663586789 -0400
-@@ -378,14 +378,14 @@
- 
-     def isScanActive(self):
-         if self.scan_thread is not None:
--            return self.scan_thread.isAlive() and self.scan_thread.scan_active
-+            return self.scan_thread.is_alive() and self.scan_thread.scan_active
-         else:
-             return False
- 
- 
-     def waitForScanDone(self):
-         if self.scan_thread is not None and \
--            self.scan_thread.isAlive() and \
-+            self.scan_thread.is_alive() and \
-             self.scan_thread.scan_active:
- 
-             try:
-@@ -398,9 +398,9 @@
-         #time.sleep(0.5)
-         if self.scan_thread is not None:
-             while True:
--                #print self.scan_thread.isAlive()
-+                #print self.scan_thread.is_alive()
-                 #print self.scan_thread.scan_active
--                if self.scan_thread.isAlive() and \
-+                if self.scan_thread.is_alive() and \
-                     self.scan_thread.scan_active:
-                     return
- 
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index c6bc1a9b0df2..339d08b463d8 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.20.9
-revision=6
+version=3.21.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
@@ -19,6 +19,7 @@ configure_args="
  --enable-hpijs-install
  --enable-foomatic-drv-install
  --enable-pp-build
+ --disable-imageProcessor-build
  --with-mimedir=/usr/share/cups/mime
  am_cv_python_version=${py3_ver}"
 conf_files="/etc/hp/hplip.conf"
@@ -33,8 +34,9 @@ short_desc="HP Linux Imaging and Printing"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, BSD-3-Clause, MIT"
 homepage="https://developers.hp.com/hp-linux-imaging-and-printing"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
 distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz"
-checksum=36251189aa9cc349f6a3eacbb7ac3c4fd26fc9f087c9f75cee051010c85d2ddf
+checksum=de230e1fdd1e718fc718417265612e0c882949e08fe045ee56f9f9882e6b6a60
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"

From 2fed8e8a01602f7a89f24f53fa94941fa488df8c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 1 Oct 2021 12:41:11 +0200
Subject: [PATCH 3563/4088] python3-gobject: update to 3.42.0.

* backport fix for GTK 4.1+ incompatibility
---
 ..._insert_with_valuesv_with_newer_gtk4.patch | 84 +++++++++++++++++++
 srcpkgs/python3-gobject/template              | 10 +--
 2 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/python3-gobject/patches/restore_gtk_liststore_insert_with_valuesv_with_newer_gtk4.patch

diff --git a/srcpkgs/python3-gobject/patches/restore_gtk_liststore_insert_with_valuesv_with_newer_gtk4.patch b/srcpkgs/python3-gobject/patches/restore_gtk_liststore_insert_with_valuesv_with_newer_gtk4.patch
new file mode 100644
index 000000000000..1d7f06e2f09f
--- /dev/null
+++ b/srcpkgs/python3-gobject/patches/restore_gtk_liststore_insert_with_valuesv_with_newer_gtk4.patch
@@ -0,0 +1,84 @@
+From db472c14416da879fdd1ba685928be9b7c919e57 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sun, 19 Sep 2021 16:52:15 +0200
+Subject: [PATCH] gtk overrides: restore Gtk.ListStore.insert_with_valuesv with
+ newer gtk4
+
+It got renamed in gtk 4.1.0, see https://gitlab.gnome.org/GNOME/gtk/-/commit/a1216599ff6b39bca3e936fbf
+To avoid an API break and make porting easier provide both versions for
+all users.
+
+Fixes #467
+---
+ gi/overrides/Gtk.py         |  9 ++++++++-
+ tests/test_docstring.py     |  5 +++--
+ tests/test_overrides_gtk.py | 14 ++++++++++++++
+ 3 files changed, 25 insertions(+), 3 deletions(-)
+
+diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py
+index 7739751e..f53ec6bd 100644
+--- ./gi/overrides/Gtk.py
++++ ./gi/overrides/Gtk.py
+@@ -995,10 +995,17 @@ class ListStore(Gtk.ListStore, TreeModel, TreeSortable):
+         Gtk.ListStore.__init__(self)
+         self.set_column_types(column_types)
+ 
++    # insert_with_valuesv got renamed to insert_with_values with 4.1.0
++    # https://gitlab.gnome.org/GNOME/gtk/-/commit/a1216599ff6b39bca3e9
++    if not hasattr(Gtk.ListStore, "insert_with_valuesv"):
++        insert_with_valuesv = Gtk.ListStore.insert_with_values
++    elif not hasattr(Gtk.ListStore, "insert_with_values"):
++        insert_with_values = Gtk.ListStore.insert_with_valuesv
++
+     def _do_insert(self, position, row):
+         if row is not None:
+             row, columns = self._convert_row(row)
+-            treeiter = self.insert_with_valuesv(position, columns, row)
++            treeiter = self.insert_with_values(position, columns, row)
+         else:
+             treeiter = Gtk.ListStore.insert(self, position)
+ 
+diff --git a/tests/test_docstring.py b/tests/test_docstring.py
+index 29b7e5ef..49d030f5 100644
+--- ./tests/test_docstring.py
++++ ./tests/test_docstring.py
+@@ -93,8 +93,9 @@ class Test(unittest.TestCase):
+     @unittest.skipUnless(Gtk, 'no Gtk')
+     def test_shared_array_length_with_prior_out_arg(self):
+         # Test the 'iter' out argument does not effect length argument skipping.
+-        self.assertEqual(Gtk.ListStore.insert_with_valuesv.__doc__,
+-                         'insert_with_valuesv(self, position:int, columns:list, values:list) -> iter:Gtk.TreeIter')
++        self.assertRegex(
++            Gtk.ListStore.insert_with_valuesv.__doc__,
++            'insert_with_values.*\\(self, position:int, columns:list, values:list\\) -> iter:Gtk.TreeIter')
+ 
+     def test_sub_class_doc(self):
+         class A(GObject.Object):
+diff --git a/tests/test_overrides_gtk.py b/tests/test_overrides_gtk.py
+index 72fd2c8e..6bd2345a 100644
+--- ./tests/test_overrides_gtk.py
++++ ./tests/test_overrides_gtk.py
+@@ -1377,6 +1377,20 @@ class TestCustomSorter():
+             assert result.props.name == member
+ 
+ 
++@unittest.skipUnless(Gtk, 'Gtk not available')
++class TestListStore(unittest.TestCase):
++
++    def test_insert_with_values(self):
++        model = Gtk.ListStore(int)
++        assert hasattr(model, 'insert_with_values')
++        iter_ = model.insert_with_values(0, (0,), [42])
++        assert isinstance(iter_, Gtk.TreeIter)
++        assert hasattr(model, 'insert_with_valuesv')
++        iter_ = model.insert_with_valuesv(0, (0,), [43])
++        assert isinstance(iter_, Gtk.TreeIter)
++        assert len(model) == 2
++
++
+ @ignore_gi_deprecation_warnings
+ @unittest.skipUnless(Gtk, 'Gtk not available')
+ class TestTreeModel(unittest.TestCase):
+-- 
+GitLab
+
diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 22ae460c9125..d14b48f66e6b 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.40.1
-revision=2
+version=3.42.0
+revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
 build_helper="gir"
@@ -15,10 +15,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
+checksum=9b12616e32cfc792f9dc841d9c472a41a35b85ba67d3a6eb427e307a6fe4367b
 
-pre_check() {
-	make_cmd="xvfb-run ninja"
+do_check() {
+	xvfb-run ninja -C build test
 }
 
 python3-gobject-devel_package() {

From 571f3168a23927092cf415b9bde3b1683006a202 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 17 Sep 2021 21:30:10 +0200
Subject: [PATCH 3564/4088] common/environment: set debug-prefix-map to prevent
 ccache cache misses

Packages with debug symbols do invalidate their cache with every version
change since $wrksrc does contain the version number and is getting cached

Closes: #33002 [via git-merge-pr]
---
 common/environment/build/debug-debug-prefix-map.sh     | 1 +
 common/environment/check/debug-debug-prefix-map.sh     | 1 +
 common/environment/configure/debug-debug-prefix-map.sh | 2 ++
 common/environment/install/debug-debug-prefix-map.sh   | 1 +
 common/environment/patch/debug-debug-prefix-map.sh     | 1 +
 5 files changed, 6 insertions(+)
 create mode 120000 common/environment/build/debug-debug-prefix-map.sh
 create mode 120000 common/environment/check/debug-debug-prefix-map.sh
 create mode 100644 common/environment/configure/debug-debug-prefix-map.sh
 create mode 120000 common/environment/install/debug-debug-prefix-map.sh
 create mode 120000 common/environment/patch/debug-debug-prefix-map.sh

diff --git a/common/environment/build/debug-debug-prefix-map.sh b/common/environment/build/debug-debug-prefix-map.sh
new file mode 120000
index 000000000000..98c260a33f36
--- /dev/null
+++ b/common/environment/build/debug-debug-prefix-map.sh
@@ -0,0 +1 @@
+../configure/debug-debug-prefix-map.sh
\ No newline at end of file
diff --git a/common/environment/check/debug-debug-prefix-map.sh b/common/environment/check/debug-debug-prefix-map.sh
new file mode 120000
index 000000000000..98c260a33f36
--- /dev/null
+++ b/common/environment/check/debug-debug-prefix-map.sh
@@ -0,0 +1 @@
+../configure/debug-debug-prefix-map.sh
\ No newline at end of file
diff --git a/common/environment/configure/debug-debug-prefix-map.sh b/common/environment/configure/debug-debug-prefix-map.sh
new file mode 100644
index 000000000000..ca30b61b79ab
--- /dev/null
+++ b/common/environment/configure/debug-debug-prefix-map.sh
@@ -0,0 +1,2 @@
+CFLAGS="${CFLAGS} -fdebug-prefix-map=$wrksrc=."
+CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$wrksrc=."
diff --git a/common/environment/install/debug-debug-prefix-map.sh b/common/environment/install/debug-debug-prefix-map.sh
new file mode 120000
index 000000000000..98c260a33f36
--- /dev/null
+++ b/common/environment/install/debug-debug-prefix-map.sh
@@ -0,0 +1 @@
+../configure/debug-debug-prefix-map.sh
\ No newline at end of file
diff --git a/common/environment/patch/debug-debug-prefix-map.sh b/common/environment/patch/debug-debug-prefix-map.sh
new file mode 120000
index 000000000000..98c260a33f36
--- /dev/null
+++ b/common/environment/patch/debug-debug-prefix-map.sh
@@ -0,0 +1 @@
+../configure/debug-debug-prefix-map.sh
\ No newline at end of file

From 52f81a0c70fb7099a3a05975b02229c691322ac6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 6 Dec 2021 17:24:26 +0100
Subject: [PATCH 3565/4088] firefox: update to 95.0.

---
 srcpkgs/firefox/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index b36392274960..2e5dce233bf8 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=94.0
+version=95.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 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=b7bb8c5fcc74a74e9d2b55d1e9415b891305fe86520fb854cec25024d7e5de67
+checksum=7fa3e43f6ec710b2ebba0e99db713a56d13d85f1f23c4a1399bb594fd74864de
 
 lib32disabled=yes
 
@@ -24,7 +24,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-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.66 nspr>=4.32 desktop-file-utils hicolor-icon-theme"
+depends="nss>=3.72 nspr>=4.32 desktop-file-utils hicolor-icon-theme"
 conflicts="firefox-esr>=0"
 
 build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
@@ -120,6 +120,10 @@ do_build() {
 		echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
 	fi
 
+	# XXX: wasi currently not ready
+	# echo "ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot" >>.mozconfig
+	echo "ac_add_options --without-wasm-sandboxed-libraries" >>.mozconfig
+
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in

From 8d6173a2bf0fe877bb0d2835780b3816b643fd5f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 6 Dec 2021 17:33:12 +0100
Subject: [PATCH 3566/4088] firefox-i18n: update to 95.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 93eb253f2485..ad6ab237b77f 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=94.0
+version=95.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="aedd5e13aabd5c130dcd1a7567a2c94fa69d2c454e2f310d58e44c282da38ca1
- 5130cf8407d76864a94533db04008831ebae9d4d900c98025be17dbe7e943861
- fb2913edec316b5bbc6e09c3ffa5662040802359e37a6ed968adc81a642c5a85
- f82e3cce9b27940be860a8dc0340f0e917328742e79c616b5906661f10097c50
- 682d1ffd0d1027c76cbc1dfd109a76361dc4866597c4645a5ece68d7a5cdf440
- ad4485c1b09238e8bcc8258d313f987e25e35585af84cf832f29bc67e92f87cf
- be4b89d6251429052d9ae512c75b59ab8dba174a9cebf6cc40eea350dbf73e42
- 55eff9a1b7cb7e0e8c6a5fb97c1e4f9de66c380c6b4b512fd843a68f3da880af
- 45858174eb26f6265eca5792693e4c051a9bdb5effc6eaee511864e7ee02b910
- 65ced255598f0d7e98ae70b71914a65ed67789efa9b2a64688c6ef63a13bfced
- 4632431d7969125cdd8f27e177ef25fa674c92ffe8960321722851941b2b05a4
- 3d6bf8211550e77ca9f673d870a1cae47fa6ee6f7a7e372e8f9a4f630d215305
- 9aa0f7f417b72f72e3447c0e4f438ca044c3fc91e5ed46be4f74293064d14df2
- 814b58191af0087f871e69163eb4fa9b7d7ba78eb66782324168c1043d355dd5
- 6b2c9b1e8ef5fbd29b3fc7a887be2fda0d37db3ed02e3904d2b5dc18a40852a1
- 2e6c9f036f60788a65b5c05d2e54ac60790e634ff8f94f06800df2c6a8113821
- 0e6201e35752963fb3591aa846fec5cf425faea90cbd390497846a6ad3b1f8fc
- 29f97b363c02e3b23a7a6d8319aa4909827a800b076a84addedf0e7d21f42fee
- 482eda912151c317060db889fa567c5ff9e6c3da4d08b40e6858e381f11264e2
- 61d09abbca0f43594d9adaf2272f3c8752aa02165f7cb4fb06387171accd4b82
- d01d6a426eb0038e88e1bc98a9572d88edd4321d2eb4f02457bfc400bf07cb73
- 79d72c3fbc531d09cecb02051760149f8d3166ff709519aea4c1219c0e280acd
- 1fe9bbdf961e9114544d7ec0de62c7a45b44f1de76028ac989c217db28d51aa6
- 4b9131de001c2bde0454717098d2d2a10221a7ec106eeed855e21dfa6a138b8b
- 54d2a8a58de684a096e2d960d08e00418564a40dfba6e10779bff7535c485642
- 4f6ebbf1ee4677907b06d1e6d1fc525ce5e083c19f6f57d584b12649bc0b8f8b
- bc635613551146140af4b09fc8ff6db42f12da25a763984f278c17e7093be0c1
- 0e08d3c9010c96874086c0e4b9d0cc7d30a3f3109b0555d2b93a5268b46f4214
- 9b03a928056312676a6cf480709fdf9e1b8169d35f7470dd14cce28cf6659b28
- 8eb95e2cc114fcb5a38005bc24b158754e5c50dcaa2355de27bd10de3c2f4b0f
- 2cbd800c3926d41b3efb443e5560109d464c1b68830bc49da543e6187fba62d9
- 06708befcba04b7351b513b5e2e81885ef3b3eb773290fbf62a929f50ad58836
- 113fdb182c31eedf0c20103f0bdbeae9afd107eb1e39be0d7d034a5d3f0acc8f
- f4659230aac688047521bdda68d99eabe7e72b6b52bd8bb5c566829aef79a4cb
- c1005571dd2e2ba27a908bb7f721df6d7bca518de149f2720756e0894d705759
- 3eb7337ed218f9d5591a347359beec7b4ed08c8ce22460e4620f59d78ab1c61f
- 6841e57c4c30df75e7fe63ea5785dbcb1f2e1e15c3fe7dba52b11cbf56ced2a0
- 46c8f62f7663853e2b3d201e04d2bea3b5f6d2a3d6604985376b009c6ed77672
- 98addd1a8e45f962b803325a40cbbe614083b654d0a0fabd13bda96caa5496d1
- 865ede37b99859fbb5ee74a81e0cdca24315ec5f20682a4c90da39a3b190eccb
- 9eaebfd15bdfd2f52a8dae5752cf69130b7c99a4bc1021ac85e42eec7ac5ffa7
- eee43cdcce6e15cd86f7f73641644a660963584de8a67ec233b3855716cd51fd
- c7bce562daded83cd3be09ab36d1914d6e84a282805efd9f677fe15adcf1b0dc
- f9838ea7a29192827b3712f96df2ecad792d1197d73ea80c213d328ac5d31700
- c7069b3b3596ef69ba3f946a6eb2d2bf8ee86d6d93ddc5398e067c88599af5bd
- 6088d27920345998e0244514a14f9f8fb7d1f58dca181982d3438bce28de3172
- 3a322aef898889a564776fcacf2c763cf2ce9a56708022ee8cd2939734fe0aa8
- 977bb9140273387973be872f41febc2b5ca66b6bd902a07f162f091139b3bef7
- ef67fcbaec50eeb88cc50cbf74d574a4a158c9408b662db472d29ca98197d201
- f4543a90bc9c8b94dd0a85ca810671e6e4c1a627817c93542bb22def01b832c2
- 522f3fffcf223c8f747d21a95e0a30e5868279e920e395fba7e87c7cd6378842
- ada2079706cf0fa2ff2a7644900b92d8b2d612caa524d05a1dcd2bd55e56b8f0
- aab7d9d162fe4477f71182aa6bc9e1a1ca002d140de0a6eb39eb19e5843c80b0
- 39fabe2b514b0c5089a5b9b62b2473d5c92bea654eb2f62979c3ca0fd95b6f64
- 81906ac1f2005ab7f5c589d7469e3be258ad5463af6f0446459476f1e62318eb
- de420d1e5198422a93d7db84887156f684478931a4b07355292759b09611b925
- be3cc85c5f6517f37bf3da7785f097d0ef16bf4fd017daf3aa17f9587ec15034
- 3e2619459ab0af0287dc0e0a26bf50f1f7abd5508086f9dc8d1b3e6a465565d2
- 3742b78d332b06855217f5023a8530e436cfa3bec2d9c1a7e93e8c949b30e3d2
- 261b50cc92d768cd88a02894f8d710003989d87de2deb3f6bcca822acb0338a5
- 11717d312e58f4377aa4262dc4c868da2297ea1cc618eb3c68a1da49ba2b3107
- 772b846575b0e5fa0c5b8484d9f8c93266ac3004ef286ee527a3e2e1cdae8dfb
- 8f446b76f69f217dbd4b4154b516893b528adc535a264ad3f764537d24271e9c
- f0464a95c2378d422a2a739186664d455332637bf4b3829bfaaf36de9722dc37
- aaf831bbb84fed8b39e33b2d907c41acb82500fb3e536561aea3e674b8980d5f
- df351e87eb7f6ad1c24f8a05cd0d600c452ba39b0951ffca0323fa4e273e3a96
- a7d5d1163f600a2387e010524bba504c21770ffe287374d6bad588c240d90b8e
- 9ace163e1a66b355c384c9e62536c048f547a1071814bc38b6608aaf11836c58
- 6737fa293f0ea7f92dfaa4710f679c86c6df0c61e523edfe8e954ef20c3886af
- a51449afb34fae45a4d043364b117d6f905098cf7643def4c40f3f7713a14c0e
- dbd34b425896b456f9e5e2a1ee373aae679e43cb5dfdd0a2e01af9f017c98e6c
- a609d06a53441e8da089e609d61c24c15577cc38f2c82774d361ee97a16b5712
- 53a739f37e07f83e7515c6bac6a452bb93b215dde9ce1c8ca694b68a2ec0df60
- 5873abdce7be403aa25c07fae5b4e2622cc0b2ecd09ec06ef0ee2b555b871c60
- 5c519a41933cd074cb5d69a89a0f22d070c4c3800f2984c365e841abb0f1ad7e
- fd0faa8c92305fe19dbd94d1ed80cb87dfb9f231f6deec7cedc4c4bd9788398b
- cd9ce95d036585f16d29773a9468d80e262070a975334a6fe38cc7d9a9b38848
- 3675607c387d3bc0cb848a695814f4f67e0d98278c49659df6f5b9d85771e7c2
- 2a39d04d3878a38bdf51ceb88f2abb1673308cfdbba8b15ba949037a2e63c0e5
- 8e07afed85f39f9b802f07bc3e8db88ff52382202b927fa72aa4edb92e756781
- 290c2d1c5102260c36dbb0a1fb4e15003584d3daad5cb558b154650281574d70
- 875ac1629fff7a72bb1ff4abc49fa1495123bf9040d8a8031493c84499357721
- bd56ddb376f48a7eb0ddff5cbe84f947f86c39bc25fd50df1f2667c8ad51c4cc
- c69d76f82a2aba7e8547f5899def998457c1c0cbb452504bb6f79ffc68c18cfa
- 72c735116d9b0fc2500300868a9c373bc8db6317d6721f739855e643d83fa4ab
- 41a7de596d02f3f7457217f36694978bce3e4006c3a0558fd30c7c03adbb76c7
- 309d532ee07a175cc8ec40bd53a6d094f99aabae0d7c3337180747ef497cc068
- 63d9b14746125d42ea4b01c315e7d8186a5a8bda779ee8623d57e4aae415b5fc
- 06413dbec086907cbda0a130f89effe752121f596b3e9299c309d89e9cc4e678
- 6a0c6c355897ceb309f8c07fc09f99f538a18e339cef1e3141efb8b2823554ea
- b9923737190e2e5a59c00b79724b0116dbb407c5698c8e986b92bf4ee56f85df
- b013ab217c22270e9b39116f00bc1e4b09eeb15a38d709355fd424cfbf5ea065
- 2e667b87e19385f2a6b018ed01dc959e31ae71a21b6f3c11742cde51dec62a2f
- 0ecebf97293852f95ab9a7e8394c70773c5cb6067085bb689d113282104f47a4
- 055eedea0a2d9614809e4af9011747dca2013cf1616e2856d09e7232cfaee591
- a315dc4c412d58ae2a1771d27e364922b85b5d88953fc33e3962f54c2771eb3a"
+checksum="cfe7f3362a1fb648edd359fea57845cfe7a7a78d7b1f95fd6248056042d017d1
+ 5dd93b8a35a7818d9ecfc82cd85665fa9c20b25f68c8426960d14d95819d6527
+ e15b6b403e6ff13cda801d5cf9af3e49a628ec436eab1ac41103fef409742aac
+ 6133e8e1558a40f040037629b5f30c92952cbecb7cc59ce170cd5e6999980581
+ 4485398bb3031e9d277e82d9bf35f33867a730fc24ebaf120c9e37db77939e40
+ 25abd5ec2e5f577c118ea72b985aafe5f4e2929d76745b19c8d55105df87f8fe
+ 04d0a3af06c3d0866ff68d7941eb99cd0249c68d27a43e9edbc997924ce2d76a
+ 4a225d1c00be54db3b87bfad04222adb7ffe63e0641e103e8d8d4a03d78c7fd0
+ 135cfbeb651a408564b18b3e34fcdafcb05910a094ee3ad65927e600d71ba599
+ 1b577e75bf51c1c40c670591a3a2f4c0e32a25d23d97fc82741c71fd9d88fe93
+ 48a2acbe48b50eeb6fee5e5c45a3750b576bc5e7e1096ab5fec40d878264688f
+ d2c52f7289d96d9cd3269a8a8758f774c28c86ccdd0518f82af9487b78462d59
+ 6afc282591069ae7fdd0c784d168889822176dd02f8bab1955928541b38a75e2
+ 26d3bf0617a331117978d0396c9323d4d4a442807a338ddb4a31b71682cdf9c1
+ a8b15ccb48133e80d1a91017a836479f119f8696db5d352b66301e6ebbbbe559
+ c86068669b104bce708d3b8c3509c3509f5db58b094276b4c8d08656d35637b4
+ c877d7d4a2f11ca6f97262bbcd866d382eab05657dfc91f61514a789bc92b523
+ dcbd8bc253390c4c3c1ce16e3417774b3835bc7b83f89a271b2150096d9c9de9
+ 7353961a10b508aae3b54b43599094aa2c9c3409ab686a8d5429fb7d653eb947
+ ae8e90564862418013cddc30b779f97830f8004dd07bdc6e1836a4594b6ba0a2
+ 9d46363758153d9f1c236bbd0c17d3fe7950b7bf039b8ceae6173fc8915a91e9
+ 6170c09d02348d15191de90d81517214066bb50aa7fdde4de7d5a21072cce06c
+ c5ad2bdb64de5e095cb5703ce37238b83869c3028d8a8fce27d8a791b398d5e0
+ fbe76faa48df284065082ca9e62b32635a7654ac8ca484fa5d65b6b6f9f83414
+ de5d1eba575e855df21f820251607cd765c48015c4a40cb115fb4da56dbedf3b
+ 17740894dcc6d0596a244d7e5544cba47f161cf749781eacd0fb5988cc31d6a8
+ 74417da5f2d2897d659ea45da8078aa0bbe007b9e7ce7e1c1bca0af4aeff3ae6
+ 084e64083afed72fd333d28447879bab2595e0892ca9255d5394536c8fba810d
+ 3ae87ea5ccde4c72d4765742748aa90834d05659520e0c2be881dd2e394cbfc0
+ 64ad8cb1b72109a40b106785f7f609ef5793d9cb36a5349edb75152069c4ace0
+ f05de5ef6de26bd29f810aeb333019878c2d0bef89287deff864b6eafd109318
+ a16cff4ceed1d777dc8a37d8458d41b4b07a4ecfae628f869a46bdcb95517565
+ ac2ec4eded44084ca6bcecdecb3a1375b3287afba1748aa83827122d83078b30
+ f422fefdda275dce825980b8b52704eb740d6c323b5f3a9a2e1d6eb085c0237e
+ 6a829bf16e9387ee4524a5f205677b35c3cc8bd8d3a085dd6038974d51e9403a
+ 41f3ee7cd0e4ec2b5ecf74edc09dbbb7295d1992d5e728a90b591a681bcd8344
+ 3c4918b715edcefc3232d87df31fc44d437ff4ffe3aea5c468ce01743a10d2a3
+ d86394d51cb050773b9019aaae7a214a928baf0929b1280b3a4ed1c1f877e11b
+ 1cf69683407cd0fecae1a2d168fbffeba5693b9618777a9ce500d37d24c7bd67
+ 142041fb9a0ab8eb7ccc9e95fdf7d3ab22cb810aa3ea2c440f27dfb744c5bcd3
+ 3a6b530380591d89d16812371dce9c5e7aa274d40427200d7561e8148318310c
+ f9bad43bc7fc1b5ee2822a7a6eeb9c4ec4f0dfac0c110cf6817e0c41135f661f
+ 7808cdb157329b8d1fd95a41476d33ced3c3da7a71a11653bc0693156bf4f9ec
+ 6f759790d409ea833103c6826c3da24ba0e68cf8ba0c30914c4db12f9e10122a
+ 80b58611757a1b5b95d8932e606aaac491cf19b83ebfd8c97b121c8cfff69d56
+ 01f74de9828faa7e851042b548282978ace5757c5c80204603fd61829225eafe
+ 880901655b2ad565df62b39e2013ee8b3fa821c97ba606181e0820b446b0e5c6
+ 41a22ea30907b0417ed5ffdffb8a5884ea0ce810c2d655c148efcfeec478b3e3
+ 70b7b32158eb6b5e6da6ef3b02cad6a8b26e3092a78816cf1ebd194f5d3dd85e
+ 702e37d4d2979f7230c23814ca7fff5d4434d4b4d21ec9bef80d6c47ad8896ae
+ 9addf2d79f8a5d978429bf7bbf3f63f659cc5fb92b354a19429b970f177cb110
+ d93afa883c14dcbc6b9a84ab69030d0ee2717801471ad56fdf5574df0629d83d
+ c799c8b29e3e597cdbb1b448c5a5770323236f3054e6d2b941ce119773749148
+ 743f428b57c413ad72e4dacfbabc8104e26ca371540bb57eb0919b22bca3dee8
+ a6e35a6a1940ef15faae9dfdb14f8a24a77139ae47e8d7d9d59305a5164406c7
+ be962117642e1887e77f90c6c59baeb1bc459a0a152601fe9afbd35cc5a7cd38
+ a2a6ea131606016a328538d9ead4ba74a23c00a0044893abfcd267ca78738f1c
+ 35fab44fdf97d098b8b5ce956d8eefab664e88f1e690512c0f0d2e7bba15cd10
+ 06676ccf455c56e2cc85ba6b7695e6b0358db03f1b49532ff426e1a2dbc968e4
+ 937a72ea4457bc359d9356717944687eaa0f12ddc93955564b8d069df24d54b1
+ 78c9491f44a3758df2b118b909b28bc754062859bc08fc7dbb2f712c2b7ce044
+ 13a4b6795acb679acd19aaf312abbbc7543a17064a5c984eadaea2fb9dc3a446
+ 8351906b8dd9c5b2a91b52a723aa35f4fb36dcc43a2c9ecbe38993e7e3b9f917
+ 01ed5eb39445431aa77ff5882b5cdf5e0131f8e643ded1332b28d5c747f51f3a
+ 1ab7f3a263fed5ffd0985bdca75d78935088994c2c8fb9293e0545961d21be1f
+ eefca6bb67e1479d21b417f619deb9868ec4c36bb03ab5f1a389edc849768dd2
+ 3a6328e10c11f427c34e84a06d6f9819d08fce759003f66371d70613e7716880
+ f5a9345f6c57eb09254f664a6d85768bc74a9b420e96274f5db4d644f131c2ac
+ 2991f022278ca92c538e398cba5e5be6a3dea31e825c7c7c07f33340f777cd44
+ 1e278704fefbf85c50ca37a2ebdafa28cac694e82cbaaf410b1f0bd2b0575134
+ f1c39fa3736bd6d0ba4ac15eb9bb6b72d50190458413165815ea5db262659837
+ 54a03e13b43b0510d4465de61e5d1bdac166218909cfc912ffd89858fc32d1fb
+ 34e30654dd6a24f74563f3268520900b7eae0edd2c9f5c84e4166fd060e8d187
+ cd16926c10cd99e99c4757904c28cc2a4d49c7e35e6e9c0811b117ebea88fc39
+ 655eecd75266d8f73e020e99e80fc858e58c16968d50868c621853ec157f5045
+ be5150b27734c1ed74c2b6f2821890bdbfeb01ff7c4db6073119b6bf81b48832
+ 98fa9cc1cbf891009242cfb1185f7ba4fad0a0c607ee7930ec6f705e2ca7aa51
+ 3678fb42946e788e61a43ec8dff59ce236097fc191f605d481c1e8a0160a9acb
+ c3aab42f4f4bc3f2a577a97e02bf5a001831224cbfc061d329df8562996554e5
+ c0c277c32c8b91b500f35b905dabb63d7a0f6800d7f90ac431468de14952bac6
+ 0150ac70a789ebc64f4fe7edb976360d274dc5b888bcda1871028ad9b4861889
+ 22748fe34353085524ea8bc271d8edddebec8bfc41bda5c4890bc872af95a90c
+ ca890e61257934bcc64e28e2b1966c93ec16b7a7c79c8f78911ac951105cb556
+ 04ae9b37f72ae7b2b8c2df5e9cc2d3731471bc1e579641d5f1fec431a87ecd72
+ 766f36eda6380ea34f0d56d42b4bd72519c57aeb79f4b32a26257472a8c3a9d3
+ f473c9d48c8299fbce714c6fe829b263835e562fd048a699cb69a3c23ae8a687
+ da7eaa5054cffbaa0a757f8a593285660fa9223a3e4b2cecebcca8a667146076
+ 25a6b645b8426d21238627f4918d0294840ea22698826e45f4fc46cc0a5029df
+ 026759a3278ee086cc9133b7c64782315668203c796cc8f0f9c4436134c21ebb
+ 1913dfe5fe2dcb3e4034ca73872afb794161d6306c583ffefefb471335a7d6ee
+ 51d5c887a1bd25d7793bb87fbffabbfe1f14343859c4404b0c14d9c076f1aba3
+ 944a5fc25185b42ea8390452b6255f0a269bb0706e2cb26542481fd01260c159
+ 68c54f13b0cd5688b2f6076032b7eadb2fe4bbab1eba7a361cd5f4cc20559ba7
+ df57d1a9f24f728a116009dc8b08609683589bf0b2f87c73c12add7c9c72d8d5
+ 1de31c7a7d959f8194b58f9b4574ac797af8dea853126b7be84ff078d5748159
+ 141e4c209a48feaa81387469b87753179a479421e30287ecd4b6f89189b2e7af"

From e2ec50ebb73c185dd1f5ff7d848953a14dde543b Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 7 Dec 2021 11:13:09 +0100
Subject: [PATCH 3567/4088] google-chrome: update to 96.0.4664.93

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 214616168a10..d9949d06e371 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=96.0.4664.45
+version=96.0.4664.93
 revision=1
 _channel=stable
 archs="x86_64"
@@ -19,7 +19,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=4f34e7235d3ecbc2b1d0e3aa4237d377a4c124c0b74b8810d850c9d03c898614
+checksum=0b8b50d03cb9a58f8841fc03912e847a54a213745a8b10d8c0c75223a51d4394
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 92280ee9fa5568e7023b9e57a9e6ba3da728060a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 8 Dec 2021 15:44:02 +0100
Subject: [PATCH 3568/4088] unshield: update to 1.5.1.

---
 srcpkgs/unshield/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unshield/template b/srcpkgs/unshield/template
index 7bd233efd7c8..9a2ea2ed2802 100644
--- a/srcpkgs/unshield/template
+++ b/srcpkgs/unshield/template
@@ -1,6 +1,6 @@
 # Template file for 'unshield'
 pkgname=unshield
-version=1.4.3
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://github.com/twogood/unshield"
 distfiles="https://github.com/twogood/${pkgname}/archive/${version}.tar.gz"
-checksum=aa8c978dc0eb1158d266eaddcd1852d6d71620ddfc82807fe4bf2e19022b7bab
+checksum=34cd97ff1e6f764436d71676e3d6842dc7bd8e2dd5014068da5c560fe4661f60
 
 libunshield_package() {
 	short_desc="Libary to extract CAB archives form InstallShield installers"

From e5f2b9fa9c3f89906e89d6afb874ac72449cd1fc Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 8 Dec 2021 12:24:39 +0100
Subject: [PATCH 3569/4088] fcron: update to 3.3.1.

---
 srcpkgs/fcron/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template
index 11efd44b0bbd..d3f8567f8927 100644
--- a/srcpkgs/fcron/template
+++ b/srcpkgs/fcron/template
@@ -1,7 +1,7 @@
 # Template file for 'fcron'
 pkgname=fcron
-version=3.3.0
-revision=5
+version=3.3.1
+revision=1
 build_style=gnu-configure
 configure_args="
 	--sysconfdir=/etc/fcron
@@ -30,7 +30,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://fcron.free.fr"
 distfiles="$homepage/archives/$pkgname-$version.src.tar.gz"
-checksum=9aead33a0926e2eec123698c502114c6d67b483fe1ec232969fae6809b0bab60
+checksum=f359daa08a63ddfb7fe2f964bb3f5c52244c25aa36f9225a3cc54d36f4681106
 
 alternatives="
  crond:crond:/etc/sv/fcron

From e0b0c49ba71127767edc8ce83edbb16dd037e77e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Dec 2021 08:22:15 -0500
Subject: [PATCH 3570/4088] maturin: update to 0.12.4.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 1556fa8f98c2..6db10055fd39 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.3
+version=0.12.4
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="9a6ee17bdee33aa319941ca5000016397a2d5343a17341406150c4015aa81b75
+checksum="5a636c2f5b08654c09d50f429179d1fe93449474db503100a55b85adbad67dfc
  b6c2ddab7498cf6eab8e637a5b7895f3170b2f9ef989861d1ff33af6c8459b27"
 # Tests use unstable features and fail to build
 make_check=no

From a96ce38a912ea0a91dddacf034a0a536472a6d92 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Dec 2021 08:23:55 -0500
Subject: [PATCH 3571/4088] python-Cython: update to 0.29.25.

---
 srcpkgs/python-Cython/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 63cb8b7fad69..8842d7283bf7 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
-version=0.29.24
-revision=2
+version=0.29.25
+revision=1
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://cython.org/"
 changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443
+checksum=a87cbe3756e7c464acf3e9420d8741e62d3b2eace0846cb39f664ad378aab284
 # Tests are flaky
 make_check=no
 

From 1a73d9c9d9b81159f8551d00d9cd0a8ab124cd35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Dec 2021 08:25:09 -0500
Subject: [PATCH 3572/4088] python3-imageio: update to 2.13.2.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 00e60a63af44..db63985d1ce5 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.13.1
+version=2.13.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=00c843712d00d075a87bc9eb37c1b6ffe2b210327d8fbaabd52759a961b5b4bd
+checksum=a54c3b785811237e6f029603bc253ca3c92ea346d5865b4c673d45b65b3e4548
 
 post_install() {
 	vlicense LICENSE

From 382c43cb8beab03f7e9ab37e806ed07941aebb10 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Dec 2021 08:26:15 -0500
Subject: [PATCH 3573/4088] python3-pyopencl: update to 2021.2.10.

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index a2d740626c6f..14f6bca6415c 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2021.2.9
+version=2021.2.10
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=51425e65ec49c738eefe21b1eeb1f39245b01cc0ddfd495fbe1f8df33dbc6c9e
+checksum=75a1f202741bace9606a8680bbbfac69bf8a73d4e7511fb1a6ce3e48185996ae
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From 073acc21c274a8a87a5cdb4adc6b70033f8eb3c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Dec 2021 08:26:26 -0500
Subject: [PATCH 3574/4088] python3-setuptools-rust: update to 1.1.2.

---
 srcpkgs/python3-setuptools-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 1811ad4be88e..9cd1c497793f 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=1.1.1
+version=1.1.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/PyO3/setuptools-rust"
 changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=dc04afb52a70e56f5d6800a7ed9c45ad5937ba95e51a042b9096459edc038ad6
+checksum=a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1
 # Tests have unpackaged dependencies
 make_check=no
 

From cd865a4e814ade80881f9bf292260b67deef2234 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Dec 2021 08:32:59 -0500
Subject: [PATCH 3575/4088] qtutilities: update to 6.5.3.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 75fb6b76a62d..8a7a238bc5b4 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.2
+version=6.5.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=01afcb59312615129de29d339255224ca09c5fee050659b7896ea880483bd311
+checksum=17b5bf0db407ff1408ba1d2be6be3fc80de5dbd3fab78f6a66f55b6c4c0b6e22
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From c95c901186010008871a38ae289455e1596a92d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:32:44 +0100
Subject: [PATCH 3576/4088] qt6-3d: update to 6.2.2.

---
 srcpkgs/qt6-3d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 3c9e560e892d..06017e74ef5e 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
-checksum=730c0e8e1a1a59c4acbeca68e206bab14ef770f5dacb94b84103a82243cfeeb3
+checksum=ce5088048f151be2dd41600aa1132faa6cf8accfaaf4c40e60572384aef396ad
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 70e7a4a0fbdfadd8a3d1f4903caa9c3ac673564a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:32:52 +0100
Subject: [PATCH 3577/4088] qt6-base: update to 6.2.2.

---
 srcpkgs/qt6-base/patches/qtbug-97811.patch | 53 ----------------------
 srcpkgs/qt6-base/template                  |  4 +-
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/qtbug-97811.patch

diff --git a/srcpkgs/qt6-base/patches/qtbug-97811.patch b/srcpkgs/qt6-base/patches/qtbug-97811.patch
deleted file mode 100644
index e3ea6b09d843..000000000000
--- a/srcpkgs/qt6-base/patches/qtbug-97811.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ffc9323671d045e3566980d9ed4567f071004e65 Mon Sep 17 00:00:00 2001
-From: Volker Hilsheimer <volker.hilsheimer@qt.io>
-Date: Thu, 28 Oct 2021 16:55:33 +0200
-Subject: Fix performance regression when avoiding scrollbar flipping
-
-Amends 6c4dc722cb9bf765904feefff4fb00bdb0b3dc9f.
-
-Don't search for the optimal size of the scrollarea's widget if it can't
-be found anyway. Try the size with scrollbar first, which covers the
-vast majority of sizes.
-
-Optimizing the loop with e.g. a binary search adds no value, as the size
-is often just a pixel too small.
-
-Since we can't rely on the number of height-for-width calls, we can't
-meaningfully test this behavior. The number of calls is still very high
-during showing and resizing; optimizing this further is for a separate
-commit.
-
-Fixes: QTBUG-97811
-Pick-to: 6.2 5.15
-Change-Id: If145302e6414b32cf1ce7251ff33b0039f584867
-Reviewed-by: Jonas Kvinge <jonas@jkvinge.net>
-Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
----
- src/widgets/widgets/qscrollarea.cpp | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
-index f880240ea7..e8fdadb648 100644
---- a/src/widgets/widgets/qscrollarea.cpp
-+++ b/src/widgets/widgets/qscrollarea.cpp
-@@ -203,10 +203,13 @@ void QScrollAreaPrivate::updateScrollBars()
-             if (vbarpolicy == Qt::ScrollBarAsNeeded) {
-                 int vbarWidth = vbar->sizeHint().width();
-                 QSize m_hfw = m.expandedTo(min).boundedTo(max);
--                while (h > m.height() && vbarWidth) {
--                    --vbarWidth;
--                    --m_hfw.rwidth();
--                    h = widget->heightForWidth(m_hfw.width());
-+                // is there any point in searching?
-+                if (widget->heightForWidth(m_hfw.width() - vbarWidth) <= m.height()) {
-+                    while (h > m.height() && vbarWidth) {
-+                        --vbarWidth;
-+                        --m_hfw.rwidth();
-+                        h = widget->heightForWidth(m_hfw.width());
-+                    }
-                 }
-                 max = QSize(m_hfw.width(), qMax(m_hfw.height(), h));
-             }
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index d1bcbe898e9d..58a82ac0c352 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
@@ -29,7 +29,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
-checksum=2c5f07b5c3ea27d3fc1a46686ea3fb6724f94dddf1fb007de3eb0bdb87429079
+checksum=85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From ff927234d3f209c7ab77f50746b372770de0030a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:32:55 +0100
Subject: [PATCH 3578/4088] qt6-charts: update to 6.2.2.

---
 srcpkgs/qt6-charts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 77adbc9061ec..0da284b2f9b0 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
-checksum=f92ad16abd382a1488e6aafa129d88887a14300cb0f237fe37bca9173cf5a688
+checksum=8ffe724433af53a09892cce4e13b242cfcb6c67fef68295b0f29374460f16e7a
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 61799a1d6dc667e2046431022b89759f7c657ca4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:02 +0100
Subject: [PATCH 3579/4088] qt6-declarative: update to 6.2.2.

---
 srcpkgs/qt6-declarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index bb8d976201e1..fafd1f1505a9 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=5aeb841a5665f79672a302569754ea7d541c69102c551707e43489e797213c71
+checksum=1a04ef0092b31354e0fded0d8391865719cb58f9ca5dc604da2b1f62c742cf28
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 86bf3df6d64233ce01f5c651fc4186c42b6ebfe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:04 +0100
Subject: [PATCH 3580/4088] qt6-imageformats: update to 6.2.2.

---
 srcpkgs/qt6-imageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index 47def09028f8..db47b21186d8 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz"
-checksum=df61dc1a517988bfa123117c78a7dbeda859cbb6d9cbd080ce60058277bca3df
+checksum=214f6d552391a70d72ff534295ef06c59dba756b6323762967820963a15bd267

From 7ac643138002f3d91963e8510cf0e92a41768b22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:06 +0100
Subject: [PATCH 3581/4088] qt6-location: update to 6.2.2.

---
 srcpkgs/qt6-location/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index 7767df810207..9a895b81c63a 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.2.1
+version=6.2.2
 revision=1
-wrksrc="qtlocation-everywhere-src-${version}"
+wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
@@ -11,8 +11,8 @@ short_desc="Cross-platform application and UI framework - location"
 maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlocation-everywhere-src-${version}.tar.xz"
-checksum=a99e92c762d45b17e14685cd8a3c1564a3da0ce1cfd1a68ffd5b3fd7c409dcad
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz"
+checksum=26231545eae383089510b236e88bbee8a6d338c06c170b674e8f36a57a0ba09a
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From f16568652fddf72c4d27a73bd433df1303149ac0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:07 +0100
Subject: [PATCH 3582/4088] qt6-lottie: update to 6.2.2.

---
 srcpkgs/qt6-lottie/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 168068542276..75a2d476e08c 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz"
-checksum=6f896b47aa3c9a0ea3905a3d49b8737ff42a444c2deb54d80426da80b2fabfd3
+checksum=9c2ac91b9f5dc860d211ed9f3c1e3965dbb4665ace4af735e96b6328990fd74f
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 6465a443caf69e9a2c0a7d98116e69441b81ed34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:09 +0100
Subject: [PATCH 3583/4088] qt6-networkauth: update to 6.2.2.

---
 srcpkgs/qt6-networkauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index 7bb9d9e0345c..bc7e7fd8b4cc 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz"
-checksum=8027f85095a9c56d8cada988527454f786a5f8dd4157206db4f21299016d1c9e
+checksum=c8217c740167b9e96c3fabcc92d781864220c553c7a23254c16bd8f09f05e9e1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From d241d1696d8dfc11a1b718072e824a6b0d182032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:12 +0100
Subject: [PATCH 3584/4088] qt6-qt5compat: update to 6.2.2.

---
 srcpkgs/qt6-qt5compat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index dba256935ffd..27b4ebb6c494 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
-checksum=3865c031450a3c2616de1e20104ca9470ac5447adf51faa918f8b01a2c425de7
+checksum=a5bb33d9df1d99e5afc21b0d0a36b79aa98829e2b1bee03c811ad69b79276bad
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 3288768f11e8085b15b1db3453e9a46a63f49155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:31 +0100
Subject: [PATCH 3585/4088] qt6-quick3d: update to 6.2.2.

---
 srcpkgs/qt6-quick3d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 3f864bee6f4f..2bafca923bef 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=4022ce0e40a5d1c93a9593037a151cf7abe64c91a8b9882d9549f6a3c002a1b2
+checksum=be7ef8a36e84cb2f05edfd238d98899478eefbd56a5fecc7d570ce5848b5364b
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually

From 8b173b33f9cb81bc417e8370e36ebc4c09dbe83f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:32 +0100
Subject: [PATCH 3586/4088] qt6-quicktimeline: update to 6.2.2.

---
 srcpkgs/qt6-quicktimeline/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index c605cc230949..ad3155c453e0 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz"
-checksum=55f571ee2adcf7b12473b8df8b9e2e60d3778d8c9055c301d4c11d7c2327de63
+checksum=939d5479b035f674dd669b3e084ec9688eaea62763d2a7ad134630ff20efd479
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From e1bfc2f8d9cc6f397c7f4119931f620a0b446104 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:34 +0100
Subject: [PATCH 3587/4088] qt6-scxml: update to 6.2.2.

---
 srcpkgs/qt6-scxml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index e2aef5375678..eaf992803dbd 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz"
-checksum=cff613f68af98f4bdc1e40df0b6515b69175e10e83c551a57ee5db4359505767
+checksum=b71d438c5e4106532cf48833116241bc48c0c4effe617770ae80e34bb77e92ed
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 556bf298b309d4bfae3332b3fc7c22504def9edf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:36 +0100
Subject: [PATCH 3588/4088] qt6-serialport: update to 6.2.2.

---
 srcpkgs/qt6-serialport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index f268851732c3..e4763e3f4162 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtserialport-everywhere-src-${version}.tar.xz"
-checksum=ec77f4c9d6096588f3e735315f873976103479be453985b27f27fe8994e0776a
+checksum=5555aae0332df90c7d955381a758a2b918b6e65e2148da8003c1fb2f9cf9640a
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 754c48a2f1040b0b6238bd4c3cd57dd48028a758 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:38 +0100
Subject: [PATCH 3589/4088] qt6-shadertools: update to 6.2.2.

---
 srcpkgs/qt6-shadertools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 13c320c8eba4..72cfb47e50a9 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=2c8d38724181b31cd828a56e377775c2d461ee2ea0d6362ebec411c3b288067e
+checksum=f97505e72358c1fa2a2131c3a9a5b3497a2b9ea65b75a5beaf7f46c4b56a89e5
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 605e08f6add5c906f4159df61eb7191d5f247a5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:39 +0100
Subject: [PATCH 3590/4088] qt6-svg: update to 6.2.2.

---
 srcpkgs/qt6-svg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index 18ad60a94038..51ad5f24aea3 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=86e27e005c2421052ca90e619c8d13f1bd19c6bf1a7b84dd4e0f7855fc884fd7
+checksum=e1bd63932fa16468bc737a38b0060431f67a6073f4101ede188eb47a191abd75
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 382fa8a3d48d2731f68c509b70ad8237bfd063e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:42 +0100
Subject: [PATCH 3591/4088] qt6-tools: update to 6.2.2.

---
 srcpkgs/qt6-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index 094016b331de..768fc552fb75 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=5a856d3d3d5fe6e15dc3f1af707a0ef1df2e687850403fc94af635edb9312bfb
+checksum=c0542ecb4a0aec21246a1cb5cd9f8f51b368929ce2065a455b13c3b47a94ecd1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 2d01127c213d3edb1a4dbbbc08e529daf20b5d43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:45 +0100
Subject: [PATCH 3592/4088] qt6-translations: update to 6.2.2.

---
 srcpkgs/qt6-translations/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index 8a1ffbd7d1c7..ee844d48b010 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=3f680b520da585697fc725697a52c7d2074a6a728f6830366b491a6f8b9183c7
+checksum=fc9244224c6e9930035e7efc8b6b541c739aa4cccf46de9779bc3f64d8e94c8f

From 8b6aab848dd5d1afca39531b8f30980eec5e9596 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:47 +0100
Subject: [PATCH 3593/4088] qt6-virtualkeyboard: update to 6.2.2.

---
 srcpkgs/qt6-virtualkeyboard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index e39dceb4f10b..1fba027d4582 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
-checksum=61baa6be64b41f3b1e526ed11896f818a50eb50d282906d4464eb8e0fa98f0fe
+checksum=9973c1a703e717936858a8e81eeef1372e6830127f9729013f9da3c2870561a5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From b6cdb0dccce4fdba2a5b1c4d714339b987e185c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:48 +0100
Subject: [PATCH 3594/4088] qt6-wayland: update to 6.2.2.

---
 srcpkgs/qt6-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index 4c432a560e6b..a13e6e52ff52 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=051e6bd0a6fed988436fd86ad5146a556151f3a51f8bd5c4a31c99845a54efd7
+checksum=2d3652b3ecb5d8c9493c938b3d379dd700800859bb19033e8024e29d8deb3618
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 6b418b28ac75261d5fc09e9215a1d59e9114ba93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 16:33:50 +0100
Subject: [PATCH 3595/4088] qt6-websockets: update to 6.2.2.

---
 srcpkgs/qt6-websockets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index 71bedf3123a1..a8a471e485fb 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.2.1
+version=6.2.2
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebsockets-everywhere-src-${version}.tar.xz"
-checksum=23344e21e96a839697abed7bf7931a8c08a752f08bf25edf240748501aba3816
+checksum=8847a8bf0da6741b0bb22883c760037488c2d336fccc8cdb0b4e368f034c2076
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From eca78bcb1473b25891ca9e0d032c69ccdcdcd7c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 17:08:47 +0100
Subject: [PATCH 3596/4088] bctoolbox: update to 5.0.55.

---
 .../bctoolbox/patches/cmake-bcunit-fix.patch  | 19 -------------------
 srcpkgs/bctoolbox/template                    |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/bctoolbox/patches/cmake-bcunit-fix.patch

diff --git a/srcpkgs/bctoolbox/patches/cmake-bcunit-fix.patch b/srcpkgs/bctoolbox/patches/cmake-bcunit-fix.patch
deleted file mode 100644
index ef883d569068..000000000000
--- a/srcpkgs/bctoolbox/patches/cmake-bcunit-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index 6828b3f..b41262f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,14 +106,9 @@ if(POLARSSL_FOUND)
- endif()
- 
- if(ENABLE_TESTS_COMPONENT)
--  find_package(BcUnit CONFIG REQUIRED)
--  cmake_push_check_state(RESET)
--	list(APPEND CMAKE_REQUIRED_INCLUDES ${BCUNIT_INCLUDE_DIRS})
--	list(APPEND CMAKE_REQUIRED_LIBRARIES ${BCUNIT_LIBRARIES})
- 	check_symbol_exists("CU_get_suite" "BCUnit/BCUnit.h" HAVE_CU_GET_SUITE)
- 	check_symbol_exists("CU_curses_run_tests" "BCUnit/BCUnit.h" HAVE_CU_CURSES)
- 	check_symbol_exists("CU_set_trace_handler" "BCUnit/Util.h" HAVE_CU_SET_TRACE_HANDLER)
--	cmake_pop_check_state()
- 	set(TESTER_REQUIRES_PRIVATE "bcunit")
- endif()
- 
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 4de00e55e201..128235dc7d32 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,17 +1,17 @@
 # Template file for 'bctoolbox'
 pkgname=bctoolbox
-version=4.4.17
+version=5.0.55
 revision=1
 build_style=cmake
-configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=OFF
+configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
  -DCMAKE_MODULE_PATH=/usr/lib/cmake"
 makedepends="bcunit-devel mbedtls-devel"
 short_desc="Library to create and run audio and video streams"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="John <me@johnnynator.dev>"
 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=1364d5f42b5514546b9c6654c227804ff92cf9cf13fdc7cb6ca666e3bb5a7987
+checksum=64409771baf978f826eb052c0349fd9350b5aef8fd4135c988627dc6489ace81
 
 bctoolbox-devel_package() {
 	depends="bctoolbox-${version}_${revision}"

From e836d110dc3a3a933045e0b04f31209ace553ed6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 17:08:52 +0100
Subject: [PATCH 3597/4088] bzrtp: update to 5.0.55.

---
 srcpkgs/bzrtp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index e8498d54b0a5..8f0b9823668d 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,16 +1,16 @@
 # Template file for 'bzrtp'
 pkgname=bzrtp
-version=4.4.17
+version=5.0.55
 revision=1
 build_style=cmake
-configure_args="-DENABLE_TESTS=0 -DENABLE_STATIC=FALSE"
+configure_args="-DENABLE_TESTS=FALSE -DENABLE_STATIC=FALSE"
 makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
 short_desc="Opensource implementation of ZRTP keys exchange protocol"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/bzrtp/-/archive/${version}/bzrtp-${version}.tar.gz"
-checksum=8cfb6f8be7be64046982849aaa48020caf5c6f1ab9cd9422af6082dfd669267d
+checksum=53e94486fdb2bece03ebe0daf49b5d476cab977babec364cd04407aca25be4c2
 
 bzrtp-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 15bd392bf51239ddf613889ecba38956b35609c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 17:13:26 +0100
Subject: [PATCH 3598/4088] belr: update to 5.0.55.

---
 srcpkgs/belr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/belr/template b/srcpkgs/belr/template
index 72db03bce0b5..2e93a5492da2 100644
--- a/srcpkgs/belr/template
+++ b/srcpkgs/belr/template
@@ -1,6 +1,6 @@
 # Template file for 'belr'
 pkgname=belr
-version=4.4.0
+version=5.0.55
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=FALSE -DENABLE_TESTS=NO"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belr/-/archive/${version}/belr-${version}.tar.gz"
-checksum=0b6ab6d3c4d0eb07036e21d2a7e03d949230cc89fd70730d79e28292f02ff101
+checksum=6ef5ea9b730d5206cf278f6dd0dc0e3c87ab61a222f08cee50148b6868f6023b
 
 belr-devel_package() {
 	short_desc+=" - development files"

From 2d2ddbc1d53ed6bdd2c29f6675cf2a49fffcee01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 17:13:30 +0100
Subject: [PATCH 3599/4088] belle-sip: update to 5.0.55.

---
 srcpkgs/belle-sip/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 6351feba635d..d1d46c11bd3b 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,18 +1,18 @@
 # Template file for 'belle-sip'
 pkgname=belle-sip
-version=4.4.0
+version=5.0.55
 revision=1
 build_style=cmake
 configure_args="-DANTLR3_JAR_PATH=/usr/share/java/antlr3.jar -DENABLE_STRICT=OFF
  -DENABLE_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_MODULE_PATH=/usr/lib/cmake"
 hostmakedepends="antlr3-bin"
-makedepends="mbedtls-devel libantlr3c bctoolbox-devel zlib-devel"
+makedepends="mbedtls-devel libantlr3c bctoolbox-devel zlib-devel belr-devel"
 short_desc="SIP (RFC3261) implementation written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${version}/belle-sip-${version}.tar.gz"
-checksum=4f9218b0bbf55c2f68d70a0e83779e591ef9fe97f1caf7550768ea192ee34cee
+checksum=f97e1dd8ab8eea4363187128d4ccf0223701c6efcd1e382226da25bd62ca3b24
 
 belle-sip-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 73506bb324ea250b3202cfcd9b706477f850f41b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 17:14:22 +0100
Subject: [PATCH 3600/4088] belcard: update to 5.0.55.

---
 srcpkgs/belcard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/belcard/template b/srcpkgs/belcard/template
index 0eaa48f8b054..292ec35f1891 100644
--- a/srcpkgs/belcard/template
+++ b/srcpkgs/belcard/template
@@ -1,6 +1,6 @@
 # Template file for 'belcard'
 pkgname=belcard
-version=4.4.0
+version=5.0.55
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=FALSE -DENABLE_UNIT_TESTS=FALSE"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belcard/-/archive/${version}/belcard-${version}.tar.gz"
-checksum=7283334681eb83b7461446dd3aa21ab97450b7a47a06c5fc1fd24bd9987e0996
+checksum=6b8f6188630eb5aeec671c8c9d417aa37b04a2d3b0b0944866bcbf6a3b2baec2
 
 belcard-devel_package() {
 	short_desc+=" - development files"

From 87748c1a9c3c32bd84f4182f1f73c675e29edf3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 17:14:35 +0100
Subject: [PATCH 3601/4088] ortp: update to 5.0.55.

---
 srcpkgs/ortp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ortp/template b/srcpkgs/ortp/template
index ab414f4fe570..f8b08f2b9be9 100644
--- a/srcpkgs/ortp/template
+++ b/srcpkgs/ortp/template
@@ -1,6 +1,6 @@
 # Template file for 'ortp'
 pkgname=ortp
-version=4.4.17
+version=5.0.55
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=OFF"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linphone.org/technical-corner/ortp"
 distfiles="https://gitlab.linphone.org/BC/public/ortp/-/archive/${version}/ortp-${version}.tar.gz"
-checksum=4368be03f7f1ec6a29ada80c1a962a4793964e1c58f4d9b9117e68332a401c93
+checksum=2851d825f06ecfeeac921b73d7a932e2c8fcdbf49c83b09cd600db3e8025bc28
 
 ortp-devel_package() {
 	depends="bctoolbox-devel ortp-${version}_${revision}"

From a4e16794ca6e9a2e6a24863bab2a8366536e8f95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 18:39:19 +0100
Subject: [PATCH 3602/4088] linphone: update to 5.0.56.

---
 srcpkgs/linphone/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/linphone/template b/srcpkgs/linphone/template
index 5954875de644..c98b8c7e950e 100644
--- a/srcpkgs/linphone/template
+++ b/srcpkgs/linphone/template
@@ -1,13 +1,17 @@
 # Template file for 'linphone'
 pkgname=linphone
-version=4.4.0
+version=5.0.56
+# 5.0.57 requires an unreleased mediastreamer2
 revision=1
 build_style="cmake"
 wrksrc="liblinphone-${version}"
-configure_args="-DENABLE_STRICT=0 -DENABLE_GTK_UI=$(vopt_if gui true false)
+configure_args="-DENABLE_STRICT=FALSE
  -DENABLE_ADVANCED_IM=FALSE -DENABLE_DB_STORAGE=FALSE
- -DENABLE_LIME=NO -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=NO"
-hostmakedepends="doxygen graphviz python-pystache python-six"
+ -DENABLE_LIME=NO -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=NO
+ -DENABLE_STATIC=OFF -DENABLE_FLEXIAPI=OFF"
+# FLEXIAPI disabled because their cmake script doesn't find jsoncpp
+hostmakedepends="doxygen graphviz python3-pystache python3-six
+ pkg-config"
 makedepends="sqlite-devel readline-devel mediastreamer-devel
  belle-sip-devel speex-devel libxml2-devel libnotify-devel
  bctoolbox-devel ortp-devel bzrtp-devel gettext-devel ortp-devel
@@ -17,7 +21,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/liblinphone/-/archive/${version}/liblinphone-${version}.tar.gz"
-checksum=a9a468e7e15ad59062d6460b7d2f6b1f1cd74c15d54a7b5dae6bad28a489cf40
+checksum=56bc789cda2507644477c1fad84169b3a39b9c26bad859763c6be66fb705c2db
 
 pre_build() {
 	echo "#define MS2_GIT_VERSION=unknown" > coreapi/gitversion.h
@@ -44,7 +48,7 @@ linphone-tools_package() {
 		for i in lp-auto-answer\
 			lp-sendmsg lp-test-ecc lpc2xml_test \
 			xml2lpc_test; do
-			vmove usr/bin/$i;
+			vmove "usr/bin/$i";
 		done
 		vmove "usr/bin/*test"
 	}
@@ -55,7 +59,6 @@ linphone-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libxml2-devel ortp-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.a"
 		vmove usr/include
 		vmove usr/share/LinphoneCxx/cmake
 		vmove usr/share/Linphone/cmake

From 3c5634dc6cf0d2c0d39d746a51040195dcc177d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 18:39:28 +0100
Subject: [PATCH 3603/4088] linphone-desktop: update to 4.3.2.

---
 ...0933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch | 29 -------------------
 .../linphone-desktop/patches/version.patch    | 26 +++++++++++++++++
 srcpkgs/linphone-desktop/template             |  8 ++---
 3 files changed, 30 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch
 create mode 100644 srcpkgs/linphone-desktop/patches/version.patch

diff --git a/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch b/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch
deleted file mode 100644
index 2b4c83d3ffa9..000000000000
--- a/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd Mon Sep 17 00:00:00 2001
-From: Julien Wadel <julien.wadel@belledonne-communications.com>
-Date: Sun, 5 Jul 2020 11:55:34 +0200
-Subject: [PATCH] Avoid to reduce window if it is already maximized
-
----
- linphone-app/src/app/App.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp
-index 199d8c9a..5a50057c 100644
---- a/linphone-app/src/app/App.cpp
-+++ b/linphone-app/src/app/App.cpp
-@@ -405,7 +405,11 @@ void App::smartShowWindow (QQuickWindow *window) {
-   if (!window)
-     return;
-   window->setVisible(true);
--  window->show();// Force show, maybe redundant with setVisible
-+// Force show, maybe redundant with setVisible
-+  if(window->visibility() == QWindow::Maximized)// Avoid to change visibility mode
-+    window->showMaximized();
-+  else
-+    window->show();
-   window->raise();// Raise ensure to get focus on Mac
-   window->requestActivate();
- }
--- 
-2.21.0
-
diff --git a/srcpkgs/linphone-desktop/patches/version.patch b/srcpkgs/linphone-desktop/patches/version.patch
new file mode 100644
index 000000000000..556061582d4f
--- /dev/null
+++ b/srcpkgs/linphone-desktop/patches/version.patch
@@ -0,0 +1,26 @@
+--- linphone-desktop-4.3.2/linphone-app/CMakeLists.txt.orig	2021-12-08 16:02:45.190027494 +0100
++++ linphone-desktop-4.3.2/linphone-app/CMakeLists.txt	2021-12-08 16:03:05.969026699 +0100
+@@ -21,18 +21,13 @@
+ ################################################################################
+ cmake_minimum_required(VERSION 3.1)
+ 
+-find_package(bctoolbox CONFIG)
+-set(FULL_VERSION )
+-bc_compute_full_version(FULL_VERSION)
+-set(version_major )
+-set(version_minor )
+-set(version_patch )
+-set(identifiers )
+-set(metadata )
+-bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata)
++set(FULL_VERSION 4.3.2)
++set(version_major 4)
++set(version_minor 3)
++set(version_patch 2)
+ 
+ project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}")
+-
++find_package(bctoolbox CONFIG REQUIRED)
+ 
+ if(ENABLE_BUILD_VERBOSE)
+ 	#message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
diff --git a/srcpkgs/linphone-desktop/template b/srcpkgs/linphone-desktop/template
index 3991291c0b7f..8699388aa9fc 100644
--- a/srcpkgs/linphone-desktop/template
+++ b/srcpkgs/linphone-desktop/template
@@ -1,10 +1,9 @@
 # Template file for 'linphone-desktop'
 pkgname=linphone-desktop
-version=4.2.1
-revision=2
+version=4.3.2
+revision=1
 build_wrksrc="linphone-app" # The root cmake is glue code for their vendored libs
 build_style=cmake
-configure_args="-DCMAKE_INSTALL_RPATH=OFF"
 hostmakedepends="qt5-qmake qt5-host-tools qt5-declarative"
 makedepends="bctoolbox-devel belcard-devel belle-sip-devel linphone-devel
  mediastreamer-devel qt5-declarative-devel qt5-quickcontrols2-devel
@@ -15,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.linphone.org/"
 distfiles="https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/${version}/linphone-desktop-${version}.tar.gz"
-checksum=a9c520851ec40ebd6bc28b5ebc0e4d2b5f62ef3b53e5d60bb241c0b2bd56ad62
+checksum=dc7580816b5c289d9a4f21e9b3392a9b4a1a947c64ffbd6af504c8c01e3af111
 replaces="linphone-gui>=0"
 CFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
 CXXFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
@@ -29,6 +28,7 @@ linphone-gui_package() {
 # XXX: The cmake install does all kinds of stuff we don't want
 do_install() {
 	vbin build/linphone
+	vinstall build/libapp-plugin.so 644 usr/lib
 	vinstall build/linphone.desktop 644 usr/share/applications/
 	vinstall assets/images/linphone_logo.svg 644 usr/share/icons/hicolor/scalable/apps/ linphone.svg
 	vinstall assets/linphonerc-factory 644 usr/share/linphone/

From a64a30931254e3e8b2bc80a7a5860da0711102b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 6 Dec 2021 18:39:35 +0100
Subject: [PATCH 3604/4088] mediastreamer: update to 5.0.55.

---
 srcpkgs/mediastreamer/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 884237ddf436..ba8b3dcc19e0 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,20 +1,20 @@
 # Template file for 'mediastreamer'
 pkgname=mediastreamer
-version=4.4.17
+version=5.0.55
 revision=1
 wrksrc="mediastreamer2-${version}"
 build_style=cmake
 configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
-hostmakedepends="python"
+hostmakedepends="python3"
 makedepends="bzrtp-devel ffmpeg-devel glew-devel libXv-devel libsrtp-devel
  libupnp-devel libvpx-devel mbedtls-devel opus-devel ortp-devel pulseaudio-devel
- speex-devel v4l-utils-devel"
+ libtheora-devel speex-devel v4l-utils-devel"
 short_desc="Powerful and lightweight streaming engine for voice/video telephony"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org/technical-corner/mediastreamer2"
 distfiles="https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/${version}/mediastreamer2-${version}.tar.gz"
-checksum=4f67262621a93349651cfb0b51a2157623bf7758126d070e1c122bff58c7d5b4
+checksum=4c15baa786f637c630afa7989ebdd8c8f9d424548cb02400e03fb5fe2d61e1ee
 
 mediastreamer-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 441526aca48a3a3f13bb8440a68eda973bf0fb36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 8 Dec 2021 17:18:13 +0100
Subject: [PATCH 3605/4088] bluez-alsa: remove unused ortp makedependency

---
 srcpkgs/bluez-alsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bluez-alsa/template b/srcpkgs/bluez-alsa/template
index dd88e535601d..cf5de4c35bd5 100644
--- a/srcpkgs/bluez-alsa/template
+++ b/srcpkgs/bluez-alsa/template
@@ -7,7 +7,7 @@ configure_args="--enable-aac --enable-aptx --with-libopenaptx
  --enable-manpages --disable-debug --disable-hcitop"
 hostmakedepends="pkg-config automake libtool python3-docutils"
 makedepends="alsa-lib-devel fdk-aac-devel libbluetooth-devel
- libglib-devel libopenaptx-devel ortp-devel sbc-devel"
+ libglib-devel libopenaptx-devel sbc-devel"
 short_desc="Bluetooth Audio ALSA Backend"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 06673e415ba702f9c2a53b8a4ff6c768c9377fc3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Dec 2021 14:44:16 -0500
Subject: [PATCH 3606/4088] python3: update to 3.10.1.

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cdaf9bd2e3d9..e47733161a6e 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,7 +3,7 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.10.0
+version=3.10.1
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -22,7 +22,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
+checksum=a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From abe45a317b7dcfc52067326c2484f57aacf2b0b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Dec 2021 14:45:26 -0500
Subject: [PATCH 3607/4088] python3-tkinter: update to 3.10.1.

---
 srcpkgs/python3-tkinter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 2aa3be1efb96..930e4eb779d1 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.10.0
+version=3.10.1
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -28,7 +28,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
+checksum=a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From f3b4889a31a01566ef965779a3c11c5e0d098519 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 6 Dec 2021 16:01:05 +0100
Subject: [PATCH 3608/4088] jimtcl: update to 0.81.

---
 common/shlibs           | 2 +-
 srcpkgs/jimtcl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index abdf7b261f8a..b9a112357c07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2585,7 +2585,7 @@ libmunge.so.2 munge-libs-0.5.14_3
 libmgba.so.0.9 libmgba-0.9.2_1
 libglabels-3.0.so.8 libglabels30-3.2.1_1
 libglbarcode-3.0.so.0 libglabels30-3.2.1_1
-libjim.so.0.80 jimtcl-0.80_1
+libjim.so.0.81 jimtcl-0.81_1
 libftdi1.so.2 libftdi1-1.2_1
 libax25.so.0 libax25-0.0.12rc4_1
 libax25io.so.0 libax25-0.0.12rc4_1
diff --git a/srcpkgs/jimtcl/template b/srcpkgs/jimtcl/template
index 569742c38869..25d32bb5c5ae 100644
--- a/srcpkgs/jimtcl/template
+++ b/srcpkgs/jimtcl/template
@@ -1,6 +1,6 @@
 # Template file for 'jimtcl'
 pkgname=jimtcl
-version=0.80
+version=0.81
 revision=1
 build_style=gnu-configure
 configure_args="--full --shared --with-ext=sqlite3 --docdir=/usr/share/doc/${pkgname}"
@@ -10,7 +10,7 @@ makedepends="sqlite-devel"
 license="BSD"
 homepage="http://jim.tcl.tk/"
 distfiles="https://github.com/msteveb/${pkgname}/archive/${version}.tar.gz"
-checksum=9e79a960de925552eeb4df51121f0ea017e34409568117b1ac461f4c3071289e
+checksum=ab7eb3680ba0d16f4a9eb1e05b7fcbb7d23438e25185462c55cd032a1954a985
 
 post_extract() {
 	sed -i '/Unknown option/s/error/notice/' autosetup/autosetup

From be69fc65cc7b806427aa73b50437161146ec0e11 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 5 Dec 2021 22:19:24 +0100
Subject: [PATCH 3609/4088] openocd: rebuild for jimtcl-0.81.

---
 srcpkgs/openocd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template
index 017d075e8614..fd50363dd97f 100644
--- a/srcpkgs/openocd/template
+++ b/srcpkgs/openocd/template
@@ -1,7 +1,7 @@
 # Template file for 'openocd'
 pkgname=openocd
 version=0.11.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --disable-werror

From f51ae7d170b44f533ea6c5ac79ae474ac614303f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 6 Dec 2021 17:07:32 +0100
Subject: [PATCH 3610/4088] perl-LWP: update to 6.59.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index f1c5ad930cff..f03930a8e0db 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.58
+version=6.59
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=f881f52775073a685cefd6aed4f8c53d0c17a808d4dc6e2231530426b997edbd
+checksum=179a284f10d8ba17632c68f94546bee0bb4ac03badb2cb51266e48d21c039e5c

From 60d6c45ebeb1acbe7156824bf600a3137181669f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Dec 2021 14:59:54 +0100
Subject: [PATCH 3611/4088] dovecot: update to 2.3.17.1.

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index c1392de6a745..3fc42c4cd7c8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.17
+version=2.3.17.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=224412cd77a23a3ffb857da294da200883d956082cff7257942eff2789bd2df9
+checksum=1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From e333d1808feec4559a7623e4b209b8da5bb1415a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Dec 2021 15:00:49 +0100
Subject: [PATCH 3612/4088] dovecot-plugin-pigeonhole: update to 0.5.17.1.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 209c2b23595b..ecb422c2a886 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.17
+version=0.5.17.1
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=031e823966c53121e289b3ecdcfa4bc35ed9d22ecbf5d93a8eb140384e78d648
+checksum=3cc4a3de6d7e27bd99ac59b99faa161287f78167272699a22591798ffcf84512
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 04a119a01f076a5334241a16e55af015889e63e7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Dec 2021 15:02:33 +0100
Subject: [PATCH 3613/4088] libX11: update to 1.7.3.

---
 srcpkgs/libX11/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..00b5c042f820 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.2
-revision=3
+version=1.7.3
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
@@ -11,18 +11,11 @@ short_desc="Base X libraries from Xorg"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" libtool automake xorgproto xtrans"
-	pre_configure() {
-		autoreconf -fi
-	}
-fi
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=dfd1343db3a0e523f1bb97d5ba71453c79eee78a77e51ca9f8dfef7131c6f0fe
 
 do_configure() {
-	CFLAGS_FOR_BUILD="-fPIC" ./configure ${configure_args}
+	./configure ${configure_args}
 }
 
 post_install() {

From ee85277f7e878934cc62118a4d8939592e954155 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Dec 2021 21:25:39 +0100
Subject: [PATCH 3614/4088] apostrophe: add missing dependencies

---
 srcpkgs/apostrophe/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 5453ded482b0..127919d611a3 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,16 +1,17 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.5
-revision=1
-wrksrc=apostrophe-v$version
+revision=2
+wrksrc="$pkgname-v$version"
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1 webkit2gtk"
+depends="python3-gobject python3-chardet python3-setuptools python3-pypandoc
+ gspell iso-codes libhandy1 webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
-homepage="https://gitlab.gnome.org/somas/apostrophe"
-distfiles="$homepage/-/archive/v$version/apostrophe-v$version.tar.bz2"
-checksum=2a3d766d84165653f3060b63b6284e52720d68ccd4937e1c1e00d9cab5a47bdb
+homepage="https://gitlab.gnome.org/World/apostrophe"
+distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
+checksum=366b239ea7bb720c11fc7344827b6739e4983132c9932aa4705a3b88533d75e4

From 2c800977c765d086656fc6b21eed2cfa767ea14a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Dec 2021 23:08:56 +0100
Subject: [PATCH 3615/4088] libX11: fix cross

---
 srcpkgs/libX11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 00b5c042f820..7ea1c53fff92 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
-hostmakedepends="pkg-config xorg-util-macros"
+hostmakedepends="pkg-config xorg-util-macros xorgproto"
 makedepends="xorgproto xtrans libxcb-devel"
 short_desc="Base X libraries from Xorg"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From eb64f2d3c83264bb1a89e727edc1f74e34074634 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 6 Dec 2021 11:26:08 +0100
Subject: [PATCH 3616/4088] wike: update to 1.6.2.

---
 srcpkgs/wike/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wike/template b/srcpkgs/wike/template
index 088b54e97534..f9db7aa3c21f 100644
--- a/srcpkgs/wike/template
+++ b/srcpkgs/wike/template
@@ -1,6 +1,6 @@
 # Template file for 'wike'
 pkgname=wike
-version=1.6.0
+version=1.6.2
 revision=1
 wrksrc="Wike-$version"
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hugolabe/Wike"
 distfiles="https://github.com/hugolabe/Wike/archive/refs/tags/$version.tar.gz"
-checksum=6244e99fe456684f3b0b495bb3da1db403f6c8067f0c2e564476df4603c54ccd
+checksum=39c3a731587c0d60cca2262d104a35d20cd087288f46621955f014b72f5ba6d1

From fe7bfcdf87b092af061a1c3bbb180355976ac407 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 6 Dec 2021 11:25:57 +0100
Subject: [PATCH 3617/4088] streamlink: update to 3.0.3.

---
 srcpkgs/streamlink/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 447ac90ccb29..27871ef70f8a 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=3.0.2
+version=3.0.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=d4d0fbf2067af32d2c3e8a6bea7ea1cef6a28020fe452a80d8bd55c2a5fed68a
+checksum=a042bda7a3aea864a6d897607e727e374b09b51abac02a15086714d0634430b2
 make_check=ci-skip # some tests fail when running as root
 
 post_install() {

From 664448c1d057913f6f854b13f5ea5696d5d746af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 6 Dec 2021 11:25:47 +0100
Subject: [PATCH 3618/4088] python3-charset-normalizer: update to 2.0.9.

---
 srcpkgs/python3-charset-normalizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index c2146ab534b1..f4a39c525822 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-charset-normalizer'
 pkgname=python3-charset-normalizer
-version=2.0.7
+version=2.0.9
 revision=1
 wrksrc="charset_normalizer-$version"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://charset-normalizer.readthedocs.io/"
 distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
-checksum=6473e80f73f5918254953073798a367f120cc5717e70c917359e155901c0e2d0
+checksum=d3a0e1a74c1ed5804c12ed4ae3d58062434ba7b1782fcbd202633074a8319d5c
 
 pre_check() {
 	vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg

From 58566f4449d4de1b531a259f78cba4d83aef87ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 8 Dec 2021 16:02:35 +0100
Subject: [PATCH 3619/4088] doctl: update to 1.68.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 1a89b1adaebc..c755b60fbcd8 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.67.0
+version=1.68.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=97c9ee6f28efd621f04ff4bafa269d4f7f6632f5884178f443a22cb610e086a7
+checksum=63bf2c754cc6da01eeacf43c139cab3dd04458d16be4047f5a1f238b9e0e5cb9

From 4d176b63b2f6ecd2b9de45af9c673f2730ae90c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 8 Dec 2021 16:19:03 +0100
Subject: [PATCH 3620/4088] doomretro: update to 4.4.1.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index d0a7996ac62b..d8968e24e67f 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.4
+version=4.4.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=f28e439498de97a38decafd924d06e72ec247efca82719afca17d0532170be3b
+checksum=2778a21c45804875d69460f2695b4e48687f3b38b1e6c7ff0c62114a51f1d5c3

From eafe65e8a54fcd6811ce25d2722babe1ff8d2049 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 9 Dec 2021 09:52:28 +0100
Subject: [PATCH 3621/4088] vscode: update to 1.63.0

---
 srcpkgs/vscode/patches/product.patch |  8 +++-----
 srcpkgs/vscode/patches/ripgrep.patch | 22 +++++++++++++---------
 srcpkgs/vscode/template              |  4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index e1874ba18545..edeebf5d1439 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,20 +1,18 @@
 diff --git a/product.json b/product.json
-index 14ef10628d3..a5b1df55002 100644
+index 22e93d4b7c3..335cddd4c7c 100644
 --- a/product.json
 +++ b/product.json
-@@ -23,15 +23,24 @@
+@@ -25,13 +25,22 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/dc1a6699060423b8c4d2ced736ad70195378fddf/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/c42793d0357ff9c6589cce79a847177fd42852ee/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
  		"ms-vscode.vscode-js-profile-table",
- 		"ms-vscode.remotehub",
- 		"ms-vscode.remotehub-insiders",
 +		"ms-python.python",
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index 389dd6a5aa13..6e81145a1cb1 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -4,25 +4,29 @@ This prevents vscode from fetching prebuilt ripgrep from Microsoft
 during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
+diff --git a/package.json b/package.json
+index 6d1fb7cca0c..057ed39ac31 100644
 --- a/package.json
 +++ b/package.json
 @@ -83,7 +83,7 @@
-     "vscode-oniguruma": "1.5.1",
+     "vscode-oniguruma": "1.6.1",
      "vscode-proxy-agent": "^0.11.0",
      "vscode-regexpp": "^3.1.0",
 -    "vscode-ripgrep": "^1.12.1",
 +    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.4.1",
-     "xterm": "4.15.0-beta.10",
-     "xterm-addon-search": "0.9.0-beta.5",
+     "vscode-textmate": "5.5.0",
+     "xterm": "4.16.0-beta.2",
+     "xterm-addon-search": "0.9.0-beta.6",
+diff --git a/remote/package.json b/remote/package.json
+index 662ce3568ab..a79fe3764d9 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -23,7 +23,7 @@
-     "vscode-oniguruma": "1.5.1",
+@@ -22,7 +22,7 @@
+     "vscode-oniguruma": "1.6.1",
      "vscode-proxy-agent": "^0.11.0",
      "vscode-regexpp": "^3.1.0",
 -    "vscode-ripgrep": "^1.12.1",
 +    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.4.1",
-     "xterm": "4.15.0-beta.10",
-     "xterm-addon-search": "0.9.0-beta.5",
+     "vscode-textmate": "5.5.0",
+     "xterm": "4.16.0-beta.2",
+     "xterm-addon-search": "0.9.0-beta.6",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 1933b2194164..20b84996bf27 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.62.3
+version=1.63.0
 revision=1
 _electronver=13.6.1
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=87638a1b26f58225d3cae953f5a5036139ef3529a43caee50c4c18def801ce22
+checksum=e71637baa6e3ccba876e6d465bda517f40aef2548f8941f69f38891bd0f983f3
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From fbb6d5a6d28e4befdf168e84d04a0d98a26718a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 2 Dec 2021 13:54:10 -0300
Subject: [PATCH 3622/4088] linux5.15: add patch to fix bluetooth dongle

The patch is taken verbatim from this particular comment:

    https://gist.github.com/nevack/6b36b82d715dc025163d9e9124840a07#gistcomment-3818325

Note that there are several fake variants of this CSR dongle
(usb id 0a12:0001) that need different workarounds. The gist itself
mentions a workaround (force-suspend) that is already included in 5.15
and fixes some dongles but not mine.

The issue is also mentioned in kernel bugzilla at

    https://bugzilla.kernel.org/show_bug.cgi?id=60824#c187

Starting at comment 187 there are several reports of dongles fixed by
that patch (or a variation / rediscovery of the workaround).
---
 .../btusb-quirk-HCI_FLT_CLEAR_ALL.patch       | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 srcpkgs/linux5.15/patches/btusb-quirk-HCI_FLT_CLEAR_ALL.patch

diff --git a/srcpkgs/linux5.15/patches/btusb-quirk-HCI_FLT_CLEAR_ALL.patch b/srcpkgs/linux5.15/patches/btusb-quirk-HCI_FLT_CLEAR_ALL.patch
new file mode 100644
index 000000000000..5c04e5158217
--- /dev/null
+++ b/srcpkgs/linux5.15/patches/btusb-quirk-HCI_FLT_CLEAR_ALL.patch
@@ -0,0 +1,96 @@
+From 4d5b0262d30dd6227d9bef96c2a2259bf1162350 Mon Sep 17 00:00:00 2001
+From: Ismael Ferreras Morezuelas <swyterzone@gmail.com>
+Date: Mon, 19 Jul 2021 12:39:11 +0200
+Subject: [PATCH] Bluetooth: Add a new quirk to skip HCI_FLT_CLEAR_ALL
+
+Signed-off-by: Ismael Ferreras Morezuelas <swyterzone@gmail.com>
+---
+ drivers/bluetooth/btusb.c   |  1 +
+ include/net/bluetooth/hci.h |  6 ++++++
+ net/bluetooth/hci_core.c    | 12 +++++++++---
+ net/bluetooth/hci_request.c |  8 ++++++--
+ 4 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 197cafe75..8fa07f9e3 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -1899,6 +1899,7 @@ static int btusb_setup_csr(struct hci_dev *hdev)
+ 		 */
+ 		set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &hdev->quirks);
+ 		set_bit(HCI_QUIRK_BROKEN_ERR_DATA_REPORTING, &hdev->quirks);
++		set_bit(HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL, &hdev->quirks);
+ 
+ 		/* Clear the reset quirk since this is not an actual
+ 		 * early Bluetooth 1.1 device from CSR.
+diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
+index b80415011..a12178387 100644
+--- a/include/net/bluetooth/hci.h
++++ b/include/net/bluetooth/hci.h
+@@ -246,6 +246,12 @@ enum {
+ 	 * HCI after resume.
+ 	 */
+ 	HCI_QUIRK_NO_SUSPEND_NOTIFIER,
++
++	/* When this quirk is set, HCI_OP_SET_EVENT_FLT requests with
++	 * HCI_FLT_CLEAR_ALL are ignored. A subset of the CSR controller
++	 * clones struggle with this and instantly lock up.
++	 */
++	HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL,
+ };
+ 
+ /* HCI device flags */
+diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
+index 2560ed2f1..7ed355c3e 100644
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -273,6 +273,7 @@ static void bredr_setup(struct hci_request *req)
+ {
+ 	__le16 param;
+ 	__u8 flt_type;
++	struct hci_dev *hdev = req->hdev;
+ 
+ 	/* Read Buffer Size (ACL mtu, max pkt, etc.) */
+ 	hci_req_add(req, HCI_OP_READ_BUFFER_SIZE, 0, NULL);
+@@ -292,9 +293,14 @@ static void bredr_setup(struct hci_request *req)
+ 	/* Read Current IAC LAP */
+ 	hci_req_add(req, HCI_OP_READ_CURRENT_IAC_LAP, 0, NULL);
+ 
+-	/* Clear Event Filters */
+-	flt_type = HCI_FLT_CLEAR_ALL;
+-	hci_req_add(req, HCI_OP_SET_EVENT_FLT, 1, &flt_type);
++	/* Clear Event Filters; some fake CSR controllers lock up after setting
++	 * this type of filter, so avoid sending the request altogether.
++	 */
++	if (!test_bit(HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL, &hdev->quirks))
++	{
++		flt_type = HCI_FLT_CLEAR_ALL;
++		hci_req_add(req, HCI_OP_SET_EVENT_FLT, 1, &flt_type);
++	}
+ 
+ 	/* Connection accept timeout ~20 secs */
+ 	param = cpu_to_le16(0x7d00);
+diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
+index 1d14adc02..90a88539b 100644
+--- a/net/bluetooth/hci_request.c
++++ b/net/bluetooth/hci_request.c
+@@ -1156,11 +1156,15 @@ static bool adv_instance_is_scannable(struct hci_dev *hdev, u8 instance)
+ static void hci_req_clear_event_filter(struct hci_request *req)
+ {
+ 	struct hci_cp_set_event_filter f;
++	struct hci_dev *hdev = req->hdev;
++
++	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))
++		return;
+ 
+-	if (!hci_dev_test_flag(req->hdev, HCI_BREDR_ENABLED))
++	if (test_bit(HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL, &hdev->quirks))
+ 		return;
+ 
+-	if (hci_dev_test_flag(req->hdev, HCI_EVENT_FILTER_CONFIGURED)) {
++	if (hci_dev_test_flag(hdev, HCI_EVENT_FILTER_CONFIGURED)) {
+ 		memset(&f, 0, sizeof(f));
+ 		f.flt_type = HCI_FLT_CLEAR_ALL;
+ 		hci_req_add(req, HCI_OP_SET_EVENT_FLT, 1, &f);
+-- 
+2.32.0

From 329f3b03522a0492f7331b11278612f3c54d5119 Mon Sep 17 00:00:00 2001
From: Ranme Fritzvilliams <ranme@dotnetfox.tk>
Date: Thu, 9 Dec 2021 04:21:56 +0300
Subject: [PATCH 3623/4088] opensmtpd-extras: update to 6.7.1, orphan.

template:

- wrksrc: tarball with the new version is extracted to the lowercase
          directory, rendering this variable obsolete for the present
          time.

- maintainer: the person responsible for the package is inactive/gone.
---
 srcpkgs/opensmtpd-extras/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index f022e13ed9cb..0a835a9fe194 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,8 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
-version=6.6.0
-revision=4
-wrksrc="OpenSMTPD-extras-${version}"
+version=6.7.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
  --with-table-postgres --with-table-socketmap --with-table-sqlite"
@@ -11,11 +10,11 @@ makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"
-maintainer="Denis Revin <denis.revin@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://www.opensmtpd.org"
 distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
-checksum=126b023602e8bb222bf24543a056ee0a548343dc86d184669ff9d82dfca1fbdf
+checksum=f84385559a8bb366b2fe25d8b1f78c108f07cc15992350171569d7bdc2e935ac
 
 CFLAGS="-D_DEFAULT_SOURCE"
 

From 62ed2d3011ce8cf2357004f36d1e583237ab2c02 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 13:32:57 +0100
Subject: [PATCH 3624/4088] libX11: remove merged patch

---
 .../handle_new_xorgproto_symbols.patch        | 42 -------------------
 srcpkgs/libX11/template                       |  2 +-
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch

diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 7ea1c53fff92..75680e242a5e 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"

From ebeb2adeafeef60546fadc7609c46690c23594ec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Dec 2021 13:42:30 +0100
Subject: [PATCH 3625/4088] linux5.15: update to 5.15.7.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 484f473b5ba8..dec1bf4ccc0a 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.6
+version=5.15.7
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 23f5753121e2f18ef757449f94728d18ba70a20728dd217a53d4fa0a1cde621e"
+ 9112078380091e8f18680f9ea863bbd74cf36eaf2ee68f6e483e718ddd3314e1"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From df1b6f3a472a81337a24f76c544498010bdf936c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Dec 2021 13:43:33 +0100
Subject: [PATCH 3626/4088] linux5.10: update to 5.10.84.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 422c10d16ba8..13b45f66a644 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.83
+version=5.10.84
 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=ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70
+checksum=6e96271d72dd106c4bd83931ca16fda622413b34c5649e2916116c38c12e233d
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 7af5f980ccb13f32b406fe34b80320c8ed1e42ea Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 9 Dec 2021 17:40:35 +0100
Subject: [PATCH 3627/4088] New package: mat2-0.12.2

---
 srcpkgs/mat2/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/mat2/template

diff --git a/srcpkgs/mat2/template b/srcpkgs/mat2/template
new file mode 100644
index 000000000000..3b09ac81ba9a
--- /dev/null
+++ b/srcpkgs/mat2/template
@@ -0,0 +1,13 @@
+# Template file for 'mat2'
+pkgname=mat2
+version=0.12.2
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="bubblewrap python3-cairo python3-gobject python3-mutagen"
+short_desc="Metadata removal tool"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="LGPL-3.0-or-later"
+homepage="https://0xacab.org/jvoisin/mat2"
+distfiles="https://0xacab.org/jvoisin/mat2/-/archive/${version}/mat2-${version}.tar.gz"
+checksum=f3ef46fc0ccc13fd055991841c7fbee8a1322ba895d83a8da404bdaf0c638b98

From 0ad604c1fea7bc5da86d3a0dacf2426ce638887b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Tue, 7 Dec 2021 18:56:48 +0000
Subject: [PATCH 3628/4088] tailscale: update to 1.18.1.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index fe0f2c701035..96ebdd1354a8 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.16.2
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=fe6ef40d668cdd559fabc21eca754985999661f32d6962a19d219896cf05626e
+checksum=a8630d66ee1d475ba4ec97f389bae87d2777e9a33422726c052be1a6bbd2330c
 
 post_install() {
 	vlicense LICENSE

From f36d5f5520f0e10e1694fcf1ecb50341a45db382 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:55:01 +0200
Subject: [PATCH 3629/4088] cinnamon: update to 5.2.4.

---
 srcpkgs/cinnamon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index e2149fe4d8fd..83fcd9b58240 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=4.8.6
-revision=4
+version=5.2.4
+revision=1
 build_helper=gir
 build_style=meson
 hostmakedepends="libtool pkg-config gobject-introspection gettext
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/cinnamon/archive/${version}.tar.gz"
-checksum=00f82253f44c694c379e29959aa6e57b4878b722df1f08d68f9466272ef64893
+checksum=2f7c3c36de73ab86b8775b64225ff2cd6d6f8cd41d759978bea5b4b53199676f
 
 python_version=3
 pycompile_dirs="

From 4a98bcde44440bc4893bdad58531b48c4cc01f02 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:55:07 +0200
Subject: [PATCH 3630/4088] cinnamon-desktop: update to 5.2.0.

---
 srcpkgs/cinnamon-desktop/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 985e05ed4927..98bf8b08e35d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=4.8.1
+version=5.2.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,9 +12,9 @@ depends="xkeyboard-config"
 short_desc="Library with common API for various Cinnamon modules"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cb9aeff385764ba33cf4f7ee2bb5cb7308960670e8fa9f3be38a1d431b20436d
+homepage="https://github.com/linuxmint/cinnamon-desktop"
+distfiles="https://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz"
+checksum=3af13e687821cfd5af1989070db1240f72fe4c12995780ea6935946eb153ca39
 
 cinnamon-desktop-devel_package() {
 	depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"

From 502094e995d6feaf7ce451b6dfd690171758d626 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:55:13 +0200
Subject: [PATCH 3631/4088] cinnamon-session: update to 5.2.0.

---
 srcpkgs/cinnamon-session/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index c27272b802a3..b4bb1355e7e8 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=4.8.0
+version=5.2.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,6 +14,6 @@ depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
 short_desc="Cinnamon session handler"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
+homepage="https://github.com/linuxmint/cinnamon-session"
+distfiles="https://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz"
+checksum=f7ee24258b419a12e68c129b499889b682489cc5bf4e38b0eea2c60111c67121

From bbe3a2f1f5c0f5be06176981749c849c6a3e1746 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:55:19 +0200
Subject: [PATCH 3632/4088] cinnamon-menus: update to 5.2.0.

---
 srcpkgs/cinnamon-menus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 0fd49ed716aa..79514024bbdd 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=4.8.3
+version=5.2.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,8 +10,8 @@ short_desc="Cinnamon menu specifications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-menus"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=b0a02ab0e37d67e761c24545123ec354e7fab0a504267e524892a953bcfd98d7
+distfiles="https://github.com/linuxmint/cinnamon-menus/archive/${version}.tar.gz"
+checksum=fb654a214b7a7291a964b0d38b89e88ffc1a3343fa0a686f61059367bfa55e76
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 81b0be25c5e71944425a6fcc07c22daa133332c0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:55:25 +0200
Subject: [PATCH 3633/4088] cinnamon-translations: update to 5.2.1.

---
 srcpkgs/cinnamon-translations/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 8c4f65b38121..2a9404cd42c7 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,15 +1,15 @@
 # Template file for 'cinnamon-translations'
 pkgname=cinnamon-translations
-version=4.8.3
+version=5.2.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext"
 short_desc="Translations for Cinnamon and Nemo"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://translations.launchpad.net/linuxmint/latest/"
+homepage="https://github.com/linuxmint/cinnamon-translations/"
 distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=272b4e128b352f8a877bb57eaa4ed85ff72ad1cb25c4c58c8a35d0b093908f93
+checksum=d66b6998903511d2fa762ed3bce81b50b62213c2cf9db322afb981f9d3a4ae9e
 
 do_install() {
 	vmkdir usr

From c6b3677194eeb199d5439d7085b4d615bfe48089 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:55:31 +0200
Subject: [PATCH 3634/4088] cinnamon-control-center: update to 5.2.0.

Also:
 - add patch to build on musl (by @ericonr).
---
 .../cinnamon-control-center/patches/musl.diff | 19 +++++++++++++++++++
 srcpkgs/cinnamon-control-center/template      |  9 +++------
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/cinnamon-control-center/patches/musl.diff

diff --git a/srcpkgs/cinnamon-control-center/patches/musl.diff b/srcpkgs/cinnamon-control-center/patches/musl.diff
new file mode 100644
index 000000000000..860b0c4195e5
--- /dev/null
+++ b/srcpkgs/cinnamon-control-center/patches/musl.diff
@@ -0,0 +1,19 @@
+Include networkmanager header after the musl ones, to avoid conflicts.
+
+diff --git a/panels/network/wireless-security/utils.c b/panels/network/wireless-security/utils.c
+index b74424d..2bb543f 100644
+--- a/panels/network/wireless-security/utils.c
++++ b/panels/network/wireless-security/utils.c
+@@ -20,11 +20,10 @@
+  * Copyright 2007 - 2015 Red Hat, Inc.
+  */
+ 
+-#include "nm-default.h"
+-
+ #include <string.h>
+ #include <netinet/ether.h>
+ 
++#include "nm-default.h"
+ #include "utils.h"
+ 
+ /**
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 1d503bdb6e86..365c11f9fa54 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=4.8.2
+version=5.2.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -18,11 +18,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-control-center"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=407e88fe458af7b25c0dd91d54aad93a72a1464ced285a741ed1ce6249ed61af
-
-do_check() {
-	:
-}
+checksum=4a400801d2a53c0f0ab600682645376ea4afac3d6b1bbad3fbf580bf35651825
+make_check=no
 
 libcinnamon-control-center_package() {
 	short_desc+=" - runtime library"

From 391edbe438ac4a5e8da24a0dc7f8bf803aefd03f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:56:09 +0200
Subject: [PATCH 3635/4088] cinnamon-screensaver: update to 5.2.0.

---
 srcpkgs/cinnamon-screensaver/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 6952100a2268..a4a8f8ebbdff 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=4.8.1
-revision=2
+version=5.2.0
+revision=1
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel gobject-introspection
@@ -16,15 +16,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-screensaver"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e06a9f28cba55c38d1464d02917eb374de941fd09007608c239a348e7653b675
+checksum=0e0dff969e5fbfa3c81912f336ed43b23f69b1277f34c1108ad5d7d8a38787a7
+make_check=no
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"
 
-do_check() {
-	:
-}
-
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
 }

From 6c299866886661c5c262fbddaa02616bbfdb81d1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:57:34 +0200
Subject: [PATCH 3636/4088] cinnamon-settings-daemon: update to 5.2.0.

---
 srcpkgs/cinnamon-settings-daemon/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 2e5239c2c897..b7c1dd0b7728 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
-version=4.8.5
+version=5.2.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,12 +14,9 @@ short_desc="Cinnamon Settings Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-settings-daemon"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=f2e770113230e04bb5fe887c33b725ac273dcac912a3825ab6b9c821ce92ff32
-
-do_check() {
-	:
-}
+distfiles="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${version}.tar.gz"
+checksum=327dcb7dbb9986545e20e2142a6fe629aaf1bfaba29b530d06ea124cdfce6772
+make_check=no
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"

From 651599049c25bc060e68acf3fa017d2c4d153056 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:56:14 +0200
Subject: [PATCH 3637/4088] cjs: update to 5.2.0.

Also remove outdated build fix.
---
 srcpkgs/cjs/files/ax_code_coverage.m4 | 265 --------------------------
 srcpkgs/cjs/template                  |  16 +-
 2 files changed, 10 insertions(+), 271 deletions(-)
 delete mode 100644 srcpkgs/cjs/files/ax_code_coverage.m4

diff --git a/srcpkgs/cjs/files/ax_code_coverage.m4 b/srcpkgs/cjs/files/ax_code_coverage.m4
deleted file mode 100644
index e4bf6dbb44a9..000000000000
--- a/srcpkgs/cjs/files/ax_code_coverage.m4
+++ /dev/null
@@ -1,265 +0,0 @@
-# ===========================================================================
-#     https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CODE_COVERAGE()
-#
-# DESCRIPTION
-#
-#   Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS,
-#   CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included
-#   in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every
-#   build target (program or library) which should be built with code
-#   coverage support. Also defines CODE_COVERAGE_RULES which should be
-#   substituted in your Makefile; and $enable_code_coverage which can be
-#   used in subsequent configure output. CODE_COVERAGE_ENABLED is defined
-#   and substituted, and corresponds to the value of the
-#   --enable-code-coverage option, which defaults to being disabled.
-#
-#   Test also for gcov program and create GCOV variable that could be
-#   substituted.
-#
-#   Note that all optimization flags in CFLAGS must be disabled when code
-#   coverage is enabled.
-#
-#   Usage example:
-#
-#   configure.ac:
-#
-#     AX_CODE_COVERAGE
-#
-#   Makefile.am:
-#
-#     @CODE_COVERAGE_RULES@
-#     my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ...
-#     my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ...
-#     my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ...
-#     my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ...
-#
-#   This results in a "check-code-coverage" rule being added to any
-#   Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module
-#   has been configured with --enable-code-coverage). Running `make
-#   check-code-coverage` in that directory will run the module's test suite
-#   (`make check`) and build a code coverage report detailing the code which
-#   was touched, then print the URI for the report.
-#
-#   In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined
-#   instead of CODE_COVERAGE_LIBS. They are both still defined, but use of
-#   CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is
-#   deprecated. They have the same value.
-#
-#   This code was derived from Makefile.decl in GLib, originally licenced
-#   under LGPLv2.1+.
-#
-# LICENSE
-#
-#   Copyright (c) 2012, 2016 Philip Withnall
-#   Copyright (c) 2012 Xan Lopez
-#   Copyright (c) 2012 Christian Persch
-#   Copyright (c) 2012 Paolo Borelli
-#   Copyright (c) 2012 Dan Winship
-#   Copyright (c) 2015 Bastien ROUCARIES
-#
-#   This library is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation; either version 2.1 of the License, or (at
-#   your option) any later version.
-#
-#   This library is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-#serial 25
-
-AC_DEFUN([AX_CODE_COVERAGE],[
-	dnl Check for --enable-code-coverage
-	AC_REQUIRE([AC_PROG_SED])
-
-	# allow to override gcov location
-	AC_ARG_WITH([gcov],
-	  [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
-	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
-	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
-
-	AC_MSG_CHECKING([whether to build with code coverage support])
-	AC_ARG_ENABLE([code-coverage],
-	  AS_HELP_STRING([--enable-code-coverage],
-	  [Whether to enable code coverage support]),,
-	  enable_code_coverage=no)
-
-	AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
-	AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
-	AC_MSG_RESULT($enable_code_coverage)
-
-	AS_IF([ test "$enable_code_coverage" = "yes" ], [
-		# check for gcov
-		AC_CHECK_TOOL([GCOV],
-		  [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
-		  [:])
-		AS_IF([test "X$GCOV" = "X:"],
-		  [AC_MSG_ERROR([gcov is needed to do coverage])])
-		AC_SUBST([GCOV])
-
-		dnl Check if gcc is being used
-		AS_IF([ test "$GCC" = "no" ], [
-			AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
-		])
-
-		AC_CHECK_PROG([LCOV], [lcov], [lcov])
-		AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
-
-		AS_IF([ test -z "$LCOV" ], [
-			AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
-		])
-
-		AS_IF([ test -z "$GENHTML" ], [
-			AC_MSG_ERROR([Could not find genhtml from the lcov package])
-		])
-
-		dnl Build the code coverage flags
-		dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
-		CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
-		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-		CODE_COVERAGE_LIBS="-lgcov"
-		CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
-
-		AC_SUBST([CODE_COVERAGE_CPPFLAGS])
-		AC_SUBST([CODE_COVERAGE_CFLAGS])
-		AC_SUBST([CODE_COVERAGE_CXXFLAGS])
-		AC_SUBST([CODE_COVERAGE_LIBS])
-		AC_SUBST([CODE_COVERAGE_LDFLAGS])
-
-		[CODE_COVERAGE_RULES_CHECK='
-	-$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
-']
-		[CODE_COVERAGE_RULES_CAPTURE='
-	$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS)
-	$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
-	-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
-	$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
-	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
-']
-		[CODE_COVERAGE_RULES_CLEAN='
-clean: code-coverage-clean
-distclean: code-coverage-clean
-code-coverage-clean:
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
-']
-	], [
-		[CODE_COVERAGE_RULES_CHECK='
-	@echo "Need to reconfigure with --enable-code-coverage"
-']
-		CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
-		CODE_COVERAGE_RULES_CLEAN=''
-	])
-
-[CODE_COVERAGE_RULES='
-# Code coverage
-#
-# Optional:
-#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
-#    Multiple directories may be specified, separated by whitespace.
-#    (Default: $(top_builddir))
-#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
-#    by lcov for code coverage. (Default:
-#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
-#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
-#    reports to be created. (Default:
-#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
-#  - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage,
-#    set to 0 to disable it and leave empty to stay with the default.
-#    (Default: empty)
-#  - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov
-#    instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
-#  - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov
-#    instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-#  - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov
-#  - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the
-#    collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov
-#    instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-#  - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering
-#    lcov instance. (Default: empty)
-#  - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov
-#    instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-#  - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the
-#    genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
-#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
-#    instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
-#  - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
-#
-# The generated report will be titled using the $(PACKAGE_NAME) and
-# $(PACKAGE_VERSION). In order to add the current git hash to the title,
-# use the git-version-gen script, available online.
-
-# Optional variables
-CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
-CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
-CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
-CODE_COVERAGE_BRANCH_COVERAGE ?=
-CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
---rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)"
-CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?=
-CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\
-$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
---rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
-CODE_COVERAGE_IGNORE_PATTERN ?=
-
-GITIGNOREFILES ?=
-GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-
-code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
-code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_lcov_cap_0 = @echo "  LCOV   --capture"\
- $(CODE_COVERAGE_OUTPUT_FILE);
-code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V))
-code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_lcov_ign_0 = @echo "  LCOV   --remove /tmp/*"\
- $(CODE_COVERAGE_IGNORE_PATTERN);
-code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V))
-code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_genhtml_0 = @echo "  GEN   " $(CODE_COVERAGE_OUTPUT_DIRECTORY);
-code_coverage_quiet = $(code_coverage_quiet_$(V))
-code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
-code_coverage_quiet_0 = --quiet
-
-# sanitizes the test-name: replaces with underscores: dashes and dots
-code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1)))
-
-# Use recursive makes in order to ignore errors during check
-check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"'
-
-# Capture code coverage data
-code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"'
-
-# Hook rule executed before code-coverage-capture, overridable by the user
-code-coverage-capture-hook:
-
-'"$CODE_COVERAGE_RULES_CLEAN"'
-
-A''M_DISTCHECK_CONFIGURE_FLAGS ?=
-A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
-
-.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
-']
-
-	AC_SUBST([CODE_COVERAGE_RULES])
-	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])
-])
-
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index fbf86ea36b64..0c28d41045a0 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,6 +1,6 @@
 # Template file for 'cjs'
 pkgname=cjs
-version=4.8.2
+version=5.2.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,16 +14,20 @@ short_desc="Javascript for Cinnamon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cjs"
-distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=c3248663e0084dbcee1bf4d1db56966c1321983617dbbec9b1253e50614a3f4e
+distfiles="https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz"
+checksum=4141185cc554156ebbad80faf66c52f4287db911528e7f3ef8035f6b9c5f8f8c
+# ΧΧ A single test fails on x86_64,  meson reports in the configure stage:
+# meson.build:663: WARNING: Your libc does not have the C.UTF-8 locale and no
+# other suitable UTF-8 fallback locale could be found. You can still build GJS,
+# but some tests will fail.
+make_check=extended
 
-# The deleted lines in meson.build try to build and run a simple program,
-# and that does not work when cross-compiling.
 pre_configure() {
+	# The deleted lines in meson.build try to build and run a simple program,
+	# and that does not work when cross-compiling.
 	vsed -e '/Check if a minimal SpiderMonkey program compiles/,/^endif/d' -i meson.build
 }
 
-
 cjs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From a05d3ebe0d1b7520599c1cdd5fa789f15183c5ec Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:56:20 +0200
Subject: [PATCH 3638/4088] muffin: update to 5.2.0.

---
 srcpkgs/muffin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 6c3d645ef6a9..830922739b4f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=4.8.1
+version=5.2.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/muffin"
 distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz"
-checksum=d342165270690c8565004cd6aa26aa79620d99e442ee6207061c26a505690407
+checksum=8366569f27a62913dade9935e0688b3636ca11b8ee00a061c9fdcbb6b27f3e2f
 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
  libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
 

From 8fbce58adde4994f53502354694d6cf7d6aab5ad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:56:27 +0200
Subject: [PATCH 3639/4088] nemo: update to 5.2.0.

---
 srcpkgs/nemo/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 7925d1840cf9..ea65d448d96f 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,27 +1,23 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=4.8.6
-revision=2
+version=5.2.0
+revision=1
 build_style=meson
 build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel tracker-devel xapps-devel"
+ libexif-devel libnotify-devel tracker-devel xapps-devel libgsf-devel"
 depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo"
 distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
-checksum=bcaca1268d5f3b47d08c0524bea2fa3f1cb9861a7a7469a06320ab82504e1eae
+checksum=7b48afe5faf238c3b2e39dd94def90282bd4f747e621ec8c9ff3f6ad01603e36
 python_version=3
-
-do_check() {
-	:
-	# Requires xvfb-run and dbus-run-session;
-	# can't be run inside chroot due to fusermount3
-}
+# Requires xvfb-run and dbus-run-session
+make_check=no # can't be run inside chroot due to fusermount3
 
 post_patch() {
 	# Rename 'Files' app name to avoid having the same as nautilus

From 6cbb7a11eed538c02a763066e44beab90aeec172 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:56:33 +0200
Subject: [PATCH 3640/4088] xapps: update to 2.2.6.

Also:
 - remove gist dependency (no longer needed - thanx @dmarto).
---
 srcpkgs/xapps/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index f2c14c32c55b..d2148b2bb005 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,21 +1,21 @@
 # Template file for 'xapps'
 pkgname=xapps
-version=2.0.6
-revision=2
+version=2.2.6
+revision=1
 wrksrc="xapp-${version}"
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
 makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
  libdbusmenu-gtk3-devel"
-depends="gist inxi xfconf"
+depends="inxi xfconf"
 short_desc="Cross-desktop libraries and common resources from Linux Mint"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/linuxmint/xapps"
 changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
 distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=4541a54760715f54fe6ab6174d4e040f5bfa3a0186b63836f2332a3ddfde3cc6
+checksum=f3f5ab006383b9c0e231d30f8a0be727d0352fd4733ca3ea168883205793fcfd
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From 7679dce9addc34e3fca564123fcf356561dfc9af Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:57:49 +0200
Subject: [PATCH 3641/4088] nemo-fileroller: update to 5.0.1.

---
 srcpkgs/nemo-fileroller/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 62f53f6365d2..5c907d6b9f04 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,20 +1,16 @@
 # Template file for 'nemo-fileroller'
 pkgname=nemo-fileroller
-version=4.8.0
+version=5.0.1
 revision=1
-wrksrc="nemo-extensions-${version}"
+wrksrc="nemo-extensions-${pkgname}-${version}"
 build_wrksrc=nemo-fileroller
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
+build_style=meson
+hostmakedepends="pkg-config"
 makedepends="nemo-devel libglib-devel"
 depends="file-roller"
 short_desc="Nemo file roller extension"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
-
-pre_configure() {
-	autoreconf -fi
-}
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-fileroller-${version}.tar.gz"
+checksum=736f574d69344ad9a4e903322e3650ad31aa5447ccc011845b24a5f73784f686

From dc9de0ebceb7339764482e578fd9d4bfd1d805c9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:57:42 +0200
Subject: [PATCH 3642/4088] New package: nemo-extensions-5.2.0

---
 srcpkgs/nemo-extensions/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/nemo-extensions/template

diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
new file mode 100644
index 000000000000..fb47f3c75980
--- /dev/null
+++ b/srcpkgs/nemo-extensions/template
@@ -0,0 +1,18 @@
+# Template file for 'nemo-extensions'
+pkgname=nemo-extensions
+version=5.2.0
+revision=1
+build_style=meta
+depends="
+ nemo-image-converter
+ nemo-preview
+ nemo-audio-tab
+ nemo-compare
+ nemo-fileroller
+ nemo-python
+ nemo-emblems
+ nemo-terminal"
+short_desc="Extentions for nemo file manager"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-2-Clause" #no vlicense
+homepage="https://github.com/linuxmint/nemo-extensions"

From ddba1dd8e20b8e3c211835fd1b81b77a2065142e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:58:06 +0200
Subject: [PATCH 3643/4088] New package: nemo-audio-tab-5.2.0

---
 srcpkgs/nemo-audio-tab/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/nemo-audio-tab/template

diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template
new file mode 100644
index 000000000000..ad99a463436f
--- /dev/null
+++ b/srcpkgs/nemo-audio-tab/template
@@ -0,0 +1,16 @@
+# Template file for 'nemo-audio-tab'
+pkgname=nemo-audio-tab
+version=5.2.0
+revision=1
+wrksrc="nemo-extensions-${version}"
+build_wrksrc=nemo-audio-tab
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools"
+makedepends="nemo-devel libglib-devel"
+depends="nemo-python python3-mutagen"
+short_desc="Nemo audio tab extention"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/linuxmint/nemo-extensions"
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
+checksum=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5

From 64871446ede25b04ec1a15fc1352f1fd3e96e0dd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:58:14 +0200
Subject: [PATCH 3644/4088] New package: nemo-python-5.0.1

---
 srcpkgs/nemo-python/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/nemo-python/template

diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template
new file mode 100644
index 000000000000..e87562d1810d
--- /dev/null
+++ b/srcpkgs/nemo-python/template
@@ -0,0 +1,15 @@
+# Template file for 'nemo-python'
+pkgname=nemo-python
+version=5.0.1
+revision=1
+wrksrc="nemo-extensions-nemo-python-${version}"
+build_wrksrc=nemo-python
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="nemo-devel python3-devel python3-gobject-devel"
+short_desc="Nemo python binding"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/linuxmint/nemo-extensions"
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-python-${version}.tar.gz"
+checksum=b0900d80a082ef4f5aa1ca7c322fca3e33e7a6dfcc4be4c19cca6ae7d8111dbe

From 689da50888e10d63d90709e53bb5888bf9690bb6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:58:24 +0200
Subject: [PATCH 3645/4088] New package: nemo-emblems-5.2.0

---
 srcpkgs/nemo-emblems/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/nemo-emblems/template

diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template
new file mode 100644
index 000000000000..ecd44791b44f
--- /dev/null
+++ b/srcpkgs/nemo-emblems/template
@@ -0,0 +1,16 @@
+# Template file for 'nemo-emblems'
+pkgname=nemo-emblems
+version=5.2.0
+revision=1
+wrksrc="nemo-extensions-${version}"
+build_wrksrc=nemo-emblems
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools"
+makedepends="nemo-devel libglib-devel"
+depends="nemo-python"
+short_desc="Nemo extension for changing emblems in files/dirs"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/linuxmint/nemo-extensions"
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
+checksum=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5

From 447dcad973c7aa900bbad89a64050c4d2ea8fb3d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:58:31 +0200
Subject: [PATCH 3646/4088] New package: nemo-compare-5.0.1

---
 srcpkgs/nemo-compare/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/nemo-compare/template

diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
new file mode 100644
index 000000000000..e53193719dc3
--- /dev/null
+++ b/srcpkgs/nemo-compare/template
@@ -0,0 +1,16 @@
+# Template file for 'nemo-compare'
+pkgname=nemo-compare
+version=5.0.1
+revision=1
+wrksrc="nemo-extensions-${pkgname}-${version}"
+build_wrksrc=nemo-compare
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools"
+makedepends="nemo-devel libglib-devel"
+depends="nemo-python meld"
+short_desc="Nemo compare extention"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/linuxmint/nemo-extensions"
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
+checksum=7eef629856f64b7483d372259994b878398e98903d83319e1072d754a034289e

From 81c2ed499067d9a996d558f863c84544ba6ac585 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:58:38 +0200
Subject: [PATCH 3647/4088] New package: nemo-preview-5.0.1

---
 srcpkgs/nemo-preview/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/nemo-preview/template

diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
new file mode 100644
index 000000000000..22767ba17c81
--- /dev/null
+++ b/srcpkgs/nemo-preview/template
@@ -0,0 +1,17 @@
+# Template file for 'nemo-preview'
+pkgname=nemo-preview
+version=5.0.1
+revision=1
+wrksrc="nemo-extensions-${pkgname}-${version}"
+build_wrksrc=nemo-preview
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config gettext gobject-introspection glib-devel"
+makedepends="nemo-devel  libmusicbrainz5-devel cjs-devel clutter-devel
+ clutter-gtk-devel clutter-gst3-devel libxreader-devel gtksourceview4-devel webkit2gtk-devel"
+short_desc="Nemo preview extension"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/linuxmint/nemo-extensions"
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-preview-${version}.tar.gz"
+checksum=042719518af70c21879df5f5e314aec03da727fc3c118c509ef9aba59744a6cd

From f6234d5a68350e4ceca082eead6fd540bede91a1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:58:45 +0200
Subject: [PATCH 3648/4088] New package: nemo-terminal-5.2.0

---
 srcpkgs/nemo-terminal/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/nemo-terminal/template

diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template
new file mode 100644
index 000000000000..d1fac6c9623f
--- /dev/null
+++ b/srcpkgs/nemo-terminal/template
@@ -0,0 +1,16 @@
+# Template file for 'nemo-terminal'
+pkgname=nemo-terminal
+version=5.2.0
+revision=1
+wrksrc="nemo-extensions-${version}"
+build_wrksrc=nemo-terminal
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools"
+makedepends="nemo-devel libglib-devel"
+depends="nemo-python vte3 glib gtk+3 xapps"
+short_desc="Nemo terminal extention"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/linuxmint/nemo-extensions"
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
+checksum=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5

From 451ce591d8b7dc8247e8da88cdadd14904d6109d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Nov 2021 20:58:51 +0200
Subject: [PATCH 3649/4088] New package: nemo-image-converter-5.2.0

Closes: #31379 [via git-merge-pr]
---
 srcpkgs/nemo-image-converter/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/nemo-image-converter/template

diff --git a/srcpkgs/nemo-image-converter/template b/srcpkgs/nemo-image-converter/template
new file mode 100644
index 000000000000..bfbb4318d1e0
--- /dev/null
+++ b/srcpkgs/nemo-image-converter/template
@@ -0,0 +1,16 @@
+# Template file for 'nemo-image-converter'
+pkgname=nemo-image-converter
+version=5.2.0
+revision=1
+wrksrc="nemo-extensions-${version}"
+build_wrksrc=nemo-image-converter
+build_style=meson
+hostmakedepends="pkg-config gettext"
+makedepends="nemo-devel libglib-devel"
+depends="ImageMagick"
+short_desc="Nemo image converter extension"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/linuxmint/nemo-extensions"
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
+checksum=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5

From ddd268c88d0bb20f653be4b409c48c76ed474875 Mon Sep 17 00:00:00 2001
From: Hugo Machet <mail@hmachet.com>
Date: Thu, 9 Dec 2021 09:45:58 +0100
Subject: [PATCH 3650/4088] kak-lsp: update to 11.1.0.

---
 srcpkgs/kak-lsp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kak-lsp/template b/srcpkgs/kak-lsp/template
index 3a744b3cfcdb..912f5fda2113 100644
--- a/srcpkgs/kak-lsp/template
+++ b/srcpkgs/kak-lsp/template
@@ -1,6 +1,6 @@
 # Template file for 'kak-lsp'
 pkgname=kak-lsp
-version=11.0.1
+version=11.1.0
 revision=1
 build_style=cargo
 short_desc="Language Server Protocol client for Kakoune"
@@ -8,7 +8,7 @@ maintainer="Emerson Ferreira <me@skrps.me>"
 license="Unlicense"
 homepage="https://github.com/kak-lsp/kak-lsp"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4ab679b1d99830b999039ee1664c360aaba79ba943d7686e44e31efe96fb808b
+checksum=8e3b5d1804628dc6680902e9d93f0aef62e53ba022802330d60e6eebeef6991b
 
 post_install() {
 	vlicense UNLICENSE

From 9442947b39b6df2fbefb3c406cd4c97bf55b7802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 9 Dec 2021 16:57:05 -0300
Subject: [PATCH 3651/4088] orca: add missing libwnck dep.

Seems to be pulled in by some DEs, which would explain why this went
unnoticed for a while. Necessary to launch orca on Cinnamon, at least.
---
 srcpkgs/orca/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 9ad08628e514..6199c4033276 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,12 +1,13 @@
 # Template file for 'orca'
 pkgname=orca
 version=40.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
 depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme liblouis
- python3-atspi python3-brlapi python3-dbus python3-xdg speech-dispatcher"
+ python3-atspi python3-brlapi python3-dbus python3-xdg speech-dispatcher
+ libwnck"
 short_desc="Screen reader for individuals who are blind or visually impaired"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From ea0a9f8f554efe2d51313d8c25a51bc83fc01add Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 9 Dec 2021 21:06:38 +0100
Subject: [PATCH 3652/4088] inadyn: update to 2.9.1.

---
 srcpkgs/inadyn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 22da48b6a43e..b6a0f2f12ef6 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,6 +1,6 @@
 # Template file for 'inadyn'
 pkgname=inadyn
-version=2.9.0
+version=2.9.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-openssl"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://troglobit.com/inadyn.html"
 changelog="https://github.com/troglobit/inadyn/raw/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"
-checksum=2e2eb9e3ef76e314e147aeb2aec80018e09af6b6357b46dda5b2a52ce9da738e
+checksum=0094d20cfcd431674b8d658e93169c7589bf8f2b351b2860818a1ca05f0218c5
 
 system_accounts="inadyn"
 inadyn_homedir="/var/empty"

From 8a8fbe5be9dc03bdf8462e59ebccb61660ea8086 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 9 Dec 2021 13:50:57 +0100
Subject: [PATCH 3653/4088] chromium: update to 96.0.4664.93.

---
 srcpkgs/chromium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index ff6eb803adeb..9568f4131fdc 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=96.0.4664.45
+version=96.0.4664.93
 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=488c6ad983ebf7781cb4d704f70496e8aa2165611b46656d7aa62f269c760407
+checksum=7c7b1f8e4e0abc3453d40c60d6a70f30851db96e5d872cbaa1b4dd7f43aa3493
 
 lib32disabled=yes
 

From 2f1535aaba8e7283ce53c47dfd135867cc99bb9a Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Thu, 9 Dec 2021 07:46:35 -0600
Subject: [PATCH 3654/4088] glances: add missing runtime dep python3-packaging

---
 srcpkgs/glances/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index e329bcbf6858..f6576497929e 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,10 +1,10 @@
 # Template file for 'glances'
 pkgname=glances
 version=3.2.4.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-future python3-psutil python3-defusedxml"
+depends="python3-future python3-psutil python3-defusedxml python3-packaging"
 checkdepends="$depends"
 short_desc="Cross-platform curses-based monitoring tool"
 maintainer="Alessio Sergi <al3hex@gmail.com>"

From 387d9b5cf39b23d5095a328d5de655f05e7fca50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 6 Dec 2021 11:25:53 +0100
Subject: [PATCH 3655/4088] python3-isort: update to 5.10.1.

---
 srcpkgs/python3-isort/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
index f7956a7dcbd3..fac655ae70ba 100644
--- a/srcpkgs/python3-isort/template
+++ b/srcpkgs/python3-isort/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-isort'
 pkgname=python3-isort
-version=5.9.3
-revision=2
+version=5.10.1
+revision=1
 wrksrc="isort-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/PyCQA/isort"
 changelog="https://raw.githubusercontent.com/PyCQA/isort/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
-checksum=9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899
+checksum=e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951
 conflicts="python-isort>=0"
 make_check=no # needs many unpackaged dependencies
 

From c05d872242b372069e5459635cc17b3268da4a43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 6 Dec 2021 11:25:41 +0100
Subject: [PATCH 3656/4088] python3-astroid: update to 2.9.0.

---
 srcpkgs/python3-astroid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index b6310c002b1d..be93234e9037 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.8.3
+version=2.9.0
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
 distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4cccf37b45f72a2107c2541829f36b00348679967868ba54a03a52a1bd4ae7ff
+checksum=35ceb3584637c7ad7c0238024ec8d4a7693f868238e03d37ae77975fdb45b76d

From fca933985ef7297fb507a927904ee5567d3d896b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Oct 2021 14:53:48 +0200
Subject: [PATCH 3657/4088] pylint: update to 2.12.2.

---
 srcpkgs/pylint/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index a28415cd17c4..4eb6c572756b 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,20 +1,21 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.11.1
-revision=2
+version=2.12.2
+revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
 depends="python3-astroid python3-isort python3-mccabe python3-toml
- python3-platformdirs python3-typing_extensions"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+ python3-platformdirs"
+checkdepends="$depends python3-pytest python3-tkinter python3-six
+ python3-GitPython git"
 short_desc="Python code static checker"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=b797b4906068c616db2aaf364e56506d42b130474e98a16a0e2b9eb72fa0b1b7
+checksum=411308682f3d4578bb769e7fa549c8f34edf1033871d2e8cd5c3ce16a5741c59
 
 post_install() {
 	# install example config and emacs files

From cd3295b48da081d928a5ee2d43012d3eb2c9e976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 10 Dec 2021 00:47:07 -0300
Subject: [PATCH 3658/4088] cinnamon: add missing dependency.

python3-requests is necessary to launch some applications, such as
cinnamon-settings.
---
 srcpkgs/cinnamon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 83fcd9b58240..ee6c4c0f7827 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
 version=5.2.4
-revision=1
+revision=2
 build_helper=gir
 build_style=meson
 hostmakedepends="libtool pkg-config gobject-introspection gettext
@@ -18,7 +18,7 @@ depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
  network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
  python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
- python3-tinycss python3-pytz python3-distro libtimezonemap"
+ python3-tinycss python3-pytz python3-distro python3-requests libtimezonemap"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"

From 9c1d59fe1dcb69e7af4d172b658fe5273dbbdc13 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 10 Dec 2021 13:57:11 +0100
Subject: [PATCH 3659/4088] linux5.4: update to 5.4.164.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 0d10710d41c2..e9ca05b9a5e8 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.163
+version=5.4.164
 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=6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be
+checksum=3951308f6ae44ba318fe9d273d2f174c4ce899b92c70a3d36fb2033058b48204
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 02f1a9c44c6c830ebc582bbfc99b298d17e913c3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 10 Dec 2021 13:59:39 +0100
Subject: [PATCH 3660/4088] linux4.19: update to 4.19.220.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 2d239d61d715..3539ead97173 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.219
+version=4.19.220
 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=8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db
+checksum=58061d1d7a43573b093ef409458185e31e33ce6a6604e7ec495938810dccb060
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 3f993d25498342f4949a612c08feb7b9d198612e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 10 Dec 2021 14:03:23 +0100
Subject: [PATCH 3661/4088] libkdcraw5: update to 21.12.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index b97774e4e909..7603c489c7c4 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.3
+version=21.12.0
 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=06bd50e9a86b637f7c7a8b0c424de7ed66f76df1707ba2d68de1796598b3a83e
+checksum=2e8a7a1b7924283c71e84355375f9ac92eda43cc043aea063169061edc8bfc33
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6ba0e866179e4293923f743c70e18f523c7b4d5c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 10 Dec 2021 14:29:01 +0100
Subject: [PATCH 3662/4088] gwenview: update to 21.12.0.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 129f6cc3730e..88c1974e6d5c 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -16,4 +16,4 @@ 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=04e7bd26c07a87d8fd3baa2792eac5b8a8f58b362dc4e7e272ddc4e735100f1a
+checksum=0f711c51f8497591552785f77dc9afc7a632c6046abb96f10942daed8e2388f8

From 74899dc8144c1c6258976a7e96cd1651a7760806 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:17:00 +0100
Subject: [PATCH 3663/4088] nsd: update to 4.3.9.

---
 srcpkgs/nsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index fe9bab7c2a96..29dd0d4ac134 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.3.8
+version=4.3.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.nlnetlabs.nl/projects/nsd/"
 changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
 distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=11897e25f72f5a98f9202bd5378c936886d54376051a614d3688e451e9cb99e1
+checksum=531549f09289ecbd05829e14bb34563294d85b9edde2c613a00f597af2135e8d
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"

From a43811a83808f3f74f6a2d8992fdaa81e83b8deb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:18:04 +0100
Subject: [PATCH 3664/4088] unbound: update to 1.14.0.

---
 srcpkgs/unbound/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..0fadc12ae27e 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,6 +1,6 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
+version=1.14.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8
 system_accounts="_unbound"
 
 post_install() {

From 263664814a8acd5ef8b179268bdd47364d425046 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:23:49 +0100
Subject: [PATCH 3665/4088] wireguard-dkms: update to 1.0.20211208.

---
 srcpkgs/wireguard-dkms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireguard-dkms/template b/srcpkgs/wireguard-dkms/template
index b083e86a6a14..ed6aa026e171 100644
--- a/srcpkgs/wireguard-dkms/template
+++ b/srcpkgs/wireguard-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'wireguard-dkms'
 pkgname=wireguard-dkms
-version=1.0.20210606
+version=1.0.20211208
 revision=1
 wrksrc="wireguard-linux-compat-${version}"
 build_wrksrc="src"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.wireguard.com/"
 distfiles="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"
-checksum=3f5d990006e6eabfd692d925ec314fff2c5ee7dcdb869a6510d579acfdd84ec0
+checksum=c0e607138a17daac656f508d8e63ea3737b5221fa5d9288191ddeb099f5a3b92
 
 dkms_modules="wireguard ${version}"
 

From 3a02bc5fc31cc77bf38b87fccd0fc0358990b55c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:26:48 +0100
Subject: [PATCH 3666/4088] ugrep: update to 3.3.11.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 75826fd725ac..610564f3e659 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.10
+version=3.3.11
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=8cf74bdf254bac78c19385028bbf8678d83be35522d452b71d16105a1c4c57b8
+checksum=4a1c9cb0d2937d0dad5572c91af30e91829359289058dbd34315017638a3719e
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From be8fff4c0d131b5cbd9730d02060bbc22bd03d06 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:29:38 +0100
Subject: [PATCH 3667/4088] xlbiff: update to 4.5.6.

---
 srcpkgs/xlbiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index 34cff616327a..eb1c58789eed 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
 # Template file for 'xlbiff'
 pkgname=xlbiff
-version=4.5.5
+version=4.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.edsantiago.com/xlbiff/"
 distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=c773486518c7927ec01fc4eb3105087faae65c1e05447fedcc245b47d5ddfa46
+checksum=94a26679a2ed359e4f2ede12e7b43bb663d0247021f6aff4b7babb1085bfb34f
 
 pre_configure() {
 	autoreconf -fi

From 46d1f175b9bf99fc3e15a96b5e31bc51404d2abd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:29:40 +0100
Subject: [PATCH 3668/4088] k9s: update to 0.25.8.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 8785e10e8e4f..3d1fe84f8387 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.25.2
+version=0.25.8
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ 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=a2b73c9a34950db5ff7b6f4fed0cc961becd652a17acc9e5d5f00c816ccb0a39
+checksum=56a4939b18a1059b55823e3a34b27fef8863473dca6c901659506a79219dba8e
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From 17e7bf5a26aefbbba40fb91c1a8731af0550cab2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:31:18 +0100
Subject: [PATCH 3669/4088] mcelog: update to 180.

---
 srcpkgs/mcelog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index c22cd4cb966a..9bc39023a71e 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=179
+version=180
 revision=1
 archs="i686* x86_64*"
 conf_files="/etc/mcelog/mcelog.conf"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://www.mcelog.org/"
 distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=35b8c7686c1064c7f382b58d9992869b7434030cd994a2bbe1c5e846ec8b5ec7
+checksum=e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From 0c77b6e946e77ac0338e68f75c1dfadf46c4e619 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:34:00 +0100
Subject: [PATCH 3670/4088] perl-PDF-API2: update to 2.043.

---
 srcpkgs/perl-PDF-API2/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 6a33c3784841..b671d6cb4721 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.042
+version=2.043
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
-depends="perl"
-checkdepends="perl-Test-Exception"
+depends="perl perl-Font-TTF"
+checkdepends="${depends} perl-Test-Exception"
 short_desc="PDF::API2 - Facilitates the creation and modification of PDF files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=ab992941500601dc31a1a2fae6cde10f75531a880a2a3100c99d5560acd53c5d
+checksum=6312f605172973fa4d017639c217b61b1a8d6c533237ce58d5aacecfa273f0b2

From 8dc463113a71fd08f145bed98c752fce60639dc3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:36:41 +0100
Subject: [PATCH 3671/4088] stress-ng: update to 0.13.08.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index d7d2a027eaec..568e0ac23ba6 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.07
+version=0.13.08
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=f7c0a0d0f49c39ff9b1a45919741e60e770c7873851028f46b4bbefd1e8a4e74
+checksum=5dbb886f3926ef6c88e18cfd83c750f9fc11fb658f83b6eafcf22fd3a456cc8f

From dbd7fa955df1796c8ee8fdd50943f2beef268d66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:53:17 +0100
Subject: [PATCH 3672/4088] sysstat: update to 12.4.4.

---
 srcpkgs/sysstat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index dd1eda09a7a8..f244a26b5e4c 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,6 +1,6 @@
 # Template file for 'sysstat'
 pkgname=sysstat
-version=12.4.3
+version=12.4.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-copy-only --disable-file-attr
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://pagesperso-orange.fr/sebastien.godard/"
 distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=ae432431f45aacbcabacfbbe129e2505e215cafa9ce996d7550c6091a46f0bfd
+checksum=9512e7479e04f92e251c5c6b4bd94b8f643d212bd0e986a8ea4d147a6e943d24
 
 post_extract() {
 	vsed -i 's/lib64/lib/' configure

From 84636cb20dca5b4242764406fbd9b74c2999e476 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 14:54:57 +0100
Subject: [PATCH 3673/4088] tcsh: update to 6.23.01.

---
 srcpkgs/tcsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index 5c40904212e2..6fc75734638a 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
 # Template file for 'tcsh'
 pkgname=tcsh
-version=6.23.00
+version=6.23.01
 revision=1
 build_style=gnu-configure
 conf_files="/etc/csh.login /etc/csh.cshrc"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.tcsh.org/"
 distfiles="https://astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=4ebeb2f33633d115d9535f554c651a8523040d8d91e5de333fb2ee045b8e001e
+checksum=816c5204b9a0ee9ba88515a98af398fffd3f46fc8791943a1ff38d473055ba6d
 register_shell="/bin/tcsh /bin/csh"
 
 post_extract() {

From a2ca653492ae24c91766c647c9bb428daa0f59b2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 15:04:53 +0100
Subject: [PATCH 3674/4088] babashka: update to 0.7.0.

---
 srcpkgs/babashka/template | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index aba66be44069..2815d4e58cd8 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.6.7
+version=0.7.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,13 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=f3d2764b8f9fc14026c89e23d94fa2071ededcea
+changelog="https://github.com/babashka/babashka/blob/master/CHANGELOG.md"
+_sci_commit=573ee0e2f2ecdfc30f9f4b0d306626cacd6d3f06
 _babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df
-_babashka_nrepl_commit=eadb3330f0a65e781755d8b328727698f1d41fb0
+_babashka_nrepl_commit=e8e2273a8de6e8c45371e8ee8d5fa49e5d7dea02
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=cb12d2eea240fc1401feb9af2606a0847edfab10
+_process_commit=7847bdd56bb8db3293070a5c09b94dddc77c0155
 _pods_commit=f360afa6135b8bd2d384d9ba4582c0de6fdac804
-_deps_clj_commit=e06a1a450625a11409be0e2e8199415e0d2e51a9
+_deps_clj_commit=6f51f783a91b0cfab2663b55607b45e9e342bcb6
 _fs_commit=6019ec9cb09632fdf84e4bc5879fd47ed57a35eb
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
@@ -28,14 +29,14 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="2ec3ab92626ec42d681bb486e06ce784732401d404dfea32dbe5be23c26b3f5e
- 89bfee50868795b09551550b5156865623fec8435eea8b9e8f71ae0ffab362eb
+checksum="5bc8d1eb8340c7652f5317d75dd4f10d313b8c59b601ac5a509ef01de5c674ae
+ c91fe32b5e94223210179c24b484defc093352ce534e383ff8a8e7dcccc8b3de
  45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d
- 916d9cc8c0a3b895a72068b95c6ac985a65d30465a9d556af8acea20aaaacc42
+ bc6a65c9bad2ced362636fca54ee5105e12706bd7c4412edd64c0bb18af15b3e
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 510facf66f1b4404de0ab12a1093b85213cf396f5d061728315c95fc527ed96b
+ 06a4c394169655a7fac994a6d594462d8d272d1e23f532763521618c7476667e
  4070395956fc3cb0c22bac6fb4de1ad27130d24916e1915d8a3fe9eb591f6143
- c7ee5cfac6592885342897b3a2a2276385a3c40f0df61beee9c0e84e313b3469
+ 9a68d4ac03b400ff959c0bd07082a5f3011817e57c21cde26c35013729d1a545
  9bb9cb06a1a2a3cd2e9334e9e1082a510474760ed650c98b9650ceca41f4fa42
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
@@ -62,10 +63,6 @@ post_extract() {
 	mv ${wrksrc}/../fs-${_fs_commit} ${wrksrc}/fs
 }
 
-do_patch() {
-	vsed -i -e '/install native-image/d' script/compile
-}
-
 do_build() {
 	export GRAALVM_HOME=/usr/lib/jvm/mandrel11
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 7c35c64980c24391316e11e0743fced0063885c4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Dec 2021 15:05:55 +0100
Subject: [PATCH 3675/4088] xscope: update to 1.4.2.

---
 srcpkgs/xscope/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xscope/template b/srcpkgs/xscope/template
index 1d203c198fe7..fa4ee8e01601 100644
--- a/srcpkgs/xscope/template
+++ b/srcpkgs/xscope/template
@@ -1,7 +1,7 @@
 # Template build file for 'xscope'.
 pkgname=xscope
-version=1.4.1
-revision=3
+version=1.4.2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXt-devel"
@@ -9,8 +9,8 @@ short_desc="X Window Protocol Viewer"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=33807fbd51822435b23c28e7e78116e552826a6ca4d85632f098ad0ddf1ff423
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=507c107ce6969430b9d57441283a4278aecab656bf9d343a7a1ab56ec5ac4764
 
 post_install() {
 	vlicense COPYING

From ea57b93023832a9a4755cd5ed446c490826fb70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 10 Dec 2021 07:18:34 +0100
Subject: [PATCH 3676/4088] exiftool: update to 12.37.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index f92eee5d4f03..1c5133b213b7 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.36
+version=12.37
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=e95a8548a6cca3e8495b86a5652cb522fb8c06fe6a9ae15b6a59b92f3a3c7ca7
+checksum=1527d7de8037a7d547896d6e004724e815ac7f3a9e1754c2e9fe70e2687f0919

From 40d0d6615ac989974a844099ca3bfee5e2bd0a12 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Fri, 10 Dec 2021 21:40:56 +0700
Subject: [PATCH 3677/4088] vivaldi: update to 5.0.2497.28

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 1ef2335e9ebe..fae7f11b690b 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.0.2497.24
+version=5.0.2497.28
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=40f1cf35e6bd0e04e6bf9360f5179c85c68af403562a46358ea306e18080b32d
+checksum=9beb241951d58a1e4d2596a023c13c1169fba92e3822b01d5cdc5ff0b3ce6d54
 repository=nonfree
 restricted=yes
 nostrip=yes

From ab78bc96331698f50a8dea813228d92b15cf71ce Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 10 Dec 2021 09:45:38 +0400
Subject: [PATCH 3678/4088] calibre: update to 5.33.2.

---
 srcpkgs/calibre/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index f96c9329ace6..55adad369532 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.33.0
+version=5.33.2
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -18,7 +18,7 @@ depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
  python3-css-parser python3-cssselect python3-dateutil python3-jeepney
  python3-dnspython python3-feedparser python3-html5-parser python3-mechanize
  python3-msgpack python3-netifaces python3-psutil python3-regex python3-html2text
- python3-pychm python3-cchardet qt5-webengine speech-dispatcher"
+ python3-pychm python3-cchardet qt5-webengine speech-dispatcher python3-sgmllib"
 # should check if python3-pycryptodome is still needed
 checkdepends="${depends} libjpeg-turbo-tools jxrlib python3-pycryptodome"
 short_desc="Ebook management application"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=5c32cdd9cb7feecb125131842e3f66a8c9e838d7c5be6f016367de1a1d1f78fd
+checksum=c2db77b9c09a16af702e4efd09e0b3db4b4c33a01b2ed6782e7e93c4ec7476f2
 lib32disabled=yes
 nocross=yes
 

From a9d73a60a7fa182ae77acec106d545c0b3d23a04 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 9 Dec 2021 23:35:06 +0200
Subject: [PATCH 3679/4088] opensc: update to 0.22.0

---
 common/shlibs           | 2 +-
 srcpkgs/opensc/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b9a112357c07..2c0536f1550a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1702,7 +1702,7 @@ libBulletSoftBody.so.3.17 bullet-3.17_1
 libBullet3Common.so.3.17 bullet-3.17_1
 libinotifytools.so.0 libinotify-tools-3.14_2
 libfswatch.so.11 libfswatch-1.13.0_1
-libopensc.so.7 libopensc-0.21.0_2
+libopensc.so.8 libopensc-0.22.0_1
 libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1
 librtlsdr.so.0 librtlsdr-0.5.3_1
 libSDL2_mixer-2.0.so.0 SDL2_mixer-2.0.0_1
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 596cd849584f..8ae62b250231 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,7 +1,7 @@
 # Template file for 'opensc'
 pkgname=opensc
-version=0.21.0
-revision=2
+version=0.22.0
+revision=1
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/OpenSC/OpenSC/wiki"
 distfiles="https://github.com/OpenSC/OpenSC/archive/${version}.tar.gz"
-checksum=d4ee136d1b3a764868433da01857da7347de240e0c82545faa8659c2384ee43d
+checksum=138acf5724573d68bdfaf988bb05c00391edbfe262e69835813ed6bd00748c7a
 conf_files="/etc/opensc.conf"
 CFLAGS="-Wno-error=format-overflow"
 

From dd26694a9d7ce6607a540f3aef0c6fd41614b83d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 10 Dec 2021 18:50:10 +0100
Subject: [PATCH 3680/4088] mcelog: add missing hostmakedepends

---
 srcpkgs/mcelog/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 9bc39023a71e..9707998bd78b 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -3,6 +3,7 @@ pkgname=mcelog
 version=180
 revision=1
 archs="i686* x86_64*"
+hostmakedepends="python3"
 conf_files="/etc/mcelog/mcelog.conf"
 short_desc="Decode kernel machine check log on x86 machines"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b7d9ca67a210e4acb39ec81d7aff4efe148544c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 10 Dec 2021 14:58:54 -0300
Subject: [PATCH 3681/4088] glib: fix g_ascii_formatd indirectly.

This makes it so we use snprintf instead of their fallback float
formatting code, which fixes asserts caused by pango 1.5.0.
---
 srcpkgs/glib/patches/fix-formatd.patch | 86 ++++++++++++++++++++++++++
 srcpkgs/glib/template                  |  2 +-
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
new file mode 100644
index 000000000000..2249ff5a4506
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-formatd.patch
@@ -0,0 +1,86 @@
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
+
+Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
+available. This way, we can still use the _g_snprintf() path for some
+functions, and also use the *_l functions when they are available.
+
+newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
+functions being used are nonstandard glibc extensions. Gating all the
+locale functionality behind them meant we were using fallbacks on non
+glibc platforms unnecessarily.
+
+Further changes to this code could add fallback for the non _l suffixed
+number parsing functions, but that might be unnecessary complexity.
+
+Fixes #2553
+---
+ glib/gstrfuncs.c | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
+index ea710c7a1..e486251ab 100644
+--- a/glib/gstrfuncs.c
++++ b/glib/gstrfuncs.c
+@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
+ 
+ const guint16 * const g_ascii_table = ascii_table_data;
+ 
+-#if defined (HAVE_NEWLOCALE) && \
+-    defined (HAVE_USELOCALE) && \
+-    defined (HAVE_STRTOD_L) && \
+-    defined (HAVE_STRTOULL_L) && \
+-    defined (HAVE_STRTOLL_L)
++#if defined(HAVE_NEWLOCALE) && \
++    defined(HAVE_USELOCALE)
+ #define USE_XLOCALE 1
+ #endif
+ 
+@@ -731,7 +728,7 @@ gdouble
+ g_ascii_strtod (const gchar *nptr,
+                 gchar      **endptr)
+ {
+-#ifdef USE_XLOCALE
++#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
+ 
+   g_return_val_if_fail (nptr != NULL, 0);
+ 
+@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
+ #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
+ #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
+ 
+-#ifndef USE_XLOCALE
++#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
+ 
+ static guint64
+ g_parse_long_long (const gchar  *nptr,
+@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
+     }
+   return 0;
+ }
+-#endif /* !USE_XLOCALE */
++#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
+ 
+ /**
+  * g_ascii_strtoull:
+@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
+                   gchar      **endptr,
+                   guint        base)
+ {
+-#ifdef USE_XLOCALE
++#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
+   return strtoull_l (nptr, endptr, base, get_C_locale ());
+ #else
+   gboolean negative;
+@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
+                  gchar      **endptr,
+                  guint        base)
+ {
+-#ifdef USE_XLOCALE
++#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
+   return strtoll_l (nptr, endptr, base, get_C_locale ());
+ #else
+   gboolean negative;
+-- 
+2.34.1
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 34f6bc335ff3..5ada11809774 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
 version=2.70.0
-revision=2
+revision=3
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu

From 9c47bc6aa8252d8c8c1935341605683fa6e2d4fd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 26 Nov 2021 14:07:40 +0200
Subject: [PATCH 3682/4088] s6-man-pages: update to 2.11.0.0.4.

---
 srcpkgs/s6-man-pages/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
index 8c01b2e8883b..c1830cc15758 100644
--- a/srcpkgs/s6-man-pages/template
+++ b/srcpkgs/s6-man-pages/template
@@ -1,20 +1,17 @@
 # Template file for 's6-man-pages'
 pkgname=s6-man-pages
-version=2.11.0.0.2
+version=2.11.0.0.4
 revision=1
 build_style=gnu-makefile
-hostmakedepends="mdocml"
 short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/s6-man-pages"
 distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
-checksum=0936736aec214ee0be94ecafa6501003d5b36cd5e7e157a00b9d5caf27cd3682
+checksum=83d51bc0fd688dc48f84f1b80f55c9c9831a6c000902421947eed1eecfc102cd
 
-
-do_install() {
-	vmkdir usr/share/man/man1
+pre_install() {
 	vmkdir usr/share/man/man7
-	make MANPATH="${DESTDIR}/usr/share/man"
+	vmkdir usr/share/man/man8
 	vlicense LICENSE
 }

From fbed249eb88aee93022f01e86ea0562f0574c0e1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 26 Nov 2021 15:17:16 +0200
Subject: [PATCH 3683/4088] bc-gh: update to 5.2.1.

---
 srcpkgs/bc-gh/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index 33e0b0292762..8804980eb9c9 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,6 +1,6 @@
 # Template file for 'bc-gh'
 pkgname=bc-gh
-version=5.1.1
+version=5.2.1
 revision=1
 wrksrc="bc-${version}"
 short_desc="Implementation of POSIX bc with GNU extensions"
@@ -9,13 +9,15 @@ license="BSD-2-Clause"
 homepage="https://git.yzena.com/gavin/bc"
 changelog="https://git.yzena.com/gavin/bc/raw/branch/master/NEWS.md"
 distfiles="https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz"
-checksum=cfec5571216693537f9565073334be691717bfb762610cf1a06050e0f25aa94d
+checksum=bc031b68e5eafef37305697b76f6261abac4a94286e260fa339771f2484f1ecd
 alternatives="
  bc:bc:/usr/bin/bc-gh
  bc:bc.1:/usr/share/man/man1/bc-gh.1
  dc:dc:/usr/bin/dc-gh
  dc:dc.1:/usr/share/man/man1/dc-gh.1"
 
+# no translations in musl, because there is not a gencat binary there.
+
 do_configure() {
 	PREFIX=/usr DESTDIR="${DESTDIR}" EXECSUFFIX=-gh CC="${CC}" CFLAGS="${CFLAGS}" \
 	HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="${CFLAGS_FOR_BUILD}" ./configure.sh -GM \

From bb88f440deb4cd1fd5c065f11e6d5409003ee68e Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 00:25:34 +0300
Subject: [PATCH 3684/4088] polkit: update to 0.119.

---
 ...13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch | 27 -------------------
 srcpkgs/polkit/template                       | 12 ++++++---
 2 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/polkit/patches/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch

diff --git a/srcpkgs/polkit/patches/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch b/srcpkgs/polkit/patches/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch
deleted file mode 100644
index c4bea97d19f0..000000000000
--- a/srcpkgs/polkit/patches/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81 Mon Sep 17 00:00:00 2001
-From: Jan Rybar <jrybar@redhat.com>
-Date: Wed, 2 Jun 2021 15:43:38 +0200
-Subject: [PATCH] GHSL-2021-074: authentication bypass vulnerability in polkit
-
-initial values returned if error caught
----
- src/polkit/polkitsystembusname.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c
-index 8daa12c..8ed1363 100644
---- a/src/polkit/polkitsystembusname.c
-+++ b/src/polkit/polkitsystembusname.c
-@@ -435,6 +435,9 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName           *system_bus
-   while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error))
-     g_main_context_iteration (tmp_context, TRUE);
- 
-+  if (data.caught_error)
-+    goto out;
-+
-   if (out_uid)
-     *out_uid = data.uid;
-   if (out_pid)
--- 
-GitLab
-
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 01d31d7dc6ae..74f75c20c608 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit'
 pkgname=polkit
-version=0.118
-revision=2
+version=0.119
+revision=1
 build_style=gnu-configure
 build_helper=gir
 configure_args="$(vopt_enable gir introspection) -disable-static
@@ -17,8 +17,9 @@ short_desc="Authorization Toolkit"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/polkit"
+changelog="https://gitlab.freedesktop.org/polkit/polkit/-/raw/master/NEWS"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz"
-checksum=6d54e984e7072339f0d3147179e16e34e5fe0705158f259a765d772dcf78956b
+checksum=c8579fdb86e94295404211285fee0722ad04893f0213e571bd75c00972fd1f5c
 system_accounts="polkitd"
 #replaces="polkit-elogind>=0"
 #provides="polkit-elogind-${version}_${revision}"
@@ -27,6 +28,11 @@ system_accounts="polkitd"
 build_options="gir"
 build_options_default="gir"
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# see https://gitlab.freedesktop.org/polkit/polkit/-/issues/134
+	make_check=no
+fi
+
 pre_configure() {
 	autoreconf -fi
 	# Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF.

From 2078e7ac2b2ea3d9b553d797814ea6f15caa3222 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 10 Dec 2021 23:41:36 +0100
Subject: [PATCH 3685/4088] mdnsd: fix libmdnsd subpackage

Closes #34454
---
 srcpkgs/mdnsd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mdnsd/template b/srcpkgs/mdnsd/template
index 71f97e7ebdf0..5c0fde701f1a 100644
--- a/srcpkgs/mdnsd/template
+++ b/srcpkgs/mdnsd/template
@@ -1,13 +1,14 @@
 # Template file for 'mdnsd'
 pkgname=mdnsd
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config libtool"
 short_desc="Embeddable Multicast DNS Daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/troglobit/mdnsd"
+changelog="https://github.com/troglobit/mdnsd/raw/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/mdnsd/archive/v${version}.tar.gz"
 checksum=2e1a77fc9ff36e993a39b10016fe38723784ca7e3141ca00e4d6f43545d2988c
 
@@ -25,8 +26,7 @@ post_install() {
 }
 
 libmdnsd_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
+	short_desc+=" - library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 		vlicense LICENSE

From a6a4fccfe87339e7b49eba5bb763fe17cbf34fdc Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 23 Jul 2021 09:37:52 +0300
Subject: [PATCH 3686/4088] New package: perl-GD-2.73

---
 srcpkgs/perl-GD/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/perl-GD/template

diff --git a/srcpkgs/perl-GD/template b/srcpkgs/perl-GD/template
new file mode 100644
index 000000000000..0435909e928c
--- /dev/null
+++ b/srcpkgs/perl-GD/template
@@ -0,0 +1,18 @@
+# Template file for 'perl-GD'
+pkgname=perl-GD
+version=2.73
+revision=1
+wrksrc="GD-${version}"
+build_style=perl-module
+hostmakedepends="perl-ExtUtils-PkgConfig"
+makedepends="gd-devel"
+short_desc="Interface to Gd Graphics Library"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="Artistic-2.0, GPL-1.0-or-later"
+homepage="https://metacpan.org/pod/GD"
+distfiles="${CPAN_SITE}/GD/GD-${version}.tar.gz"
+checksum=491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b
+
+post_install() {
+	vlicense LICENSE
+}

From d6b7db5d60c440e4fe1fee78bf0e083756497473 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 15 Aug 2021 12:41:20 +0300
Subject: [PATCH 3687/4088] New package: perl-FCGI-0.82

---
 srcpkgs/perl-FCGI/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/perl-FCGI/template

diff --git a/srcpkgs/perl-FCGI/template b/srcpkgs/perl-FCGI/template
new file mode 100644
index 000000000000..01a5aad9da70
--- /dev/null
+++ b/srcpkgs/perl-FCGI/template
@@ -0,0 +1,19 @@
+# Template file for 'perl-FCGI'
+pkgname=perl-FCGI
+version=0.82
+revision=1
+wrksrc="FCGI-${version}"
+build_style=perl-module
+makedepends="fcgi-devel"
+short_desc="Fast CGI module"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/pod/FCGI"
+distfiles="${CPAN_SITE}/FCGI/FCGI-${version}.tar.gz"
+checksum=4c7d60e26da2c07f058a4e345021e92505273b33c9542215977e084611f09ecf
+# Test requires unpackaged module: FCGI::Client
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From a7a3ead12191ca7e6a73468ce8964388c652461a Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 20 Jul 2021 22:08:09 +0300
Subject: [PATCH 3688/4088] nginx: update to 1.20.1.

Closes: #32070 [via git-merge-pr]
---
 .../fix-libressl-stapling-issues.patch        | 27 -------------------
 srcpkgs/nginx/template                        | 21 ++++++++++++---
 2 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch

diff --git a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch b/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
deleted file mode 100644
index 4bb73f5ebb26..000000000000
--- a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5
---- a/src/event/ngx_event_openssl_stapling.c.org  2019-05-12 23:56:58.526833000 +0200
-+++ b/src/event/ngx_event_openssl_stapling.c      2019-05-13 01:31:53.737800000 +0200
-@@ -298,7 +298,10 @@
-     SSL_CTX_select_current_cert(ssl->ctx, cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+    /* OpenSSL 1.0.2+ */
-+    SSL_CTX_get0_chain_certs(ssl->ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-     /* OpenSSL 1.0.1+ */
-     SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
- #else
-@@ -655,7 +658,10 @@
-     SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+    /* OpenSSL 1.0.2+ */
-+    SSL_CTX_get0_chain_certs(staple->ssl_ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-     /* OpenSSL 1.0.1+ */
-     SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
- #else
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..23feed77caf5 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,16 +1,24 @@
 # Template file for 'nginx'
 pkgname=nginx
-version=1.18.0
-revision=6
+version=1.20.2
+revision=1
+_tests_commit=18ac4d9e5a2a
+create_wrksrc=yes
+build_wrksrc="nginx-${version}"
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
+checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://nginx.org"
-distfiles="https://nginx.org/download/nginx-${version}.tar.gz"
-checksum=4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
+distfiles="https://nginx.org/download/nginx-${version}.tar.gz
+ https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz"
+checksum="958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42
+ e34ef2f38512e1c04ee201c3b68f7ba7ec8f1537dc6a500278bc2219ab435228"
+# Tests fail when nginx run as root and there is no nginx user
+make_check=ci-skip
 
 # NOTE:
 # On update, the pregenerated header file for ARM may need synchronization.
@@ -94,6 +102,11 @@ pre_build() {
 	sed -i 's/-lcrypt/$(LDFLAGS) &/' objs/Makefile
 }
 
+do_check() {
+	TEST_NGINX_BINARY="$PWD/objs/nginx" \
+		prove -j ${XBPS_MAKEJOBS} "../${pkgname}-tests-${_tests_commit}"
+}
+
 post_install() {
 	sed -e 's|\<user\s\+\w\+;|user html;|g' \
 		-e '44s|html|/usr/share/nginx/html|' \

From 4a6c75201342107802210038b7c046bf6f9118b5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 11 Dec 2021 02:33:06 +0100
Subject: [PATCH 3689/4088] nginx: update cross build configuration, adopt

---
 srcpkgs/nginx/files/ngx_auto_config.h.aarch64 | 57 ++++++++++++++--
 srcpkgs/nginx/files/ngx_auto_config.h.armv6l  | 67 ++++++++++++++++---
 srcpkgs/nginx/template                        |  4 +-
 3 files changed, 109 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/nginx/files/ngx_auto_config.h.aarch64 b/srcpkgs/nginx/files/ngx_auto_config.h.aarch64
index 19056b8b0789..403700079535 100644
--- a/srcpkgs/nginx/files/ngx_auto_config.h.aarch64
+++ b/srcpkgs/nginx/files/ngx_auto_config.h.aarch64
@@ -1,4 +1,4 @@
-#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module"
+#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --with-compat --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module"
 
 #ifndef NGX_HAVE_GCC_ATOMIC
 #define NGX_HAVE_GCC_ATOMIC  1
@@ -40,6 +40,16 @@
 #endif
 
 
+#ifndef NGX_HAVE_EVENTFD
+#define NGX_HAVE_EVENTFD  1
+#endif
+
+
+#ifndef NGX_HAVE_SYS_EVENTFD_H
+#define NGX_HAVE_SYS_EVENTFD_H  1
+#endif
+
+
 #ifndef NGX_HAVE_O_PATH
 #define NGX_HAVE_O_PATH  1
 #endif
@@ -268,11 +278,6 @@
 #endif
 
 
-#ifndef NGX_SYS_NERR
-#define NGX_SYS_NERR  1000
-#endif
-
-
 #ifndef NGX_HAVE_LOCALTIME_R
 #define NGX_HAVE_LOCALTIME_R  1
 #endif
@@ -453,6 +458,46 @@
 #endif
 
 
+#ifndef NGX_COMPAT
+#define NGX_COMPAT  1
+#endif
+
+
+#ifndef NGX_HTTP_GZIP
+#define NGX_HTTP_GZIP  1
+#endif
+
+
+#ifndef NGX_HTTP_DAV
+#define NGX_HTTP_DAV  1
+#endif
+
+
+#ifndef NGX_HTTP_REALIP
+#define NGX_HTTP_REALIP  1
+#endif
+
+
+#ifndef NGX_HTTP_X_FORWARDED_FOR
+#define NGX_HTTP_X_FORWARDED_FOR  1
+#endif
+
+
+#ifndef NGX_HTTP_HEADERS
+#define NGX_HTTP_HEADERS  1
+#endif
+
+
+#ifndef NGX_HTTP_UPSTREAM_ZONE
+#define NGX_HTTP_UPSTREAM_ZONE  1
+#endif
+
+
+#ifndef NGX_STREAM_UPSTREAM_ZONE
+#define NGX_STREAM_UPSTREAM_ZONE  1
+#endif
+
+
 #ifndef NGX_PCRE
 #define NGX_PCRE  1
 #endif
diff --git a/srcpkgs/nginx/files/ngx_auto_config.h.armv6l b/srcpkgs/nginx/files/ngx_auto_config.h.armv6l
index f32af78d12ba..ab1be86207e6 100644
--- a/srcpkgs/nginx/files/ngx_auto_config.h.armv6l
+++ b/srcpkgs/nginx/files/ngx_auto_config.h.armv6l
@@ -1,9 +1,4 @@
-#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module"
-
-#ifndef NGX_COMPILER
-#define NGX_COMPILER  "gcc 9.2.0 (GCC) "
-#endif
-
+#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --with-compat --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module"
 
 #ifndef NGX_HAVE_GCC_ATOMIC
 #define NGX_HAVE_GCC_ATOMIC  1
@@ -45,6 +40,16 @@
 #endif
 
 
+#ifndef NGX_HAVE_EVENTFD
+#define NGX_HAVE_EVENTFD  1
+#endif
+
+
+#ifndef NGX_HAVE_SYS_EVENTFD_H
+#define NGX_HAVE_SYS_EVENTFD_H  1
+#endif
+
+
 #ifndef NGX_HAVE_O_PATH
 #define NGX_HAVE_O_PATH  1
 #endif
@@ -273,11 +278,6 @@
 #endif
 
 
-#ifndef NGX_SYS_NERR
-#define NGX_SYS_NERR  135
-#endif
-
-
 #ifndef NGX_HAVE_LOCALTIME_R
 #define NGX_HAVE_LOCALTIME_R  1
 #endif
@@ -328,6 +328,11 @@
 #endif
 
 
+#ifndef NGX_HAVE_FIONREAD
+#define NGX_HAVE_FIONREAD  1
+#endif
+
+
 #ifndef NGX_HAVE_GMTOFF
 #define NGX_HAVE_GMTOFF  1
 #endif
@@ -453,6 +458,46 @@
 #endif
 
 
+#ifndef NGX_COMPAT
+#define NGX_COMPAT  1
+#endif
+
+
+#ifndef NGX_HTTP_GZIP
+#define NGX_HTTP_GZIP  1
+#endif
+
+
+#ifndef NGX_HTTP_DAV
+#define NGX_HTTP_DAV  1
+#endif
+
+
+#ifndef NGX_HTTP_REALIP
+#define NGX_HTTP_REALIP  1
+#endif
+
+
+#ifndef NGX_HTTP_X_FORWARDED_FOR
+#define NGX_HTTP_X_FORWARDED_FOR  1
+#endif
+
+
+#ifndef NGX_HTTP_HEADERS
+#define NGX_HTTP_HEADERS  1
+#endif
+
+
+#ifndef NGX_HTTP_UPSTREAM_ZONE
+#define NGX_HTTP_UPSTREAM_ZONE  1
+#endif
+
+
+#ifndef NGX_STREAM_UPSTREAM_ZONE
+#define NGX_STREAM_UPSTREAM_ZONE  1
+#endif
+
+
 #ifndef NGX_PCRE
 #define NGX_PCRE  1
 #endif
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 23feed77caf5..4c946a910766 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.20.2
-revision=1
+revision=2
 _tests_commit=18ac4d9e5a2a
 create_wrksrc=yes
 build_wrksrc="nginx-${version}"
@@ -10,7 +10,7 @@ hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which"
 short_desc="High performance web and reverse proxy server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://nginx.org"
 distfiles="https://nginx.org/download/nginx-${version}.tar.gz

From 80ea5b55ca0da9744ccf5ecb0588828dff2aa626 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 9 Dec 2021 21:39:01 +0100
Subject: [PATCH 3690/4088] fcft: update to 2.5.1.

---
 srcpkgs/fcft/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index e39da0ee4dde..4f78c6b67d07 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,10 +1,11 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.5.0
+version=2.5.1
 revision=1
 wrksrc=$pkgname
 build_style=meson
-configure_args="-Drun-shaping=$(vopt_if textshaping enabled disabled)"
+configure_args="-Drun-shaping=$(vopt_if textshaping enabled disabled)
+ -Ddocs=enabled"
 hostmakedepends="pkg-config scdoc"
 makedepends="fontconfig-devel freetype-devel pixman-devel tllist
  $(vopt_if textshaping harfbuzz-devel)
@@ -14,7 +15,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=58663c684f04154674c52551daa604618e0bb3db6c62492b06b13768fb4f4b3c
+checksum=1b9e9346c884f16bce9548806ea89c5e34ccc98ce27ec6ecff1f5011235de112
 
 build_options="textshaping"
 build_options_default="textshaping"

From 74ca963618726c2f50a6293d0f29e149af414437 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 9 Dec 2021 21:41:52 +0100
Subject: [PATCH 3691/4088] foot: update to 1.10.3.

---
 srcpkgs/foot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index 3e5a04bfc7bb..1863441239cb 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.10.2
+version=1.10.3
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/foot"
 changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=49ad179d5815bf76f8ccdd869b28ce56e3cb5aab8e73e45b09c7510d4a5086d7
+checksum=24f57d9926ead7bea491f1bdd97eaceae5fdc10c1cb3435ee588a8f9c9af805a
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE

From 87261178d17b2c4651090036b2af43cf434f2db3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 10 Dec 2021 20:42:20 +0200
Subject: [PATCH 3692/4088] opera: update to 82.0.4227.23.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index d7a461625e79..1fb8f4a29a6f 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=81.0.4196.60
+version=82.0.4227.23
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
-checksum=e72f4030dcdbb1e47fceb3122428406bbb12232c358ccd612c247cda6525c444
+checksum=fafbba41f99960f8c824bfdb41d813d8e66a3e9c7e9f772bd796d0fdd0ccf52e
 repository="nonfree"
 nostrip=yes
 

From b5b47baa56fdaa75f39ad6dcff355d564deff4e9 Mon Sep 17 00:00:00 2001
From: Dakota Walsh <kota@nilsu.org>
Date: Sat, 11 Dec 2021 12:30:07 +1300
Subject: [PATCH 3693/4088] amfora: update to 1.9.2.

---
 srcpkgs/amfora/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 35126aae9a41..505f1ba84141 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,6 +1,6 @@
 # Template file for 'amfora'
 pkgname=amfora
-version=1.8.0
+version=1.9.2
 revision=1
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
@@ -10,7 +10,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/makeworld-the-better-one/amfora"
 changelog="https://raw.githubusercontent.com/makeworld-the-better-one/amfora/master/CHANGELOG.md"
 distfiles="https://github.com/makeworld-the-better-one/${pkgname}/archive/v${version}.tar.gz"
-checksum=2cf95009ee9b70e46f92ea6346d4f615df2c163b27182ec0e62bf67fb9f9544c
+checksum=81bb4605920955ddbeb0e7236be4f89979ab543fd41b34ea4a4846ac947147e2
 
 post_install() {
 	vinstall amfora.desktop 644 usr/share/applications/

From d1400e151893f6feac002306034a3dba4461d672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 10 Dec 2021 11:22:35 +0100
Subject: [PATCH 3694/4088] dunst: update to 1.7.3.

---
 srcpkgs/dunst/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index 3c3d9f5107bd..a54b1cd62168 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,6 +1,6 @@
 # Template file for 'dunst'
 pkgname=dunst
-version=1.7.2
+version=1.7.3
 revision=1
 build_style=gnu-makefile
 make_check_target=test
@@ -18,7 +18,7 @@ license="BSD-3-Clause"
 homepage="https://dunst-project.org"
 changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
 distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=e4fa376d327e8a4cd375d00d4c318c93cc0968d4f184ab40da94ca6b30477181
+checksum=150c782690286e163663b0eb2605b733927240159738b8365808b851e0afbbee
 
 build_options="wayland"
 build_options_default="wayland"

From 0818a88c954936b7f48d5f79cd3fa2814b7d98e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 10 Dec 2021 15:16:53 +0100
Subject: [PATCH 3695/4088] go: update to 1.17.5.

---
 srcpkgs/go/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index cc66dc6c7f46..38be9438b0e8 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,7 +1,7 @@
 # Template file for 'go'
 pkgname=go
-version=1.17.2
-revision=2
+version=1.17.5
+revision=1
 create_wrksrc=yes
 build_wrksrc=go
 hostmakedepends="go1.12-bootstrap"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2255eb3e4e824dd7d5fcdc2e7f84534371c186312e546fb1086a34c17752f431
+checksum=3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d
 nostrip=yes
 noverifyrdeps=yes
 

From 33e7fdbf5bafdc86266cdbb3494454729e01c105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 7 Dec 2021 00:46:51 +0100
Subject: [PATCH 3696/4088] element-desktop: update to 1.9.6.

---
 ...s-compilation-on-a-bunch-of-targets.patch} | 34 ++++++++++++-------
 srcpkgs/element-desktop/template              |  8 ++---
 2 files changed, 25 insertions(+), 17 deletions(-)
 rename srcpkgs/element-desktop/patches/{0001-support-more-architectures.patch => 0001-Fixes-compilation-on-a-bunch-of-targets.patch} (85%)

diff --git a/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
similarity index 85%
rename from srcpkgs/element-desktop/patches/0001-support-more-architectures.patch
rename to srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
index 2482b46ffd7b..869dca38b8a4 100644
--- a/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch
+++ b/srcpkgs/element-desktop/patches/0001-Fixes-compilation-on-a-bunch-of-targets.patch
@@ -1,23 +1,28 @@
-commit 6253d67b13db2bd075fb6f17e8fffc92efd7fdee
-Author: Jan Christian Grünhage <jan.christian@gruenhage.xyz>
-Date:   Tue Aug 17 17:33:02 2021 +0200
+From bc552079ad526a8b7da12c091e384d640407c7ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Tue, 17 Aug 2021 17:33:02 +0200
+Subject: [PATCH] Fixes compilation on a bunch of targets
 
-    Fixes compilation on a bunch of targets
-    
-    Considering that this changes generated files, I've not submitted this
-    patch directly. Instead, the original source has received a PR over at
-    https://github.com/vector-im/element-builder/pull/58.
+Considering that this changes generated files, I've not submitted this
+patch directly. Instead, the original source has received a PR over at
+https://github.com/vector-im/element-builder/pull/58.
+---
+ package.json          |  1 +
+ scripts/hak/target.js | 82 +++++++++++++++++++++++++++++++++++++------
+ yarn.lock             |  2 +-
+ 3 files changed, 74 insertions(+), 11 deletions(-)
 
 diff --git a/package.json b/package.json
-index 4dd59aa..141705b 100644
+index c958137..3b371d2 100644
 --- a/package.json
 +++ b/package.json
 @@ -57,6 +57,7 @@
-     "allchange": "^1.0.0",
+     "allchange": "^1.0.6",
      "asar": "^2.0.1",
      "chokidar": "^3.5.2",
 +    "detect-libc": "^1.0.3",
-     "electron": "^13.1.9",
+     "electron": "13.5",
      "electron-builder": "22.11.4",
      "electron-builder-squirrel-windows": "22.11.4",
 diff --git a/scripts/hak/target.js b/scripts/hak/target.js
@@ -144,10 +149,10 @@ index 0a965fc..07349fc 100644
  exports.getHost = getHost;
  function isHostId(id) {
 diff --git a/yarn.lock b/yarn.lock
-index 37690bb..7e112a8 100644
+index ae661ba..782282f 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -1775,7 +1775,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
+@@ -1778,7 +1778,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
    resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
    integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
  
@@ -156,3 +161,6 @@ index 37690bb..7e112a8 100644
    version "1.0.3"
    resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
    integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+-- 
+2.34.1
+
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 40d06208f9d2..9f6a02244ffc 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.8.4
+version=1.9.6
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,15 +18,15 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="3a972531c40da5de922824667ea048f16ee407800b26327542cac1d81357b44f
- 2752b88227c17dfcd3b207db88aba08375f9751851f2ea549115fac7a517a18a"
+checksum="420ac62f306a522170aede01b807aa4b406c7f1e1377165f455851b220c32f7b
+ 07c5575c79a5ddb2a3750528286cfe90ceeb32d985a88eb2b55452d7902e351e"
 
 patch_args="-Np1 -d ../${pkgname}-${version}"
 
 export USE_SYSTEM_APP_BUILDER=true
 
 pre_patch() {
-	ln -s ../element-web-${version}/0001-support-more-architectures.patch ../element-desktop-${version}/
+	ln -s ../element-web-${version}/0001-Fixes-compilation-on-a-bunch-of-targets.patch ../element-desktop-${version}/
 }
 
 pre_build() {

From f939a52fe5fced7a844ac28edffb42ca31aa5682 Mon Sep 17 00:00:00 2001
From: Hilton Chain <26847027+rakino@users.noreply.github.com>
Date: Tue, 7 Dec 2021 11:52:33 +0800
Subject: [PATCH 3697/4088] proxychains-ng: update to 4.15.

---
 srcpkgs/proxychains-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/proxychains-ng/template b/srcpkgs/proxychains-ng/template
index 4f9cfa8f74e6..3cbb9a335e93 100644
--- a/srcpkgs/proxychains-ng/template
+++ b/srcpkgs/proxychains-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'proxychains-ng'
 pkgname=proxychains-ng
-version=4.14
+version=4.15
 revision=1
 build_style=gnu-configure
 make_install_target="install install-config"
@@ -10,4 +10,4 @@ maintainer="David <kalichakra@zoho.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rofl0r/proxychains-ng"
 distfiles="http://ftp.barfooze.de/pub/sabotage/tarballs/${pkgname}-${version}.tar.xz"
-checksum=9d00e035b8a808b9e0c750501b08f38eeadd0be421f30ee83e88fd15e872b0ae
+checksum=3207ab7f1f053c3fdcdf5ac158bcdef0683e3b7d8427b602ce9c0abe6a369081

From 112a115acd6773d5f7e94c37aab969b667822599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:20 -0300
Subject: [PATCH 3698/4088] texlive: update to 20210325.

For ownership.txt changes:

- all files using the texlive version were identical between packages
- tikztosvg had more features in texlive-pictures
---
 .../build-style/texmf/ownership.txt           |  6 +++
 srcpkgs/texlive/patches/tlmgr.patch           | 44 +++++++------------
 srcpkgs/texlive/template                      | 18 +++-----
 3 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/common/environment/build-style/texmf/ownership.txt b/common/environment/build-style/texmf/ownership.txt
index 0f41d75e2055..01dcd2f0cc6f 100644
--- a/common/environment/build-style/texmf/ownership.txt
+++ b/common/environment/build-style/texmf/ownership.txt
@@ -20,6 +20,7 @@ scripts/accfonts/mkt1font texlive
 scripts/accfonts/vpl2ovp texlive
 scripts/accfonts/vpl2vpl texlive
 scripts/adhocfilelist/adhocfilelist.sh texlive
+scripts/albatross/albatross.sh texlive
 scripts/arara/arara.sh texlive
 scripts/attachfile2/pdfatfi.pl texlive
 scripts/authorindex/authorindex texlive
@@ -71,8 +72,10 @@ scripts/fontools/autoinst texlive
 scripts/fontools/ot2kpx texlive
 scripts/fragmaster/fragmaster.pl texlive
 scripts/getmap/getmapdl.lua texlive
+scripts/git-latexdiff/git-latexdiff texlive
 scripts/glossaries/makeglossaries-lite.lua texlive
 scripts/glossaries/makeglossaries texlive
+scripts/hyperxmp/hyperxmp-add-bytecount.pl texlive
 scripts/installfont/installfont-tl texlive
 scripts/jfmutil/jfmutil.pl texlive
 scripts/ketcindy/ketcindy.pl texlive
@@ -91,6 +94,7 @@ scripts/latexindent/latexindent.pl texlive
 scripts/latexmk/latexmk.pl texlive
 scripts/latexpand/latexpand texlive
 scripts/latex-papersize/latex-papersize.py texlive
+scripts/light-latex-make/llmk.lua texlive
 scripts/lilyglyphs/lily-glyph-commands.py texlive-music
 scripts/lilyglyphs/lily-image-commands.py texlive-music
 scripts/lilyglyphs/lily-rebuild-pdfs.py texlive-music
@@ -122,6 +126,7 @@ scripts/pdfxup/pdfxup texlive
 scripts/pedigree-perl/pedigree.pl texlive-pstricks
 scripts/perltex/perltex.pl texlive
 scripts/petri-nets/pn2pdf texlive
+scripts/tikztosvg/tikztosvg texlive-pictures
 scripts/pfarrei/a5toa4.tlu texlive
 scripts/pfarrei/pfarrei.tlu texlive
 scripts/pkfix-helper/pkfix-helper texlive
@@ -144,6 +149,7 @@ scripts/pythontex/depythontex.py texlive
 scripts/pythontex/pythontex.py texlive
 scripts/rubik/rubikrotation.pl texlive-games
 scripts/simpdftex/simpdftex texlive
+scripts/spix/spix.py texlive
 scripts/splitindex/splitindex.pl texlive
 scripts/srcredact/srcredact.pl texlive
 scripts/sty2dtx/sty2dtx.pl texlive
diff --git a/srcpkgs/texlive/patches/tlmgr.patch b/srcpkgs/texlive/patches/tlmgr.patch
index ef3ae26e7368..b4c1c02e8943 100644
--- a/srcpkgs/texlive/patches/tlmgr.patch
+++ b/srcpkgs/texlive/patches/tlmgr.patch
@@ -11,26 +11,21 @@ Modified by fosslinux.
 
 --- a/texk/texlive/linked_scripts/texlive/tlmgr.pl
 +++ b/texk/texlive/linked_scripts/texlive/tlmgr.pl
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@ $datrev =~ s/^.*Date: //;
+ $datrev =~ s/ \(.*$//;
  $tlmgrversion = "$tlmgrrevision ($datrev)";
  
- our $Master;
--our $ismain;
-+our $ismain = 1;
+-our $Master;
++our $Master = "/usr/share/texmf-dist";
  our $loadmediasrcerror;
  our $packagelogfile;
  our $packagelogged;
-@@ -41,50 +41,8 @@
+@@ -39,38 +39,9 @@ END {
+ }
  
  BEGIN {
-   $^W = 1;
--  $ismain = (__FILE__ eq $0);
--  # WARNING
--  # The only use anticipated for tlmgr.pl as library for the 2009 release
--  # is the Windows w32client prototype script.
--  # Unix-specific problems with use as library will probably go undetected.
--
--  # make subprograms (including kpsewhich) have the right path:
+-  $^W = 1;
+   # make subprograms (including kpsewhich) have the right path:
 -  my $kpsewhichname;
 -  if ($^O =~ /^MSWin/i) {
 -    # on w32 $0 and __FILE__ point directly to tlmgr.pl; they can be relative
@@ -44,14 +39,8 @@ Modified by fosslinux.
 -  } else {
 -    $Master = __FILE__;
 -    $Master =~ s,/*[^/]*$,,;
--    if ($ismain) {
--      $bindir = $Master;
--      $Master = "$Master/../..";
--    } else {
--      # for the time being, this code will not be used or tested
--      $Master = "$Master/../../..";
--      # no code yet for $bindir; would have to detect platform
--    }
+-    $bindir = $Master;
+-    $Master = "$Master/../..";
 -    # make subprograms (including kpsewhich) have the right path:
 -    $ENV{"PATH"} = "$bindir:$ENV{PATH}";
 -    $kpsewhichname = "kpsewhich";
@@ -67,13 +56,12 @@ Modified by fosslinux.
 -    die ("Could not determine directory of tlmgr executable, "
 -         . "maybe shared library woes?\nCheck for error messages above");
 -  }
--
-+  
-+  $Master = "/usr/share/texmf-dist";
++  $bindir = $Master;
++  $ENV{"PATH"} = "$bindir:$ENV{PATH}";
+ 
    $::installerdir = $Master;  # for config.guess et al., see TLUtils.pm
  
-   # make Perl find our packages first:
-@@ -621,6 +579,13 @@
+@@ -615,6 +586,13 @@ for the full story.\n";
      tldie("$prg: Try --help if you need it.\n");
    }
  
@@ -87,7 +75,7 @@ Modified by fosslinux.
    #
    # the main tree we will be working on
    $::maintree = $Master;
-@@ -6099,7 +6064,9 @@
+@@ -6118,7 +6096,9 @@ sub action_postaction {
  # sets up the user tree for tlmgr in user mode
  sub action_init_usertree {
    # init_local_db but do not die if localtlpdb is not found!
@@ -98,7 +86,7 @@ Modified by fosslinux.
    my $tlpdb = TeXLive::TLPDB->new;
    my $usertree;
    if ($opts{"usertree"}) {
-@@ -6739,7 +6706,11 @@
+@@ -6758,7 +6738,11 @@ sub init_local_db {
      if ($should_i_die == 2) {
        return undef;
      } else {
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..7c1a5079c774 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
-version=20200406
-revision=10
+version=20210325
+revision=1
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
@@ -47,6 +47,7 @@ configure_args="
  --disable-ttf2pk2
  --disable-vlna
  --disable-xindy
+ --disable-xpdfopen
  --with-ps=gs
  --with-banner-add=/VoidLinux
  --with-system-cairo
@@ -62,7 +63,6 @@ configure_args="
  --with-system-poppler
  --with-system-pixman
  --with-system-teckit
- --with-system-xpdf
  --with-system-zlib
  --with-system-zziplib
  --with-xdvi-x-toolkit=Xaw"
@@ -71,13 +71,13 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel
  harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
  poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel
  libXaw-devel"
-depends="dialog ghostscript perl-Tk texlive-core xbps-triggers>=0.119_1"
+depends="dialog ghostscript perl-Tk texlive-core xbps-triggers"
 short_desc="TeX Live"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="https://www.tug.org/texlive/"
-distfiles="ftp://tug.org/texlive/historic/2020/texlive-${version}-source.tar.xz"
-checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+homepage="https://tug.org/texlive/"
+distfiles="ftp://tug.org/texlive/historic/2021/texlive-${version}-source.tar.xz"
+checksum=7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
 python_version=3
 # Virtual package cares only about year part of version
 provides="tex-${version%${version#????}}_1"
@@ -134,10 +134,6 @@ esac
 export DASM_ARCH
 
 post_extract() {
-	# pdftex poppler compatibility
-	cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.86.0,}.cc
-	cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc
-
 	mkdir -p "${build_wrksrc}"
 	cp -rf texk/web2c "${build_wrksrc}/web2c-host"
 }

From 240a7e9e95188bcfe14a5dde2a812cb57dc262d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:21 -0300
Subject: [PATCH 3699/4088] texlive-basic: update to 2021.0.

---
 srcpkgs/texlive-basic/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/texlive-basic/template b/srcpkgs/texlive-basic/template
index 68af65f2c705..f00aacdb39a5 100644
--- a/srcpkgs/texlive-basic/template
+++ b/srcpkgs/texlive-basic/template
@@ -1,15 +1,16 @@
 # Template file for 'texlive-basic'
 pkgname=texlive-basic
-version=2020.1
+version=2021.0
 revision=1
 build_style=meta
-depends="texlive>=20200406
- texlive-BibTeX>=20200406
- texlive-LuaTeX>=20200406
- texlive-dvi>=20200406
- texlive-core>=2020.57066
- texlive-latexextra>=2020.57067
- texlive-pictures>=2020.57065"
+_year=${version%.*}
+depends="texlive>=20210325
+ texlive-BibTeX>=20210325
+ texlive-LuaTeX>=20210325
+ texlive-dvi>=20210325
+ texlive-core>=${_year}
+ texlive-latexextra>=${_year}
+ texlive-pictures>=${_year}"
 short_desc="TeX Live - Metapackage including some simple packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"

From c51b49095ea0252db37f2a43c0c02a2b2bef3dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:21 -0300
Subject: [PATCH 3700/4088] texlive-bibtexextra: update to 2021.58697.

---
 srcpkgs/texlive-bibtexextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-bibtexextra/template b/srcpkgs/texlive-bibtexextra/template
index fe9d2fa2681d..0d7b57159892 100644
--- a/srcpkgs/texlive-bibtexextra/template
+++ b/srcpkgs/texlive-bibtexextra/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-bibtexextra'
 pkgname=texlive-bibtexextra
-version=2020.56991
+version=2021.58697
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Additional BibTeX styles and bibliography databases"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=29ac4e1ab0447832a6847abf4a4f2a034ff4deae339fe9c118aef1bc95c02b49
+checksum=d65aa2a12df851e9ddca879f6502a15a52ece9d33c803d4c0d0227fcc785a1c9

From 0ece95e07fdc3b09eb3c7def37cd79ea0fca7f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:22 -0300
Subject: [PATCH 3701/4088] texlive-core: update to 2021.58710.

---
 srcpkgs/texlive-core/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-core/template b/srcpkgs/texlive-core/template
index b330bfc6c2bc..2289356f9142 100644
--- a/srcpkgs/texlive-core/template
+++ b/srcpkgs/texlive-core/template
@@ -1,11 +1,11 @@
 # Template file for 'texlive-core'
 pkgname=texlive-core
-version=2020.57066
+version=2021.58710
 revision=1
 build_style="texmf"
 short_desc="TeX Live - core texmf distribution"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive"
+homepage="https://tug.org/texlive"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=b3280ddd2b2c8d41dba3784ba41b755e317e5352868015fe1f70a16b24f5dde9
+checksum=ef11a19ca15f3e937733ed9e17cc024afaf525afdf3d649c9ae4261f1bfb4415

From 4502ff52454c128fdfd514ea4635af1eafecbc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:22 -0300
Subject: [PATCH 3702/4088] texlive-fontsextra: update to 2021.58704.

---
 srcpkgs/texlive-fontsextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-fontsextra/template b/srcpkgs/texlive-fontsextra/template
index ea129fa90f8c..3de281b7428b 100644
--- a/srcpkgs/texlive-fontsextra/template
+++ b/srcpkgs/texlive-fontsextra/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-fontsextra'
 pkgname=texlive-fontsextra
-version=2020.57042
+version=2021.58704
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - All sorts of extra fonts"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=88a46fc20ec4522bb825aad3b8792ad1494933b2dcbeee4e6b746e1a264352fb
+checksum=4e1647ea20536d336120c2885af3f7677d9e483ce7f397c1c4404e31fc5fc0aa

From 55805044f92b1d96e8ea66263f6bb0bdb3940f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:23 -0300
Subject: [PATCH 3703/4088] texlive-formatsextra: update to 2021.57972.

---
 srcpkgs/texlive-formatsextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-formatsextra/template b/srcpkgs/texlive-formatsextra/template
index fee99a62cd6e..d3042a9b2038 100644
--- a/srcpkgs/texlive-formatsextra/template
+++ b/srcpkgs/texlive-formatsextra/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-formatsextra'
 pkgname=texlive-formatsextra
-version=2020.56699
+version=2021.57972
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Collection of extra TeX 'formats'"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=ead7b2f6674f0db9b35db6ad89c13dead0831f7782999b7fdd921937ffec8352
+checksum=641660f85062d70d715b11e8bd404558d1618a02ce95e1d54792f01e3aa8b80a

From 3b4288b51e97782457eddd138122aa9bb8f5c640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:24 -0300
Subject: [PATCH 3704/4088] texlive-games: update to 2021.56833.

---
 srcpkgs/texlive-games/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-games/template b/srcpkgs/texlive-games/template
index 682791ab0e36..ecaffb00fd8d 100644
--- a/srcpkgs/texlive-games/template
+++ b/srcpkgs/texlive-games/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-games'
 pkgname=texlive-games
-version=2020.56833
+version=2021.56833
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Typesetting board games"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=c11db61e7daf90f815a606df357da480479d300ebe7606179f67ca8c13fedc27
+checksum=9d808f5ecbc8a00d3b2fabef627e4ae0ac026c9eb54d6b02f2efeed486aea54b

From f53c086c5966b310a82972ca50025be0dcf14b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:24 -0300
Subject: [PATCH 3705/4088] texlive-humanities: update to 2021.58589.

---
 srcpkgs/texlive-humanities/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-humanities/template b/srcpkgs/texlive-humanities/template
index 4623280a8914..67a66171b548 100644
--- a/srcpkgs/texlive-humanities/template
+++ b/srcpkgs/texlive-humanities/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-humanities'
 pkgname=texlive-humanities
-version=2020.57034
+version=2021.58589
 revision=1
 build_style="texmf"
 depends="texlive-core texlive-latexextra texlive-pictures"
 short_desc="TeX Live - Packages for humanities, law, linguistics, etc"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=9eecd63565d7ab550fa7f82f10f4f1bbb523c501e987c3eef051426e5927ed70
+checksum=a2688733e66ba324154ee9715327f4cdb26e7c19283a38d03f086e1b3f123e9f

From efc30509ace8c067409eda064e96c1f0cae4b2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:25 -0300
Subject: [PATCH 3706/4088] texlive-langchinese: update to 2021.58583.

---
 srcpkgs/texlive-langchinese/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langchinese/template b/srcpkgs/texlive-langchinese/template
index 9b10e8751d56..387b14ef7cbe 100644
--- a/srcpkgs/texlive-langchinese/template
+++ b/srcpkgs/texlive-langchinese/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-langchinese'
 pkgname=texlive-langchinese
-version=2020.57044
+version=2021.58583
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Chinese"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=635ff96a2373caca1c4b927ba54d6fd1bd3ee629dc9279be768021eb8fe1c93f
+checksum=61c476961b3e4d2cc8e95fe68b8ade9a4e692abe644190c1b34adfb58c2f8f8b

From 5a0f2a2f5f2a358c2a4ffa0f32cde3e5d25be959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:26 -0300
Subject: [PATCH 3707/4088] texlive-langcyrillic: update to 2021.58426.

---
 srcpkgs/texlive-langcyrillic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langcyrillic/template b/srcpkgs/texlive-langcyrillic/template
index 6ab9170e30d1..67c0592949fb 100644
--- a/srcpkgs/texlive-langcyrillic/template
+++ b/srcpkgs/texlive-langcyrillic/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-langcyrillic'
 pkgname=texlive-langcyrillic
-version=2020.56674
+version=2021.58426
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Cyrillic text"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=b20e99fd5a7f48e0024fc2e2bb2609d28eb9a74e5b2abee1843e680632833cf9
+checksum=9dbab28a29c74164f336f38d735277b46ae837492a6fe417b96345620979db7f

From bc9fe5514d5c7f450573dd76347b443a6ce001ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:26 -0300
Subject: [PATCH 3708/4088] texlive-langextra: update to 2021.58019.

---
 srcpkgs/texlive-langextra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langextra/template b/srcpkgs/texlive-langextra/template
index a66c38aa338a..d527ba24cc9c 100644
--- a/srcpkgs/texlive-langextra/template
+++ b/srcpkgs/texlive-langextra/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-langextra'
 pkgname=texlive-langextra
-version=2020.56781
+version=2021.58019
 revision=1
 build_style="texmf"
 depends="texlive-core texlive-latexextra"
 short_desc="TeX Live - Packages for a bunch of extra languages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=57b27be556189cb9a50ee5c724d4cce40cab2efdc3e253d8a4fb61c52d36860a
+checksum=3b4b6b09a67a33f2a327021ba39e32e746b9be602037c1f50f7e4ab64605bd47

From f53259721d44c7f59f029891fd9f3d131585fdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:27 -0300
Subject: [PATCH 3709/4088] texlive-langgreek: update to 2021.57684.

---
 srcpkgs/texlive-langgreek/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langgreek/template b/srcpkgs/texlive-langgreek/template
index 1e4c61c3fc2b..2cf3904193e8 100644
--- a/srcpkgs/texlive-langgreek/template
+++ b/srcpkgs/texlive-langgreek/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-langgreek'
 pkgname=texlive-langgreek
-version=2020.56956
+version=2021.57684
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Greek"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=9fac133578469c91572306a537c47ee6fdc661caf0f0dacba276af6a69fca465
+checksum=dc51d6c3b1ccf8ef95504f4d610759e465eb2703764d0a5bb6cc82790c831141

From b91ad4a9ea97fb5a472066b6d9a287186b504659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:28 -0300
Subject: [PATCH 3710/4088] texlive-langjapanese: update to 2021.58632.

---
 srcpkgs/texlive-langjapanese/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langjapanese/template b/srcpkgs/texlive-langjapanese/template
index e5949a7f2325..a58a1b4bd7af 100644
--- a/srcpkgs/texlive-langjapanese/template
+++ b/srcpkgs/texlive-langjapanese/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-langjapanese'
 pkgname=texlive-langjapanese
-version=2020.57025
+version=2021.58632
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Japanese"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=8f358bde670e7afb8b1561382bc0c18797da97f0e2ea40c74b87a54fc32057c7
+checksum=60f3306ab01d1e57720190c8f59d77e50784646a4050720ed0233deccf65871e

From 795debc46e8ef1f8791918f2ae20a026605ea535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:28 -0300
Subject: [PATCH 3711/4088] texlive-langkorean: update to 2021.58468.

---
 srcpkgs/texlive-langkorean/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-langkorean/template b/srcpkgs/texlive-langkorean/template
index 05287fea5178..5d8a6b46a5a0 100644
--- a/srcpkgs/texlive-langkorean/template
+++ b/srcpkgs/texlive-langkorean/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-langkorean'
 pkgname=texlive-langkorean
-version=2020.56915
+version=2021.58468
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Fonts and macro packages for typesetting Korean"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=e767951038f076f9cdd76a7b5bad9598733ef3df098082d623511d9adffb1d1e
+checksum=65da5065850e516840ade0522dca2fe0ecbbcabe38c68744372513943c6c61fc

From a599d439369739418c1db658bb483444283efdf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:29 -0300
Subject: [PATCH 3712/4088] texlive-latexextra: update to 2020.57067.

---
 srcpkgs/texlive-latexextra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive-latexextra/template b/srcpkgs/texlive-latexextra/template
index bedea0152676..18db31615c45 100644
--- a/srcpkgs/texlive-latexextra/template
+++ b/srcpkgs/texlive-latexextra/template
@@ -7,6 +7,6 @@ depends="perl-File-Which python3-Pygments texlive-core texlive-pictures"
 short_desc="TeX Live - Collection of LaTeX addon packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
 checksum=6ab6ca702f7d956de9ee8fb9c78518da64c322472716c99780d9dfd9c158930f

From 242dbb8f9a31e56bf996bf19b265ea83b224be97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:30 -0300
Subject: [PATCH 3713/4088] texlive-music: update to 2021.58331.

---
 srcpkgs/texlive-music/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-music/template b/srcpkgs/texlive-music/template
index 03a03d99805f..2c71e1e607e7 100644
--- a/srcpkgs/texlive-music/template
+++ b/srcpkgs/texlive-music/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-music'
 pkgname=texlive-music
-version=2020.56473
+version=2021.58331
 revision=1
 build_style="texmf"
 depends="fontforge python3 texlive-core"
 short_desc="TeX Live - Music typesetting packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=06caf29f5ef2e3881cde74963f70ffe75215359ae824ebae4f0599b24ca4458b
+checksum=6018606d59925c94a22aeaafbc1fc8e3fbfa78ce2c2f39a4494249e5a27cd984

From 44be01c70a52051de7abda7a707706bc257b0c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:30 -0300
Subject: [PATCH 3714/4088] texlive-pictures: update to 2021.58558.

---
 srcpkgs/texlive-pictures/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-pictures/template b/srcpkgs/texlive-pictures/template
index e60fb2462824..9dc20b90f8aa 100644
--- a/srcpkgs/texlive-pictures/template
+++ b/srcpkgs/texlive-pictures/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-pictures'
 pkgname=texlive-pictures
-version=2020.57065
+version=2021.58558
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Packages for drawing graphics"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=4e9a720d65b4a2d15cb05591f817cc76dff57797485b075f356c1c1ff109bca5
+checksum=3c4451eb8d81edadfb165233477835ec7dc8b6ba2ba636cc98204623e3f284d6

From 1f92d065ec12fa543cb2eba049c8db72864997dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:31 -0300
Subject: [PATCH 3715/4088] texlive-pstricks: update to 2021.58293.

---
 srcpkgs/texlive-pstricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-pstricks/template b/srcpkgs/texlive-pstricks/template
index 40773bad302a..4988e816311b 100644
--- a/srcpkgs/texlive-pstricks/template
+++ b/srcpkgs/texlive-pstricks/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-pstricks'
 pkgname=texlive-pstricks
-version=2020.56758
+version=2021.58293
 revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Additional PSTricks packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=3c02a5733450544e8d38f66e6fa20055974a474e6184b293fe7d7003e891f6a1
+checksum=f35f6fa8b9686cfdf9a7a2bd43add9d193c1d28f67dd87acfe69765672930b7d

From 97e9df50a99f5100b1ab4490f8492f3e111aa466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:31 -0300
Subject: [PATCH 3716/4088] texlive-publishers: update to 2021.58683.

---
 srcpkgs/texlive-publishers/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive-publishers/template b/srcpkgs/texlive-publishers/template
index 892d6e202462..066d07250f35 100644
--- a/srcpkgs/texlive-publishers/template
+++ b/srcpkgs/texlive-publishers/template
@@ -1,11 +1,11 @@
 # Template file for 'texlive-publishers'
 pkgname=texlive-publishers
-version=2020.57058
+version=2021.58683
 revision=1
 build_style="texmf"
 short_desc="TeX Live - Classes and packages for certain publishers"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=13a312f58913e168e68b6dc57ef93b099485537c99e5f6f588f5c98764abf069
+checksum=7ee1bdb92641601c285f972f1978b19adbcbb90f430ae38356bd2e5165506304

From e049564d275e825cdbc2c41f384f54809c8e0998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:51:32 -0300
Subject: [PATCH 3717/4088] texlive-science: update to 2021.58667.

---
 srcpkgs/texlive-science/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/texlive-science/template b/srcpkgs/texlive-science/template
index 17000ee36c22..28221640fbc4 100644
--- a/srcpkgs/texlive-science/template
+++ b/srcpkgs/texlive-science/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-science'
 pkgname=texlive-science
-version=2020.57068
-revision=2
+version=2021.58667
+revision=1
 build_style="texmf"
 depends="texlive-core"
 short_desc="TeX Live - Typesetting for mathematics and science disciplines"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="http://tug.org/texlive/"
+homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=ae3925dce04e315ee53cef15799c03a743bdf048313cf328a50b143ff9ace888
+checksum=5b065edb313860e48461ce5591c0f3a346c44abab2a53967661f7f50958c3112

From c4acba43f81c1fd5fd8579b9956c3193a1d0646f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:53:55 -0300
Subject: [PATCH 3718/4088] texlive-most: update to 2021.0.

---
 srcpkgs/texlive-most/template | 45 ++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/texlive-most/template b/srcpkgs/texlive-most/template
index 68683f7d1c01..a1a644f9e3b8 100644
--- a/srcpkgs/texlive-most/template
+++ b/srcpkgs/texlive-most/template
@@ -1,29 +1,30 @@
 # Template file for 'texlive-most'
 pkgname=texlive-most
-version=2020.1
+version=2021.0
 revision=1
 build_style=meta
-depends="texlive>=20200406
- texlive-BibTeX>=20200406
- texlive-ConTeXt>=20200406
- texlive-LuaTeX>=20200406
- texlive-PythonTeX>=20200406
- texlive-Xdvi>=20200406
- texlive-XeTeX>=20200406
- texlive-dvi>=20200406
- texlive-core>=2020.57066
- texlive-bibtexextra>=2020.56991
- texlive-fontsextra>=2020.57042
- texlive-formatsextra>=2020.56699
- texlive-games>=2020.56833
- texlive-humanities>=2020.57034
- texlive-latexextra>=2020.57067
- texlive-music>=2020.56473
- texlive-pictures>=2020.57065
- texlive-pstricks>=2020.56758
- texlive-publishers>=2020.57058
- texlive-science>=2020.57068"
+_year=${version%.*}
+depends="texlive>=20210325
+ texlive-BibTeX>=20210325
+ texlive-ConTeXt>=20210325
+ texlive-LuaTeX>=20210325
+ texlive-PythonTeX>=20210325
+ texlive-Xdvi>=20210325
+ texlive-XeTeX>=20210325
+ texlive-dvi>=20210325
+ texlive-core>=${_year}
+ texlive-bibtexextra>=${_year}
+ texlive-fontsextra>=${_year}
+ texlive-formatsextra>=${_year}
+ texlive-games>=${_year}
+ texlive-humanities>=${_year}
+ texlive-latexextra>=${_year}
+ texlive-music>=${_year}
+ texlive-pictures>=${_year}
+ texlive-pstricks>=${_year}
+ texlive-publishers>=${_year}
+ texlive-science>=${_year}"
 short_desc="TeX Live - Metapackage including most packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="https://www.tug.org/texlive/"
+homepage="https://tug.org/texlive/"

From d0e5e510211af214252d08548a09a3d3d47cee02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:53:56 -0300
Subject: [PATCH 3719/4088] texlive-minimal: update to 2021.0.

---
 srcpkgs/texlive-minimal/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/texlive-minimal/template b/srcpkgs/texlive-minimal/template
index cd6fed4d1f4e..bff6399d5fd8 100644
--- a/srcpkgs/texlive-minimal/template
+++ b/srcpkgs/texlive-minimal/template
@@ -1,11 +1,12 @@
 # Template file for 'texlive-minimal'
 pkgname=texlive-minimal
-version=2020.1
+version=2021.0
 revision=1
 build_style=meta
-depends="texlive>=20200406
- texlive-core>=2020.57066"
+_year=${version%.*}
+depends="texlive>=20210325
+ texlive-core>=${year}"
 short_desc="TeX Live - Metapackage including minimal packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="https://www.tug.org/texlive/"
+homepage="https://tug.org/texlive/"

From b8835dd3f9e789e332c823d20e65abf3a9be0fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:53:56 -0300
Subject: [PATCH 3720/4088] texlive-lang: update to 2021.0.

---
 srcpkgs/texlive-lang/template | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/texlive-lang/template b/srcpkgs/texlive-lang/template
index 7473c58c229a..3d7989843dd6 100644
--- a/srcpkgs/texlive-lang/template
+++ b/srcpkgs/texlive-lang/template
@@ -1,16 +1,17 @@
 # Template file for 'texlive-lang'
 pkgname=texlive-lang
-version=2020.1
+version=2021.0
 revision=1
 build_style=meta
-depends="texlive-core>=2020.57066
- texlive-langchinese>=2020.57044
- texlive-langcyrillic>=2020.56674
- texlive-langextra>=2020.56781
- texlive-langgreek>=2020.56956
- texlive-langjapanese>=2020.57025
- texlive-langkorean>=2020.56915"
+_year=${version%.*}
+depends="texlive-core>=${_year}
+ texlive-langchinese>=${_year}
+ texlive-langcyrillic>=${_year}
+ texlive-langextra>=${_year}
+ texlive-langgreek>=${_year}
+ texlive-langjapanese>=${_year}
+ texlive-langkorean>=${_year}"
 short_desc="TeX Live - Metapackage including all languages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="https://www.tug.org/texlive/"
+homepage="https://tug.org/texlive/"

From 93c94bdfc900b020cf86434e4a41caf1751c854b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 00:53:57 -0300
Subject: [PATCH 3721/4088] texlive-full: update to 2021.0.

---
 srcpkgs/texlive-full/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/texlive-full/template b/srcpkgs/texlive-full/template
index dd578736f605..b5b28221516f 100644
--- a/srcpkgs/texlive-full/template
+++ b/srcpkgs/texlive-full/template
@@ -1,11 +1,12 @@
 # Template file for 'texlive-full'
 pkgname=texlive-full
-version=2020.1
+version=2021.0
 revision=1
 build_style=meta
-depends="texlive-most>=2020.1
- texlive-lang>=2020.1"
+_year=${version%.*}
+depends="texlive-most>=${_year}
+ texlive-lang>=${_year}"
 short_desc="TeX Live - Metapackage including all packages"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
-homepage="https://www.tug.org/texlive/"
+homepage="https://tug.org/texlive/"

From 6e8f580736417755cafef983c2d3383205fcf841 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 5 Dec 2021 14:08:00 +0100
Subject: [PATCH 3722/4088] alacritty: add ncurses to terminfo dependencies

alacritty-terminfo.INSTALL uses tic to compile terminfo dependencies,
but it doesn't depend on ncurses, the provider of tic. This commit fixes
this.
---
 srcpkgs/alacritty/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..9d34bdfb4a1b 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,7 +1,7 @@
 # Template file for 'alacritty'
 pkgname=alacritty
 version=0.9.0
-revision=1
+revision=2
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -33,6 +33,7 @@ post_install() {
 
 alacritty-terminfo_package() {
 	short_desc+=" - terminfo data"
+	depends="ncurses"
 	pkg_install() {
 		vmove usr/share/terminfo
 	}

From cd399b0d40c97547c173097c13a6c5dba8084824 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 5 Dec 2021 14:13:13 +0100
Subject: [PATCH 3723/4088] mtm: add ncurses to terminfo dependencies

mtm-terminfo.INSTALL uses tic to compile terminfo dependencies,
but it doesn't depend on ncurses, the provider of tic. This commit fixes
this.
---
 srcpkgs/mtm/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mtm/template b/srcpkgs/mtm/template
index 96597a16b13b..a6cfd2c104ce 100644
--- a/srcpkgs/mtm/template
+++ b/srcpkgs/mtm/template
@@ -1,7 +1,7 @@
 # Template file for 'mtm'
 pkgname=mtm
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 makedepends="ncurses-devel ncurses-libs"
 depends="ncurses"
@@ -24,6 +24,7 @@ do_install() {
 
 mtm-terminfo_package() {
 	short_desc+=" - terminfo data"
+	depends="ncurses"
 	pkg_install() {
 		vmove usr/share/terminfo
 	}

From 8532c3bef315bd590e89ac7cdc0b0db6c3c62d2c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Nov 2021 23:24:18 +0200
Subject: [PATCH 3724/4088] stremio-shell: fix server start, adopt.

- autostart server.js using a node symlink and remove the
stremio-server script
- install an icon to the proper location (fixes missing icon in most
icon themes)
- replace the stremio script with a symlink to the binary.
---
 srcpkgs/stremio-shell/template | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 3d29d1da3303..5e74be56b18e 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.142
-revision=2
+revision=3
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
 build_style=qmake
@@ -12,7 +12,7 @@ makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel
 depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime
  qt5-webengine"
 short_desc="Hub for video content aggregation"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.stremio.com"
 distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
@@ -35,21 +35,27 @@ post_extract() {
 }
 
 post_install() {
+
 	# Fix the bizarre locations
 	vmkdir usr/lib/stremio
-	mv "${DESTDIR}"/usr/opt/stremio/stremio ${DESTDIR}/usr/lib/stremio
+	mv "${DESTDIR}/usr/opt/stremio/stremio" "${DESTDIR}/usr/lib/stremio"
 
+	# Move .desktop file to proper location
 	vmkdir usr/share/applications
-	mv "${DESTDIR}"/usr/opt/stremio/smartcode-stremio.desktop ${DESTDIR}/usr/share/applications
+	mv "${DESTDIR}/usr/opt/stremio/smartcode-stremio.desktop" "${DESTDIR}/usr/share/applications"
+
+	# Link executable in PATH
+	vmkdir usr/bin
+	ln -s /usr/lib/stremio/stremio "${DESTDIR}/usr/bin/stremio"
 
-	echo "#!/bin/sh" > stremio
-	echo "cd /usr/lib/stremio && exec ./stremio" >> stremio
-	vbin stremio
+	# Symlink node in the instalation directory
+	ln -s /usr/bin/node "${DESTDIR}/usr/lib/stremio/node"
 
-	echo "#!/bin/sh" > stremio-server
-	echo "cd /usr/lib/stremio && exec node server.js" >> stremio-server
-	vbin stremio-server
+	# Install icon
+	vmkdir usr/share/icons
+	cp "${wrksrc}/images/stremio_window.png" "${DESTDIR}/usr/share/icons/smartcode-stremio.png"
 
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js ${DESTDIR}/usr/lib/stremio
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar ${DESTDIR}/usr/lib/stremio
+	# Copy server
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/server.js" "${DESTDIR}/usr/lib/stremio"
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/stremio.asar" "${DESTDIR}/usr/lib/stremio"
 }

From 550a917a51cc496639b71bf19625e368aa95ccc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 8 Dec 2021 17:44:35 +0100
Subject: [PATCH 3725/4088] telegram-desktop: update to 3.3.0.

---
 srcpkgs/telegram-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 79ef99c187fd..15c994966ea6 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=3.2.5
+version=3.3.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=48b09d0b179e8652d1da8f1d3acf4911896afa5bc58ed41d92c14bf2ec45a346
+checksum=72c51d0f24c78f9362c334091fb2de71ecfe786e8d9076f9f4fca4925809489b
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 7551113a6fc06c827e2df9f2ed722a6f425d15ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 8 Dec 2021 18:03:10 +0100
Subject: [PATCH 3726/4088] tg_owt: update to 0.0.0.20211207.

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index d1477736d0a7..6afa56d321e4 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,8 +1,8 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
-version=0.0.0.20211012
+version=0.0.0.20211207
 revision=1
-_commit=d578c760dc6f1ae5f0f3bb5317b0b2ed04b79138
+_commit=d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 wrksrc="tg_owt-$_commit"
@@ -21,7 +21,7 @@ homepage="https://github.com/desktop-app/tg_owt"
 distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
  https://chromium.googlesource.com/webm/libvpx/+archive/${_libvpx_commit}.tar.gz
  https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz"
-checksum="@25b7609f41020d1b2270f87aead2b1dd8e1f2e8365243ebeef9a8bc0e6e616b7
+checksum="@693bf80128946881c9dd357218c806c7e98f02daec02e076f1d123d3e6afc525
  @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9
  @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
 skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"

From 3f1a9d4cb9d0393c4a5a7fce3175229ebb102d80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 11 Dec 2021 12:59:00 +0100
Subject: [PATCH 3727/4088] ghidra: update to 10.1.

---
 srcpkgs/ghidra/patches/protoc.patch | 75 ++++++++++++++++++-----------
 srcpkgs/ghidra/template             | 23 ++++++---
 2 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch
index 30c45164caf9..aa985b86cf6d 100644
--- a/srcpkgs/ghidra/patches/protoc.patch
+++ b/srcpkgs/ghidra/patches/protoc.patch
@@ -1,46 +1,67 @@
---- a/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle	2021-09-28 20:47:24.000000000 +0200
-+++ -	2021-10-21 16:35:42.275129993 +0200
-@@ -33,21 +33,11 @@
- def os = org.gradle.internal.os.OperatingSystem.current()
+--- ghidra-10.1/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle	2021-12-10 19:03:38.000000000 +0100
++++ -	2021-12-11 13:01:51.089861724 +0100
+@@ -33,33 +33,33 @@
+ def platform = getCurrentPlatformName()
  
  dependencies {
--	allProtocArtifacts 'com.google.protobuf:protoc:3.11.1:windows-x86_64@exe'
--    allProtocArtifacts 'com.google.protobuf:protoc:3.11.1:linux-x86_64@exe'
--    allProtocArtifacts 'com.google.protobuf:protoc:3.11.1:osx-x86_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
+-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
 +	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:windows-x86_64@exe'
-+    allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
-+    allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
++	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-aarch_64@exe'
  
--	if (os.isWindows()) {
--    	protocArtifact 'com.google.protobuf:protoc:3.11.1:windows-x86_64@exe'
--	}
--	if (os.isLinux()) {
--    	protocArtifact 'com.google.protobuf:protoc:3.11.1:linux-x86_64@exe'
--	}
--	if (os.isMacOsX()) {
--    	protocArtifact 'com.google.protobuf:protoc:3.11.1:osx-x86_64@exe'
--    }
--
--	api 'com.google.protobuf:protobuf-java:3.11.1'
+ 	if (isCurrentWindows()) {
+-		protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
++		protocArtifact 'com.google.protobuf:protoc:3.18.1:windows-x86_64@exe'
+ 	}
+ 	if (isCurrentLinux()) {
+ 		if (platform.endsWith("x86_64")) {
+-			protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
++			protocArtifact 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
+ 		}
+ 		else {
+-			protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
++			protocArtifact 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe'
+ 		}
+ 	}
+ 	if (isCurrentMac()) {
+ 		if (platform.endsWith("x86_64")) {
+-			protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
++			protocArtifact 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
+ 		}
+ 		else {
+-			protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
++			protocArtifact 'com.google.protobuf:protoc:3.18.1:osx-aarch_64@exe'
+ 		}
+ 	}
+ 
+-	api 'com.google.protobuf:protobuf-java:3.17.3'
 +	api 'com.google.protobuf:protobuf-java:3.18.1'
  	api project(':Framework-AsyncComm')
  	api project(':Framework-Debugging')
  	api project(':ProposedUtils')
-@@ -58,7 +48,7 @@
+@@ -70,7 +70,7 @@
  
  /*protobuf {
  	protoc {
--		artifact = 'com.google.protobuf:protoc:3.11.1'
+-		artifact = 'com.google.protobuf:protoc:3.17.3'
 +		artifact = 'com.google.protobuf:protoc:3.18.1'
  	}
  }*/
  
-@@ -72,12 +62,7 @@
+@@ -82,14 +82,9 @@
+ 	ext.outdir = file("build/generated/source/proto/main/java")
+ 	outputs.dir(outdir)
  	inputs.files(src)
 -	dependsOn(configurations.protocArtifact)
  	doLast {
 -		def exe = configurations.protocArtifact.first()
--		if (!os.isWindows()) {
+-		if (!isCurrentWindows()) {
 -			exe.setExecutable(true)
 -		}
  		exec {
@@ -49,8 +70,8 @@
  			args src
  		}
  	}
---- a/ghidra_build/Ghidra/Debug/Debugger-gadp/Module.manifest	2021-09-28 20:47:24.000000000 +0200
-+++ -	2021-10-21 16:40:18.629990242 +0200
+--- ghidra-10.1/ghidra_build/Ghidra/Debug/Debugger-gadp/Module.manifest	2021-12-10 19:03:38.000000000 +0100
++++ -	2021-12-11 13:02:09.420069640 +0100
 @@ -1 +1 @@
--MODULE FILE LICENSE: lib/protobuf-java-3.11.1.jar BSD
+-MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD
 +MODULE FILE LICENSE: lib/protobuf-java-3.18.1.jar BSD
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 30eb7b2e9716..929ded075627 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,8 +1,10 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.0.4
+version=10.1
 revision=1
-archs="x86_64*"
+archs="x86_64* aarch64*"
+# Other 64bit archs should be easily patchable,
+# grep for linux_arm_64 to find all places in need of patching
 create_wrksrc=yes
 build_wrksrc="ghidra_build"
 hostmakedepends="gradle openjdk11 flex unzip protobuf which"
@@ -14,18 +16,18 @@ homepage="https://ghidra-sre.org/"
 distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${version}_build.tar.gz
  https://github.com/pxb1988/dex2jar/releases/download/2.0/dex-tools-2.0.zip
  https://sourceforge.net/projects/catacombae/files/HFSExplorer/0.21/hfsexplorer-0_21-bin.zip
- https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-12.12/yajsw-stable-12.12.zip
+ https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-beta-13.01/yajsw-beta-13.01.zip
  https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar"
-checksum="76f1bd9604d49a2e59c47b347aedb90484bcfe51217c792e8cc771fc6481147c
+checksum="6250b2c2ff56d6f7beaf29d6144ae5d52ce33ba0a132ef54e5d4f7839d950dff
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
  90c9b54798abca5b12f4a678db7d0a4c970f4702cb153c11919536d0014dedbf
- 1398fcb1e93abb19992c4fa06d7fe5758aabb4c45781d7ef306c6f57ca7a7321
+ 430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99
  00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d"
 skip_extraction="AXMLPrinter2.jar"
 nopie=yes
 nostrip_files="animals createStructure dataMutability inline ldiv opaque
  setRegister switch compilerVsDecompiler custom globalRegVars.so
- jumpWithinInstruction noReturn override.so sharedReturn"
+ jumpWithinInstruction noReturn override.so sharedReturn write"
 skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
  /usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/compilerVsDecompiler
  /usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/createStructure
@@ -43,6 +45,7 @@ skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
  /usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/switch
  /usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/write"
 python_version=2 # Jython 2.7.2 stuff
+nocross=yes
 
 post_extract() {
 	# makes patching easier
@@ -57,7 +60,7 @@ do_configure() {
 	done
 	cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
 	mkdir -p ${wrksrc}/ghidra.bin/Ghidra/Features/GhidraServer/
-	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-stable-12.12.zip ${wrksrc}/ghidra.bin/Ghidra/Features/GhidraServer/
+	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-beta-13.01.zip ${wrksrc}/ghidra.bin/Ghidra/Features/GhidraServer/
 	gradle yajswDevUnpack
 }
 
@@ -66,9 +69,13 @@ do_build() {
 }
 
 do_install() {
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) arch=x86_64;;
+		aarch64*) arch=arm_64;;
+	esac
 	cd ${wrksrc}/${build_wrksrc}
 	vmkdir usr/libexec/ghidra
-	bsdtar --strip-components 1 -C ${DESTDIR}/usr/libexec/ghidra -xf build/dist/ghidra_${version}_DEV_$(date -u +%Y%m%d)_linux64.zip
+	bsdtar --strip-components 1 -C ${DESTDIR}/usr/libexec/ghidra -xf build/dist/ghidra_${version}_DEV_$(date -u +%Y%m%d)_linux_${arch}.zip
 	vmkdir usr/bin
 	ln -srf /usr/libexec/$pkgname/ghidraRun ${DESTDIR}/usr/bin/ghidra
 }

From 56a822f25610ddfce9c3251acc8d6b037b5c62c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 11 Dec 2021 14:01:11 +0100
Subject: [PATCH 3728/4088] xxHash: update to 0.8.1.

---
 srcpkgs/xxHash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xxHash/template b/srcpkgs/xxHash/template
index 67c6720af847..987399219420 100644
--- a/srcpkgs/xxHash/template
+++ b/srcpkgs/xxHash/template
@@ -1,6 +1,6 @@
 # Template file for 'xxHash'
 pkgname=xxHash
-version=0.8.0
+version=0.8.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, GPL-2.0-or-later"
 homepage="https://cyan4973.github.io/xxHash/"
 distfiles="https://github.com/Cyan4973/${pkgname}/archive/v${version}.tar.gz>xxhash-${version}.tar.gz"
-checksum=7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f
+checksum=3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c
 
 post_install() {
 	vlicense LICENSE

From 67d9f89dda9e7e28e74cfc7cab81401482ebb97e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 11 Dec 2021 08:31:41 -0500
Subject: [PATCH 3729/4088] texlive-latexextra: update to 2021.58668.

---
 srcpkgs/texlive-latexextra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/texlive-latexextra/template b/srcpkgs/texlive-latexextra/template
index 18db31615c45..f0b40027323f 100644
--- a/srcpkgs/texlive-latexextra/template
+++ b/srcpkgs/texlive-latexextra/template
@@ -1,6 +1,6 @@
 # Template file for 'texlive-latexextra'
 pkgname=texlive-latexextra
-version=2020.57067
+version=2021.58668
 revision=1
 build_style="texmf"
 depends="perl-File-Which python3-Pygments texlive-core texlive-pictures"
@@ -9,4 +9,4 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
 homepage="https://tug.org/texlive/"
 distfiles="https://sources.archlinux.org/other/texlive/${pkgname}-${version}-src.zip"
-checksum=6ab6ca702f7d956de9ee8fb9c78518da64c322472716c99780d9dfd9c158930f
+checksum=9c2ef3ce71ad656df7644770a2c4aec27c4ea9375421d0ab3b56cb5b25a06287

From 78e6a397432f9080c5ad72068bbdc66e6e14b218 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 11 Dec 2021 09:54:53 -0500
Subject: [PATCH 3730/4088] lxqt-build-tools: remove "template+" file

---
 srcpkgs/lxqt-build-tools/template+ | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/lxqt-build-tools/template+

diff --git a/srcpkgs/lxqt-build-tools/template+ b/srcpkgs/lxqt-build-tools/template+
deleted file mode 100644
index 9f8169832bf3..000000000000
--- a/srcpkgs/lxqt-build-tools/template+
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'lxqt-build-tools'
-pkgname=lxqt-build-tools
-version=0.10.0
-revision=1
-build_style=cmake
-hostmakedepends="qt5-host-tools qt5-qmake pkg-config"
-makedepends="qt5-devel"
-short_desc="LXQt build tools"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="BSD-3-Clause"
-homepage="https://lxqt.org/"
-distfiles="https://github.com/lxqt/lxqt-build-tools/releases/download/${version}/lxqt-build-tools-${version}.tar.xz"
-checksum=9782878d6c0cc896d4a54fce5cc322561cdf1df270b8f941b2088a434b535e4d
-
-post_install() {
-	vlicense BSD-3-Clause LICENSE
-}

From 443b28941809aab95c3b552f402438291e2d17a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 11 Dec 2021 16:56:05 +0100
Subject: [PATCH 3731/4088] xxHash: move pc file to devel

---
 srcpkgs/xxHash/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xxHash/template b/srcpkgs/xxHash/template
index 987399219420..f2dc141743ce 100644
--- a/srcpkgs/xxHash/template
+++ b/srcpkgs/xxHash/template
@@ -1,7 +1,7 @@
 # Template file for 'xxHash'
 pkgname=xxHash
 version=0.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
 make_check_target="test"
@@ -28,6 +28,7 @@ xxHash-devel_package() {
 	depends="libxxHash>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 	}

From e17ef490268d1b15e32b6416ec0fe60dd102f5f9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 11 Dec 2021 17:21:03 +0100
Subject: [PATCH 3732/4088] nginx: build with threads enabled

Closes #34476
---
 srcpkgs/nginx/files/ngx_auto_config.h.aarch64 |  7 ++++++-
 srcpkgs/nginx/files/ngx_auto_config.h.armv6l  |  7 ++++++-
 srcpkgs/nginx/template                        | 15 +++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nginx/files/ngx_auto_config.h.aarch64 b/srcpkgs/nginx/files/ngx_auto_config.h.aarch64
index 403700079535..1469fe2cc682 100644
--- a/srcpkgs/nginx/files/ngx_auto_config.h.aarch64
+++ b/srcpkgs/nginx/files/ngx_auto_config.h.aarch64
@@ -1,4 +1,4 @@
-#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --with-compat --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module"
+#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-compat --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-threads --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module"
 
 #ifndef NGX_HAVE_GCC_ATOMIC
 #define NGX_HAVE_GCC_ATOMIC  1
@@ -358,6 +358,11 @@
 #endif
 
 
+#ifndef NGX_THREADS
+#define NGX_THREADS  1
+#endif
+
+
 #ifndef NGX_HTTP_CACHE
 #define NGX_HTTP_CACHE  1
 #endif
diff --git a/srcpkgs/nginx/files/ngx_auto_config.h.armv6l b/srcpkgs/nginx/files/ngx_auto_config.h.armv6l
index ab1be86207e6..05113df5b453 100644
--- a/srcpkgs/nginx/files/ngx_auto_config.h.armv6l
+++ b/srcpkgs/nginx/files/ngx_auto_config.h.armv6l
@@ -1,4 +1,4 @@
-#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --with-compat --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module"
+#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-compat --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-threads --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module"
 
 #ifndef NGX_HAVE_GCC_ATOMIC
 #define NGX_HAVE_GCC_ATOMIC  1
@@ -358,6 +358,11 @@
 #endif
 
 
+#ifndef NGX_THREADS
+#define NGX_THREADS  1
+#endif
+
+
 #ifndef NGX_HTTP_CACHE
 #define NGX_HTTP_CACHE  1
 #endif
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 4c946a910766..afd67eaf4eed 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.20.2
-revision=2
+revision=3
 _tests_commit=18ac4d9e5a2a
 create_wrksrc=yes
 build_wrksrc="nginx-${version}"
@@ -63,7 +63,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
@@ -75,16 +74,20 @@ do_configure() {
 		--http-fastcgi-temp-path=${tmpdir}/fastcgi \
 		--http-scgi-temp-path=${tmpdir}/scgi \
 		--http-uwsgi-temp-path=${tmpdir}/uwsgi \
-		--with-mail --with-mail_ssl_module \
-		--with-pcre-jit --with-file-aio \
-		--with-http_gunzip_module \
-		--with-http_v2_module \
+		--with-compat \
+		--with-file-aio \
 		--with-http_dav_module \
+		--with-http_gunzip_module \
 		--with-http_gzip_static_module \
 		--with-http_realip_module \
 		--with-http_ssl_module \
 		--with-http_stub_status_module \
 		--with-http_sub_module \
+		--with-http_v2_module \
+		--with-mail \
+		--with-mail_ssl_module \
+		--with-pcre-jit \
+		--with-threads \
 		$(vopt_if geoip --with-http_geoip_module) \
 		$(vopt_if stream "$stream_modules") \
 		$(vopt_if slice --with-http_slice_module)

From 00ad0e474befff53956b1d0d1c32113e921bad9d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 11 Dec 2021 17:27:54 +0100
Subject: [PATCH 3733/4088] alttab: update to 1.6.1.

---
 srcpkgs/alttab/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alttab/template b/srcpkgs/alttab/template
index 42a9961687ef..6fe6f2005d6e 100644
--- a/srcpkgs/alttab/template
+++ b/srcpkgs/alttab/template
@@ -1,6 +1,6 @@
 # Template file for 'alttab'
 pkgname=alttab
-version=1.6.0
+version=1.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,8 +11,9 @@ short_desc="Task switcher for minimalistic window managers"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/sagb/alttab"
+changelog="https://github.com/sagb/alttab/raw/master/ChangeLog"
 distfiles="https://github.com/sagb/alttab/archive/v${version}.tar.gz"
-checksum=9d362266a490a969b6398ccef1514dca2668c38c4b824bb11c8d16923bcb58ee
+checksum=0964653440ec42d56b022ea5df081489196956054b365198851057a6a71dba91
 
 make_check=no # needs cnee/xnee which is not packaged
 

From 01475e6e9dd8c0d4293c3cd85285a5c73a999278 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 11 Dec 2021 17:40:25 +0100
Subject: [PATCH 3734/4088] elixir: update to 1.13.0.

---
 srcpkgs/elixir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index af53ab1047a5..cc2ab43b7f7d 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.12.3
+version=1.13.0
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,7 +13,7 @@ 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=c5affa97defafa1fd89c81656464d61da8f76ccfec2ea80c8a528decd5cb04ad
+checksum=0ed0fb89a9b6428cd1537b7f9aab1d6ea64e0c5972589eeb46dff6f0324468ae
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From 38613f76f59dda1bd97ff7ab49a9e875ef1c06f6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 11 Dec 2021 11:55:41 +0400
Subject: [PATCH 3735/4088] unrar: update to 6.1.3.

---
 srcpkgs/unrar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index 45beac0964dd..11ce82028475 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,6 +1,6 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=6.1.2
+version=6.1.3
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
@@ -8,7 +8,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=3e96421f568e438af6dcdaef717c48eb93b825d97058ebcb173b9bfc57807be3
+checksum=d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636
 repository=nonfree
 
 do_build() {

From 5de3e496c285af0955153677ee5e1f6d01a49b2e Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 6 Dec 2021 13:11:30 +0100
Subject: [PATCH 3736/4088] scid_vs_pc: update to 4.22

scid_vs_pc: update to 4.22
---
 srcpkgs/scid_vs_pc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scid_vs_pc/template b/srcpkgs/scid_vs_pc/template
index bc592cafce70..ed2e13d5d235 100644
--- a/srcpkgs/scid_vs_pc/template
+++ b/srcpkgs/scid_vs_pc/template
@@ -1,7 +1,7 @@
 # Template file for 'scid_vs_pc'
 pkgname=scid_vs_pc
-version=4.21
-revision=2
+version=4.22
+revision=1
 build_style=configure
 hostmakedepends="tcl"
 makedepends="tk-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://scidvspc.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/scidvspc/source/scid_vs_pc-${version}.tgz"
-checksum=5ee9fdfe8a72306bf8f8e651832ea7461236c5a3120d672aaf0b430a852e55d3
+checksum=3d21c33eb7e1248fc3c845502e8f0291aae0a9ffe2506e4f82f51b3bfe163493
 
 do_configure() {
 	./configure CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \

From 3c3a3b8dfc285574414142e21f2337d05913414e Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Sat, 4 Dec 2021 16:05:07 +0100
Subject: [PATCH 3737/4088] iwd: update to 1.20

---
 ...d04e0de69a2c02bb39c774adf84dcbae6bb9.patch | 31 -------------------
 srcpkgs/iwd/template                          |  6 ++--
 2 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/iwd/patches/4e61d04e0de69a2c02bb39c774adf84dcbae6bb9.patch

diff --git a/srcpkgs/iwd/patches/4e61d04e0de69a2c02bb39c774adf84dcbae6bb9.patch b/srcpkgs/iwd/patches/4e61d04e0de69a2c02bb39c774adf84dcbae6bb9.patch
deleted file mode 100644
index c4c040cee54a..000000000000
--- a/srcpkgs/iwd/patches/4e61d04e0de69a2c02bb39c774adf84dcbae6bb9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4e61d04e0de69a2c02bb39c774adf84dcbae6bb9 Mon Sep 17 00:00:00 2001
-From: James Prestwood <prestwoj@gmail.com>
-Date: Tue, 2 Nov 2021 12:57:49 -0700
-Subject: client: special case daemon interface for non-interactive
-
-In non-interactive mode, when a dbus method call returns the process
-exits. This is true for all methods except agent requests since e.g.
-Connect() call automatically requests credentials and the client must
-wait for that to return before exiting. The new daemon interface must
-also be treated in the same way and not exit.
----
- client/dbus-proxy.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/client/dbus-proxy.c b/client/dbus-proxy.c
-index ab9fb5a5..0373a3df 100644
---- a/client/dbus-proxy.c
-+++ b/client/dbus-proxy.c
-@@ -315,7 +315,8 @@ static void proxy_callback(struct l_dbus_message *message, void *user_data)
- 	}
- 
- 	proxy = callback_data->user_data;
--	if (!strcmp(proxy->type->interface, IWD_AGENT_MANAGER_INTERFACE))
-+	if (!strcmp(proxy->type->interface, IWD_AGENT_MANAGER_INTERFACE) ||
-+			!strcmp(proxy->type->interface, IWD_DAEMON_INTERFACE))
- 		return;
- 
- quit:
--- 
-cgit 1.2.3-1.el7
-
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index b01c42ad6cd1..f56edb63cbf9 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,7 +1,7 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.19
-revision=2
+version=1.20
+revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
  --enable-dbus-policy --enable-wired"
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=dd65a8795f6127fb1b9e29f2092686b0590a0d3738c2b90c792ccd320deaf966
+checksum=7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 021b51a64fce3b7faeda87e351e86b81a81411f7 Mon Sep 17 00:00:00 2001
From: Ranme Fritzvilliams <ranme@dotnetfox.tk>
Date: Mon, 29 Nov 2021 10:34:50 +0300
Subject: [PATCH 3738/4088] glib: update to 2.70.2.

---
 srcpkgs/glib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 5ada11809774..0cd7eee4f698 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.0
-revision=3
+version=2.70.2
+revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742
+checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From a08a137b45631d5d55c4c5f61a70d2943790d4a2 Mon Sep 17 00:00:00 2001
From: Matthew Treadwell <x@matte.fyi>
Date: Sat, 13 Nov 2021 19:04:37 -0800
Subject: [PATCH 3739/4088] MultiMC: update to 0.6.13

---
 srcpkgs/MultiMC/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 1ce848f0873d..a842a76ac798 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,7 +1,7 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
-version=0.6.12
-revision=4
+version=0.6.13
+revision=1
 wrksrc="Launcher-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
 _nbtversion="multimc-0.6.1"
@@ -12,13 +12,13 @@ hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
 makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
 depends="virtual?java-environment qt5-svg"
 short_desc="Instanced Minecraft client"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://multimc.org"
 distfiles="https://github.com/MultiMC/Launcher/archive/${version}.tar.gz
  https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
  https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="9be496910e53a7e07454b6c4433cf6d540a3c3fea01762ac3390f19a001cb4c9
+checksum="d77d07e77754875a8a4abd5a2f4d0e01593aa7ffb4860efe993eb2755e8a3164
  36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
  ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
 skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
@@ -44,7 +44,7 @@ post_install() {
 	vbin "${FILESDIR}/MultiMC.sh" MultiMC
 	vinstall build/libMultiMC_nbt++.so 755 /usr/lib
 	vinstall build/libMultiMC_quazip.so 755 /usr/lib
-	vinstall application/package/linux/multimc.desktop 644 /usr/share/applications
+	vinstall launcher/package/linux/multimc.desktop 644 /usr/share/applications
 	vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/'
-	vinstall application/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps
+	vinstall launcher/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps
 }

From 550ab7ef361738fbfb04f2b4442695495aa4e203 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Tue, 9 Nov 2021 13:29:43 -0500
Subject: [PATCH 3740/4088] acpica-utils: update to 20210930

---
 srcpkgs/acpica-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index bf2f0df5d93d..4308cd11f148 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20210331
+version=20210930
 revision=1
 archs="i686* x86_64* aarch64*"
 wrksrc="acpica-unix-${version}"
@@ -10,7 +10,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://www.acpica.org/"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=b49237a2c3df58b57310612ec3a6ebee69e1a525b5efeec7152faf32a03b7068
+checksum=3cd82a281a16bc70c2708665668f138c4fc606c31161d46ce77230454ec04821
 
 do_build() {
 	vsed -e 's/-Werror//g' \

From 51ffef526154529ac7a3d042003fe95150ac5592 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Tue, 9 Nov 2021 13:07:12 -0500
Subject: [PATCH 3741/4088] usbutils: update to 014

---
 srcpkgs/usbutils/template | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template
index c3a53b0aee02..0b149585e8e6 100644
--- a/srcpkgs/usbutils/template
+++ b/srcpkgs/usbutils/template
@@ -1,30 +1,19 @@
 # Template file for 'usbutils'
 pkgname=usbutils
-version=013
+version=014
 revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/hwdata --disable-zlib"
-hostmakedepends="autogen automake libtool pkg-config"
+hostmakedepends="automake libtool pkg-config"
 makedepends="eudev-libudev-devel libusb-devel"
 depends="hwids"
 short_desc="Linux USB utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://linux-usb.sourceforge.net/"
-#changelog="https://raw.githubusercontent.com/gregkh/usbutils/master/NEWS"
+homepage="https://linux-usb.sourceforge.net/"
+changelog="https://raw.githubusercontent.com/gregkh/usbutils/master/NEWS"
 distfiles="${KERNEL_SITE}/utils/usb/usbutils/usbutils-${version}.tar.xz"
-checksum=9e23494fcc78b7a80ee29a07dd179c95ae2f71509c35728dbbabc2d1cca41338
-
-pre_configure() {
-	local autogen_args
-	autogen_args="--prefix=/usr"
-
-	if [ "$CROSS_BUILD" ]; then
-		autogen_args+="--build=${XBPS_CROSS_TRIPLET} --host=${XBPS_CROSS_TRIPLET}"
-	fi
-
-	./autogen.sh ${autogen_args}
-}
+checksum=3a079cfad60560227b67192482d7813bf96326fcbb66c04254839715f276fc69
 
 post_install() {
 	# Remove lsusb.py - avoid useless python scripts

From a3689140546a6c96a91abf7f222cdfcf1aa994f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 11 Dec 2021 21:40:46 +0100
Subject: [PATCH 3742/4088] element-desktop: prevent from fetching sentry-cli
 during build

This would break ppc64le since there are no sentry builds for that.
---
 .../patches/remove-sentry-dep.patch           | 45 +++++++++++++++++++
 .../patches/remove-sentry-dep.patch.args      |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/element-desktop/patches/remove-sentry-dep.patch
 create mode 100644 srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args

diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch b/srcpkgs/element-desktop/patches/remove-sentry-dep.patch
new file mode 100644
index 000000000000..a67af3745722
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/remove-sentry-dep.patch
@@ -0,0 +1,45 @@
+commit 69e6b3e631fc8cd88cbe78b06d908f4310aa56e0
+Author: q66 <daniel@octaforge.org>
+Date:   Sat Dec 11 21:22:44 2021 +0100
+
+    remove dependency on sentry
+    
+    This is unused and breaks ppc64 because it downlaods binaries.
+
+diff --git a/package.json b/package.json
+index 078c772..5b5c430 100644
+--- a/package.json
++++ b/package.json
+@@ -89,7 +89,6 @@
+     "@babel/runtime": "^7.12.5",
+     "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
+     "@principalstudio/html-webpack-inject-preload": "^1.2.7",
+-    "@sentry/webpack-plugin": "^1.18.1",
+     "@types/flux": "^3.1.9",
+     "@types/jest": "^27.0.2",
+     "@types/modernizr": "^3.5.3",
+diff --git a/webpack.config.js b/webpack.config.js
+index 3aed215..7babcef 100644
+--- a/webpack.config.js
++++ b/webpack.config.js
+@@ -9,7 +9,6 @@ const TerserPlugin = require('terser-webpack-plugin');
+ const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+ const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
+ const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+-const SentryCliPlugin = require("@sentry/webpack-plugin");
+ 
+ dotenv.config();
+ let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
+@@ -539,12 +538,6 @@ module.exports = (env, argv) => {
+             }),
+             useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }),
+ 
+-            // upload to sentry if sentry env is present
+-            process.env.SENTRY_DSN &&
+-                new SentryCliPlugin({
+-                    release: process.env.VERSION,
+-                    include: "./webapp/bundles",
+-                }),
+             new webpack.EnvironmentPlugin(['VERSION']),
+         ].filter(Boolean),
+ 
diff --git a/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args b/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
new file mode 100644
index 000000000000..2eba1cb3c5ce
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/remove-sentry-dep.patch.args
@@ -0,0 +1 @@
+-Np1

From 2d164f9ad3420b47df0ab32afcd6b616189a1443 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 11 Dec 2021 21:34:51 +0100
Subject: [PATCH 3743/4088] cloc: update to 1.92.

---
 srcpkgs/cloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index 893b7afa89d7..e5a24140afc5 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,6 +1,6 @@
 # Template file for 'cloc'
 pkgname=cloc
-version=1.90
+version=1.92
 revision=1
 hostmakedepends="perl"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/AlDanial/cloc"
 distfiles="https://github.com/AlDanial/cloc/archive/v${version}.tar.gz"
-checksum=60b429dd2aa5cd65707b359dcbcbeb710c8e4db880886528ced0962c67e52548
+checksum=b5f18f4dbc05eff08ada215b6c2a8cbdab397e9b4b4e25c7427d4ed86fb6e248
 
 do_build() {
 	make -C Unix man

From 1a93ed7b9cf76d8c43dc100fe802520f5336ee15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 11 Dec 2021 21:56:20 +0100
Subject: [PATCH 3744/4088] perl-IO-Socket-INET6: update to 2.73.

---
 srcpkgs/perl-IO-Socket-INET6/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-IO-Socket-INET6/template b/srcpkgs/perl-IO-Socket-INET6/template
index 4036ecce9e1a..a51d7b284338 100644
--- a/srcpkgs/perl-IO-Socket-INET6/template
+++ b/srcpkgs/perl-IO-Socket-INET6/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-IO-Socket-INET6'.
 pkgname=perl-IO-Socket-INET6
-version=2.72
-revision=3
+version=2.73
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://metacpan.org/release/IO-Socket-INET6"
 license="Artistic, GPL-1"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=85e020fa179284125fc1d08e60a9022af3ec1271077fe14b133c1785cdbf1ebb
+checksum=b6da746853253d5b4ac43191b4f69a4719595ee13a7ca676a8054cf36e6d16bb

From dd617e0d5cfb50626974ea6f7e6ca040f86f7b5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 11 Dec 2021 22:01:52 +0100
Subject: [PATCH 3745/4088] perl-Unicode-Tussle: update to 1.114.

---
 srcpkgs/perl-Unicode-Tussle/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Unicode-Tussle/template b/srcpkgs/perl-Unicode-Tussle/template
index 52c589509712..2671667d63e6 100644
--- a/srcpkgs/perl-Unicode-Tussle/template
+++ b/srcpkgs/perl-Unicode-Tussle/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Unicode-Tussle'
 pkgname=perl-Unicode-Tussle
-version=1.111
-revision=3
+version=1.114
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Unicode-Tussle"
 distfiles="${CPAN_SITE}/Unicode/${pkgname/perl-/}-$version.tar.gz"
-checksum=532f3ef9055fff53b9951be2667076431dc6963d00a3a309730b4bf0dbe99c28
+checksum=cb09d08bb8fa2d39904719a33bbef3338a1609b1578b5826f93df25fddbe52fb
 
 post_install() {
 	# Avoid clashes with mono, iproute2, util-linux

From 3524da972449a54e750d3cea1adba3aebdc5b734 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 12 Dec 2021 02:14:51 +0100
Subject: [PATCH 3746/4088] slrn: fix homepage, fix cross

---
 srcpkgs/slrn/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 85765f5e8378..3a84fee8c93a 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,23 +1,28 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=9
+revision=10
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
+hostmakedepends="slang-devel"
 makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.slrn.org/"
+homepage="https://slrn.info/"
 # distfiles="http://jedsoft.org/releases/slrn/${pkgname}-${version}.tar.bz2"
 distfiles="https://ftp.icm.edu.pl/packages/slrn/slrn-${version}.tar.bz2"
 checksum=3ba8a4d549201640f2b82d53fb1bec1250f908052a7983f0061c983c634c2dac
-nocross=yes  # need to host-compile chkslang
 
+pre_build() {
+	mkdir -p src/objs
+	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" LIBS= LDFLAGS= RPATH= INCS= \
+		-C src slangversion
+}
 post_install() {
 	vsconf doc/slrn.rc
 }

From 64cba7f3188e949012d06bd572699ab4ed7f11e9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 12 Dec 2021 02:18:52 +0100
Subject: [PATCH 3747/4088] slrn: fix cross

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 3a84fee8c93a..c8899264fb36 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -8,8 +8,8 @@ configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-hostmakedepends="slang-devel"
-makedepends="openssl-devel slang-devel"
+hostmakedepends="openssl-devel slang-devel"
+makedepends="${hostmakedepends}"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From c7e003b153e605697d8f2a6d578c8ab568d87e70 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 12 Dec 2021 02:24:42 +0100
Subject: [PATCH 3748/4088] slrn: fix cross harder

---
 srcpkgs/slrn/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index c8899264fb36..32deb0d30681 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -8,8 +8,7 @@ configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-hostmakedepends="openssl-devel slang-devel"
-makedepends="${hostmakedepends}"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
@@ -18,10 +17,9 @@ homepage="https://slrn.info/"
 distfiles="https://ftp.icm.edu.pl/packages/slrn/slrn-${version}.tar.bz2"
 checksum=3ba8a4d549201640f2b82d53fb1bec1250f908052a7983f0061c983c634c2dac
 
-pre_build() {
-	mkdir -p src/objs
-	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" LIBS= LDFLAGS= RPATH= INCS= \
-		-C src slangversion
+post_patch() {
+	# Rip out compile time test to allow cross building.
+	sed -i 's/ slangversion / /' src/Makefile.in
 }
 post_install() {
 	vsconf doc/slrn.rc

From 6e0bd9c69e9d383a4b32197d1ec6fe3acece8103 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 12 Dec 2021 09:30:05 +0100
Subject: [PATCH 3749/4088] wine: update to 7.0rc1.

---
 srcpkgs/wine/patches/musl-limits.patch |  4 ++--
 srcpkgs/wine/patches/musl-uid-t.patch  |  4 ++--
 srcpkgs/wine/template                  | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 9bcc16c8ce88..21d4e4fe4e1c 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-6.23/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-6.23/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.0-rc1/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.0-rc1/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 2753c2720e3f..963c731e94cb 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-6.23/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-6.23/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-7.0-rc1/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-7.0-rc1/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index a4a50d266852..916141ce3775 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.23
-revision=2
+version=7.0rc1
+revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -11,10 +11,10 @@ short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="d96c7f31741e4251fb50f919309c604665267cfacee13f8f450a30c953620e0d
- 1b996e7a0ce0f0015bae1a465aa55787edff3bc9edf1c7164dd264872cc7f3f6"
+checksum="2e9362c07c264c13baeac61c188175e977965b3778d6f00368040e8155d72061
+ 0d4447688e31fced16adbe4b3d15502f1e11422dcb18b66e133e5265d5f86f5d"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 8cd4f07f75eceda10739a3af6af0318871d20a50 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 12 Dec 2021 13:16:57 +0100
Subject: [PATCH 3750/4088] digikam: update to 7.4.0.

---
 srcpkgs/digikam/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index ba0f4931db08..a9061514cbd7 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
 # Template file for 'digikam'
 pkgname=digikam
-version=7.3.0
-revision=2
+version=7.4.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config bison flex qt5-qmake
@@ -20,8 +20,8 @@ short_desc="Advanced digital photo management application"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.digikam.org"
-distfiles="${KDE_SITE}/digikam/${version}/digikam-${version}.tar.xz"
-checksum=95aea93be1cfd39bb52333b82b3e57bf68080c7d1319d754d167a20f6dbe4551
+distfiles="${KDE_SITE}/digikam/${version}/digiKam-${version}.tar.xz"
+checksum=d08ab66da732bb449bc10106ec11dd9defa5b3562ded3741b041dbbaa715504a
 
 CXXFLAGS="-Wl,-lpthread"
 

From 7cb44d83b42ea653ad7d9cc46477425099ffb9bc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 12 Dec 2021 16:31:57 +0100
Subject: [PATCH 3751/4088] perl-Unicode-Tussle: update to 1.115.

---
 srcpkgs/perl-Unicode-Tussle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Unicode-Tussle/template b/srcpkgs/perl-Unicode-Tussle/template
index 2671667d63e6..8ea9f4501f19 100644
--- a/srcpkgs/perl-Unicode-Tussle/template
+++ b/srcpkgs/perl-Unicode-Tussle/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Unicode-Tussle'
 pkgname=perl-Unicode-Tussle
-version=1.114
+version=1.115
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Unicode-Tussle"
 distfiles="${CPAN_SITE}/Unicode/${pkgname/perl-/}-$version.tar.gz"
-checksum=cb09d08bb8fa2d39904719a33bbef3338a1609b1578b5826f93df25fddbe52fb
+checksum=6e626a6021766451f95dea67e0160f2cfe150c777701a1eb59c3935eb340cf0d
 
 post_install() {
 	# Avoid clashes with mono, iproute2, util-linux

From 87c7e78fb8b3042572fc8efb520f3a4fb2e6642c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 12 Dec 2021 16:32:27 +0100
Subject: [PATCH 3752/4088] libX11: update to 1.7.3.1.

---
 srcpkgs/libX11/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 75680e242a5e..260b42da9770 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.3
-revision=2
+version=1.7.3.1
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=dfd1343db3a0e523f1bb97d5ba71453c79eee78a77e51ca9f8dfef7131c6f0fe
+checksum=2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989
 
 do_configure() {
 	./configure ${configure_args}

From ea60a2a9e8957af03cf4fd0de3d9a58a3372d6ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 12 Dec 2021 16:33:04 +0100
Subject: [PATCH 3753/4088] ugrep: update to 3.3.12.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 610564f3e659..2f2e434e900f 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.11
+version=3.3.12
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=4a1c9cb0d2937d0dad5572c91af30e91829359289058dbd34315017638a3719e
+checksum=24f7de6d1dc2263a75b455c461c2d04b3a719d4165b6383c99d270b99758878e
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 02c53f1e4eb37c12478b8ee15255ba310704b859 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 12 Dec 2021 16:55:05 +0100
Subject: [PATCH 3754/4088] pysolfc: update to 2.14.1.

---
 srcpkgs/pysolfc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template
index 2f76aaa65889..83b617b37146 100644
--- a/srcpkgs/pysolfc/template
+++ b/srcpkgs/pysolfc/template
@@ -1,7 +1,7 @@
 # Template file for 'pysolfc'
 pkgname=pysolfc
-version=2.14.0
-revision=2
+version=2.14.1
+revision=1
 wrksrc="PySolFC-${pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-pygame python3-random2 python3-six
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://pysolfc.sourceforge.net/"
 distfiles="https://github.com/shlomif/PySolFC/archive/${pkgname}-${version}.tar.gz"
-checksum=421917abb4ae9e0f40820d41adad30e86a82e644c9fe0415603ec1873287038a
+checksum=7b517baeb9e84c710e60a72e2706e64c7e4b796b9b0ab018b3899b9b03c19766
 
 post_build() {
 	make mo rules

From bce87236638f82167ffee36483eb249e1cdfa58a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 12 Dec 2021 17:43:43 +0100
Subject: [PATCH 3755/4088] mblaze: update to 1.2.

---
 srcpkgs/mblaze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mblaze/template b/srcpkgs/mblaze/template
index 88624be8f71d..9d447933834e 100644
--- a/srcpkgs/mblaze/template
+++ b/srcpkgs/mblaze/template
@@ -1,6 +1,6 @@
 # Template file for 'mblaze'
 pkgname=mblaze
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
 checkdepends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain, MIT"
 homepage="https://github.com/leahneukirchen/mblaze"
 distfiles="https://leahneukirchen.org/releases/${pkgname}-${version}.tar.gz"
-checksum=edd8cb86f667543e703dee58263b81c7e47744339d23ebbb6a43e75059ba93b1
+checksum=50c164c88cc83b4f52691341ee14060da5a6f1859e86aa73ff595de4b410037f
 
 post_install() {
 	vbin contrib/mcount

From ed9077cec5c5634251998a5b31de0e83e2bd7bcc Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Sat, 11 Dec 2021 19:27:22 -0600
Subject: [PATCH 3756/4088] python3-botocore: update to 1.23.23

---
 srcpkgs/python3-botocore/template | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index 6b2c6f07ac35..0271e9204c19 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -1,14 +1,21 @@
 # Template file for 'python3-botocore'
 pkgname=python3-botocore
-version=1.17.28
-revision=4
+version=1.23.23
+revision=1
 wrksrc="botocore-${version}"
 build_style=python3-module
+# integration tests want aws credentials
+make_check_target="tests/functional tests/unit"
 hostmakedepends="python3-setuptools"
-depends="python3-dateutil python3-docutils python3-jmespath python3-urllib3"
+depends="python3-dateutil python3-jmespath python3-urllib3"
+checkdepends="$depends python3-pytest python3-jsonschema"
 short_desc="Core functionality library of boto 3 (Python3)"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/botocore"
 distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=c9a4b4ffedeff89848a899bd4634be46a21a190690b505c2050888c0a5447936
+checksum=6b23a1e91387c1a461f10b17bde9ace15b3c128ed385646ab058644dfedd2c47
+
+pre_check() {
+	rm -r tests/functional/leak # these 6 tests fail, probably fixable
+}

From f944a43f8030ea5279f75cd6af6817f809d192ac Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Sat, 11 Dec 2021 19:30:56 -0600
Subject: [PATCH 3757/4088] python3-s3transfer: update to 0.5.0

---
 srcpkgs/python3-s3transfer/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-s3transfer/template b/srcpkgs/python3-s3transfer/template
index 525c3ad252f5..a848c12ccf27 100644
--- a/srcpkgs/python3-s3transfer/template
+++ b/srcpkgs/python3-s3transfer/template
@@ -1,14 +1,17 @@
 # Template file for 'python3-s3transfer'
 pkgname=python3-s3transfer
-version=0.3.3
-revision=4
+version=0.5.0
+revision=1
 wrksrc="s3transfer-${version}"
 build_style=python3-module
+# integration tests want aws credentials
+make_check_target="tests/unit tests/functional"
 hostmakedepends="python3-setuptools"
 depends="python3-botocore"
+checkdepends="python3-botocore python3-pytest python3-mock"
 short_desc="Amazon S3 Transfer Manager (Python3)"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/s3transfer"
 distfiles="https://github.com/boto/s3transfer/archive/${version}.tar.gz"
-checksum=0c8b0f7aaf32173d1475df0a453bfdc37be8207ea15c1d8415a590ef3986fc51
+checksum=a07ff8461f1dfa081fa5f02c1e6ad3f7bb7a4f3ca424e913ba48fcf5b1c87640

From d024637d49d466c1c78934ca63abb0e5343e7e53 Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Sat, 11 Dec 2021 19:33:37 -0600
Subject: [PATCH 3758/4088] aws-cli: update to 1.22.23

---
 srcpkgs/aws-cli/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 67550003bd47..0448d39f5a61 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,18 +1,24 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.18.125
-revision=3
+version=1.22.23
+revision=1
 wrksrc="aws-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="groff python3-botocore python3-s3transfer python3-colorama
  python3-rsa python3-yaml python3-docutils"
+checkdepends="$depends python3-pytest"
 short_desc="Universal Command Line Interface for Amazon Web Services"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=97f632fb7aede8f7986a4bd381f3d460606e9c31ef91f02388f7895dd5822c27
+checksum=d5424e05c87963547d6c98440391c6729e4e4f8eb7a4c64520ff7eefeffe41f3
+
+do_check() {
+	# integration tests want aws credentials, have some other issues not worth fixing
+	PATH=$PWD/bin:$PATH PYTHONPATH=$PWD python3 -m pytest tests/unit tests/functional
+}
 
 post_install() {
 	vinstall bin/aws_bash_completer 644 usr/share/bash-completion/completions aws

From 507912c22ea786ebb67066ef351de46d4eec3d1d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 11 Dec 2021 00:18:37 +0100
Subject: [PATCH 3759/4088] gede: update to 2.18.2.

---
 srcpkgs/gede/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template
index 00edce27b05f..236927cb22e8 100644
--- a/srcpkgs/gede/template
+++ b/srcpkgs/gede/template
@@ -1,6 +1,6 @@
 # Template file for 'gede'
 pkgname=gede
-version=2.18.1
+version=2.18.2
 revision=1
 build_wrksrc=src
 build_style=qmake
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
 homepage="http://acidron.com/gede"
 distfiles="http://gede.dexar.se/uploads/source/${pkgname}-${version}.tar.xz"
-checksum=8883f8418062a3046cf6f8e017bdc954a2a57bc7fb8a0d9ec5a229d7ea33469d
+checksum=416ac31d5fb6b6b97ec0a2a26d68836be915444375d7a3b043a0e899a2a3dcb6
 
 do_install() {
 	cd $wrksrc

From 31382a583a15880a199bf29876a60b342f4793e7 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 11 Dec 2021 00:20:32 +0100
Subject: [PATCH 3760/4088] hugo: update to 0.90.1.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 444018d45dbf..40d4c0d81f21 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.89.4
+version=0.90.1
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9d4f61788f8d886913a1be15b3eae04fad04a4e243bd7f65c5e7367bd617856d
+checksum=456789091bfe30dd3f69b63ac627d6e08ae973326294cc6517be8ed70353af35
 
 post_install() {
 	vdoc README.md

From 7341c40f1ce9b712a4905cc6662334f5385cf3fe Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 11 Dec 2021 00:24:49 +0100
Subject: [PATCH 3761/4088] kubernetes: update to 1.23.0.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 2c297bf071b0..0686bc46f7e1 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.22.4
+version=1.23.0
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=7afd37bc86e0d2b42b2902aa31dda1352244486c6bec13f8018a4ee81ef526ea
+checksum=5b4a27cbf0675a5d5e5228a58795bc76a0ec13df71ad5b423caa240bef2c574d
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From d2720d0cf1d90e7cf96071503dfc9fda8baffcca Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 13 Dec 2021 01:01:44 +0100
Subject: [PATCH 3762/4088] libguestfs: update to 1.46.1.

---
 srcpkgs/libguestfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 4ee141709df0..626fa3ac8aed 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.46.0
-revision=2
+version=1.46.1
+revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"
@@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license=" GPL-2.0-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${_version_short}-stable/${pkgname}-${version}.tar.gz"
-checksum=11c5a39f241b514558f9a734b7dc1606a9b7cc5b1c8f3c5797a395547a3530ae
+checksum=fe1f6318a4166e6201268a8ceda331433ab7bf91ede9766d04ab30165c534f9e
 
 conf_files="etc/libguestfs-tools.conf"
 

From 9d903a22b007aff2ff14e4945a86f11b4ce8d6e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 12 Dec 2021 15:21:58 -0500
Subject: [PATCH 3763/4088] python3-imageio: update to 2.13.3.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index db63985d1ce5..35916b90d7d2 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.13.2
+version=2.13.3
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a54c3b785811237e6f029603bc253ca3c92ea346d5865b4c673d45b65b3e4548
+checksum=bf24e13e75074778cfb3da6d47976974b9ac6dd387005329a612a89e3a106ab4
 
 post_install() {
 	vlicense LICENSE

From 63b1c5606ac961f65ec73dcb6f2f84b0ee5e47b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 12 Dec 2021 15:28:24 -0500
Subject: [PATCH 3764/4088] python3-hypothesis: update to 6.31.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 9c88772dc4e8..2385ccf10d62 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.30.0
+version=6.31.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=d10473a0b5a87eadd8e978067e4e18215cc69f40c1fdcaeedcd0ef89648c8f61
+checksum=bec2a8a02cb2609ab67c310ebe68b6baecee7afa87c0dfd1f8b4c0253f717a00
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 4457ee24b0c23b2b7e59e43800659ecbab93a4d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 12 Dec 2021 15:29:23 -0500
Subject: [PATCH 3765/4088] python3-matplotlib: update to 3.5.1.

---
 srcpkgs/python3-matplotlib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index d6a4b78ea754..b4b1852b2e58 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.5.0
-revision=2
+version=3.5.1
+revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=fc46f0eb54d9d51ddf0637e383afce2fdb6e352d894a81993b25d8df41eddaaf
+checksum=9683da9a0c84d1c42d1bf92ecf6e012d302406a38fd987e3dfbcb7b58b2eea2d
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From b71a0a531f692ee60e6650376120f293a89dd124 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 12 Dec 2021 15:43:37 -0500
Subject: [PATCH 3766/4088] python3-pandas: update to 1.3.5.

---
 srcpkgs/python3-pandas/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 74962d1466c3..6dc19e5297ea 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.4
-revision=2
+version=1.3.5
+revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=dd0fa7107ed4540e5a0cf8ca2a81852b14a8bf1f6b0f38f1c3a99f7441133ddb
+checksum=34ed48884abf6d2f9e4f4fc6ca227178b49f5e66866eeb1112ea6eb74532eb4e
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From c80ae58b9d374feb3411625f9d97d644834fba6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 12 Dec 2021 15:44:16 -0500
Subject: [PATCH 3767/4088] python3-prompt_toolkit: update to 3.0.24.

---
 srcpkgs/python3-prompt_toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index ca30e275d05f..b241def4869a 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.23
+version=3.0.24
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=7053aba00895473cb357819358ef33f11aa97e4ac83d38efb123e5649ceeecaf
+checksum=1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From fd7b68bde57c5e5f3fe4b09e225ed62af7e553ca Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:08:35 +0100
Subject: [PATCH 3768/4088] jupyterlab: update to 3.2.4

---
 srcpkgs/jupyterlab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 8914dca25600..528dde7d643b 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,7 +1,7 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.11
-revision=2
+version=3.2.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyterlab/jupyterlab-${version}.tar.gz"
-checksum=329b41d6d99bf4e40ab210b37387d32033ea9227e776aa1baf7817bf55423156
+checksum=f692e0d95338d60f72dde660f16f3955a087775c59ec541ddb25952e3f97e9b1
 # Tests require unpackaged dependencies
 make_check=no
 

From 49b37a0b68df246f5934303dd38d2f0a3aa59e6e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:10:03 +0100
Subject: [PATCH 3769/4088] python3-anyio: update to 3.4.0

---
 srcpkgs/python3-anyio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 94bdb2541b2d..840c35b408de 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.1
-revision=2
+version=3.4.0
+revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=85913b4e2fec030e8c72a8f9f98092eeb9e25847a6e00d567751b77e34f856fe
+checksum=24adc69309fb5779bc1e06158e143e0b6d2c56b302a3ac3de3083c705a6ed39d
 # Tests not supported
 make_check=no
 

From e907efbf87d4abb25cfb34adc8a98d45ba04b865 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:11:19 +0100
Subject: [PATCH 3770/4088] python3-jupyter_server: update to 1.13.0

---
 srcpkgs/python3-jupyter_server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index f5ef0ff0bdcb..7b02e0f67065 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.11.0
-revision=2
+version=1.13.0
+revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8ab4f484a4a2698f757cff0769d27b5d991e0232a666d54f4d6ada4e6a61330b
+checksum=05a96dfc5352adf70e88868b4ab3d1fc13e17bd84daf74d02cc6299098855fda
 # Tarball defines no tests
 make_check=no
 

From 4231d1d3d64c81a4408aa9b391c1496916b2f40b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:13:46 +0100
Subject: [PATCH 3771/4088] python3-jupyterlab_server: update to 2.8.2

---
 srcpkgs/python3-jupyterlab_server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 6fbf7b0a5cd8..f890070f11e5 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.8.1
-revision=2
+version=2.8.2
+revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-jupyter_notebook python3-jupyter_server"
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyterlab_server/jupyterlab_server-${version}.tar.gz"
-checksum=39fd519e9b3275873bd15de891363c28f2649814f7bbc11c57469c60e8408e97
+checksum=26d813c8162c83d466df7d155865987dabe70aa452f9187dfb79fd88afc8fa0b
 # Tests require unpackaged dependencies
 make_check=no
 

From 8ba709fba3e65332f847bc3fb5cd4ca93cd36f08 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:15:00 +0100
Subject: [PATCH 3772/4088] python3-nbclassic: update to 0.3.4

---
 srcpkgs/python3-nbclassic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-nbclassic/template b/srcpkgs/python3-nbclassic/template
index 0306c4e45bcf..9ecf44b0672c 100644
--- a/srcpkgs/python3-nbclassic/template
+++ b/srcpkgs/python3-nbclassic/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbclassic'
 pkgname=python3-nbclassic
-version=0.3.1
-revision=2
+version=0.3.4
+revision=1
 wrksrc=nbclassic-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/n/nbclassic/nbclassic-${version}.tar.gz"
-checksum=f920f8d09849bea7950e1017ff3bd101763a8d68f565a51ce053572e65aa7947
+checksum=f00b07ef4908fc38fd332d2676ccd3ceea5076528feaf21bd27e809ef20f5578
 # Tarball includes no tests
 make_check=no
 

From e18d58294106339a9ab9cce05c7d8d7772a2a7bb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:16:20 +0100
Subject: [PATCH 3773/4088] python3-nbclient: update to 0.5.9

---
 srcpkgs/python3-nbclient/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
index 300561020279..1e48610db900 100644
--- a/srcpkgs/python3-nbclient/template
+++ b/srcpkgs/python3-nbclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbclient'
 pkgname=python3-nbclient
-version=0.5.4
-revision=2
+version=0.5.9
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://nbclient.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/n/nbclient/nbclient-${version}.tar.gz"
-checksum=6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce
+checksum=99e46ddafacd0b861293bf246fed8540a184adfa3aa7d641f89031ec070701e0
 # Package might need to be installed for testing
 make_check=no
 

From b94c8efb804a9698cc7e42be7a69c1456ce00584 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:18:25 +0100
Subject: [PATCH 3774/4088] python3-nest_asyncio: update to 1.5.4

---
 srcpkgs/python3-nest_asyncio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
index 64f4574dc8f0..0d07d918986a 100644
--- a/srcpkgs/python3-nest_asyncio/template
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nest_asyncio'
 pkgname=python3-nest_asyncio
-version=1.5.1
-revision=3
+version=1.5.4
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -12,7 +12,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/erdewit/nest_asyncio"
 distfiles="${PYPI_SITE}/n/nest_asyncio/nest_asyncio-${version}.tar.gz"
-checksum=afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa
+checksum=f969f6013a16fadb4adcf09d11a68a4f617c6049d7af7ac2c676110169a63abd
 
 post_install() {
 	vlicense LICENSE

From 96774528c90b29569fe222a5757d522675b62702 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 13 Dec 2021 02:07:53 +0300
Subject: [PATCH 3775/4088] rofi: update to 1.7.2.

Closes: #34499 [via git-merge-pr]
---
 srcpkgs/rofi/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rofi/template b/srcpkgs/rofi/template
index b3aab8f8fd30..137ae789b7e9 100644
--- a/srcpkgs/rofi/template
+++ b/srcpkgs/rofi/template
@@ -1,9 +1,8 @@
 # Template file for 'rofi'
 pkgname=rofi
-version=1.7.0
+version=1.7.2
 revision=1
 build_style=gnu-configure
-make_check_args="XFAIL_TESTS=textbox_test"
 hostmakedepends="autoconf automake flex glib-devel pkg-config which"
 makedepends="libXinerama-devel librsvg-devel
  libxkbcommon-devel pango-devel startup-notification-devel
@@ -13,7 +12,7 @@ maintainer="Dave Davenport <qball@gmpclient.org>"
 license="MIT"
 homepage="https://github.com/davatorium/rofi"
 distfiles="https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.xz"
-checksum=aabb95b35fc30da2de75292b97d9a3f0f367805a40ffe9ee68d8213ddbc049a4
+checksum=adfa04b2b3fb5f8ef4be356885e7473f611fc93ab32815027f1d7deba94fd7cd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	makedepends+=" check-devel"

From 85c8b8f191f02115f30820d60db21c22d0e1bacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Fri, 10 Dec 2021 21:14:09 +0200
Subject: [PATCH 3776/4088] eventviews: update to 21.08.3.

---
 common/shlibs               | 2 +-
 srcpkgs/eventviews/template | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2c0536f1550a..6dc55116b3b6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3474,8 +3474,8 @@ libshp.so.1 shapelib-1.4.1_1
 libantlr3c.so libantlr3c-3.4_1
 libbzrtp.so.0 bzrtp-1.0.6_1
 libbellesip.so.1 belle-sip-4.4.0_1
-libKF5EventViews.so.5 eventviews-18.04.3_1
 libKF5IncidenceEditor.so.5 incidenceeditor-18.04.3_1
+libKF5EventViews.so.5 eventviews-21.08.3_1
 libmediastreamer.so.11 mediastreamer-4.4.0_1
 liblinphone.so.10 linphone-4.4.0_1
 liblinphone++.so.10 linphone-4.4.0_1
diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index 0b05ce1c83e8..c9fdbd63a2bc 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,6 +1,6 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b28f3a6823194a6a64d8e6043ff4c8ec1897e47b3cc4404cda4aceafec842a34
+checksum=86cc394d4fd9956758503d1300150aef1225c53a62b2e354f4e13c15d3e16c21
 
 eventviews-devel_package() {
 	short_desc+=" - development"
@@ -23,4 +23,3 @@ eventviews-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-

From 8f95e1680c7d4869459f31986b2ffe94cce09ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Fri, 10 Dec 2021 21:15:07 +0200
Subject: [PATCH 3777/4088] incidenceeditor: update to 21.08.3.

---
 common/shlibs                    |  2 +-
 srcpkgs/incidenceeditor/template | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6dc55116b3b6..25dd7777a273 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3474,8 +3474,8 @@ libshp.so.1 shapelib-1.4.1_1
 libantlr3c.so libantlr3c-3.4_1
 libbzrtp.so.0 bzrtp-1.0.6_1
 libbellesip.so.1 belle-sip-4.4.0_1
-libKF5IncidenceEditor.so.5 incidenceeditor-18.04.3_1
 libKF5EventViews.so.5 eventviews-21.08.3_1
+libKF5IncidenceEditor.so.5 incidenceeditor-21.08.3_1
 libmediastreamer.so.11 mediastreamer-4.4.0_1
 liblinphone.so.10 linphone-4.4.0_1
 liblinphone++.so.10 linphone-4.4.0_1
diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 3e32345f49a4..23c3f0430a78 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,6 +1,6 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=181d4e32ef7e8c8a83f3fbc5d24c4d3e777ee810ecc9e5de3f8355e2fe1c3f77
+checksum=93b1a062423aac0f114e08e1689f6cef21bae94ff74f2166a7d3ad3f71e9855c
+
+do_check() {
+	# failing tests are disabled
+	cd build
+	ctest -E ".*sqlite.*test"
+}
 
 incidenceeditor-devel_package() {
 	short_desc+=" - development"
@@ -23,4 +29,3 @@ incidenceeditor-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-

From 9f5e4e3f4cc2297d09b9cda27912acbd996ac43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Fri, 10 Dec 2021 21:16:28 +0200
Subject: [PATCH 3778/4088] New package: libphonenumber-8.12.38

---
 common/shlibs                   |  2 ++
 srcpkgs/libphonenumber-devel    |  1 +
 srcpkgs/libphonenumber/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/libphonenumber-devel
 create mode 100644 srcpkgs/libphonenumber/template

diff --git a/common/shlibs b/common/shlibs
index 25dd7777a273..f577c371c659 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4071,3 +4071,5 @@ libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
 libptytty.so.0 libptytty-2.0_1
 libcoeurl.so.0 coeurl-0.1.0_1
+libphonenumber.so.8 libphonenumber-8.12.38_1
+libgeocoding.so.8 libphonenumber-8.12.38_1
diff --git a/srcpkgs/libphonenumber-devel b/srcpkgs/libphonenumber-devel
new file mode 120000
index 000000000000..a69b53811ea8
--- /dev/null
+++ b/srcpkgs/libphonenumber-devel
@@ -0,0 +1 @@
+libphonenumber
\ No newline at end of file
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
new file mode 100644
index 000000000000..708a13962e49
--- /dev/null
+++ b/srcpkgs/libphonenumber/template
@@ -0,0 +1,30 @@
+# Template file for 'libphonenumber'
+pkgname=libphonenumber
+version=8.12.38
+revision=1
+build_wrksrc=cpp
+build_style=cmake
+build_helper=qemu
+make_cmd=make
+hostmakedepends="pkg-config protobuf"
+makedepends="boost-devel gtest-devel icu-devel protobuf-devel"
+short_desc="Google's common library for handling international phone numbers"
+maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
+license="Apache-2.0"
+homepage="https://github.com/googlei18n/libphonenumber"
+distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version}.tar.gz"
+checksum=6a57c68550c382ac176715e275d4bed6deac1b5736df2e184e34653da1f141c2
+
+pre_configure() {
+	export CMAKE_GENERATOR="Unix Makefiles"
+}
+
+libphonenumber-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 2f1c1d015095194820f8d91e99c4f3d842893537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Fri, 10 Dec 2021 21:20:00 +0200
Subject: [PATCH 3779/4088] kaddressbook: update to 21.08.3.

---
 common/shlibs                 | 2 ++
 srcpkgs/kaddressbook/template | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f577c371c659..8cd2e95b0c58 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4073,3 +4073,5 @@ libptytty.so.0 libptytty-2.0_1
 libcoeurl.so.0 coeurl-0.1.0_1
 libphonenumber.so.8 libphonenumber-8.12.38_1
 libgeocoding.so.8 libphonenumber-8.12.38_1
+libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1
+libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index 3673f4ccc59a..5b7c383617bf 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,6 +1,6 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=21.08.2
+version=21.08.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kaddressbook"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e2d833394ab1f0163c111499663f305bd94ddb53ea7758c1962354757f186ddf
+checksum=8f630d77ab59ccf16c548da2475c2827627b92719b2a39572780972617bb26b0

From 78f9e747d77b8d083b0a08831815ecffe2978047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Fri, 10 Dec 2021 21:21:06 +0200
Subject: [PATCH 3780/4088] kpkpass: update to 21.08.3.

---
 common/shlibs            | 1 +
 srcpkgs/kpkpass/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8cd2e95b0c58..263e5f9c5e0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4071,6 +4071,7 @@ libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
 libptytty.so.0 libptytty-2.0_1
 libcoeurl.so.0 coeurl-0.1.0_1
+libKPimPkPass.so.5 kpkpass-21.08.3_1
 libphonenumber.so.8 libphonenumber-8.12.38_1
 libgeocoding.so.8 libphonenumber-8.12.38_1
 libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1
diff --git a/srcpkgs/kpkpass/template b/srcpkgs/kpkpass/template
index a6b53e8dcc04..e2e98496a272 100644
--- a/srcpkgs/kpkpass/template
+++ b/srcpkgs/kpkpass/template
@@ -1,6 +1,6 @@
 # Template file for 'kpkpass'
 pkgname=kpkpass
-version=21.08.0
+version=21.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools shared-mime-info"
@@ -10,7 +10,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=500899c5ecd7244ae9cbbe6f30702709200cc2cea0479e48e2d5d1e9f2981315
+checksum=c5b1acc4a41747a8be381388101b401d7156abebd755c92176443cfb5019d650
 
 kpkpass-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41e979c14c8357251a6f4e3b9824849a7471aafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Fri, 10 Dec 2021 21:22:03 +0200
Subject: [PATCH 3781/4088] New package: kitinerary-21.08.3

---
 common/shlibs               |  1 +
 srcpkgs/kitinerary-devel    |  1 +
 srcpkgs/kitinerary/template | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 120000 srcpkgs/kitinerary-devel
 create mode 100644 srcpkgs/kitinerary/template

diff --git a/common/shlibs b/common/shlibs
index 263e5f9c5e0f..72d64d9aa8dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4074,5 +4074,6 @@ libcoeurl.so.0 coeurl-0.1.0_1
 libKPimPkPass.so.5 kpkpass-21.08.3_1
 libphonenumber.so.8 libphonenumber-8.12.38_1
 libgeocoding.so.8 libphonenumber-8.12.38_1
+libKPimItinerary.so.5 kitinerary-21.08.3_1
 libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1
 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
diff --git a/srcpkgs/kitinerary-devel b/srcpkgs/kitinerary-devel
new file mode 120000
index 000000000000..813c38f18b3e
--- /dev/null
+++ b/srcpkgs/kitinerary-devel
@@ -0,0 +1 @@
+kitinerary
\ No newline at end of file
diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
new file mode 100644
index 000000000000..e9049c16a797
--- /dev/null
+++ b/srcpkgs/kitinerary/template
@@ -0,0 +1,24 @@
+# Template file for 'kitinerary'
+pkgname=kitinerary
+version=21.08.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
+makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel
+ kpkpass-devel libphonenumber-devel poppler-devel protobuf-devel qt5-devel"
+short_desc="Data model and extraction system for travel reservation information"
+maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
+license="LGPL-2.1-or-later"
+homepage="https://kontact.kde.org"
+distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=6e7d052888b4e8f4b8b81a34917204c6d2326e10af1f56dcaf39d0f204c1d918
+
+kitinerary-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 9bd189675f1afe8595dcccd900ac1fd0af45204d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Fri, 10 Dec 2021 21:22:49 +0200
Subject: [PATCH 3782/4088] New package: kdepim-addons-21.08.3

---
 common/shlibs                  | 12 ++++++++++++
 srcpkgs/kdepim-addons/template | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 srcpkgs/kdepim-addons/template

diff --git a/common/shlibs b/common/shlibs
index 72d64d9aa8dc..285ccf18a711 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4076,4 +4076,16 @@ libphonenumber.so.8 libphonenumber-8.12.38_1
 libgeocoding.so.8 libphonenumber-8.12.38_1
 libKPimItinerary.so.5 kitinerary-21.08.3_1
 libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1
+libadblocklibprivate.so.5 kdepim-addons-21.08.3_1
+libdkimverifyconfigure.so.5 kdepim-addons-21.08.3_1
+libexpireaccounttrashfolderconfig.so.5 kdepim-addons-21.08.3_1
+libfolderconfiguresettings.so.5 kdepim-addons-21.08.3_1
+libshorturlpluginprivate.so.5 kdepim-addons-21.08.3_1
+libkmailquicktextpluginprivate.so.5 kdepim-addons-21.08.3_1
+libkmailmarkdown.so.5 kdepim-addons-21.08.3_1
+libgrammarcommon.so.5 kdepim-addons-21.08.3_1
+libkmailgrammalecte.so.5 kdepim-addons-21.08.3_1
+libkmaillanguagetool.so.5 kdepim-addons-21.08.3_1
+libkaddressbookmergelibprivate.so.5 kdepim-addons-21.08.3_1
+libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1
 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
new file mode 100644
index 000000000000..884544cb0988
--- /dev/null
+++ b/srcpkgs/kdepim-addons/template
@@ -0,0 +1,33 @@
+# Template file for 'kdepim-addons'
+pkgname=kdepim-addons
+version=21.08.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules python3 kdoctools kcoreaddons kaddressbook
+ gettext qt5-qmake qt5-host-tools"
+makedepends="akonadi-import-wizard-devel discount-devel incidenceeditor-devel
+ kontactinterface-devel kitinerary-devel ktnef-devel libksieve-devel mailcommon-devel
+ mailimporter-devel messagelib-devel poppler-qt5-devel qt5-devel kpkpass-devel"
+checkdepends=dbus
+short_desc="Addons for KDE PIM applications"
+maintainer="Louis Dupré Bertoni <contact@louis.xyz>"
+license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
+homepage="https://invent.kde.org/pim/kdepim-addons"
+distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=4eb7768ed72ff599334b165e581fa4b9bbe33180fef2ceffb8342159bf4f55c1
+
+do_check() {
+	# failing tests are disabled
+	cd build
+	exclude=".*sqlite.*|addressbookwidget|csvwidget|fancyheaderstyleplugin|folderconfiguresettingswidget|
+grammalecteconfigwidget|grammalecteresultwidget|grantleeheaderstyleplugin|languagetoolconfigwidget|mailmergedialogt|
+mailmergedialog|mailmergejob|mailmergewidget|markdownpreview.*|mergecontacts|
+messageviewer-dkimauthenticationverifiedserverdialog|messageviewerplugins-.*"
+	dbus-run-session ctest -E "($(echo ${exclude} | tr -d ' '))test"
+}
+
+post_install() {
+	for license in LICENSES/*; do
+		vlicense $license
+	done
+}

From 6ced9d5e98ecc15127cd6bf5a6f7217948e0ba8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Dupr=C3=A9=20Bertoni?=
 <louisdb@lespetitspedestres.org>
Date: Fri, 10 Dec 2021 21:24:34 +0200
Subject: [PATCH 3783/4088] common/shlibs: add libKPimImportWizard

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 285ccf18a711..8c7f5cf3a137 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4076,6 +4076,7 @@ libphonenumber.so.8 libphonenumber-8.12.38_1
 libgeocoding.so.8 libphonenumber-8.12.38_1
 libKPimItinerary.so.5 kitinerary-21.08.3_1
 libKPimAddressbookImportExport.so.5 kaddressbook-21.08.3_1
+libKPimImportWizard.so.5 akonadi-import-wizard-21.08.3_1
 libadblocklibprivate.so.5 kdepim-addons-21.08.3_1
 libdkimverifyconfigure.so.5 kdepim-addons-21.08.3_1
 libexpireaccounttrashfolderconfig.so.5 kdepim-addons-21.08.3_1

From d1d69fbb9b6121292d29d9a13b15eca5cd227b62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:20:09 +0100
Subject: [PATCH 3784/4088] libphonenumber: update to 8.12.39.

closes #30798
---
 srcpkgs/libphonenumber/patches/32bit.patch    | 19 +++++++++++++++++++
 .../cmake-duplicate-rule-definition.patch     | 15 +++++++++++++++
 srcpkgs/libphonenumber/template               | 10 +++-------
 3 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libphonenumber/patches/32bit.patch
 create mode 100644 srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch

diff --git a/srcpkgs/libphonenumber/patches/32bit.patch b/srcpkgs/libphonenumber/patches/32bit.patch
new file mode 100644
index 000000000000..cc5f570be4d7
--- /dev/null
+++ b/srcpkgs/libphonenumber/patches/32bit.patch
@@ -0,0 +1,19 @@
+--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc	2021-12-13 14:43:42.507659848 +0100
++++ -	2021-12-13 14:45:11.191139520 +0100
+@@ -13,6 +13,7 @@
+ // limitations under the License.
+ //
+ // Author: Patrick Mezard
++#define _FILE_OFFSET_BITS 64
+ 
+ #include "cpp-build/generate_geocoding_data.h"
+ 
+@@ -567,7 +568,7 @@
+   map<int32, set<string> > country_languages;
+   vector<DirEntry> entries;
+   if (!ListDirectory(data_path, &entries)) {
+-    fprintf(stderr, "failed to read directory entries");
++    fprintf(stderr, "failed to read directory entries\n");
+     return false;
+   }
+   for (vector<DirEntry>::const_iterator it = entries.begin();
diff --git a/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch b/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch
new file mode 100644
index 000000000000..cecebae43752
--- /dev/null
+++ b/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch
@@ -0,0 +1,15 @@
+Work around a deficiency in cmake's build rule generation.
+Upstream: not yet
+Source: https://git.alpinelinux.org/aports/tree/community/libphonenumber/cmake-duplicate-rule-definition.patch
+
+--- libphonenumber-8.12.20.orig/cpp/CMakeLists.txt
++++ libphonenumber-8.12.20/cpp/CMakeLists.txt
+@@ -351,7 +351,7 @@
+   ${TEST_METADATA_TARGET}
+   "${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml"
+   "test_metadata"
+-  "metadata"
++  "test_metadata"
+ )
+ list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_metadata.cc")
+ 
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 708a13962e49..2e61f3f083df 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,11 +1,11 @@
 # Template file for 'libphonenumber'
 pkgname=libphonenumber
-version=8.12.38
+version=8.12.39
 revision=1
 build_wrksrc=cpp
 build_style=cmake
 build_helper=qemu
-make_cmd=make
+configure_args="-DREGENERATE_METADATA=OFF"
 hostmakedepends="pkg-config protobuf"
 makedepends="boost-devel gtest-devel icu-devel protobuf-devel"
 short_desc="Google's common library for handling international phone numbers"
@@ -13,11 +13,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/googlei18n/libphonenumber"
 distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version}.tar.gz"
-checksum=6a57c68550c382ac176715e275d4bed6deac1b5736df2e184e34653da1f141c2
-
-pre_configure() {
-	export CMAKE_GENERATOR="Unix Makefiles"
-}
+checksum=ff16330f130917e42bc0b1a7efe5e4fba46633bfa62e35268acec855e17e385c
 
 libphonenumber-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4f9b0931b770fee51274933936e4d0e9e1895f5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:21:46 +0100
Subject: [PATCH 3785/4088] kde5-baseapps: update to 21.12.0.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index cc2fc86c06d5..15db05fa3fab 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=meta
 depends="

From b69c208acadc1087c700b110e44887fb38399188 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:21:50 +0100
Subject: [PATCH 3786/4088] dolphin: update to 21.12.0.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 44c30aeb7dd9..90faa712faad 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.3
+version=21.12.0
 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=3b17bfd81dcb04d37810cea0d52d098ce5244289a2eb0173f575291ca97bd9a7
+checksum=e70fc08ee292c5f9bfd4fc3bb12eef524528bee8e856d294bf484b3eff7b2669
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From df982157c462bb36575e0a293af66327bbfe05db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:21:52 +0100
Subject: [PATCH 3787/4088] dolphin-plugins: update to 21.12.0.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 262b2e81aacc..2d5335dfdf53 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.3
+version=21.12.0
 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=17686354ee0396567464902babbaf77985cec103d7cc0b0c8a25c5dffc171125
+checksum=f2bc5b9874e36376afc3bcdaaa558ae7277cea724597353026dd403c2a741394

From 29b4e0ca792d6cdb8b41f9f106acff8bcd72a17f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:21:56 +0100
Subject: [PATCH 3788/4088] khelpcenter: update to 21.12.0.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index ef98f6503cf3..2434b89fe6f1 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.3
+version=21.12.0
 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=d7695b36f0403ff3880055f5cc79de3de9ffc65005b8693d1486e3ee8540c5de
+checksum=ac6867ef408a3e8ea1a06d776c7d1e78d002e5588d21b6b48502d7390f835a55
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 81d5dd7d61fb143cc066c209ae51a825c2f24959 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:02 +0100
Subject: [PATCH 3789/4088] kate5: update to 21.12.0.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 0073d6abd2ff..f9336f1a6c47 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.3
+version=21.12.0
 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=e23eb09a06e29c273332dedc95f79abb9d070ec749cf9de2178a0c383b07bfbd
+checksum=b4122e7c7078a853bde82a4177f19148d2c1cb952dca0636c07f741989146f7b
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 01374bce018d023dd226fb329e2b453f62e10da1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:05 +0100
Subject: [PATCH 3790/4088] konsole: update to 21.12.0.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index e2b8b886b8cd..bd44889cf4d3 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=21f57b47cc89de69cc4184ff9dfac0fd3ced0eac42771ae7a519225dd21300f1
+checksum=f3529987eb7b7c1a11f2efa110023925a47a7d02cc96a41160e671742fe36f73
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From 0ac7a9c69511477c5b533d2070c798ad04e44477 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:07 +0100
Subject: [PATCH 3791/4088] baloo-widgets5: update to 21.12.0.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 55bf1ab825dd..5fee34f162d6 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.3
+version=21.12.0
 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=8bcd7427e7eb601c0882967f2d2898021aac64d2a881e2966917e21d85e054de
+checksum=f720c9cfe81e3ec31a2c9ebd91011fb1320011ca39325ce070a646368e56c9a5
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From a3255b8671d3a5909aeab62285b0905f47e94f97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:09 +0100
Subject: [PATCH 3792/4088] kio-extras: update to 21.12.0.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 362c315a7787..81b90a5a3ca2 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=42020c10ea1ff595f929d3626cab3dc4f2d41957c069eea449cb5564705aa053
+checksum=246234481d7a8ad4047b46cd7dde6b3eb4a7507122a0eb6df73893749ad19c96

From 564817a61e2c9c7056e3439f05cf476efc717195 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:23 +0100
Subject: [PATCH 3793/4088] akonadi-calendar: update to 21.12.0.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 56eb4e0b852e..ad6777354a9c 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.3
+version=21.12.0
 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=4c0be997823732c6cb9408b85ebbfb35f4d8044e139aebe320f627f4e33ef49e
+checksum=7a5df066f330b1dfdd290c579132f7e84d3f8cea941da4b2f6830b170ec07f4a
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 92ed5a635e61829b6e7401e17341d9a6442cc798 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:25 +0100
Subject: [PATCH 3794/4088] akonadi-contacts: update to 21.12.0.

---
 srcpkgs/akonadi-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index d959d7309402..d5ab3258e6ef 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=11dd2d592a6f596879f84429d360d4a2b55dd982d0a9e95aad80dc8d9ce4b5c4
+checksum=e46350eff479e22f14e6a95fb0e8de0f823c5921b58c305ba4c1c1b4bdd8842a
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From 4de66c51f3a63db4859fad46dd7d7c37b947ed1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:27 +0100
Subject: [PATCH 3795/4088] akonadi-import-wizard: update to 21.12.0.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 308d662c0f30..035874d4bfc4 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=21.08.3
+version=21.12.0
 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=aaaaedc234e73955ed7780eba5d1df8b30ff2a0dad110900ac64baf89cc0f4ea
+checksum=b1977d691d4b8b89772d10b711ee9307178f47bd82d9819ad2646678d5ac3b53
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c429d9beb06e5caac81cf69950e285b4fa2b30b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:29 +0100
Subject: [PATCH 3796/4088] akonadi-mime: update to 21.12.0.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 78e739aa06f0..033a7e294d05 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.3
+version=21.12.0
 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=c4e0ac666a31ea925bc5e98e528b32ab273d4ba5016a0f7dd49c0392127daba5
+checksum=d86b6d72be0e046bc56dfe9c29256f5dfd727da1f542659144c3c3979fa6351f
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From ddd024b315ca2d1f2aeddb783d122e9e22a58de7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:31 +0100
Subject: [PATCH 3797/4088] akonadi-notes: update to 21.12.0.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 79c3f8450a98..80dc18aa9618 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.3
+version=21.12.0
 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=d6818c00f8fc1f693b7019d7dba8d1c764e2c0a08ed0064e4f824a4c246c333c
+checksum=42d87fa2bf4ba4316917b90745089b446da1120d86dcd32709d0c34273b22f5c
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ef6004d572202c216708bdcf672452b23dbe073b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:33 +0100
Subject: [PATCH 3798/4088] akonadi-search: update to 21.12.0.

---
 srcpkgs/akonadi-search/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 3050405e96f8..52c532865b3e 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,10 +1,10 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
- gettext kcoreaddons"
+ gettext kcoreaddons kpackage"
 makedepends="akonadi5-devel akonadi-mime-devel xapian-core-devel krunner-devel
  kcmutils-devel kcontacts-devel kcalendarcore-devel"
 short_desc="Libraries and daemons to implement searching in Akonadi"
@@ -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=a0d263e49296fa1f558fa350003cdd458724f93024082ad96ac97f1048686ebb
+checksum=3305dea1b1c1844fd15dc2cc3a631264beb9b00106e62ddfbecd260c41feca1d
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 79b77f386517dc78e74d8f609030db365e2b839a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:35 +0100
Subject: [PATCH 3799/4088] calendarsupport: update to 21.12.0.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 927a48fbc9b4..5aec31664efc 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.3
+version=21.12.0
 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=de798aca4ce24ea0f94c4fec1554ebc835c5414cd40e2d6c1a00708d3aa22ace
+checksum=345ce151c2811dd9172b79a142b8f3384e19b55920f56022bc9446f18aef79a8
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e84a01ad3d70a22121fc6bb5d0e6cbaf13382ed3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:37 +0100
Subject: [PATCH 3800/4088] grantleetheme: update to 21.12.0.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index e980554ddb2b..4d19ca4518c3 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.3
+version=21.12.0
 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=63248c5c16d75ecb69a7b535a7695cb8f2dd13139289d406d3f5729fae148785
+checksum=545db22246d95c47a53fcf9c54c8b42060bbbcf3844a443a0963c52472c6f3a9
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From d2c725496f03c9be3f5a8396a48a67aaec7c478e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:39 +0100
Subject: [PATCH 3801/4088] kalarmcal: update to 21.12.0.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 5a2070b7c7f8..bb15a284b0b9 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d3f340944fd52f79cfd683dc0c2965c472ecbb2053c042fba9b93ad82fe2f50f
+checksum=1dc2619888c33757a39d9ba2bd204159e47aae01cde963c7e9439d6c1b3a6066
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From b41874d6eb681529c890834aed9d0396e7ea561c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:41 +0100
Subject: [PATCH 3802/4088] kcalutils: update to 21.12.0.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index f745d20cae8e..1fecd2d2d7d6 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.3
+version=21.12.0
 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=311be30637868b25d64efe42ac8bd67ecb77c73b7866926f70d51814fd4d4050
+checksum=de2ef3a3532d0a474fb22834b14c3a40e5bd4284806eda7229fc5ffedc9a2426
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6cb8d469af42260638d5ec2237c7d247ea624331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:45 +0100
Subject: [PATCH 3803/4088] kdepim-runtime: update to 21.12.0.

---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 8c553521842e..58a6fe5955bf 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5dd700977f1a276ab2e92fa23778bafd61279cc0ee116b9dac8651c52f0242b4
+checksum=2a0c0caa75aa0aef2f790b044a49d84ff5de22de6e07a4ffe45b990a2947b7d6
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 2d0895d9aa23d55faf2b3c4258d95f5a93e5cb62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:47 +0100
Subject: [PATCH 3804/4088] kimap: update to 21.12.0.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 50a211662b2d..373935af7b3a 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=352a028f9f01214d6ad9742de73dcd6d3a4d61e073d7653cbb0b3e50fb9bbc87
+checksum=cd21661089ee22d8b189dd79f5b22c8d53763bd5d7d5f0f03a87703329c05a39
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From 7ef0ad4d6d7eaf1d87e837e2bb10b6f7d4b82bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:49 +0100
Subject: [PATCH 3805/4088] kldap: update to 21.12.0.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 4a983026b6cf..e0ed30c30c51 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.3
+version=21.12.0
 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=a1318c5f4b725b3212bae7caa3249d0896c30710ff1466d85755b3787b9961c9
+checksum=6f78eadf6e0bc7a6c4bb0ddea699393f5506f093163cc803194d75024d3ed760
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 94b1a59360927213cea4369cfa83a661423e6961 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:56 +0100
Subject: [PATCH 3806/4088] kmail: update to 21.12.0.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b21cdb1c91ad..5def2de7509a 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.3
+version=21.12.0
 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=071cc189ca862c7f5462442d44df9fcafc125cfe4f9ed587490e04db8fb2710a
+checksum=e08018e1c74cea5361a449a799a6a689886643842a460c3916c12c4311438a86

From 48fe7198d5406ecbdc114a7788d5781b107b9734 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:22:58 +0100
Subject: [PATCH 3807/4088] kmail-account-wizard: update to 21.12.0.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 002bf4bea165..7774364bc7cf 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=21.08.3
+version=21.12.0
 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=097d3a63a6165c10f8f5738677553de5eb20a3d6e9b08283d4abc276e35cdff1
+checksum=72cbb9509d72625dd19eca1e64fcc52213629666438105c7f4a524edc8367421

From dcdd8dbc9e7634333e07874af42224b4635c828d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:02 +0100
Subject: [PATCH 3808/4088] kmailtransport: update to 21.12.0.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 4370b89a9709..8189cdfd5822 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=1c32f02ebc8b07f0ecd9af36111bef8e53fd62f463f5cf4ae70501b25c8dc476
+checksum=f021ea644ad649fb680b61ed498124c1dc089db6b0b8a72726ec2049da323f98
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d380736d61c0e3915b274ce987971924cd8f9ad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:03 +0100
Subject: [PATCH 3809/4088] kmbox: update to 21.12.0.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index f27e5a5f687c..4d6d67c7fee3 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.3
+version=21.12.0
 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=32042d5d1ec3df940dbbe0c429285daafc6d00a38c88846d81a417586861b3a5
+checksum=139fbe4bfff0fdc07436e4af2d00915534f7b1b34b28793cfc0d3f6cf285a280
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4d701a52f992a9c7b85f92d944a12891c1014c2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:06 +0100
Subject: [PATCH 3810/4088] kmime: update to 21.12.0.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index a2e8dce37750..cfe8715e4bc2 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.3
+version=21.12.0
 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=66cfc3fcdffe779ff89fa54955b8d4c2a56caaafe31656508ffe3b48b5b6afae
+checksum=75bb5cc9da5fbaa2be4797e372cff47fb426cbeab9581ccdde48a92285f2d858
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From f9a502849005caa078d46966bb078ecdd067d86f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:07 +0100
Subject: [PATCH 3811/4088] kontactinterface: update to 21.12.0.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 4434de10fbca..44cb56587d5e 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.3
+version=21.12.0
 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=52fd92c560ae1eaed5e9ce4058ade1bccae436ce38f04a682474b86699710489
+checksum=7b4849eab07b26ef9406fe7afcfe011116502dbc1eaffa1ea8a819575d4c9f07
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6340eb32c9f8d58f39e7fb62f0bb4d21ad6e757b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:09 +0100
Subject: [PATCH 3812/4088] ksmtp: update to 21.12.0.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 2d1e4be33496..e611f71eb012 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.3
+version=21.12.0
 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=a060b93620a673d05578ffd93b8faa5b003e5069723fc490e7f3b3877e003f36
+checksum=2cda0ac5a355e2828770fb34e5684a01db306918a9fe748a897471bf3552055d
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bcdaade8b6fdedd2bb00e1f4ef28057c376797b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:11 +0100
Subject: [PATCH 3813/4088] ktnef: update to 21.12.0.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 766b376c8ff9..eecab8b6a31c 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.3
+version=21.12.0
 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=0a6ff64449c9bc67560570572a3db21e7e699d357ee2a5351a65684812f2da6d
+checksum=08e6565ba81d93154f8fca8f500c1570e357c28b48997713d3f519eaaafc650d
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From cd604c16b3027cb3d41e2bcccfd9bfd80456181b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:13 +0100
Subject: [PATCH 3814/4088] libgravatar: update to 21.12.0.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 36a448e6eafd..1f3ece6c3ff0 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.3
+version=21.12.0
 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=3d5ad62fac06275495a39e602f8a4452123e83d56f905a6bea1bf5ebf2a3225a
+checksum=58979aefd90e431413d8375d0cb5a8899f95b515768c6d89d3ce83cbe95747b0
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 18af98baf0695a411e790a3ce1c87d579dee91bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:15 +0100
Subject: [PATCH 3815/4088] libkdepim: update to 21.12.0.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 64352de8b8d4..df3d26041970 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=6084b80880c4e3ba280fc23f41a9ef5dcb3d6be799519433137222d4be74e69c
+checksum=d1330781d2689481f408d1b1c0f3cf1d4adfc231b4a3fe1d5d6d6662cf3ca6cd
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From e40baa0faf284ddf5692f895d024897661a4939f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:17 +0100
Subject: [PATCH 3816/4088] libkgapi: update to 21.12.0.

---
 srcpkgs/libkgapi/patches/musl.patch | 13 +++++++++++++
 srcpkgs/libkgapi/template           |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libkgapi/patches/musl.patch

diff --git a/srcpkgs/libkgapi/patches/musl.patch b/srcpkgs/libkgapi/patches/musl.patch
new file mode 100644
index 000000000000..7712b203046e
--- /dev/null
+++ b/srcpkgs/libkgapi/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/saslplugin/plugin_common.c	2021-11-30 19:15:02.000000000 +0100
++++ -	2021-12-12 10:56:46.948934294 +0100
+@@ -73,6 +73,10 @@
+ 
+ #include "plugin_common.h"
+ 
++#ifndef NI_MAXHOST
++#define NI_MAXHOST 1025
++#endif
++
+ /* translate IPv4 mapped IPv6 address to IPv4 address */
+ static void sockaddr_unmapped(
+ #ifdef IN6_IS_ADDR_V4MAPPED
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 1914ec96b3a9..7aecf65f4d31 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -11,7 +11,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=3a27cfcb988f469aababfe6b94c72fecc3a641c37e372c00c17d955912593e80
+checksum=89f7273f7feedac50e2117253242ecb0e943d4a9e8c077ef85900f068d9dc585
 
 do_check() {
 	:

From 573801c67354b46e9e0f45e406aaeff5f4292e23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:19 +0100
Subject: [PATCH 3817/4088] libkleo: update to 21.12.0.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 31637f463c72..720b13e2f117 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.3
+version=21.12.0
 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=3453152fbc56ddde19295321a2d46a26fde4fccfbde47e97a42c6c1858c57e47
+checksum=572de9a37b6c56a1aaa23f5cb5e9d7ae1250a24ed2a0746574872081edf5a5d6
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 9ed5414a3add0dc58fedc21c1872b350a326e643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:22 +0100
Subject: [PATCH 3818/4088] kleopatra: update to 21.12.0.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 06dc4eb9f04c..2ef86f5b3dea 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7169f71165acc95fc72fc4a694294bf7b9999d785c974982b092f0dcef04f6be
+checksum=878a0c2b92d3d6ee81253f527cd8ed9fdca3aa4b61c725da54145ed53fb11861
 
 do_check() {
 	dbus-run-session ninja -C build test

From 1714b8884a77884248ead56d79e982fbc2ccd900 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:24 +0100
Subject: [PATCH 3819/4088] libksieve: update to 21.12.0.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 088c5d8633ce..26d731688ab8 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8702d58742dc53da2f5627b4c8c2b89fd8876334ba87f8f631c50abcbd88d4ea
+checksum=e0a3e1ba668c3b4f47856f04394fb9d9c483e9acab4f752c744e43dc1537aa71
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e78392e8941e740158c5d16822e301cae7248689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:26 +0100
Subject: [PATCH 3820/4088] mailcommon: update to 21.12.0.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7ea08d0e1505..70f39133bc4e 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=292c2ee359f51daa1f91acacd1bf48bfe6e5bf109c0f976468c2107a11baeb6e
+checksum=7c5fd837c7786bf24f2e662e7708463a2db703632887ae5086255a92dedf209a
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 8abb0211063dc73e8c5adf5a7c59282d07fc4047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:28 +0100
Subject: [PATCH 3821/4088] mailimporter: update to 21.12.0.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 073b1d9867bd..a14b0b19a575 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=4cc8bb67799e1fc208372196783fb50b371afb90ed3fb7aa93fbb0120b217503
+checksum=3f223596f49b0952572bab1cc6e85af361c454c96cae9aaca4d52b313067425b
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0f93c0c46c7dd91af9727a2f4c2b8de61df721b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:35 +0100
Subject: [PATCH 3822/4088] messagelib: update to 21.12.0.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 0aee864a8dad..28634396876e 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=e7ddd8a3ee522a49ac6dfa2dd7055f77033bb331af6cf8445a7ced395fa43561
+checksum=6119e69d875f3f3092604265203f750c95a9f49db64f67a95c509bad6c2457e4
 
 #TODO: fix build without qca-qt5
 

From 1b7b292d35ea7fe64da39b710a8ed07e377f8468 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:37 +0100
Subject: [PATCH 3823/4088] pimcommon: update to 21.12.0.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index ec5a27c81f35..bb1ae9607290 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=748c9286f95c4d602c839514f9949d7984ce9a3f7c1a040fe41973e9ae4e44c2
+checksum=5849ff5750228a3eacd5a878cf4538e9086df0ee2070bc2386608019ace1b70b
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f564bed7b4d4e055fb34bffa308f3ee341f16106 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:39 +0100
Subject: [PATCH 3824/4088] kpimtextedit: update to 21.12.0.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 1df47e1ee70d..b701bc153568 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.3
+version=21.12.0
 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=f0383d43f659c095739a1803b5f06144b5574ba0e810feed0baa58b929dc72a1
+checksum=4157a163a9ecb339baecc19176f03f0478371b1b635187adef4d5ec98681d09f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From fe2456b28aacf5b7bb9dd2172528bbb36092ebfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:41 +0100
Subject: [PATCH 3825/4088] kidentitymanagement: update to 21.12.0.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 07c46e34a932..666abde7e008 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8b519b6ba948735d07b2922e76d430817f0dd5a499cad03cee60577998e0d001
+checksum=fc653adf022fb4c0c2f8ec8f910dbed7e6a713f6d7570d27148841fd71874d3e
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From e5aa2f7ec3db5c018e3aa3c9709715ccb491d57d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:44 +0100
Subject: [PATCH 3826/4088] akonadi5: update to 21.12.0.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 1528453b827b..0da1b8b6a2b4 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.3
+version=21.12.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,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=1a6f214b08a651a006972dd78d8f2c8746f21d2f266e2ee6b140ce13ed7f14fb
+checksum=23bf7036b9b6f5d8ce01535c2698d54768bfa7c70c9257e4c92dca4d319cb8f3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From cb698ce3ae42a044507d694947df5977fdad6524 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:46 +0100
Subject: [PATCH 3827/4088] pim-data-exporter: update to 21.12.0.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 20890bff24ee..3f3f6381cafb 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=93536ed1775b43a281c7624df9c0b6c70ebfc81920220b4abfe6f66b209fcf50
+checksum=1770587412aa8ac118e3cd37f44b47968074b420ad4214455095743140d31aa7

From 14d7e8429b9267efb8d78dd4866ffc8056c1368a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:57 +0100
Subject: [PATCH 3828/4088] okular: update to 21.12.0.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 68fabe2aecf7..b49dff295222 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=39b922d2d7c6916025bfceacf8610214cead665369285d7a6904a434fe81f001
+checksum=c8d487e5f86cd951ae0f8d0b057393c3a1d4136c8d2f99e04a0e2ec0e85d7e23
 
 do_check() {
 	cd build

From 9fbff3da84b75f75b60218b802708fba246a03f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:23:58 +0100
Subject: [PATCH 3829/4088] libkexiv25: update to 21.12.0.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 87935f97f770..d6c0e1ac6aed 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.3
+version=21.12.0
 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=166126f6d42a390afebc8f75b719e0b64fccacab299d52a991d083fbeb68a895
+checksum=9064a900dbad287dbdf2b6dd6b1202695f9409706040b43c5cad3f77490afed6
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 6cefe009db436f9c77aa308c0a09386580f53e07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:19 +0100
Subject: [PATCH 3830/4088] spectacle: update to 21.12.0.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 799c189db7c3..93a4ff5a638a 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bec40c64c11c930f637b949226e755e527c65708da865f13770434e18b293750
+checksum=568f4029bcb3959ab6d8a088e4853256cd4edda06d8f85b9531a727865362968

From 66ea0f5457f472041756732c547d1e860f81bb25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:21 +0100
Subject: [PATCH 3831/4088] libkipi5: update to 21.12.0.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 999315eae0dc..daf518bb43ee 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.3
+version=21.12.0
 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=6e4f0ff4cc4d34ee0704f866daba8adf2d87be019234d1221e6329eb4fdb128b
+checksum=ecd6390143f997b62b7f2698332ca6fc79b03e438b6ce9522694f7933c096ede
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From c339f31533f99b6dedb664866555e92b2d64b5ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:28 +0100
Subject: [PATCH 3832/4088] ark: update to 21.12.0.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1d5c6e2d483f..1a9f915c321b 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=671858504c628991bf579b1a20edd822f6bb235b4fced618cf3906a919da3df3
+checksum=dd647821993fa553d94778ace172418cab55bdca6f35142df9a092a520ec30cf
 
 do_check() {
 	cd build

From 3462b6590e9dbb86e870c4cde79a1e077ef6702c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:31 +0100
Subject: [PATCH 3833/4088] elisa: update to 21.12.0.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index c10079aef28e..45e99ffdcf25 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.3
+version=21.12.0
 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=6b0717a67d4b10f21b5e0ab087d7569f996f542c8d3e050b186a4ef844997a70
+checksum=dcbbd33f258e3150a0a8c28019c4a5c90ec44257ddc0f3b508e434fdd60c4867
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 6fac789be9b7f23d8e3acce30aeef1cc05e50e91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:33 +0100
Subject: [PATCH 3834/4088] kdeconnect: update to 21.12.0.

---
 srcpkgs/kdeconnect/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 2833420344dd..ebb7a02e618e 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,13 +1,13 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.3
+version=21.12.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-host-tools
  pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+ kpackage qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
  qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
@@ -19,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=324663336db1000163eae91a63be84b6a614131ed62bd6dd6563639ecd5bdabd
+checksum=519e1d03cef6c8b68902be7907fada4988b34c20816a977077576bf168369d4a
 python_version=3

From 8784b7a442ac79dd24fceefb6b5a97dfa5379fb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:35 +0100
Subject: [PATCH 3835/4088] kdegraphics-thumbnailers: update to 21.12.0.

---
 srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index e4dd289d2b07..0b113d03bb3e 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=e5d9dcc31c53551e79b4ee6024529ec6fbf6282b740df2698877aceae5ac72c1
+checksum=70dcb030731b7844fabbba6b67ac9bb1495981911f7e0782a7927ea15422917e

From f9b54d7464fe6561af4e9eaf65e12159f07a08bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:40 +0100
Subject: [PATCH 3836/4088] knights: update to 21.12.0.

---
 srcpkgs/knights/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 9eb9ee4550bd..2c12c0c573aa 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,14 +1,14 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
- gettext kcoreaddons kconfig kdoctools"
+ kpackage gettext kcoreaddons kconfig kdoctools"
 makedepends="libkdegames-devel kplotting-devel plasma-framework-devel"
 short_desc="Chess board program for KDE"
 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=f162c9337f665508fb4a3f46bdde1f990b164a3cac489cd03c0906a524b2562a
+checksum=69245840e2cbb2f1ea17ee74fa6d7a5468c23983da111057e5705ba2ff092c9d

From 4680721ac859bac650a275f64b0f8ce93255a346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:41 +0100
Subject: [PATCH 3837/4088] kqtquickcharts: update to 21.12.0.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 3072a3c78790..fda8b584d451 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.3
+version=21.12.0
 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=8a15c5225a47a123efd560095b171e76ee3f08b1efce90002bf2cb75b0b6df4f
+checksum=36769928c967d05bbdeffc375798c6ade4b21e8c16042be206269cc5d5fddc2e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f91077a322620c49e9f408e9c47329cf4cecf665 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:49 +0100
Subject: [PATCH 3838/4088] akregator: update to 21.12.0.

---
 srcpkgs/akregator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index b008d05663cf..9571ef409e7e 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/internet/akregator"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b9b8458152664b92316482f150d8ac214f879646124f5dfe0b8df1d8b39b1397
+checksum=9b9952c799e9469193c1e78aa733c6c25f41362129a68c92ec679fa05eb3a170

From 91be085b67beff56bb0a739a3eb013d267eb2930 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:51 +0100
Subject: [PATCH 3839/4088] eventviews: update to 21.12.0.

---
 srcpkgs/eventviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index c9fdbd63a2bc..6d74207d9185 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,6 +1,6 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=86cc394d4fd9956758503d1300150aef1225c53a62b2e354f4e13c15d3e16c21
+checksum=dedcd7583c8522a85561f544d67a25809bc533cd47cffe94c2522165d364c798
 
 eventviews-devel_package() {
 	short_desc+=" - development"

From f086725af7eefc89a31e178255a12690c023e8d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:53 +0100
Subject: [PATCH 3840/4088] incidenceeditor: update to 21.12.0.

---
 srcpkgs/incidenceeditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 23c3f0430a78..f6a82aad6169 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,6 +1,6 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=93b1a062423aac0f114e08e1689f6cef21bae94ff74f2166a7d3ad3f71e9855c
+checksum=57df77be28e81f5b1b15cd1e65dc5b7f549f32e5e4c0be37768f0000c5502de7
 
 do_check() {
 	# failing tests are disabled

From a01240cb8f835812954f3f86cba0895b60e42ff7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:24:57 +0100
Subject: [PATCH 3841/4088] kaddressbook: update to 21.12.0.

---
 srcpkgs/kaddressbook-devel    |  1 +
 srcpkgs/kaddressbook/template | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/kaddressbook-devel

diff --git a/srcpkgs/kaddressbook-devel b/srcpkgs/kaddressbook-devel
new file mode 120000
index 000000000000..bdf70cf3197e
--- /dev/null
+++ b/srcpkgs/kaddressbook-devel
@@ -0,0 +1 @@
+kaddressbook
\ No newline at end of file
diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index 5b7c383617bf..41d599bfe9d5 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,6 +1,6 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kaddressbook"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8f630d77ab59ccf16c548da2475c2827627b92719b2a39572780972617bb26b0
+checksum=3a86dfddcf2e522a7eafd60f0cd6ac558b371712edae4df06c488af71472da88
+
+kaddressbook-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
+		vmove "usr/lib/*.so"
+	}
+}

From d13a3292dc55cf6622f48b39f8b8f57838219325 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:00 +0100
Subject: [PATCH 3842/4088] kalarm: update to 21.12.0.

---
 srcpkgs/kalarm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 383f3cd9656b..2402743c5a53 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kalarm"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c5bde9166a453ba9a82c7107f7fd27f3aa9d41649490b1c723cf923a04e09c19
+checksum=353fa8c78426e6f92facae1b5e37f000442441bb981cf828895240f6cdec8142

From cdc438246537712803ea4225d7fa632c602e78e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:06 +0100
Subject: [PATCH 3843/4088] kdenlive: update to 21.12.0.

---
 srcpkgs/kdenlive/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 9090dc27a1a6..e5b2f738c4cb 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,11 +1,11 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="
  extra-cmake-modules kconfig kcoreaddons kdoctools pkg-config python3
- qt5-host-tools qt5-qmake gettext"
+ kpackage qt5-host-tools qt5-qmake gettext"
 makedepends="
  kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel
  kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f59c3749f1432cf04151a657a7e345ac45f76e75dbc7a3d411b31dd93430a183
+checksum=e11d2ee058d89ad1c7b8bb230bf3e26e9c4b8fdf7fb98fc790de7e4a1bd77420
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From cd64407ce35fced87f843b50e39a091fd4c2d651 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:11 +0100
Subject: [PATCH 3844/4088] kget: update to 21.12.0.

---
 srcpkgs/kget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index 2739dae1811c..9ade463e2492 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kget"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d0c40b968d184f1a45e83dc26ac7e4a2a9761196bc7c3e8cc85d9539ed380086
+checksum=5f55ea13f150ac063f9b2e04ffad9c0b86477a39158adcf4a319ec2a483aa535

From 0fa68ddfb00f5f4040af3602c3ea6b41e946ea46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:13 +0100
Subject: [PATCH 3845/4088] knotes: update to 21.12.0.

---
 srcpkgs/knotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index a4d4c2a9e30e..9782cbe3dba6 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,6 +1,6 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://apps.kde.org/knotes/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2925bac240c3c0d660d657fdcb947239ed08f321b6438e13508fc5c5efac79bc
+checksum=afeb17534fe609255785770cd883947ccff805908a9ab9ad3250a6739775bc61

From 453c524c60e23973d5b3d4d1e27fbe7efe1deaa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:21 +0100
Subject: [PATCH 3846/4088] konqueror: update to 21.12.0.

---
 srcpkgs/konqueror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index a00072960d7f..09988a1e266f 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/internet/org.kde.konqueror"
 distfiles="${KDE_SITE}/release-service/${version}/src/konqueror-${version}.tar.xz"
-checksum=57ca516fde6def2912939360f1da05f8cded79cccc66404fc0a43aa0b00db46c
+checksum=67360d0a5051c1f572b2234f5b9e8c5ea9510d3eb748ca80aedc656b09b0c0b3
 
 do_check() {
 	:

From a9a5f9b55fd242ffde496ac605779beea1fea462 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:24 +0100
Subject: [PATCH 3847/4088] kontact: update to 21.12.0.

---
 srcpkgs/kontact/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index ad23a66bbbf8..1c0399952d89 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kontact"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5268e2ba5c8fd1afc011a4d207539adb176b25b416e305d39c261dbf5c3feda8
+checksum=4996ad097b97cf25506a68fc5b06304bcee50ae0bfed596510e1f6258390599e

From 7275cfc86b9487b623702dcf53ddff09cc4421fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:27 +0100
Subject: [PATCH 3848/4088] korganizer: update to 21.12.0.

---
 srcpkgs/korganizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index 13dfbc934a5b..3199f69a5abc 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,6 +1,6 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.korganizer"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=67f5b87dc717c6cd1e71c8f7c8ddfbb603c77a8861cf0d3007ffe1decbfbf947
+checksum=28cd09bec0559b66199d57f95201ba1f12aad6002f419a6620297148e920cce1

From 0884bdd16bea8b1ffdf88e1ed66b3a1301f4308c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:30 +0100
Subject: [PATCH 3849/4088] krdc: update to 21.12.0.

---
 srcpkgs/krdc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index b19a9e8ab082..f05752a1d87a 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.krdc"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6d593dff61ed091f3188b76f49685ef01c74b6021656169de5a4814cf472377f
+checksum=c1a4bc7be2391ff2e7e8088a18cd50483d2037b6febe698f68eb4d5b5c73a96c
 
 krdc-devel_package() {
 	short_desc+=" - development files"

From 18ab64195f88a1f825e66eb1c0e7260884ba9060 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:25:33 +0100
Subject: [PATCH 3850/4088] krfb: update to 21.12.0.

---
 srcpkgs/krfb/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index b8ea4ebe9b98..24391100ff12 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -8,10 +8,11 @@ hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
 makedepends="qt5-devel qt5-x11extras-devel ki18n-devel kcompletion-devel
  kconfig-devel kcoreaddons-devel kcrash-devel kdbusaddons-devel kdnssd-devel
  kdoctools-devel knotifications-devel kwallet-devel kwidgetsaddons-devel
- kxmlgui-devel libvncserver-devel libXtst-devel xcb-util-image-devel"
+ kxmlgui-devel libvncserver-devel libXtst-devel xcb-util-image-devel
+ kwayland-devel"
 short_desc="KDE Desktop Sharing"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0b1f4281c5af3eecd257aaabb2824be646e045228e7391a3fa668acb400bc2c2
+checksum=6d4659fc936573941dd8d429ca3605229f362192a12ace3ac516d738c1fc7487

From 4e17b9abf24fa1a2494cf534001b3347836dd026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:26:07 +0100
Subject: [PATCH 3851/4088] ktuberling: update to 21.12.0.

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 16ca3ede4ff3..f5471af526ce 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=ce74c06fd7c328c46782e0fc0d15a70efd2d6459b5f57f426e21f001e086fb40
+checksum=54e02dac7eaa5a453174e9e2ca38a1860835e66613cf6e242aac08b18fa45058

From 53fbeced789d26d9533fb548f76e9539373c0960 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:26:10 +0100
Subject: [PATCH 3852/4088] libktorrent: update to 21.12.0.

---
 srcpkgs/libktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index 47289212a9d0..1513cb64ed43 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python3 doxygen"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/en/ktorrent"
 distfiles="${KDE_SITE}/release-service/${version}/src/libktorrent-${version}.tar.xz"
-checksum=7492cfa722a9e4f786dbcc1d7cc115e69711f5c10778be306003f87794053d9b
+checksum=5ec0b6b676d96b9b552e04a9c042804ec0c559c9e56f7b28c50b80c2ed1eeb53
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From b6ba09e1c103cc9cde27635001279de12ff3f491 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:26:56 +0100
Subject: [PATCH 3853/4088] kitinerary: update to 21.12.0.

---
 srcpkgs/kitinerary/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index e9049c16a797..a9cf99398c7b 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,6 +1,6 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6e7d052888b4e8f4b8b81a34917204c6d2326e10af1f56dcaf39d0f204c1d918
+checksum=33f19570aaabe9340bb6f8c8d37e33d1c943644eee5275b9ffc59dfa64dcef37
 
 kitinerary-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9f1f6a5d8395a147af64a752e00080ad9fe724c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:27:07 +0100
Subject: [PATCH 3854/4088] kdepim-addons: update to 21.12.0.

---
 srcpkgs/kdepim-addons/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 884544cb0988..a0242e0d775e 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,20 +1,21 @@
 # Template file for 'kdepim-addons'
 pkgname=kdepim-addons
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules python3 kdoctools kcoreaddons kaddressbook
- gettext qt5-qmake qt5-host-tools"
+hostmakedepends="extra-cmake-modules python3 kdoctools kcoreaddons
+ kconfig kpackage gettext qt5-qmake qt5-host-tools"
 makedepends="akonadi-import-wizard-devel discount-devel incidenceeditor-devel
  kontactinterface-devel kitinerary-devel ktnef-devel libksieve-devel mailcommon-devel
- mailimporter-devel messagelib-devel poppler-qt5-devel qt5-devel kpkpass-devel"
+ mailimporter-devel messagelib-devel poppler-qt5-devel qt5-devel kpkpass-devel
+ kaddressbook-devel"
 checkdepends=dbus
 short_desc="Addons for KDE PIM applications"
 maintainer="Louis Dupré Bertoni <contact@louis.xyz>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/pim/kdepim-addons"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4eb7768ed72ff599334b165e581fa4b9bbe33180fef2ceffb8342159bf4f55c1
+checksum=f00ae7ac3311bf31377830f44a44fe0a6b9c09a0749529aefd81254b0a1db603
 
 do_check() {
 	# failing tests are disabled

From 34a6e1293ff44f27d55d961c4e51a98cd521d845 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:27:50 +0100
Subject: [PATCH 3855/4088] kpkpass: update to 21.12.0.

---
 srcpkgs/kpkpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpkpass/template b/srcpkgs/kpkpass/template
index e2e98496a272..f449e255ec4b 100644
--- a/srcpkgs/kpkpass/template
+++ b/srcpkgs/kpkpass/template
@@ -1,6 +1,6 @@
 # Template file for 'kpkpass'
 pkgname=kpkpass
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools shared-mime-info"
@@ -10,7 +10,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c5b1acc4a41747a8be381388101b401d7156abebd755c92176443cfb5019d650
+checksum=b69ba26ef69f72699995425323e55f7064623b3116d806dca65c2713a0e7770a
 
 kpkpass-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ced0d659148da150850fd47d05378b423460c2e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:26 +0100
Subject: [PATCH 3856/4088] dragon-player: update to 21.12.0.

---
 srcpkgs/dragon-player/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index ab0bb5f819ee..339673195df9 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=21.08.0
+version=21.12.0
 revision=1
 wrksrc="dragon-${version}"
 build_style=cmake
@@ -9,8 +9,8 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="kio-devel kparts-devel ksolid-devel"
 depends="virtual?phonon-qt5-backend hicolor-icon-theme"
 short_desc="Multimedia player where the focus is on simplicity"
-maintainer="1is7ac3 <isaac.qa13@gmail.com>"
+maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
 distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=d5c4079e3113705c657cb6c1a62a15948d75fa719dc46f677d2000bc9acad334
+checksum=101dfce62050491845a425edf0f95c2c7a13d81956b90462621d6911672ef590

From 6bcada661a254ce17473d969f7817542491336ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:27 +0100
Subject: [PATCH 3857/4088] ffmpegthumbs: update to 21.12.0.

---
 srcpkgs/ffmpegthumbs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 87980bde5369..6bc39851c2c6 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,6 +1,6 @@
 # Template file for 'ffmpegthumbs'
 pkgname=ffmpegthumbs
-version=21.08.0
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel
@@ -11,4 +11,4 @@ maintainer="Michael Straube <straubem@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ffmpegthumbs-${version}.tar.xz"
-checksum=b5b8f70cd63b08a5d83b8bc18c0fa516341f7d498a5fb1d98b77c5eeb6b37131
+checksum=2b3ce90c799afe73d3417b51cbd7a62f160d859144f077f0a447185a5fafb192

From 7cede1c49c62f887040646751d3d71778303efd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:29 +0100
Subject: [PATCH 3858/4088] filelight: update to 21.12.0.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index a1c325747a74..cf8be4623a2d 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=9cff01597df3fcc235bda4b10340b677f096daf6413390666753d291ba01a148
+checksum=d2ca036e99f9bd95fafc6da958fb70685e9b87cf2cffa8f90ed8e2aa412976f0

From 7d69116a756e384ec1cfdea198ba755a077217a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:32 +0100
Subject: [PATCH 3859/4088] juk: update to 21.12.0.

---
 srcpkgs/juk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index b24eafb15904..e90c9673058f 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=21.08.0
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -8,8 +8,8 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-svg-devel kio-devel taglib-devel"
 depends="virtual?phonon-qt5-backend hicolor-icon-theme kinit"
 short_desc="Jukebox, tagger and music collection manager"
-maintainer="1is7ac3 <isaac.qa13@gmail.com>"
+maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=c5017e4ed567993d052de4c0588cd9457b7992013706e62e1bf9309dfc53098f
+checksum=82c3a6d71476c668d4226eed894553c3b247e140a891c1c414b39646b58f4d3f

From 64bcc425de35593f5571c5b9334b658aeddb7bd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:37 +0100
Subject: [PATCH 3860/4088] k3b: update to 21.12.0.

---
 srcpkgs/k3b/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index b69032bf3e11..9aa2392cb206 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=21.08.0
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=804c0b7932a1788b488c33455b444b8bfc47f64c41668e96c2670e309b790909
+checksum=588efbb29a45f6241d8b296d3740376648821b5dbf9f2b90c87af14554a6dabc

From 1b52465cb71e8d64f483b02de720bf701a6f9710 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:39 +0100
Subject: [PATCH 3861/4088] kaccounts-integration: update to 21.12.0.

---
 srcpkgs/kaccounts-integration/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 37a91cc5a74c..dee1f9c00f9a 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,10 +1,10 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
- kcoreaddons libaccounts-qt5-devel signond-devel gettext"
+ kcoreaddons libaccounts-qt5-devel signond-devel gettext kpackage"
 makedepends="kcmutils-devel kparts-devel libaccounts-qt5-devel signond-devel"
 depends="kinit signon-ui signon-plugin-oauth2 signon-kwallet-extension"
 short_desc="Administer web accounts for sites and services across the KDE desktop"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=c4f2a16e2bf84d2794d15f0cc217efb0f0c2032d3f294eb449dadca6f3f3ca43
+checksum=c71237afb05be595d4ef308694476d1b9f491637f98decfa7023b22f5fb08a36
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 5ab5fcf663b2d4b1991db209bcaf71a91af8c52e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:41 +0100
Subject: [PATCH 3862/4088] kaccounts-providers: update to 21.12.0.

---
 srcpkgs/kaccounts-providers/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index f724f4680043..d9600bb68a86 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,10 +1,10 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
- pkg-config kcoreaddons libaccounts-qt5-devel signond-devel"
+ kpackage pkg-config kcoreaddons libaccounts-qt5-devel signond-devel"
 makedepends="kparts-devel kaccounts-integration-devel glib-devel
  libaccounts-qt5-devel qt5-location-devel signond-devel"
 short_desc="KDE Accounts Providers"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=99c10671b985c0479f403982d467ebd2683992ebcbc043910af70d7e10950a32
+checksum=5121c11837830b234a563ff9a9a0fa8051bfbaa781cc115d9e3760a07f8e7078
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From c208fcfe017efb609c72205cf6e5ebcb27b463ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:43 +0100
Subject: [PATCH 3863/4088] kamoso: update to 21.12.0.

---
 srcpkgs/kamoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 78bdba655f34..6709ba1bb797 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.2
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f72c81d9b8039ea5961e97d8a9a0c29051642bf697e71424200abe7c664d6d66
+checksum=0d35986fb1a093023f2242b54a4db1e7ce0e6a91eac51dbe29f910c37e993d3a

From bc4594b3f556d1b875f366b614b595fce601ce09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:47 +0100
Subject: [PATCH 3864/4088] kapman: update to 21.12.0.

---
 srcpkgs/kapman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapman/template b/srcpkgs/kapman/template
index 717929e5a8c9..a069c619504f 100644
--- a/srcpkgs/kapman/template
+++ b/srcpkgs/kapman/template
@@ -1,6 +1,6 @@
 # Template file for 'kapman'
 pkgname=kapman
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -12,4 +12,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kapman"
 distfiles="${KDE_SITE}/release-service/${version}/src/kapman-${version}.tar.xz"
-checksum=23693e6695c7776a88c6acd1efc8723add5c0cf03003ac556f872283b4f00a6d
+checksum=e4111df72a7fe25251f0c9edc887c77ae988f9baf5b05e7a046fb22c15aa7687

From c4a5b72b76fadf606e72ddb791afe5f92dfb424b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:28:50 +0100
Subject: [PATCH 3865/4088] kblocks: update to 21.12.0.

---
 srcpkgs/kblocks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template
index c7bc5b1bc675..5de9c1708443 100644
--- a/srcpkgs/kblocks/template
+++ b/srcpkgs/kblocks/template
@@ -1,6 +1,6 @@
 # Template file for 'kblocks'
 pkgname=kblocks
-version=21.08.0
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kblocks"
 distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz"
-checksum=083894f4def771ae116b0c5f635f59cab6d51993913d5d281e0834f79ad0c3c5
+checksum=8f6fcf34daa88ea9b8e786f8e5c374aa703ddac452290f893fa81fb05ee58451

From 85d99b61f9d038c42d83d04e6a54cd3df0da4706 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 13 Dec 2021 12:32:20 +0100
Subject: [PATCH 3866/4088] kcharselect: update to 21.12.0.

---
 srcpkgs/kcharselect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template
index 4a503bb99117..9ddb2af8fd68 100644
--- a/srcpkgs/kcharselect/template
+++ b/srcpkgs/kcharselect/template
@@ -1,6 +1,6 @@
 # Template file for 'kcharselect'
 pkgname=kcharselect
-version=21.08.0
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons gettext"
@@ -10,7 +10,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kcharselect"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcharselect-${version}.tar.xz"
-checksum=507d1702b0247481313276d9d6d7a1130db2f4ef4cb0e6cf53d99fa2e329e69b
+checksum=7a8e919f78e4d092337b9975eeea26e5c3107ab9eabe588b0c4be7550dd17ed9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools python3 qt5-host-tools qt5-qmake"

From f7826683d39bc9ffa048d46931f432d2678d870d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 12 Dec 2021 00:31:51 +0100
Subject: [PATCH 3867/4088] plasma-browser-integration: adopt

---
 srcpkgs/plasma-browser-integration/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index d1d29a97d239..60cc4b0cd293 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -3,18 +3,15 @@ pkgname=plasma-browser-integration
 version=5.23.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
+configure_args="-DBUILD_TESTING=OFF
+ -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons qt5-host-tools
  kpackage gettext qt5-qmake"
 makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel
  plasma-workspace-devel purpose-devel kfilemetadata5-devel"
 short_desc="Integration of web browsers with the KDE Plasma 5 desktop"
-maintainer="1is7ac3 <isaac.qa13@gmail.com>"
+maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=09a418c5937357ae437b8d2baec9f183126ff5d13c94a05ed80f4480b4018400
-
-if [ "${CROSS_BUILD}" ]; then
-	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
-fi

From 56f353587e7b3982148a5186687880d9a92bad6d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:24:18 +0100
Subject: [PATCH 3868/4088] perl-DateTime-Calendar-Julian: update to 0.106

---
 srcpkgs/perl-DateTime-Calendar-Julian/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DateTime-Calendar-Julian/template b/srcpkgs/perl-DateTime-Calendar-Julian/template
index eb6ec2519e0b..5b0d30db7f6b 100644
--- a/srcpkgs/perl-DateTime-Calendar-Julian/template
+++ b/srcpkgs/perl-DateTime-Calendar-Julian/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-DateTime-Calendar-Julian'
 pkgname=perl-DateTime-Calendar-Julian
-version=0.105
+version=0.106
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="svenper <svenper@tuta.io>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/DateTime-Calendar-Julian"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz"
-checksum=45562160fedfa5fc332b3c7e5635bd678a65c1b810c2d7c59ed410d12e8405be
+checksum=faafa769a5e70ff1b584f6e2ef16561588d88c74bc336bddc1aa00f3381ba86c

From 5555afd183937ec0f29ecdfe2ce1804bb6d47b43 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:26:48 +0100
Subject: [PATCH 3869/4088] perl-DateTime-Locale: update to 1.33

---
 srcpkgs/perl-DateTime-Locale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DateTime-Locale/template b/srcpkgs/perl-DateTime-Locale/template
index 5b05d42ca640..847da13a5018 100644
--- a/srcpkgs/perl-DateTime-Locale/template
+++ b/srcpkgs/perl-DateTime-Locale/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-DateTime-Locale'
 pkgname=perl-DateTime-Locale
-version=1.32
+version=1.33
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 #changelog="http://cpansearch.perl.org/src/DROLSKY/DateTime-Locale-${version}/Changes"
 homepage="https://metacpan.org/release/DateTime-Locale"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz"
-checksum=78eabec73d13e1a23b0afcd1b05e84e3196258b98d1bbfafbad90d47db9c6679
+checksum=52bfefad9ff39c4d8fd1f5e78642e38b8dcd33363f337d8e89bf19e6ad185cb9

From 17d97530e0afccff595c5ddedab7110a1778967b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:28:06 +0100
Subject: [PATCH 3870/4088] perl-DateTime-TimeZone: update to 2.51

---
 srcpkgs/perl-DateTime-TimeZone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DateTime-TimeZone/template b/srcpkgs/perl-DateTime-TimeZone/template
index 626b97138c09..49e7f1bf9909 100644
--- a/srcpkgs/perl-DateTime-TimeZone/template
+++ b/srcpkgs/perl-DateTime-TimeZone/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-DateTime-TimeZone'
 pkgname=perl-DateTime-TimeZone
-version=2.47
+version=2.51
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -14,4 +14,4 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/DateTime-TimeZone"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz"
-checksum=41617138dbb5e255fe5ac3cab6f1cc8e09f934bc95906b8cd7077192a21ef2b9
+checksum=e376b0fa34a31978a407e7bca4f8cf89fe86103e18d67c6f6f6ce72a5f1e6c6a

From ebfb9700902c5b956f1f43b28a0aa25623158393 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:29:17 +0100
Subject: [PATCH 3871/4088] perl-URI: update to 5.10

---
 srcpkgs/perl-URI/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..9571829b0d91 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.10
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=16325d5e308c7b7ab623d1bf944e1354c5f2245afcfadb8eed1e2cae9a0bd0b5

From 093577eafee3de5bdbe2616360ec78c9dfe6acdc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 16:33:09 +0100
Subject: [PATCH 3872/4088] perl-HTTP-Message: update to 6.35

---
 srcpkgs/perl-HTTP-Message/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-HTTP-Message/template b/srcpkgs/perl-HTTP-Message/template
index 05ff7d22f9d5..9dc782a597b0 100644
--- a/srcpkgs/perl-HTTP-Message/template
+++ b/srcpkgs/perl-HTTP-Message/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-HTTP-Message'
 pkgname=perl-HTTP-Message
-version=6.33
+version=6.35
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTTP-Message"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Message-$version.tar.gz"
-checksum=23b967f71b852cb209ec92a1af6bac89a141dff1650d69824d29a345c1eceef7
+checksum=d77c3a64c2991c58e0694564fea7ed3610ae1790fa9eb32b51972b0a62bc6619

From 01cb57020401dc8e9339c225916f99e445be2693 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 12 Dec 2021 22:56:07 +0100
Subject: [PATCH 3873/4088] diffoscope: update to 196.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 31a2ca350066..064aee125366 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=194
+version=196
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,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=3d28f0325e00effc6c23c50f916d153524aa393623df2fd1fc8ae0f6a12daf94
+checksum=d31fd0d8ac58d41cc111ef6a3bb0007f5f52543b932bf93584bdd0dfe029e626

From 594ec1123525c3bbcdb68bb41fc42956ca509cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 12 Dec 2021 08:57:54 -0300
Subject: [PATCH 3874/4088] owncloudclient: update to 2.9.2.

---
 srcpkgs/owncloudclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 6731ba6409da..5d78289345a2 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,6 +1,6 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=2.9.1
+version=2.9.2
 revision=1
 wrksrc=client-${version}
 build_style=cmake
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.owncloud.org"
 changelog="https://raw.githubusercontent.com/owncloud/client/master/CHANGELOG.md"
 distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
-checksum=fe19a24efeafb1e89c2857398d128ed056b07161e49867db503e40ed222d6022
+checksum=4bae93d99c65e6780ebc2f16a2611c802f1916cff70a0e86c6c3929efa707cf8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"

From b9536ef18b665280eda446113048934fbed69a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 11 Dec 2021 19:33:05 -0300
Subject: [PATCH 3875/4088] iperf: update to 2.1.5, adopt.

---
 .../iperf/patches/fix-gettcpinfo-musl.patch   | 20 +++++++++++++++++++
 srcpkgs/iperf/template                        |  6 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch

diff --git a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
new file mode 100644
index 000000000000..71d8abf70585
--- /dev/null
+++ b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
@@ -0,0 +1,20 @@
+It seems there was a broken commit meant to fix compilation on win32,
+but this broke compilation on musl.
+
+See:
+
+https://sourceforge.net/p/iperf2/code/ci/c8f861a0a07b0606a581f2658c71959ad9417923/
+
+for the broken commit. The current patch fixes that by completing the
+definition of gettcpinfo() to what it was before the broken commit.
+
+--- a/compat/gettcpinfo.c	2021-12-05 17:49:56.000000000 -0300
++++ b/compat/gettcpinfo.c	2021-12-11 19:29:24.850947483 -0300
+@@ -99,4 +99,7 @@
+ };
+ #else
+ inline void gettcpinfo (int sock, struct ReportStruct *sample) {
++    sample->tcpstats.rtt = 1;
++    sample->tcpstats.isValid  = false;
++};
+ #endif
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index ba754db0d608..bcd7aa2aac28 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,16 +1,16 @@
 # Template file for 'iperf'
 pkgname=iperf
-version=2.1.4
+version=2.1.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
  ac_cv_sizeof_bool=0"
 short_desc="Perform network throughput tests"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="NCSA"
 homepage="https://iperf.fr/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=062b392e87b8e227aca74fef0a99b04fe0382d4518957041b508a56885b4d4f9
+checksum=56ec1312d24bd2c78790e67c96c0a991c82e71bc4c0b0d37171bd89c9fd6ef3e
 
 post_install() {
 	vlicense COPYING LICENSE

From 1a6948eec0c7254e0db4f7037f64509e5e56f374 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 11 Dec 2021 22:08:29 +0200
Subject: [PATCH 3876/4088] eclipse: update to 4.22 and adopt.

---
 srcpkgs/eclipse/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 618876b79aec..cb4c8cfff427 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,15 +1,15 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.21
+version=4.22
 revision=1
 #code name of version
-_release=2021-09
+_release=2021-12
 archs="x86_64"
 wrksrc="eclipse"
 depends="openjdk11 gtk+3 webkit2gtk libXtst
  hicolor-icon-theme desktop-file-utils"
 short_desc="IDE for Java and other languages"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="EPL-1.0"
 homepage="https://eclipse.org"
 nopie=yes
@@ -19,7 +19,7 @@ _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=851703de4b131fb4f308352839e7042913050709193f280396eaf2b06051c79e
+checksum=6d70a896ad70ef79f527447e5b0d1b373ca00179653ab2361aa9550d0a87068d
 python_version=2
 
 do_install() {

From acbf5cef0ec50c06ff42696437efe3cbea997521 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 11 Dec 2021 21:48:38 +0200
Subject: [PATCH 3877/4088] doctest: update to 2.4.7.

---
 srcpkgs/doctest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctest/template b/srcpkgs/doctest/template
index 394697cfb41e..3b1151980a2d 100644
--- a/srcpkgs/doctest/template
+++ b/srcpkgs/doctest/template
@@ -1,6 +1,6 @@
 # Template file for 'doctest'
 pkgname=doctest
-version=2.4.6
+version=2.4.7
 revision=1
 build_style=cmake
 short_desc="Doctest C++ testing framework"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/onqtam/doctest"
 changelog="https://raw.githubusercontent.com/onqtam/doctest/master/CHANGELOG.md"
 distfiles="https://github.com/onqtam/doctest/archive/${version}.tar.gz"
-checksum=39110778e6baf373ef04342d7cb3fe35da104cb40769103e8a2f0035f5a5f1cb
+checksum=551941e0b08fefdde39e394d484ed7ac6c867022c865e771f68a717cd3ce7d76
 
 post_install() {
 	vlicense LICENSE.txt

From b2ff4cdaa6be38541274143b1bb6691128333cfa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 11 Dec 2021 21:41:38 +0200
Subject: [PATCH 3878/4088] xfce4-whiskermenu-plugin: update to 2.7.1.

---
 srcpkgs/xfce4-whiskermenu-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 52cd59a87e05..14604b7bb072 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.7.0
+version=2.7.1
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=f044056c5325e878873a3a574a65f7c8d3dce2666a0b8345b1eca35bef29dc11
+checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e

From 48353837140c0e1f742c5d360a788629f590b50a Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 11 Dec 2021 17:07:32 +0100
Subject: [PATCH 3879/4088] cpuid: update to 20211210.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 0b363cdf07ff..61d6868aaf8b 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20211129
+version=20211210
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.etallen.com/cpuid.html"
 distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=230772bb88c44732e68a42d2eff43bcff46d893bf4ea6e04151d4cb6e8c88e2f
+checksum=e029895700de1a6f83360252804892cd58b54d1f5ff3af44b7bb6afe410e5f44

From 13263ffc7faacf6c896523a5585f792cd210239e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 11 Dec 2021 21:55:08 +0200
Subject: [PATCH 3880/4088] exo: update to 4.16.3.

---
 srcpkgs/exo/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 65ff908fb98b..5dd6fc3c2a1f 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,6 +1,6 @@
 # Template file for 'exo'
 pkgname=exo
-version=4.16.2
+version=4.16.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-locales-dir=/usr/share/locale"
@@ -12,14 +12,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
-checksum=4e89f5536afbf1cb9191cceb720fb2764df1a4fae3459512b7320841ab5a9e9d
+checksum=722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		# Disable tests:
 		sed -i 's/^\([[:blank:]]*po\).*$/\1/;/^[[:blank:]]*tests$/d' Makefile.am
 	fi
-	mkdir m4
 	NOCONFIGURE=1 xdt-autogen
 }
 

From d755b8677472787cfda96c198e50e6cbba435561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:52 +0100
Subject: [PATCH 3881/4088] kcachegrind: update to 21.12.0.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 87e7502fd390..d66628dc7c74 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=22e7991609f363cec8ff7b8631c4700fda391f5d6f9894b29727487d7c0915a1
+checksum=9e8a59946d54508217f865ab343d26c50165c8d593b651bc4ac798d33c7eaecc
 python_version=2

From ad342e8be9f24ebf307cdcb5b9c133e7dc780bf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:52 +0100
Subject: [PATCH 3882/4088] kcron: update to 21.12.0.

---
 srcpkgs/kcron/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 57ec8b1526da..3b353adc6baf 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,10 +1,10 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
- pkg-config qt5-host-tools qt5-qmake"
+ kauth pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 short_desc="KDE Configure and schedule tasks"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=6522abb432e398726e2a8b73620569521ffc48aa084fe64175b1309ce453e48c
+checksum=2ada43d13cb2f27cdf84415c607af1a138928214a3f113a9eb598f559563b2c8

From 2f6486e0fb38db6ff9cc3b74227f206f399aa55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:52 +0100
Subject: [PATCH 3883/4088] kdialog: update to 21.12.0.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 7988a7bf1072..bdbf6c97e088 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=f709e99441ae2a447a24f93a983529357f6fe5b03cb84190ef19a48b34fa78c5
+checksum=07dcc9e73eed23bfd6f2bcd5562e24ffdb2b6b0614b7106b422b0fc23b389fce

From 4302c2c2d44d7bbb117342d48b8622c959261ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:52 +0100
Subject: [PATCH 3884/4088] keditbookmarks: update to 21.12.0.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index dc6bb05094f0..8112948608dc 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=56647b9ed5c6441872db749175e6fc6ee74dd16707892bb1beddff8246cd2f6d
+checksum=4158996f881f6901a65d3292a88b3cfcfde2a192242afc1fa4070608919ef4dd

From 9f395613d1ff2cd482f494728c95d9d2bf34b5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:52 +0100
Subject: [PATCH 3885/4088] kfind: update to 21.12.0.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 86132d41fcd1..39ca7b9548dc 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=17f79c62e11b3afc31dbd3a23e65137e2a6a97cc9ddea94a9537ba8714ee0d13
+checksum=c5bdcf7b93aee88e10ec6f9b8d1e0448f28e544ee4de834ae08414368e41b7a8

From 7c4387d61be93123971463494a9eafbf0ff55b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3886/4088] kio-gdrive: update to 21.12.0.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 497c712f9c49..29d9a41b34f0 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2dbf3f288cd80bb7051284c6f102cdb77cc746078c66809455b860ac270be8c0
+checksum=b2c3e280a852e0210ce89056ac975a27f74a24d49b4629127384aa87cc084d7b

From df503acb4f669b41c1eec0751ca7d454d524faec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3887/4088] kmag: update to 21.12.0.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index cd3408293f10..d2b780820ba4 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=0bcece44b12262808d9eb4d36ea2d29fd5502da3ee7e49390ea3aa0661b85b26
+checksum=ae5505588eaa569ca00a4ff344d6aa514e64d23877aa69cd951fb1f928ff3525

From 402c50ae736579fc8be1eaa0769363bc7707379f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3888/4088] kmix: update to 21.12.0.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index b9ce16c086a9..7ae0a92319d1 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=a870c7f4bb225bf3a6737300610594d284e26ba1c30da74773e46d8df8dcae6a
+checksum=609d220c63750c0c2fe8aea570a5deee7592c0b2a1f4e40e1e2c76f0085c990b

From 6c5b53aae7c9aec90f1caf62569c40706e24abbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3889/4088] kolourpaint: update to 21.12.0.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0c939c396589..a5b42edb8550 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=11b2b987ed34a561f18336ec00d1e161bed06d9b31f7f747b3482994af8c9185
+checksum=55b9064d5c476f04bb911582fc34ae552b9e5e04b8312862289f3ca8e34feb98
 
 post_install() {
 	vlicense COPYING

From bc9fe56d16f34a2f0ea95a442e4982495b42e470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3890/4088] kompare: update to 21.12.0.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 8dfdfae03598..35cb762309fa 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=e0ee1279a17e3a1009fba1e10817215a6da29a9f904d020d4b9f975501f008a5
+checksum=7a9a0b9c582da081a8e8fbb43e907c74f1257379819b18dceaedad03ad89e915

From f14ad6f32da89256a957931bdcb2586026b6d97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3891/4088] konversation: update to 21.12.0.

---
 srcpkgs/konversation/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1d5b8dba829b..e389e38cf1e7 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,6 +1,6 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
@@ -13,5 +13,5 @@ license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=fb1f4ac9e3242a20cacd1055d4a295659d293e73c9954c69510967a6cd85d271
+checksum=540e4ed10453e250fc5f887b98745b4b7c9f6e9fde04c1cbf0e4fe6813afaed2
 python_version=3

From f0662dec8349a8f631fd3ba7fbf03124b64c5a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3892/4088] kpat: update to 21.12.0.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index e29d93131959..13e7d90780f4 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=24f600f9e196245175323a4b62f13d29821febe1c53e3498f8916d2802461369
+checksum=e24f697a6cdba583c4628f39571b477160686236bb89e6a615653f45f96e4a0c

From 521350a60e8e0391b34322a313279264459cd455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3893/4088] kruler: update to 21.12.0.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 872357ad886b..a9d47226e374 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=15d393163ae23bc6024dc2c6002ea128fcadcaab8967f8290f69f67e23f15d66
+checksum=b192dae359b20345f5d4ce1e67df5a3748fd3332637733b14bfbf7fbe17925ce

From 405d92863bc0becbfcc0fd1856312ca916eea016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3894/4088] ksystemlog: update to 21.12.0.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 597310eda58f..78052e186318 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=e6252c796519d29921d0b84733d8b3f2ad506f591a1eafd468ff2db7f7b640d4
+checksum=4f506b5227bfb2081096d3f7b505e85f8fc58a8ae5bcb102ab61bbffcc5cb806

From 8d6198b1a26dd77d20d10399a00f2af22ec73295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3895/4088] kteatime: update to 21.12.0.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 5e8bab11ac84..ce8cb28d15b6 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=b6fa24a667a8662da67b51c6c839f060c6a1ae04913e05ab3656510817abbb9c
+checksum=48ac97c05829ec613828643734fe5169c23e39d905fbd82406627f193d1b997b

From 7e3c60c9fc2f9cf5a33ed0e6a82af4e144932612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:53 +0100
Subject: [PATCH 3896/4088] kturtle: update to 21.12.0.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index e4bca4534108..4f1f7ef5e3d9 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=0c6e4ba188c207f0a3b74fb58da48c29a5c2c71c0ecaea130d54f70ffa8387bb
+checksum=1794ff87b288a80705012f251eddefac6effffcf25b581e2dd389605aec44cd5

From edc795f937cb8a2675888470ef06518f5cdf4e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3897/4088] kwalletmanager: update to 21.12.0.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 59e18ccf7fa0..785fc9177e62 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=582a73846787da55bd9c797d1afd07b65419ac7a6c634749bbd19d305a057831
+checksum=1e927369a843944a6332257f4fcee8f633a3b017848d6643942274b5a7211559

From 19294936d74a6e060612d50cce5b0aa63e993c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3898/4088] libkcddb: update to 21.12.0.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 79943bff49a2..46ba00c220d4 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,7 +12,7 @@ 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"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=bb321855ced7f692aeb2470b28bf3b1f0079f44d7574cda80fbcf0b8cdda9103
+checksum=cd6c05bfae0d9b0ba37e30a34a3e995492a82bb9d370ff68db85c39406c83762
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From d359eb7d7081e4d75cb87bdf47e9c6509bc3400c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3899/4088] libkdegames: update to 21.12.0.

---
 srcpkgs/libkdegames/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 4bf29f9a1bc4..f0087a7d4f61 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,10 +1,10 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
- kcoreaddons kdoctools gettext"
+ kcoreaddons kdoctools kpackage gettext"
 makedepends="qt5-svg-devel knewstuff-devel kdnssd-devel kdeclarative-devel libopenal-devel libsndfile-devel"
 short_desc="Common code and data for many KDE games"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2a10f38868cc52a09d6b8cbdf6f1e706e6b96b57d1e7817d610788abcc2b4c7b
+checksum=821b5e4fe68e8a3a5ab72caec240dd603baf100aae0e48658bba0aa6b5db9426
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d676c031a423f6a1f12cc01f9eee106f74946b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3900/4088] libkomparediff2: update to 21.12.0.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 9036330e5b6f..eddd2a4a81ef 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=1e47cd1cc462d62477eaec0dc26c266ee4b73ba38fb8ee279e85bd1827406928
+checksum=0d0d85ddb687e3c2e8e8550558f48eac898500cc0fd607a3dc6b387ab44172cd
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6ed398d0de37b203a63b8203c411bd77b303d6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3901/4088] marble5: update to 21.12.0.

---
 srcpkgs/marble5/patches/soversion.diff | 16 ++++++++--------
 srcpkgs/marble5/template               |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/marble5/patches/soversion.diff b/srcpkgs/marble5/patches/soversion.diff
index 378a12831168..90fe8e0e6ab2 100644
--- a/srcpkgs/marble5/patches/soversion.diff
+++ b/srcpkgs/marble5/patches/soversion.diff
@@ -1,14 +1,14 @@
 --- a/src/lib/astro/CMakeLists.txt	2018-01-10 08:43:24.000000000 +0100
 +++ b/src/lib/astro/CMakeLists.txt	2018-02-10 15:08:03.545093856 +0100
 @@ -6,7 +6,7 @@
- )
- 
- set(ASTRO_LIB_VERSION "0.17.20")
--set(ASTRO_LIB_SOVERSION "1")
-+set(ASTRO_LIB_SOVERSION "2")
- 
- ADD_DEFINITIONS(-O3)
- 
+ set(ASTRO_LIB_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+ set(ASTRO_LIB_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+ set(ASTRO_LIB_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+-set(ASTRO_LIB_SOVERSION 1)
++set(ASTRO_LIB_SOVERSION 2)
+ set(HEADER_PREFIX ASTRO_LIB)
+ configure_file("${marble_SOURCE_DIR}/cmake/templates/versionheader.h.in" "${CMAKE_CURRENT_BINARY_DIR}/astro_version.h")
+ include(CMakePackageConfigHelpers)
 --- a/src/lib/marble/declarative/CMakeLists.txt	2018-01-10 08:43:24.000000000 +0100
 +++ b/src/lib/marble/declarative/CMakeLists.txt	2018-02-10 15:08:55.007096153 +0100
 @@ -30,6 +30,10 @@
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 8b0206e4255a..fa5d852fa1b9 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.3
+version=21.12.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=0a285852438ab4cf0205c74fc4082cef742f16ce4b84f68aae30822e6ab5572d
+checksum=bc66e9e80480bd281ffbc9263139806349316bbd8eea9baaa59b008aa6d901b0
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From fe55cf018d617933fea9963ccf930712169a991c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3902/4088] signon-kwallet-extension: update to 21.12.0.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 8340f33c1f34..2f9201711b35 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=96aa05bacea3f8c0551a3e19ba02e8f4960fcf19b290ffa5d56472daacf77cd4
+checksum=bd49fb147f3b96e162e94130c16950d58b806ae0f47025994a4b77eeb4ae0a29

From acab1aa0aff443363c1472e3b5badd3d03a26a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3903/4088] svgpart: update to 21.12.0.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index e6d002012733..6178cf51b67b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=a863f67850f46709073efb9f4ce815dc954fef9986106b09a6cad3be1facfffe
+checksum=c1c6cf7cedca6d2deec765bcf678e2f267a9f3063ca56865d2cc6637789e1be3

From 6d5c57c64cf22b8421e6b6479a22db901127b5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3904/4088] umbrello: update to 21.12.0.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index b5a2161284cd..636aba83b5d0 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=dd888f8e81c3ee0d845ffcad4c9580dbecdbd1a48b4892e29da642658f6eb808
+checksum=4e8c76d48a9cdc7f03171590825a01d0573e04cfdc95f971474442a41a69d468
 python_version=2
 
 pre_configure() {

From 43d65f1f5c7c6a27639b71869367301149d29252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 13 Dec 2021 23:39:54 +0100
Subject: [PATCH 3905/4088] yakuake: update to 21.12.0.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index be91d392ba1a..dfec2b11fc52 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.3
+version=21.12.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=b38d322aadd8cb7559015d223feaaf35585fb7b20ae3ac7253ad24922ddc44fd
+checksum=817d6447c96e0c8e0b6c112e6ddb05d6b8fef687ed6974e9d8cd9d30acfc35f3

From 34e4845b3156c179b11f7ed161d02b7ee01720ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 11 Dec 2021 23:59:09 +0100
Subject: [PATCH 3906/4088] lagrange: update to 1.9.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index fd3b3f64fbcb..7aa42d12a5e2 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.8.2
+version=1.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=375a3640284d29a182ffec138298c9590d7228a390113023164a6a312c7e64f1
+checksum=cdb8f38a0ffe2bdac1b60838a8d25a6e12313412503a129c100cbbe40c1399c8
 
 post_install() {
 	vlicense LICENSE.md

From b3173f67a3c7c10254e337f61fe73f87ae178216 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 18 Sep 2021 22:41:03 +0200
Subject: [PATCH 3907/4088] glib-networking: update to 2.70.1.

---
 srcpkgs/glib-networking/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index e2cec4da596b..5adca78241c4 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.68.1
+version=2.70.1
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,8 +14,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30
+checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
 lib32disabled=yes
+make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From b81402063aa763cdc90742a4c5b786e46c58b2ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 12 Dec 2021 12:28:45 +0100
Subject: [PATCH 3908/4088] wike: update to 1.6.3.

---
 srcpkgs/wike/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wike/template b/srcpkgs/wike/template
index f9db7aa3c21f..8204c4095a3a 100644
--- a/srcpkgs/wike/template
+++ b/srcpkgs/wike/template
@@ -1,6 +1,6 @@
 # Template file for 'wike'
 pkgname=wike
-version=1.6.2
+version=1.6.3
 revision=1
 wrksrc="Wike-$version"
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hugolabe/Wike"
 distfiles="https://github.com/hugolabe/Wike/archive/refs/tags/$version.tar.gz"
-checksum=39c3a731587c0d60cca2262d104a35d20cd087288f46621955f014b72f5ba6d1
+checksum=c2304764cc07d3df896ef86fb296a8299c87537f87814a1d4bd5c702d5d52076

From 466d0efd46de09baed23e7fd9885c9dff63be92d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 13 Dec 2021 19:40:12 +0100
Subject: [PATCH 3909/4088] cloud-hypervisor: update to 20.0.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 90cfba9a93a7..2b0b911c50cb 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=19.0
+version=20.0
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=5de5f3cb6081a60f7c0b3a79324d06a471fa8cd62ac71962b5be0fca7314385f
+checksum=194452e2a739b5d693d687ede6b24ab0b08202f33af250850c4258f30a513342
 
 post_install() {
 	vlicense LICENSE-APACHE

From 6bec822af15dc64bacc6235577a21c2cda4a5d1f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 13 Dec 2021 19:47:40 +0100
Subject: [PATCH 3910/4088] gucci: update to 1.5.2.

---
 srcpkgs/gucci/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 5af3aba5ad09..c8dcb472ab01 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.1
+version=1.5.2
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=c8dbd097a4451aae08b1d16824b7175f4d8def6f4e064d05c9a48ab9f466d1b2
+checksum=bcef72f217dddfbcc4dfc70a68da02a001207125bc15a109dac4d47eb59a0ed6
 
 post_install() {
 	vlicense LICENSE

From 00ea907db371b2519dd6830c6c2ae248d6e3331a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 13 Dec 2021 19:48:25 +0100
Subject: [PATCH 3911/4088] scite: update to 5.1.6.

---
 srcpkgs/scite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 1e94a3295b10..1039f3d6e57d 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.1.5
+version=5.1.6
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=7b4410d32bbc9fc5c81102287588631e00e5b63a31d2f5e709f9ac12fbbfc73d
+checksum=c595bc56ca0bcdeed4e08f32ba7ad2cb9452a6e9c45241723c87dd70486a949f
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From 82a61c2e0860dd5c622c1c3a91bc5f4b30cf139e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 13 Dec 2021 19:49:40 +0100
Subject: [PATCH 3912/4088] tgt: update to 1.0.81.

---
 srcpkgs/tgt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index c5a638e6e3a5..5bf3d09a7070 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
 # Template file for 'tgt'
 pkgname=tgt
-version=1.0.80
+version=1.0.81
 revision=1
 build_style=gnu-makefile
 make_install_args="sbindir=/usr/bin"
@@ -11,9 +11,9 @@ depends="perl-Config-General"
 short_desc="Linux SCSI target framework"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
-homepage="http://stgt.sourceforge.net/"
+homepage="https://github.com/fujita/tgt"
 distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=e2255482f1a2797c115a6d545c37428b10a4ba6276a2af787da5378fa4e34e75
+checksum=f8a285549456f13fecf628131a73934ffcbb701bacb7d5802acee7b515ab5452
 
 post_extract() {
 	sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile

From 4bf7913818fea0b2e7472d6c395ed586fea57e98 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 14 Dec 2021 14:12:32 +0100
Subject: [PATCH 3913/4088] linux5.15: update to 5.15.8.

Set CONFIG_MEMTEST=y.

Closes #34399.
---
 srcpkgs/linux5.15/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.15/files/i386-dotconfig    | 2 +-
 srcpkgs/linux5.15/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.15/files/ppc64-dotconfig   | 2 +-
 srcpkgs/linux5.15/files/ppc64le-dotconfig | 2 +-
 srcpkgs/linux5.15/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.15/template                | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index fdd8b78dcb58..67c36f8f0eba 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -12023,7 +12023,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HMM is not set
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index d80747cab758..7d49d2ff2cc8 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -10253,7 +10253,7 @@ CONFIG_TEST_STATIC_KEYS=m
 CONFIG_TEST_FPU=m
 CONFIG_TEST_CLOCKSOURCE_WATCHDOG=m
 CONFIG_ARCH_USE_MEMTEST=y
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
index 8294073a1201..fd5be8a4b04d 100644
--- a/srcpkgs/linux5.15/files/ppc-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -8320,6 +8320,6 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
index 410fb0c5c2e0..07815146cd1c 100644
--- a/srcpkgs/linux5.15/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -10347,6 +10347,6 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_HMM is not set
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
index ba286205ec4e..0d05e75d034c 100644
--- a/srcpkgs/linux5.15/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -10072,6 +10072,6 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_HMM is not set
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 8b0237cb40fe..12150514a28f 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.5 Kernel Configuration
+# Linux/x86 5.15.8 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -10479,7 +10479,7 @@ CONFIG_TEST_STATIC_KEYS=m
 CONFIG_TEST_FPU=m
 CONFIG_TEST_CLOCKSOURCE_WATCHDOG=m
 CONFIG_ARCH_USE_MEMTEST=y
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index dec1bf4ccc0a..622842e8c17a 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.7
+version=5.15.8
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 9112078380091e8f18680f9ea863bbd74cf36eaf2ee68f6e483e718ddd3314e1"
+ c122c139f9b16fb6b78a70259c7fb689773c14581eb202425395e9ee251e98fb"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From a3ea7d9bebe2a592b657dd1c844c325222801d8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 14 Dec 2021 14:13:30 +0100
Subject: [PATCH 3914/4088] linux5.10: update to 5.10.85.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 13b45f66a644..13089ade942c 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.84
+version=5.10.85
 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=6e96271d72dd106c4bd83931ca16fda622413b34c5649e2916116c38c12e233d
+checksum=ba89162605ac447db8953c29f649b64d16aff7de8145e2db30d759e5476b19ac
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 12670fd41960bbe8584ab9e24c086965b0afe415 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 14 Dec 2021 10:57:04 -0500
Subject: [PATCH 3915/4088] python3-tomli: update to 2.0.0.

---
 srcpkgs/python3-tomli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tomli/template b/srcpkgs/python3-tomli/template
index c016a861beaf..b935177593a2 100644
--- a/srcpkgs/python3-tomli/template
+++ b/srcpkgs/python3-tomli/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tomli'
 pkgname=python3-tomli
-version=1.2.2
+version=2.0.0
 revision=1
 create_wrksrc=yes
 build_wrksrc="tomli-${version}"
@@ -20,7 +20,7 @@ homepage="https://github.com/hukkin/tomli"
 _flit_version=3.4.0
 distfiles="${PYPI_SITE}/t/tomli/tomli-${version}.tar.gz
  ${PYPI_SITE}/f/flit_core/flit_core-${_flit_version}.tar.gz"
-checksum="c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee
+checksum="c292c34f58502a1eb2bbb9f5bbc9a5ebc37bee10ffb8c2d6bbdfa8eb13cc14e1
  29468fa2330969167d1f5c23eb9c0661cb6dacfcd46f361a274609a7f4197530"
 # Archive includes no tests
 make_check=no

From c0cf96808c67935bd4f3187d2664cfa8774e8247 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 14 Dec 2021 10:57:37 -0500
Subject: [PATCH 3916/4088] pythran: update to 0.11.0.

---
 srcpkgs/pythran/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pythran/template b/srcpkgs/pythran/template
index 08e3af42085a..23b05a65fcbb 100644
--- a/srcpkgs/pythran/template
+++ b/srcpkgs/pythran/template
@@ -1,6 +1,6 @@
 # Template file for 'pythran'
 pkgname=pythran
-version=0.10.0
+version=0.11.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://pythran.readthedocs.io/"
 distfiles="${PYPI_SITE}/p/pythran/pythran-${version}.tar.gz"
-checksum=9dac8e1d50f33d4676003e350b1f0c878ce113e6f907920e92dc103352cac5bf
+checksum=0b2cba712e09f7630879dff69f268460bfe34a6d6000451b47d598558a92a875
 # Upstream defines no tests
 make_check=no
 

From 9de6821b52ab6cc239113b20c2a53339bc433a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 14 Dec 2021 10:10:17 +0000
Subject: [PATCH 3917/4088] pipewire: update to 0.3.41.

---
 srcpkgs/pipewire/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 67ffc1882f3e..62d392db1b6c 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.40
+version=0.3.41
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -21,7 +21,7 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
- readline-devel"
+ readline-devel openssl-devel lilv-devel "
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  libspa-v4l2>=${version}_${revision}"
@@ -32,7 +32,7 @@ homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="a2c8176d757a2ac6db445c61a50802ff1c26f49f5a28174f5eb0278609a887cf
+checksum="665dd941c37f96b2709871ac594d21850b39038eb69a99ae77a7954ad3c35f4e
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From 5857a4b786f7297878b774879de8254b36ef9c37 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 14 Dec 2021 17:13:52 +0100
Subject: [PATCH 3918/4088] rxvt-unicode: clean up configure flags

The utmp etc flags are gone.
Using perl will enable frills anyway, so remove that to avoid confusion.
---
 srcpkgs/rxvt-unicode/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 00ebdf63c3ca..1ad3c47e2448 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -1,13 +1,12 @@
 # Template file for 'rxvt-unicode'
 pkgname=rxvt-unicode
 version=9.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-terminfo=/usr/share/terminfo --enable-256-color
  --enable-font-styles --enable-xim --enable-keepscrolling
  --enable-selectionscrolling --enable-smart-resize --enable-transparency
- --disable-utmp --disable-wtmp --disable-lastlog --disable-frills
  --enable-combining --with-term=rxvt-unicode-256color
  $(vopt_if gdk_pixbuf '--enable-pixbuf' '--disable-pixbuf')
  $(vopt_if perl '--enable-perl' '--disable-perl')

From d351efe176c37dd1e61068b107dfabf739a589c1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 14 Dec 2021 15:14:49 +0100
Subject: [PATCH 3919/4088] chromium: update to 96.0.4664.110.

---
 srcpkgs/chromium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 9568f4131fdc..44dc120ab2dd 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,15 +1,15 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=96.0.4664.93
+version=96.0.4664.110
 revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=7c7b1f8e4e0abc3453d40c60d6a70f30851db96e5d872cbaa1b4dd7f43aa3493
+checksum=36a99d29c2e93a9975be53648f2cd3ffa4ee43730f217a2e7ed88c1901a671e8
 
 lib32disabled=yes
 

From 0d2c23e775e0bbda64085d9f803935635ddafc81 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 13 Dec 2021 18:54:15 +0100
Subject: [PATCH 3920/4088] gtk4: update to 4.4.1.

---
 srcpkgs/gtk4/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index bf4ba39965a1..d2b95a4d6fa1 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.4.0
-revision=2
+version=4.4.1
+revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
@@ -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=e0a1508f441686c3a20dfec48af533b19a4b2e017c18eaee31dccdb7d292505b
+checksum=0faada983dc6b0bc409cb34c1713c1f3267e67c093f86b1e3b17db6100a3ddf4
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11"

From d5bc50dd6c016679578dab837ab2f933175414be Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 14 Dec 2021 16:18:55 -0500
Subject: [PATCH 3921/4088] catgirl: update to 2.0

---
 srcpkgs/catgirl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 3316f2ae3633..d553cc93abb2 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,7 +1,7 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9a
-revision=2
+version=2.0
+revision=1
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
 distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=3049b99abad67cda7e9811c58c648e1afbdfbc127e1e8fcafa63d4c73243915d
+checksum=ae4ea7bdfc9a17127fec937dd8be6d0eb6939e07df55beaefd4edd6cd8caf632

From 6e0777182ecf8222eef36a9b75b348dd005ae9eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 13 Dec 2021 00:17:44 +0100
Subject: [PATCH 3922/4088] libnice: remove dep gssdp-igd

this removes gssdp-igd from the dependencies of libnice, as gssdp will
switch to gtk4 with version 1.4.0. This will introduce a
new dependency loop which will be prevented by this commit:

gst-plugins-bad1-1.18.5_1 -> gtk4-4.4.0_2 -> gssdp-1.4.0.1_1
-> gupnp-igd-0.2.5_3 -> libnice-0.1.18_3 -> gst-plugins-bad1-1.18.5_1
-> ...
---
 srcpkgs/libnice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 6ccfa29c6c8b..3c1f12d02ed0 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -7,7 +7,7 @@ build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
+makedepends="gstreamer1-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d311be59a91e00e6181ad521089476b00a8c0780 Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Tue, 14 Dec 2021 07:23:38 +0100
Subject: [PATCH 3923/4088] emptty: update to 0.6.2.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 28ebb5d0f301..6fccd5d53e14 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.1
+version=0.6.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=28cfbbb5692137644d76066664a88faf2b40d3c16e494f349f5f142b4622ffe5
+checksum=a750c5cbaeda6b4d0367d18cedf27d884e6fb9a0c7b20819dc878cf7d5a5013b
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 8132b5709317041c0844296b95a946220107c84f Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 11 Dec 2021 12:28:47 +0100
Subject: [PATCH 3924/4088] python3-pikepdf: update to 4.2.0.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 0e67a53877f4..7ab9e42a9b72 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=4.1.0
+version=4.2.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=bf31a8ab6b33ea5483c0a4d388e9623ff23f5b60caac9edb73201b2fcac2918c
+checksum=9a91564193f2c01a55aef4c3b97764b2cb59443034b62a95620b12eb265c647e
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 8d7ab3d8cff972a0e4c5c3dbe33ab75cf37490ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 12 Dec 2021 23:48:01 -0300
Subject: [PATCH 3925/4088] lcalc: update to 2.0.4.

---
 common/shlibs                |   2 +-
 srcpkgs/lcalc/files/test     |  30 ----------
 srcpkgs/lcalc/files/test.out | 112 -----------------------------------
 srcpkgs/lcalc/template       |  69 ++++-----------------
 4 files changed, 14 insertions(+), 199 deletions(-)
 delete mode 100644 srcpkgs/lcalc/files/test
 delete mode 100644 srcpkgs/lcalc/files/test.out

diff --git a/common/shlibs b/common/shlibs
index 8c7f5cf3a137..a634e46b4717 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4025,7 +4025,7 @@ libflint.so.16 flintlib-2.8.0_1
 libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
-libLfunction.so lcalc-1.23_2
+libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.1 lrcalc-1.2_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/lcalc/files/test b/srcpkgs/lcalc/files/test
deleted file mode 100644
index de1f2a6b34e1..000000000000
--- a/srcpkgs/lcalc/files/test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-#
-# Quick minimal test for lcalc.
-#
-# Test running the main binary (lcalc) and running the provided
-# example program which is dynamically linked to the library.
-# Also test that loading of L-function data files works.
-#
-# The precision is truncated at 13 (rather than the default 14),
-# otherwise the output could vary a little bit depending on
-# architecture and compiler flags. For the example program we
-# patch-round using sed the two outputs that seem to vary.
-#
-echo "### First 1000 zeros of zeta function"
-./lcalc -z 10 -P 13
-echo
-echo "### Analytic rank of elliptic curve 5077a1"
-./lcalc -e --a1=0 --a2=0 --a3=1 --a4=-7 --a6=6 -r
-echo
-echo "### run example program"
-# do some ad hoc rounding to avoid minor differences
-LD_LIBRARY_PATH=. example_programs/example | sed -e '
-	s/\(L4(1,0) = ([0-9.]*\)[0-9],/\1,/;
-	s/6.123[0-9]*e-17/6.123e-17/'
-echo
-echo "### test data files: zeros of data_mass"
-./lcalc -F example_data_files/data_maass -z 10 -P 13
-echo
-echo "### test data files: zeros of data_tau"
-./lcalc -F example_data_files/data_tau -z 10 -P 13
diff --git a/srcpkgs/lcalc/files/test.out b/srcpkgs/lcalc/files/test.out
deleted file mode 100644
index b8e661e7e6c8..000000000000
--- a/srcpkgs/lcalc/files/test.out
+++ /dev/null
@@ -1,112 +0,0 @@
-### First 1000 zeros of zeta function
- 14.1347251417
- 21.0220396388
- 25.0108575801
- 30.4248761259
- 32.9350615877
- 37.5861781588
- 40.9187190121
- 43.3270732809
- 48.0051508812
- 49.7738324777
-
-### Analytic rank of elliptic curve 5077a1
-analytic rank equals 3
-
-### run example program
------------------------------------------------
-
-Name of L_function: zeta
-All coefficients are equal to 1
-
-Q = 0.564189583548
-OMEGA = (1,0)
-a = 1 (the quasi degree)
-gamma[1] =0.5    lambda[1] =(0,0)
-
-
-number of poles (of the completed L function) = 2
-pole[1] =(1,0)    residue[1] =(1,0)
-pole[2] =(0,0)    residue[2] =(-1,0)
------------------------------------------------
-
------------------------------------------------
-
-Name of L_function: L4
-number of dirichlet coefficients = 4
-coefficients are periodic
-b[1] = 1
-b[2] = 0
-b[3] = -1
-b[4] = 0
-
-Q = 1.1283791671
-OMEGA = (1,0)
-a = 1 (the quasi degree)
-gamma[1] =0.5    lambda[1] =(0.5,0)
-
-
-number of poles (of the completed L function) = 0
------------------------------------------------
-
------------------------------------------------
-
-Name of L_function: L5
-number of dirichlet coefficients = 5
-coefficients are periodic
-b[1] = (1,0)
-b[2] = (0,1)
-b[3] = (-0,-1)
-b[4] = (-1,0)
-b[5] = (0,0)
-
-Q = 1.26156626101
-OMEGA = (0.850650808352,0.525731112119)
-a = 1 (the quasi degree)
-gamma[1] =0.5    lambda[1] =(0.5,0)
-
-
-number of poles (of the completed L function) = 0
------------------------------------------------
-
-zeta(0.5,0) = (-1.46035450881,0)
-L4(0.5,0) = (0.6676914571896,0)
-L5(0.5,0) = (0.7637478801173,0.2169647675189)
-L4(1,0) = (0.785398163397,0)
-L5(1,0) = (0.8648062659772,0.2041530661384)
-0.4285714285714
-1.5
-0.1666666666667
-0.6666666666667
-0.5714285714286
-0
-0.5714285714286
-0.5714285714286
-0
-0.8888888888889
-6.123e-17
--0.7071067811865
-
-### test data files: zeros of data_mass
- 2.8977246783
- 5.5912453153
- 21.0903775087
- 23.1575104846
- 25.4393003898
- 29.1892067135
- 31.0617394845
- 32.4527182375
- 34.027279684
- 36.9312371969
-
-### test data files: zeros of data_tau
- 9.22237939992
- 13.9075498614
- 17.4427769782
- 19.656513142
- 22.3361036372
- 25.2746365481
- 26.8043911584
- 28.8316826242
- 31.1782094984
- 32.7748753822
diff --git a/srcpkgs/lcalc/template b/srcpkgs/lcalc/template
index 1b3df018d527..a030c96039ef 100644
--- a/srcpkgs/lcalc/template
+++ b/srcpkgs/lcalc/template
@@ -1,66 +1,21 @@
 # Template file for 'lcalc'
 pkgname=lcalc
-version=1.23
-revision=2
-build_wrksrc="src"
-build_style=gnu-makefile
+version=2.0.4
+revision=1
+build_style=gnu-configure
+configure_args="--with-pari"
+hostmakedepends="automake libtool pkg-config gengetopt"
 makedepends="gmp-devel pari-devel"
 short_desc="Michael Rubinstein's L-function calculator"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
-homepage="https://mirrors.mit.edu/sage/spkg/upstream/lcalc/"
-distfiles="https://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-${version}.tar.bz2"
-checksum="83d4253ec2f38553b21190d6d0c6b71bab7ea14717f6dde5bd18f60775d3cdb0
- bd39a43b24a332e1826e667f85ca2ce2ca14749d56f60069cd886c96f55e9e3c
- d8c660f68f33b6eeb4b801d4028faaaaccbfff5797efe654bb6367e0a687542d
- dadf6fc6d481595cb041f8b0dd92bc2e2bc390cbb3e0dd36b7fe63b74942db26
- 342cde1c9effda48597bfee439acb37c91458a100580c97c84da6a142d2cc5b6
- 55c6c9f969593f24c75a85e7a150b876671356aa68ceb8e77c563a645897643e
- 906ef33de15bb0d94883b7797d8cb3c889b9f59bceebeb171e65f1546faf1c37
- 437e3870342ef4cb5749398ead9381504403e7e1f99efadab95f4a607678b400
- 6471f2f30497486e289fc8977cbb89c495cf0d5ff58af2b1f479a497a28165e6
- dde1f80b0ca42fb43917c24e6016c19e4a8d28de9c50cd0a523a318866bdc0eb
- 941d4ac025f5d6f0142fb785b27f7a221729466dc83d45fd206cce102c012eaf
- 045f23ea9131b8039001c8f13d22152f7b3c2e91adcf8c555354eaf39e7a7b48"
-shlib_provides="libLfunction.so"
+homepage="https://gitlab.com/sagemath/lcalc"
+changelog="https://gitlab.com/sagemath/lcalc/-/raw/master/doc/ChangeLog"
+distfiles="https://gitlab.com/sagemath/lcalc/-/archive/${version}/lcalc-${version}.tar.bz2"
+checksum=28b9d33307d0aa002accf6950fa4547df8c6764df8d025bc8523aa857423417b
 
-# get patches from sagemath
-_patchurl="https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches"
-_patchtag="?h=9.3.rc2"
-_patches="
- Lcommon.h.patch
- Lvalue.h.patch
- Makefile.patch
- clang.patch
- lcalc-1.23_default_parameters_1.patch
- lcalc-1.23_default_parameters_2.patch
- pari-2.7.patch
- pari-mem.patch
- pari_include.patch
- time.h.patch
- using_namespace_std.patch"
-for patch in $_patches ; do
-	distfiles+=" ${_patchurl}/${patch}${_patchtag}>${patch}"
-done
-skip_extraction="$_patches"
-
-post_extract() {
-	for patch in $_patches ; do
-		patch -p1 < "$XBPS_SRCDISTDIR/${pkgname}-${version}/${patch}"
-	done
-}
-
-CXXFLAGS="-fPIC -Wno-deprecated"
-
-pre_install() {
-	mkdir -p ${DESTDIR}/usr/{bin,lib,include}
-	make_install_args+=" INSTALL_DIR=${DESTDIR}/usr"
-}
-
-do_check() {
-	echo "Testing lcalc ..."
-	sh "${FILESDIR}"/test > test.log
-	diff "${FILESDIR}"/test.out test.log && echo PASS
+pre_configure() {
+	autoreconf -fi
 }
 
 lcalc-devel_package() {
@@ -68,5 +23,7 @@ lcalc-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

From d61fc9491ef1ddd4c72629d8a289493a35676a41 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Mon, 6 Dec 2021 19:42:30 -0800
Subject: [PATCH 3926/4088] python3-pycryptodomex: update to 3.12.0.

---
 srcpkgs/python3-pycryptodomex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index 5d6855a58c7f..30bd5a5d5e0c 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pycryptodomex'
 pkgname=python3-pycryptodomex
-version=3.11.0
+version=3.12.0
 revision=1
 wrksrc="pycryptodomex-${version}"
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="Antonio Gurgel <antonio@goorzhel.com>"
 license="Public Domain, BSD-2-Clause"
 homepage="https://www.pycryptodome.org/"
 changelog="https://www.pycryptodome.org/en/latest/src/changelog.html"
-distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
-checksum=0398366656bb55ebdb1d1d493a7175fc48ade449283086db254ac44c7d318d6d
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.zip"
+checksum=922e9dac0166e4617e5c7980d2cff6912a6eb5cb5c13e7ece222438650bd7f66
 
 post_install() {
 	vlicense LICENSE.rst

From 8ec63839066876d2119906eb1a0e2d67f2088980 Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Sun, 12 Dec 2021 07:07:18 -0600
Subject: [PATCH 3927/4088] mmark: update to 2.2.23

---
 srcpkgs/mmark/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 0c6bb341dd55..e3200e95c32e 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,16 +1,19 @@
 # Template file for 'mmark'
 pkgname=mmark
-version=2.2.10
+version=2.2.23
 revision=1
 build_style=go
-go_import_path=github.com/mmarkdown/mmark
-hostmakedepends="git"
+go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/mmarkdown/mmark/"
 distfiles="https://github.com/mmarkdown/mmark/archive/v${version}.tar.gz"
-checksum=1fc9d26b4c2910e72c7ee94c80d2fb1707aaae2d278204c68557ccd1802a2c08
+checksum=8c4ebb780f86f17647de1d81532bf6900498ec48edcdf03de6ef6e68287ae510
+
+do_check() {
+	go test ./...
+}
 
 post_install() {
 	vlicense LICENSE

From 11d08d671630d22116c7ed1c20207886f9e4d461 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 15 Dec 2021 11:22:16 +0100
Subject: [PATCH 3928/4088] libnice: revbump to rebuild without gupnp-igd

---
 srcpkgs/libnice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 3c1f12d02ed0..f0b53ad585ba 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,7 +1,7 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=3
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled

From 547bf28565ff6fb700c846bd758342673ea3fbd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 15 Dec 2021 13:53:45 +0100
Subject: [PATCH 3929/4088] kdepim-runtime: fix pop3 connections

---
 ...abcefb45790175e209ef8ae394def4a805e9.patch | 127 ++++++++++++++++++
 srcpkgs/kdepim-runtime/template               |   2 +-
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kdepim-runtime/patches/f14fabcefb45790175e209ef8ae394def4a805e9.patch

diff --git a/srcpkgs/kdepim-runtime/patches/f14fabcefb45790175e209ef8ae394def4a805e9.patch b/srcpkgs/kdepim-runtime/patches/f14fabcefb45790175e209ef8ae394def4a805e9.patch
new file mode 100644
index 000000000000..e911588dbdcb
--- /dev/null
+++ b/srcpkgs/kdepim-runtime/patches/f14fabcefb45790175e209ef8ae394def4a805e9.patch
@@ -0,0 +1,127 @@
+From f14fabcefb45790175e209ef8ae394def4a805e9 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 10 Dec 2021 21:55:13 +0100
+Subject: [PATCH] POP3: Fix SSL connections
+
+We need to go into ssl before trying to read from the socket, otherwise
+nothing works
+
+BUGS: 446751
+---
+ resources/pop3/pop3protocol.cpp | 72 ++++++++++++++++++++-------------
+ resources/pop3/pop3protocol.h   |  2 +
+ 2 files changed, 45 insertions(+), 29 deletions(-)
+
+diff --git a/resources/pop3/pop3protocol.cpp b/resources/pop3/pop3protocol.cpp
+index c2d01d33a..15971919e 100644
+--- a/resources/pop3/pop3protocol.cpp
++++ b/resources/pop3/pop3protocol.cpp
+@@ -535,6 +535,39 @@ Result POP3Protocol::loginPASS()
+     return Result::pass();
+ }
+ 
++Result POP3Protocol::startSsl()
++{
++    mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
++    mSocket->startClientEncryption();
++    const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
++
++    const QSslCipher cipher = mSocket->sessionCipher();
++    const QList<QSslError> errors = mSocket->sslHandshakeErrors();
++    if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
++        QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
++            if (!cur.isEmpty())
++                cur += QLatin1Char('\n');
++            cur += error.errorString();
++            return cur;
++        });
++
++        qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
++                          << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
++        mContinueAfterSslError = false;
++        Q_EMIT sslError(KSslErrorUiData(mSocket));
++        if (!mContinueAfterSslError) {
++            if (errorString.isEmpty())
++                errorString = mSocket->errorString();
++            qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
++            closeConnection();
++            return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
++        }
++    } else {
++        qCDebug(POP3_LOG) << "TLS has been enabled.";
++    }
++    return Result::pass();
++}
++
+ Result POP3Protocol::openConnection()
+ {
+     m_try_apop = mSettings.authenticationMethod() == MailTransport::Transport::EnumAuthenticationType::APOP;
+@@ -560,6 +593,13 @@ Result POP3Protocol::openConnection()
+             return Result::fail(mSocket->error(), errorString);
+         }
+ 
++        if (mSettings.useSSL()) {
++            const Result res = startSsl();
++            if (!res.success) {
++                return res;
++            }
++        }
++
+         mConnected = true;
+ 
+         greeting_buf = new char[GREETING_BUF_LEN];
+@@ -608,35 +648,9 @@ Result POP3Protocol::openConnection()
+                                          "was unsuccessful.\nYou can "
+                                          "disable TLS in the POP account settings dialog."));
+             }
+-        }
+-        if (mSettings.useSSL() || mSettings.useTLS()) {
+-            mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
+-            mSocket->startClientEncryption();
+-            const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
+-
+-            const QSslCipher cipher = mSocket->sessionCipher();
+-            const QList<QSslError> errors = mSocket->sslHandshakeErrors();
+-            if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
+-                QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
+-                    if (!cur.isEmpty())
+-                        cur += QLatin1Char('\n');
+-                    cur += error.errorString();
+-                    return cur;
+-                });
+-
+-                qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
+-                                  << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
+-                mContinueAfterSslError = false;
+-                Q_EMIT sslError(KSslErrorUiData(mSocket));
+-                if (!mContinueAfterSslError) {
+-                    if (errorString.isEmpty())
+-                        errorString = mSocket->errorString();
+-                    qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
+-                    closeConnection();
+-                    return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
+-                }
+-            } else {
+-                qCDebug(POP3_LOG) << "TLS has been enabled.";
++            const Result res = startSsl();
++            if (!res.success) {
++                return res;
+             }
+         }
+ 
+diff --git a/resources/pop3/pop3protocol.h b/resources/pop3/pop3protocol.h
+index 9b40b334f..d01f7ab7a 100644
+--- a/resources/pop3/pop3protocol.h
++++ b/resources/pop3/pop3protocol.h
+@@ -127,6 +127,8 @@ private:
+      */
+     Q_REQUIRED_RESULT Result loginPASS();
+ 
++    Q_REQUIRED_RESULT Result startSsl();
++
+     const Settings &mSettings;
+     QSslSocket *const mSocket;
+     unsigned short int m_iPort;
+-- 
+GitLab
+
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 58a6fe5955bf..48cb1d8c523a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,7 +1,7 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
 version=21.12.0
-revision=1
+revision=2
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
 hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin

From 1dea65304eb6f5cda13710b23e97b0ac460b59af Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 14 Dec 2021 21:10:44 -0500
Subject: [PATCH 3930/4088] zola: update to 0.15.2

---
 srcpkgs/zola/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 4743de0d342c..dcf2a8701cff 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.1
+version=0.15.2
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"
 homepage="https://github.com/getzola/zola"
-changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/getzola/zola/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=28e50071009a1430c5f8df94e2585d095f85f906f04101fe35ee9ed53c353cc4
+checksum=9f6b1527e728cef3536e42a18fbc06647b388fb34fc07cc7aca82e44f4fa3447
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 7cb13206affde70dd6591cbf2b11eb55911ef937 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 14 Dec 2021 19:27:21 -0500
Subject: [PATCH 3931/4088] qownnotes: update to 21.12.3

---
 srcpkgs/qownnotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index 01a5aa1e89c7..b55900e3023a 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
 # Template file for 'qownnotes'
 pkgname=qownnotes
-version=21.11.0
+version=21.12.3
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="https://www.qownnotes.org"
 changelog="https://www.qownnotes.org/changelog.html"
 distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=846f48b902169f49dbae5a5be917a3b14de4295c9a92270c021fa5a5470fa7e1
+checksum=a92df38f9c88f381af77800c339fe6aa8196a7a260081b0a48f61f1ae4c28029
 
 pre_build() {
 	sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri

From 7a2e039417fdbdbaff200f4d8db9ea2d27a617b8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 14 Dec 2021 16:31:49 -0500
Subject: [PATCH 3932/4088] zim: update to 0.74.3

---
 srcpkgs/zim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template
index a6848a9f459c..cf6d2119d841 100644
--- a/srcpkgs/zim/template
+++ b/srcpkgs/zim/template
@@ -1,6 +1,6 @@
 # Template file for 'zim'
 pkgname=zim
-version=0.74.2
+version=0.74.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-gobject python3-xdg gtk+3"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="http://zim-wiki.org/"
 changelog="https://raw.githubusercontent.com/zim-desktop-wiki/zim-desktop-wiki/master/CHANGELOG.md"
 distfiles="https://zim-wiki.org/downloads/zim-${version}.tar.gz"
-checksum=b59c41969a6cda72d38523aadd6278da2510e0d1b52dbe3addbbc343e7636490
+checksum=dde84f22486c7f52670bd431de443a8a5bd168107b6ae066d82d473ae346cd15

From b8ce1c6e71601af4fe9bc1cd9d964a34b4d1f5b9 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Wed, 15 Dec 2021 11:25:28 +1000
Subject: [PATCH 3933/4088] kubernetes-helm: update to 3.7.2

---
 srcpkgs/kubernetes-helm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template
index 67784ab94544..18c05630ce41 100644
--- a/srcpkgs/kubernetes-helm/template
+++ b/srcpkgs/kubernetes-helm/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-helm'
 pkgname=kubernetes-helm
-version=3.7.1
+version=3.7.2
 revision=1
 wrksrc="helm-${version}"
 hostmakedepends="go make git mercurial tar"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://helm.sh/"
 distfiles="https://github.com/helm/helm/archive/v${version}.tar.gz"
-checksum=5243dd0e07840404a7d19ca0917b2202ee3a5ad70a081cfa455ffd705a8d3624
+checksum=d04175807c2948261517b58120a0810ec20b92c0058acb040e973d0b9de7b08d
 conflicts="helm"
 nopie=true
 

From c1ab330eca4caf87055136f0a6dbb172c8991adc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 15 Dec 2021 17:46:42 +0100
Subject: [PATCH 3934/4088] cloud-hypervisor: update to 20.1.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 2b0b911c50cb..df5f72e6bc11 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=20.0
+version=20.1
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=194452e2a739b5d693d687ede6b24ab0b08202f33af250850c4258f30a513342
+checksum=8d37f994c4839e72ed9a5c6cfca248334e866d34bcbde5e7cd8a9b1b650c46f7
 
 post_install() {
 	vlicense LICENSE-APACHE

From bb1d66a026cba78cde600868c16df4120b351d1c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 15 Dec 2021 17:47:09 +0100
Subject: [PATCH 3935/4088] hwloc: update to 2.6.0.

---
 srcpkgs/hwloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index 818db269cebb..e96886b6cf50 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.5.0
+version=2.6.0
 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=a9cf9088be085bdd167c78b73ddf94d968fa73a8ccf62172481ba9342c4f52c8
+checksum=e1f073e44e28c296ff848dead5e9bd6e2426b77f95ead1792358958e859fa83a
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;

From 72fb3e7a3162b8f89856da6e72d0267761e8eeb1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:33:08 -0600
Subject: [PATCH 3936/4088] Amass: update to 3.15.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index f78e2f70cf12..1141a36737e2 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.15.1
+version=3.15.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=217f5f0fed02d730543a56b58f1be3ec0fb07e57b3ace53fc673c6d0132f36a8
+checksum=bdfb4c3492ebf46008f00910491381d2abee51a7322df6e978dd14e174ddf601
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From ab683662bc2e8b317884db64ad09ae084a9b2613 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:35:22 -0600
Subject: [PATCH 3937/4088] fierce: update to 1.5.0.

---
 srcpkgs/fierce/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fierce/template b/srcpkgs/fierce/template
index eec2e71b290a..eba644f398cd 100644
--- a/srcpkgs/fierce/template
+++ b/srcpkgs/fierce/template
@@ -1,9 +1,8 @@
 # Template file for 'fierce'
 pkgname=fierce
-version=1.4.0
-revision=4
+version=1.5.0
+revision=1
 build_style=python3-module
-pycompile_module="fierce"
 hostmakedepends="python3-setuptools"
 depends="python3-dnspython"
 short_desc="DNS reconnaissance tool"
@@ -11,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mschwager/fierce"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=6ff85428e06aa71fb4b52de4eef3cf1b6ebcb0f43cf1fcf0150f5e8dcb67b9d1
+checksum=39bce5720eccc2dcf7ecf34ed1a79370552c5e38e6a1752fff3dac54e10b9e67

From 160aff2a7a7b96fdfb04888c558b1a1bf2697808 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:36:12 -0600
Subject: [PATCH 3938/4088] QMPlay2: update to 21.12.07.

---
 srcpkgs/QMPlay2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index be7ad32347f9..1bfcbdb56e18 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=21.06.07
+version=21.12.07
 revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=ec9429a17df9cd3776d3e6bffe9367f56c7a54746b8085344d5d0de66f2b7aee
+checksum=3b5e75227cecfb600956b371ae3768d653fe6bf301a4603a6ad0b7d617dd686d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From b385e4676740edb541f6752866494e4097156d38 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:38:08 -0600
Subject: [PATCH 3939/4088] manuskript: update to 0.13.1.

---
 srcpkgs/manuskript/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/manuskript/template b/srcpkgs/manuskript/template
index e23defe7fbfa..3d52fc31c765 100644
--- a/srcpkgs/manuskript/template
+++ b/srcpkgs/manuskript/template
@@ -1,7 +1,7 @@
 # Template file for 'manuskript'
 pkgname=manuskript
-version=0.12.0
-revision=3
+version=0.13.1
+revision=1
 pycompile_dirs="usr/share/${pkgname}"
 hostmakedepends="python3-setuptools"
 depends="python3-enchant python3-lxml python3-Markdown python3-PyQt5 qt5-svg"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.theologeek.ch/manuskript"
 distfiles="https://github.com/olivierkes/manuskript/archive/${version}.tar.gz"
-checksum=72e5f8111573ad110f43ba385f7346243bd0823ad1f910e38929b24cb77289ea
+checksum=a90ad6197210539795507d238d17c001912225283ed2b8142380fac5a063bebf
 python_version=3
 
 do_install() {

From 52a75746166fba8c963726bf0626b21a6409d108 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:41:17 -0600
Subject: [PATCH 3940/4088] gemserv: update to 0.6.0.

---
 srcpkgs/gemserv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index 5fa724d4771f..2383d9f7683f 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,6 +1,6 @@
 # Template file for 'gemserv'
 pkgname=gemserv
-version=0.5.0
+version=0.6.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="gemini://80h.dev/projects/gemserv/"
 distfiles="https://git.sr.ht/~int80h/gemserv/archive/v${version}.tar.gz"
-checksum=20e9aa28e719199f94099889ca224f83012f893730c1e14beb06b5a0a2578cb6
+checksum=0194a8dc260142cbc5b304e7827db7aa3e1b61242f08b73a8e954eabdc72e0af
 system_accounts="_gemserv"
 
 post_install() {

From e35a160bb03c547754ec70041390ddd953f26e25 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:45:16 -0600
Subject: [PATCH 3941/4088] pahole: update to 1.23.

---
 srcpkgs/pahole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index 6eb25b847f4e..c68060d970d8 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,6 +1,6 @@
 # Template file for 'pahole'
 pkgname=pahole
-version=1.22
+version=1.23
 revision=1
 wrksrc="dwarves-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
 distfiles="https://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz"
-checksum=8bcba48be39da2868142440dc2ee7f1d7b99ffec8095e3a1afb280dc1a7c63df
+checksum=f085c25f068627d10e54bd030464f8952f5b2211d4ba26047fe209377470862a
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" musl-obstack-devel argp-standalone"

From 01fc57f38992e4cf1f0534d2c91af23a1dc35ce7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:46:02 -0600
Subject: [PATCH 3942/4088] python3-rich: update to 10.16.0.

---
 srcpkgs/python3-rich/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index a11c142a2002..07672fcf18a7 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.15.1
+version=10.16.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=93d0ea3c35ecfd8703dbe52b76885e224ad8d68c7766c921c726b14b22a57b7d
+checksum=06a1355131feda5eba4511dd749e9187ac0fb42209e189845d81e94505fc268e
 
 post_install() {
 	vlicense LICENSE

From d70ebe889956867c0fa3c1d9d37d947b0f4ac96f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:53:14 -0600
Subject: [PATCH 3943/4088] pcsclite: update to 1.9.5.

---
 srcpkgs/pcsclite/patches/python3.patch | 16 ----------------
 srcpkgs/pcsclite/template              |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/pcsclite/patches/python3.patch

diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
deleted file mode 100644
index 8ee9c968b7d1..000000000000
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
- import os
- import signal
- import time
--try:
--    # for Python3
--    from queue import Queue
--except ImportError:
--    # for Python2
--    from Queue import Queue
-+from queue import Queue
- from threading import Thread
- from operator import attrgetter
- 
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 2e9290633f06..263094827b94 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.4
+version=1.9.5
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=719e1f976504597adfd9b1bf39f0a1819b52fdab7bc5271286b5b7a6a43a3fe4
+checksum=cbd7ca9cd6323e0e8d0d99c89a1429b9392809c16d607d9180e37d9474321b0f
 
 post_install() {
 	vsv pcscd

From de256fe63fae59b519e1b8c05cc3a12a7ebde52d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:55:53 -0600
Subject: [PATCH 3944/4088] python3-httpcore: update to 0.14.3.

---
 srcpkgs/python3-httpcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-httpcore/template b/srcpkgs/python3-httpcore/template
index 1ad467b26703..85480e263833 100644
--- a/srcpkgs/python3-httpcore/template
+++ b/srcpkgs/python3-httpcore/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-httpcore'
 pkgname=python3-httpcore
-version=0.13.7
+version=0.14.3
 revision=1
 wrksrc="httpcore-$version"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.encode.io/httpcore/"
 changelog="https://raw.githubusercontent.com/encode/httpcore/master/CHANGELOG.md"
 distfiles="https://github.com/encode/httpcore/archive/refs/tags/$version.tar.gz"
-checksum=c72bf5b60981496361ec39be1f5feff1a4d756acc66847764946d3dac7e443ed
+checksum=bf299a574a7768e3e042390d9001409914bc769c8d9857dcebe0d82665e56d3c
 make_check=no # at least trustme python module is not packaged
 
 post_install() {

From c35f71c6f181dc375e6616a6da6dfebb1e8721f5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 12:55:55 -0600
Subject: [PATCH 3945/4088] steam: update to 1.0.0.74.

---
 srcpkgs/steam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index cbaefb5429d6..c74d80d54685 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,6 +1,6 @@
 # Template file for 'steam'
 pkgname=steam
-version=1.0.0.73
+version=1.0.0.74
 revision=1
 archs="i686 x86_64"
 wrksrc=steam-launcher
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom: Proprietary license"
 homepage="https://steampowered.com/"
 distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=b953ba0f52bccc696ad7696b22ceda4d01159e3d5b9353f8c1152d90f5a43591
+checksum=b0ed3b8378f541e8dab68d8b589d85ad6dc0cdf302701cf8e87130eda2b1a234
 repository=nonfree
 
 do_install() {

From a199867bd04fd3f8c12bec353d59de91c4349b17 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 13:20:28 -0600
Subject: [PATCH 3946/4088] pahole: fix more __always_inline issues

---
 srcpkgs/pahole/patches/fix_always_inline.patch | 13 +++++++++++++
 srcpkgs/pahole/template                        |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pahole/patches/fix_always_inline.patch b/srcpkgs/pahole/patches/fix_always_inline.patch
index 6ba75e61c51d..950e6b635f59 100644
--- a/srcpkgs/pahole/patches/fix_always_inline.patch
+++ b/srcpkgs/pahole/patches/fix_always_inline.patch
@@ -24,3 +24,16 @@
  #ifndef _GNU_SOURCE
  #define _GNU_SOURCE
  #endif
+--- a/lib/bpf/src/gen_loader.c
++++ b/lib/bpf/src/gen_loader.c
+@@ -1,5 +1,10 @@
+ // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
+ /* Copyright (c) 2021 Facebook */
++
++#ifndef __always_inline
++#define __always_inline inline
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index c68060d970d8..cf86686a63f8 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,7 +1,7 @@
 # Template file for 'pahole'
 pkgname=pahole
 version=1.23
-revision=1
+revision=2
 wrksrc="dwarves-${version}"
 build_style=cmake
 configure_args="-D__LIB=lib"

From 749bda902ac1a5507bc1caa6b7534746ad322af3 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 8 Dec 2021 01:35:46 -0800
Subject: [PATCH 3947/4088] New package: 1password-8.4.1

---
 srcpkgs/1password/INSTALL         | 11 +++++++
 srcpkgs/1password/files/1password |  2 ++
 srcpkgs/1password/template        | 52 +++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 srcpkgs/1password/INSTALL
 create mode 100644 srcpkgs/1password/files/1password
 create mode 100644 srcpkgs/1password/template

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
new file mode 100644
index 000000000000..131b1fae2096
--- /dev/null
+++ b/srcpkgs/1password/INSTALL
@@ -0,0 +1,11 @@
+# INSTALL
+case "${ACTION}" in
+post)
+	chmod 4755 opt/1Password/chrome-sandbox
+	chown :_onepassword opt/1Password/1Password-KeyringHelper
+	chmod u+s opt/1Password/1Password-KeyringHelper
+	chmod g+s opt/1Password/1Password-KeyringHelper
+	chown :_onepassword opt/1Password/1Password-BrowserSupport
+	chmod g+s opt/1Password/1Password-BrowserSupport
+	;;
+esac
diff --git a/srcpkgs/1password/files/1password b/srcpkgs/1password/files/1password
new file mode 100644
index 000000000000..c1c521260437
--- /dev/null
+++ b/srcpkgs/1password/files/1password
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/1Password/1password "$@"
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
new file mode 100644
index 000000000000..367703cc1b51
--- /dev/null
+++ b/srcpkgs/1password/template
@@ -0,0 +1,52 @@
+# Template file for '1password'
+pkgname=1password
+version=8.4.1
+revision=1
+archs="x86_64"
+create_wrksrc=yes
+hostmakedepends="w3m gnupg"
+short_desc="Password manager"
+maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
+license="custom:Proprietary"
+homepage="https://www.1password.com"
+distfiles="https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"
+checksum=f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
+_filename="${distfiles##*/}"
+_1passworddir="${_filename%.tar.*}"
+_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
+_gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+system_groups="_onepassword"
+repository=nonfree
+restricted=yes
+nostrip=yes
+noshlibprovides=yes
+
+post_extract() {
+	# verify gpg key
+	$XBPS_FETCH_CMD -o "${_filename}.sig" "${distfiles}.sig"
+	if ! gpg --recv-keys "${_gpg_key}"; then
+		msg_error "Incorrect gpg key: ${_gpg_key}\n"
+	fi
+	if ! gpg --verify "${_filename}.sig" "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename}"; then
+		msg_error "gpg verify failed\n"
+	fi
+
+	# verify EULA
+	$XBPS_FETCH_CMD -o eula https://1password.com/legal/terms-of-service/
+	cat eula |
+		w3m -dump -I utf-8 -T text/html |
+		sed -n '/Service Agreement for 1Password/,/We clarified what happens if we part ways./p' > EULA
+	filesum="$($XBPS_DIGEST_CMD EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+do_install() {
+	vmkdir opt/1Password
+	vcopy "${_1passworddir}/*" opt/1Password
+	vinstall "${_1passworddir}/com.1password.1Password.policy" 644 usr/share/polkit-1/actions/
+	vinstall "${_1passworddir}/resources/custom_allowed_browsers" 644 usr/share/doc/1password/examples/
+	vbin "${FILESDIR}/1password"
+	vlicense EULA
+}

From 0f5e86acf83932e0e28bf282315384e1b5a120bd Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Thu, 9 Dec 2021 23:08:23 +0100
Subject: [PATCH 3948/4088] portage: update to 3.0.30.

---
 srcpkgs/portage/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index fdf5518cda6e..cf2c8da536d7 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,7 +1,7 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.28
-revision=2
+version=3.0.30
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
 make_install_args="--sbindir=/usr/bin"
@@ -12,11 +12,11 @@ short_desc="Gentoo's package management system"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
+changelog="https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bb5e9db681f437b68e9e9cab3f637b757d6c6a90cb30ac41f6567430beb4a67f
+checksum=12b855d732218f2f4e2a226756e31f8dbcffade74c83e74a921e1febed37518a
 
 conf_files="
 	/etc/dispatch-conf.conf
 	/etc/etc-update.conf
-	/etc/logrotate.d/elog-save-summary
-	/etc/portage/repo.postsync.d/example"
+	/etc/logrotate.d/elog-save-summary"

From 87d9d17c63c07e6a0650ade9a89db37ecfdae450 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 15 Dec 2021 11:08:03 -0500
Subject: [PATCH 3949/4088] xh: update to 0.14.1

---
 srcpkgs/xh/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
index 4a878889d438..eddc9c125106 100644
--- a/srcpkgs/xh/template
+++ b/srcpkgs/xh/template
@@ -1,6 +1,6 @@
 # Template file for 'xh'
 pkgname=xh
-version=0.14.0
+version=0.14.1
 revision=1
 # depends on ring
 archs="x86_64* i686* armv[67]* aarch64*"
@@ -11,12 +11,12 @@ short_desc="Friendly and fast tool for sending HTTP requests"
 maintainer="Arthur Weagel <arthur.contrib@gmail.com>"
 license="MIT"
 homepage="https://github.com/ducaale/xh"
-changelog="https://github.com/ducaale/xh/blob/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/ducaale/xh/master/CHANGELOG.md"
 distfiles="https://github.com/ducaale/xh/archive/v${version}.tar.gz"
-checksum=6abc32e2fa49a3c7a08379dbe7375735ec7bc8f25c3f29774e275e9dcac42711
+checksum=ca89e8a9a230ff16cc0bba5bd7ebdceb986eac84638e15b4928d737b9ec12776
 
 post_install() {
-	ln -sf /usr/bin/${pkgname} ${DESTDIR}/usr/bin/${pkgname}s
+	ln -sf ${pkgname} ${DESTDIR}/usr/bin/${pkgname}s
 
 	vcompletion completions/xh.bash bash
 	vcompletion completions/_xh zsh

From bf7146882a43b12cc9a8ba24d3c4a16c73b65d86 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 15 Dec 2021 11:04:12 -0500
Subject: [PATCH 3950/4088] nicotine+: update to 3.1.1

---
 srcpkgs/nicotine+/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index c58275328a60..039e1d7ffc1e 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,14 +1,15 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
-version=3.0.6
-revision=2
+version=3.1.1
+revision=1
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
 hostmakedepends="python3 gettext"
-depends="gtk+3 python3-gobject"
+depends="gspell gtk+3 python3-gobject"
 short_desc="Graphical client for the Soulseek file sharing network"
 maintainer="doggone <doggone@airmail.cc>"
 license="GPL-3.0-or-later"
 homepage="https://nicotine-plus.org"
+changelog="https://raw.githubusercontent.com/nicotine-plus/nicotine-plus/master/NEWS.md"
 distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz"
-checksum=7ff5a256eb428037b2706bd87918fda509a36aa994cd157861acfdaaf140a6a2
+checksum=d02f374eaf4cf8cebb2b4068ed5dd36f5774d5ea72b61715ff39bfd6936252d0

From 817d43a0b47468d115a506ac170ea19b89460db6 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 15 Dec 2021 10:55:36 +0100
Subject: [PATCH 3951/4088] gnome-flashback: update to 3.42.1.

---
 srcpkgs/gnome-flashback/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 94395e5d41e4..fce623766e1c 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-flashback'
 pkgname=gnome-flashback
-version=3.42.0
+version=3.42.1
 revision=1
 build_helper=gir
 build_style=gnu-configure
@@ -13,12 +13,12 @@ makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
  gsettings-desktop-schemas-devel libXxf86vm-devel"
 depends="gnome-bluetooth gnome-session gnome-settings-daemon
  gnome-panel gnome-themes-extra metacity"
-short_desc="GNOME 3 session with similar user experience to the GNOME 2.x series"
+short_desc="GNOME session with similar user experience to the GNOME 2.x series"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4271dc07ac73b271e4b4edc81f31f64f5731aa6d448e7a15d7d933976dcdd4b
+checksum=c8029220acf268c520dbb0750834b2ef4df868324d0e0fb6a80354c80ba8844e
 
 post_extract() {
 	vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \

From 7b311895979c4af7c37a673136bce24038fa119e Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Tue, 14 Dec 2021 10:54:44 -0800
Subject: [PATCH 3952/4088] New package: ruby-build-20211203

---
 srcpkgs/ruby-build/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/ruby-build/template

diff --git a/srcpkgs/ruby-build/template b/srcpkgs/ruby-build/template
new file mode 100644
index 000000000000..8ba698addb76
--- /dev/null
+++ b/srcpkgs/ruby-build/template
@@ -0,0 +1,21 @@
+# Template file for 'ruby-build'
+pkgname=ruby-build
+version=20211203
+revision=1
+depends="bash"
+short_desc="Compile and install Ruby"
+maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
+license="MIT"
+homepage="https://github.com/rbenv/ruby-build"
+distfiles="https://github.com/rbenv/ruby-build/archive/refs/tags/v${version}.tar.gz"
+checksum=f6a9149b24c7452a512395bc43d9837171de5f43ef0cf191a4a24b013f6a2eed
+
+do_install() {
+	vbin bin/ruby-build
+	vbin bin/rbenv-install
+	vbin bin/rbenv-uninstall
+	vmkdir usr/share/ruby-build
+	vcopy share/ruby-build/* usr/share/ruby-build
+	vlicense LICENSE
+	vdoc README.md
+}

From b6507b2174812d26dac71e2218738e512c822ecb Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 15 Dec 2021 13:33:12 -0800
Subject: [PATCH 3953/4088] New package: rbenv-1.2.0

---
 srcpkgs/rbenv/files/rbenv |  2 ++
 srcpkgs/rbenv/template    | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/rbenv/files/rbenv
 create mode 100644 srcpkgs/rbenv/template

diff --git a/srcpkgs/rbenv/files/rbenv b/srcpkgs/rbenv/files/rbenv
new file mode 100644
index 000000000000..b260c7334a01
--- /dev/null
+++ b/srcpkgs/rbenv/files/rbenv
@@ -0,0 +1,2 @@
+#!/bin/sh
+LD_LIBRARY_PATH=/usr/libexec/rbenv exec /usr/libexec/rbenv/rbenv "$@"
diff --git a/srcpkgs/rbenv/template b/srcpkgs/rbenv/template
new file mode 100644
index 000000000000..8cdca07a5228
--- /dev/null
+++ b/srcpkgs/rbenv/template
@@ -0,0 +1,25 @@
+# Template file for 'rbenv'
+pkgname=rbenv
+version=1.2.0
+revision=1
+build_style="configure"
+configure_script="src/configure"
+make_build_args="-C"
+make_build_target="src"
+depends="ruby-build"
+short_desc="Manage your app's Ruby environment"
+maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
+license="MIT"
+homepage="https://github.com/rbenv/rbenv"
+distfiles="https://github.com/rbenv/rbenv/archive/refs/tags/v${version}.tar.gz"
+checksum=3f3a31b8a73c174e3e877ccc1ea453d966b4d810a2aadcd4d8c460bc9ec85e0c
+
+do_install() {
+	vbin "${FILESDIR}/rbenv"
+	vmkdir usr/libexec/rbenv
+	vcopy libexec/* usr/libexec/rbenv
+	vmkdir /usr/share/bash-completion/completions/
+	vcopy completions/rbenv.bash /usr/share/bash-completion/completions/
+	vlicense LICENSE
+	vdoc README.md
+}

From c27f1e7df2ad611dd16c77bbaeee9626f400ed02 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 14 Dec 2021 16:26:59 -0500
Subject: [PATCH 3954/4088] scdoc: update to 1.11.2

---
 srcpkgs/scdoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template
index f7f4b7c43673..d8c0db8aea4a 100644
--- a/srcpkgs/scdoc/template
+++ b/srcpkgs/scdoc/template
@@ -1,6 +1,6 @@
 # Template file for 'scdoc'
 pkgname=scdoc
-version=1.11.1
+version=1.11.2
 revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
@@ -9,7 +9,7 @@ maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="MIT"
 homepage="https://git.sr.ht/~sircmpwn/scdoc"
 distfiles="https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"
-checksum=e529fcb00508e7e4c5025a745591b805b754b3bd5c84c5192acaefabdfa8f700
+checksum=e9ff9981b5854301789a6778ee64ef1f6d1e5f4829a9dd3e58a9a63eacc2e6f0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" scdoc"

From 6401bd75307324ce229ed69e443ee5c124262399 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 18:54:05 -0600
Subject: [PATCH 3955/4088] sqlmap: update to 1.5.12.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index e22e945419da..a417bd25368d 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.11
+version=1.5.12
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=69b91d6bba6d053b300a89692d5ebe98cc3ce9803d5f25e600a31943afa7fc6e
+checksum=1221a09a9011e515c867abcba487c0e15f6732337fa3fab1d3f4babc7199fa39
 python_version=3
 
 do_install() {

From cec4172f3cc0c1c51059b26e75b08bfd5440ee98 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 18:57:38 -0600
Subject: [PATCH 3956/4088] spotifyd: update to 0.3.3.

---
 srcpkgs/spotifyd/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index 452356c3c8ae..6c16a1b12a29 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,6 +1,6 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
-version=0.3.2
+version=0.3.3
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Spotifyd/spotifyd"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d1d5442e6639cde7fbd390a65335489611eec62a1cfcba99a4aba8e8977a9d9c
+checksum=7fec8244a0052449d9c598535013dfe2a01bd6a1a55b271a713af4fcbeb98360
 
 build_options="alsa pulseaudio portaudio dbus"
 build_options_default="alsa pulseaudio portaudio dbus"
@@ -29,7 +29,3 @@ _features+="$(vopt_if portaudio ',portaudio_backend')"
 if [ "$_features" ]; then
 	configure_args+=" --features $_features"
 fi
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/636076091" ;;
-esac

From 06fe38f4b6184651f0f4f1abb23094e563ed350a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 18:58:41 -0600
Subject: [PATCH 3957/4088] python3-ytmusicapi: update to 0.19.5.

---
 srcpkgs/python3-ytmusicapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index e668fc15a94b..50b81643d1fd 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=0.19.4
+version=0.19.5
 revision=1
 wrksrc="ytmusicapi-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=e32ce1c2b6e5cb5aa14129b0724eb56e2246433b283340c2f8702b60df714e97
+checksum=7535274da7d54b5a10e4af2fac49c522d254ab56ca84f13d7a3872ca07d274aa
 
 post_install() {
 	vlicense LICENSE

From cb58b11fc4f740d150cb08af62747d3607178056 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 18:59:36 -0600
Subject: [PATCH 3958/4088] python3-rich: update to 10.16.1.

---
 srcpkgs/python3-rich/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 07672fcf18a7..07bebfb77dc7 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.16.0
+version=10.16.1
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=06a1355131feda5eba4511dd749e9187ac0fb42209e189845d81e94505fc268e
+checksum=4949e73de321784ef6664ebbc854ac82b20ff60b2865097b93f3b9b41e30da27
 
 post_install() {
 	vlicense LICENSE

From afaf91a072e0c0ef852cd3c70734f2aa0be5f457 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 15 Dec 2021 19:00:16 -0600
Subject: [PATCH 3959/4088] python3-youtubesearch: update to 1.5.3.

---
 srcpkgs/python3-youtubesearch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 8319d620097d..9f559153950d 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.5.2
+version=1.5.3
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=6094c819b195de0ef7363e76594b5c34479438a45e72c1e9f763cd9cf17a64ea
+checksum=59148ff8a79d619a06e20925c96df4468aa7e2899ef5fd2ab6fdf6f35f7fac38
 make_check=no # no tests defined
 
 post_install() {

From 8eacbc84dcc83f4a10ce28e0177fa8690f469848 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 16 Dec 2021 11:37:15 +0100
Subject: [PATCH 3960/4088] elixir: update to 1.13.1.

---
 srcpkgs/elixir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index cc2ab43b7f7d..dd5a91fee377 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.13.0
+version=1.13.1
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,7 +13,7 @@ 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=0ed0fb89a9b6428cd1537b7f9aab1d6ea64e0c5972589eeb46dff6f0324468ae
+checksum=deaba8156b11777adfa28e54e76ddf49ab1a0132cca54c41d9d7648e800edcc8
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From b9f4d94acd7336dd6a46d915e0c99c8705c96641 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 16 Dec 2021 16:38:21 +0100
Subject: [PATCH 3961/4088] podman: update to 3.4.4.

---
 srcpkgs/podman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index dd4b69d1ecb0..8558180f3a4b 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.4.2
+version=3.4.4
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31
+checksum=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 779c3317cebca904f9357a07fbfda7c9968595d6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Dec 2021 08:35:37 -0500
Subject: [PATCH 3962/4088] python3-hypercorn: update to 0.13.0.

---
 srcpkgs/python3-hypercorn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index cf8fe5cdee43..f59f86bce099 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypercorn'
 pkgname=python3-hypercorn
-version=0.12.0
+version=0.13.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-pep517
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://gitlab.com/pgjones/hypercorn"
 changelog="https://gitlab.com/pgjones/hypercorn/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=c373eda54f301fdf58c5728454fb8c7cb9585aeb73f169430d9d88b5a62f7d10
+checksum=10981b4f0409239699f514f2b02704d595474d7ebf54ccc8cd1ca353aa735785
 
 do_check() {
 	vsed -i pyproject.toml -e '/addopts/d'

From 6dc586b02f5467603eb97abe5cc674b276abb491 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Dec 2021 08:36:06 -0500
Subject: [PATCH 3963/4088] python3-quart: update to 0.16.2.

---
 srcpkgs/python3-quart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index ff88c6014813..8ee1cafff460 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-quart'
 pkgname=python3-quart
-version=0.16.1
+version=0.16.2
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-pep517
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://gitlab.com/pgjones/quart"
 changelog="https://gitlab.com/pgjones/quart/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=7a2b31a1d31906228175fb867d487165dcf05094da531106faabbaf6d7d3bfe1
+checksum=7b3d51c8c9b0faa75c92b019999539de6cf827edb57f0391347e8c0b7b399334
 
 do_check() {
 	# Tests require dist-info on the package, which is only in the wheel.

From 26e5c3210577c15b1ec25d8c8eba46d59b9e35b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Dec 2021 08:38:47 -0500
Subject: [PATCH 3964/4088] python3-scikit-image: update to 0.19.1.

---
 srcpkgs/python3-scikit-image/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index 5aaa9dbe6e39..a48ae2338769 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scikit-image'
 pkgname=python3-scikit-image
-version=0.19.0
-revision=2
+version=0.19.1
+revision=1
 _pkgname="${pkgname#python3-}"
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://scikit-image.org/"
 distfiles="https://github.com/${_pkgname}/${_pkgname}/archive/v${version}.tar.gz"
-checksum=5a0d6ad80ed3a389c19a8603391bbc1dd8e81239c2ef5ca6c274886db3087ec5
+checksum=803ae61cac7459a0b3b112602f2889f2ab0c09ae71c420b0869b8dd8cfdb5e59
 # Tests require data files and unpackaged dependencies
 make_check=no
 

From c4590bc207c5e240c3457d4b36ba95c3f8e40374 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Dec 2021 09:38:07 -0500
Subject: [PATCH 3965/4088] xpra: update to 4.3.

---
 srcpkgs/xpra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 36791e9cbb89..61e335105e91 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,13 +1,13 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.3
+version=4.3
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
 hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
 makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel
  libvpx-devel libwebp-devel libxkbfile-devel python3-gobject-devel x264-devel
- gtk+3-devel pam-devel"
+ gtk+3-devel pam-devel libXres-devel"
 depends="cups python3-gobject python3-Pillow python3-cups python3-dbus
  python3-lz4 python3-paramiko python3-rencode xauth xf86-video-dummy
  xorg-server-xvfb"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=69759c716d0dd50dba7c816f8a4c4afdfee4553d1aa8bd5104874e95a4ffd207
+checksum=d9ec407a514e0dba650196b90103eb47ec9c6b09acefc1ab71bbd3e9d6663c10
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 8b73125f19b4cf0b7da7214c59471a4834cb02d5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 16 Dec 2021 18:12:49 +0100
Subject: [PATCH 3966/4088] linux5.10: update to 5.10.86.

Enable CONFIG_BT_HCIBTUSB_MTK=m.
.
---
 srcpkgs/linux5.10/files/i386-dotconfig    | 15 +++------------
 srcpkgs/linux5.10/files/ppc-dotconfig     |  2 +-
 srcpkgs/linux5.10/files/ppc64-dotconfig   |  2 +-
 srcpkgs/linux5.10/files/ppc64le-dotconfig |  2 +-
 srcpkgs/linux5.10/files/x86_64-dotconfig  | 15 +++------------
 srcpkgs/linux5.10/template                |  4 ++--
 6 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index c76f790ac735..2ba33eadedb7 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.26 Kernel Configuration
+# Linux/i386 5.10.86 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1776,7 +1776,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -2119,7 +2119,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -6828,7 +6827,7 @@ CONFIG_I2C_HID=m
 
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
@@ -7549,7 +7548,6 @@ CONFIG_INTEL_IDMA64=m
 CONFIG_PCH_DMA=m
 CONFIG_PLX_DMA=m
 CONFIG_TIMB_DMA=m
-CONFIG_XILINX_ZYNQMP_DPDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
@@ -8239,7 +8237,6 @@ CONFIG_AD7887=m
 CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
-# CONFIG_AD9467 is not set
 # CONFIG_AXP20X_ADC is not set
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
@@ -8715,7 +8712,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9043,11 +9039,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index d73cec3eaab5..c4c1ff503748 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1515,7 +1515,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index fa41aedb6834..d7aa7ea0bb73 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -1729,7 +1729,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index de94b193290b..b530706d8f62 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -1655,7 +1655,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 619dc7455c81..e93531a1f00f 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.27 Kernel Configuration
+# Linux/x86 5.10.86 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1831,7 +1831,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -2180,7 +2180,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -6902,7 +6901,7 @@ CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
 
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
+CONFIG_USB_COMMON=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
@@ -7634,7 +7633,6 @@ CONFIG_INTEL_IDMA64=m
 CONFIG_INTEL_IDXD=m
 CONFIG_INTEL_IOATDMA=m
 CONFIG_PLX_DMA=m
-CONFIG_XILINX_ZYNQMP_DPDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
@@ -8377,7 +8375,6 @@ CONFIG_AD7887=m
 CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
-# CONFIG_AD9467 is not set
 # CONFIG_AXP20X_ADC is not set
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
@@ -8855,7 +8852,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9206,11 +9202,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 13089ade942c..b76d90022bdf 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.85
+version=5.10.86
 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=ba89162605ac447db8953c29f649b64d16aff7de8145e2db30d759e5476b19ac
+checksum=2ed51f7d0c0caa51e27da31f911917359107279b205913dfe9c0c89fef383f44
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From ef31650815ad4566912e9eef2b54ff6e4ee5c411 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 16 Dec 2021 18:16:21 +0100
Subject: [PATCH 3967/4088] linux5.15: update to 5.15.9.

Enable CONFIG_BT_HCIBTUSB_MTK=m.

Closes #34554.
---
 srcpkgs/linux5.15/files/i386-dotconfig    | 2 +-
 srcpkgs/linux5.15/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.15/files/ppc64-dotconfig   | 2 +-
 srcpkgs/linux5.15/files/ppc64le-dotconfig | 2 +-
 srcpkgs/linux5.15/files/x86_64-dotconfig  | 2 +-
 srcpkgs/linux5.15/template                | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 7d49d2ff2cc8..26d0500afb32 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1779,7 +1779,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
index fd5be8a4b04d..4cede9675c6f 100644
--- a/srcpkgs/linux5.15/files/ppc-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -1557,7 +1557,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
index 07815146cd1c..998e3081f8ba 100644
--- a/srcpkgs/linux5.15/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -1775,7 +1775,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
index 0d05e75d034c..c3bcd75a14c7 100644
--- a/srcpkgs/linux5.15/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -1699,7 +1699,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 12150514a28f..04593a447d81 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1841,7 +1841,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 622842e8c17a..24302e27ea7b 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.8
+version=5.15.9
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- c122c139f9b16fb6b78a70259c7fb689773c14581eb202425395e9ee251e98fb"
+ 61c8ebd999e694186df68d6d235b3ee0951f44740df075921f8f178e1e51a7e4"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 3b25215cbbc8725a74671a6a0a797b2f2486c017 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 16 Dec 2021 18:42:28 +0100
Subject: [PATCH 3968/4088] linux5.4: update to 5.4.166.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index e9ca05b9a5e8..652dcf4ac953 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.164
+version=5.4.166
 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=3951308f6ae44ba318fe9d273d2f174c4ce899b92c70a3d36fb2033058b48204
+checksum=d6a5fe54495d5c1cd0d1a3d8bfa052ef6cf12a1703cb8207b8aaac69c267f6af
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 366d0ab7225688257f7fb15410c489d73764333d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 16 Dec 2021 18:44:41 +0100
Subject: [PATCH 3969/4088] linux4.19: update to 4.19.221.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 3539ead97173..62a13a5d3024 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.220
+version=4.19.221
 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=58061d1d7a43573b093ef409458185e31e33ce6a6604e7ec495938810dccb060
+checksum=a349d49f5f656a7337f7d3c41cf63b744c147bc7423ed7adbc6f14eb5764e1f9
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 798d194b68e794213c21d8291d9a0500e32234dd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 16 Dec 2021 18:49:20 +0100
Subject: [PATCH 3970/4088] qemu: orphan package

---
 srcpkgs/qemu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index cb21578cfed2..1c4465234c7f 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -20,7 +20,7 @@ makedepends="libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel
  $(vopt_if spice 'pcsclite-devel')
  $(vopt_if jack 'jack-devel')"
 short_desc="Open Source Processor Emulator"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"

From 1e39c987f5c0a9ff5d1d0f2d67c09d36337b7f4f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 15 Dec 2021 07:51:41 -0600
Subject: [PATCH 3971/4088] gns3-server: update to 2.2.28.

---
 srcpkgs/gns3-server/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-server/template                   | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index bf1fea9499b7..0f108f5d4b8b 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -7,7 +7,8 @@ diff --git a/requirements.txt b/requirements.txt
 -aiohttp==3.7.4.post0
 +aiohttp>=3.7.4
  aiohttp-cors==0.7.0
- aiofiles==0.7.0
+-aiofiles==0.7.0
++aiofiles>=0.8.0
 -Jinja2==3.0.1
 +Jinja2>=3.0.1
 -sentry-sdk==1.3.1
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index ada70f593a86..a129019d74ee 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,10 +1,8 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.27
+version=2.2.28
 revision=1
 build_style=python3-module
-# Skip tests/compute/docker/test_docker_vm.py::test_stop test that wasn't updated with the code https://github.com/GNS3/gns3-server/commit/b1a62dfd
-make_check_args="-k-test_stop"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl
  python3-Jinja2 python3-psutil python3-aiofiles
@@ -14,8 +12,9 @@ short_desc="Graphical Network Simulator 3 - Server"
 maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
+changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=ed45ab788ee976474289e9e73c5bbe78cab26ebfcdcc5d2eee086908d14d0c9f
+checksum=bd37601f2924fc00a9a1690478896566911e466699d68af0abadd097dd1e314b
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From 53a400f78f30c178c8407360cd22454f5b0d5af2 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 15 Dec 2021 07:51:51 -0600
Subject: [PATCH 3972/4088] gns3-gui: update to 2.2.28.

---
 srcpkgs/gns3-gui/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index fb0b5d198308..09e7adabbed2 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.27
+version=2.2.28
 revision=1
 build_style=python3-module
 # Skip tests/test_link.py::test_create_link test that wasn't updated with the code https://github.com/GNS3/gns3-gui/commit/545a9f53
@@ -14,8 +14,9 @@ short_desc="Graphical Network Simulator 3 - GUI"
 maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
+changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=c5afadd2932703c38fb6d479be6966af65787ddc6abcb3f9b7c0b3f5722e0fd5
+checksum=8b6e5df17ae472bf3525e1adbb1a0d2c6f170df270f802163c00c02d75cc4ced
 
 post_install() {
 	vinstall gns3-gui.desktop 644 usr/share/applications

From a42b84dc0af4073dd5fb8f15520b2e886046b196 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 16 Dec 2021 22:14:52 +1100
Subject: [PATCH 3973/4088] retroarch: update to 1.9.14

---
 srcpkgs/retroarch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 4b253b236b5a..18ac7039fabb 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.9.12
+version=1.9.14
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=69b2139fd1393682be4aec3168187a05f010e3acf4ab23d1cf759e894f10ad8f
+checksum=874f3e3aca1d12d2cb9d34687eb052eec0ccfc0f335606f61fa6a03c8b6bb90a
 
 build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"

From d8278658a160e35f827d8beaf092afb0c55d88a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 15 Dec 2021 23:03:11 -0300
Subject: [PATCH 3974/4088] iperf: update to 2.1.6.

---
 srcpkgs/iperf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index bcd7aa2aac28..555b5670914f 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf'
 pkgname=iperf
-version=2.1.5
+version=2.1.6
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
@@ -10,7 +10,7 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="NCSA"
 homepage="https://iperf.fr/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=56ec1312d24bd2c78790e67c96c0a991c82e71bc4c0b0d37171bd89c9fd6ef3e
+checksum=4a43e44439b95622aebeee55754a17d1c94076032e90620dfc1ab9908cb9e080
 
 post_install() {
 	vlicense COPYING LICENSE

From 63fe8e4859ff28d36bc3dfbb501ae97a946caf98 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 16 Dec 2021 17:28:52 -0500
Subject: [PATCH 3975/4088] clipman: update to 1.6.1

---
 srcpkgs/clipman/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index 3e6141107bc8..7c0d31c6216e 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,10 +1,9 @@
 # Template file for 'clipman'
 pkgname=clipman
-version=1.6.0
+version=1.6.1
 revision=1
 build_style=go
 go_import_path=github.com/yory8/clipman
-hostmakedepends="git"
 depends="wl-clipboard"
 short_desc="Simple clipboard manager for Wayland"
 maintainer="travankor <travankor@tuta.io>"
@@ -12,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/yory8/clipman"
 changelog="https://raw.githubusercontent.com/yory8/clipman/master/CHANGELOG.md"
 distfiles="https://github.com/yory8/clipman/archive/v${version}.tar.gz"
-checksum=996d75aa422a63ae9795cfc13104f70b3e3312421aed2919070a6ad84c6c6127
+checksum=9bfd69ed299f7641188e05668442f074fca3b01858ea8e680499ace7a36dd108
 
 post_install() {
 	vman docs/clipman.1

From 2f4f7127d63bfb4e3b81584c05a9404e42e65438 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 16 Dec 2021 23:49:24 +0100
Subject: [PATCH 3976/4088] podman: fix musl.

---
 srcpkgs/podman/patches/musl.patch | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/podman/patches/musl.patch

diff --git a/srcpkgs/podman/patches/musl.patch b/srcpkgs/podman/patches/musl.patch
new file mode 100644
index 000000000000..2732d190233c
--- /dev/null
+++ b/srcpkgs/podman/patches/musl.patch
@@ -0,0 +1,47 @@
+From 1d781ccbeab3364ac18c487f66893847fe5e102f Mon Sep 17 00:00:00 2001
+From: Marc Nguyen <nguyen_marc@live.fr>
+Date: Fri, 10 Dec 2021 03:07:20 +0100
+Subject: [PATCH] [NO NEW TESTS NEEDED] rootless: declare TEMP_FAILURE_RETRY
+ before usage (Fixes: #12563)
+
+Signed-off-by: Nguyen Marc <nguyen_marc@live.fr>
+---
+ pkg/rootless/rootless_linux.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
+index e71d5d999fe..92f331ce493 100644
+--- a/pkg/rootless/rootless_linux.c
++++ b/pkg/rootless/rootless_linux.c
+@@ -19,6 +19,15 @@
+ #include <sys/select.h>
+ #include <stdio.h>
+ 
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
+ #define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
+ #define cleanup_close __attribute__ ((cleanup (cleanup_closep)))
+ #define cleanup_dir __attribute__ ((cleanup (cleanup_dirp)))
+@@ -72,15 +81,6 @@ int rename_noreplace (int olddirfd, const char *oldpath, int newdirfd, const cha
+   return rename (oldpath, newpath);
+ }
+ 
+-#ifndef TEMP_FAILURE_RETRY
+-#define TEMP_FAILURE_RETRY(expression) \
+-  (__extension__                                                              \
+-    ({ long int __result;                                                     \
+-       do __result = (long int) (expression);                                 \
+-       while (__result == -1L && errno == EINTR);                             \
+-       __result; }))
+-#endif
+-
+ static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
+ static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
+ 

From 694bf8f57b8835d098813fd816952436ff1ba2f1 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 14 Dec 2021 11:44:07 +0100
Subject: [PATCH 3977/4088] slack-desktop: update to 4.23.0

Closes: #34526 [via git-merge-pr]
---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 9b2814fa375c..8750d2687f69 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.22.0
+version=4.23.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=d12026d979673aa5cdc14f6a484776a72bedf7fec5acb2ddeb7414733b7d044d
+checksum=3a823be14d9aaea2ef565ac6c3fc62580a10775bcc1eadcc62c3256999ea59f3
 restricted=yes
 repository="nonfree"
 nopie=yes

From 604f75b19e93a7f4ae5c4ddbdec71b3f4bded8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 16 Dec 2021 20:19:19 +0100
Subject: [PATCH 3978/4088] sslscan: update to 2.0.11.

---
 srcpkgs/sslscan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
index 9d0be1812772..47449b62211b 100644
--- a/srcpkgs/sslscan/template
+++ b/srcpkgs/sslscan/template
@@ -1,6 +1,6 @@
 # Template file for 'sslscan'
 pkgname=sslscan
-version=2.0.10
+version=2.0.11
 revision=1
 build_style=gnu-makefile
 makedepends="openssl-devel"
@@ -10,6 +10,6 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/rbsec/sslscan"
 changelog="https://github.com/rbsec/sslscan/raw/master/Changelog"
 distfiles="https://github.com/rbsec/sslscan/archive/refs/tags/${version}.tar.gz"
-checksum=bb7bb0ff037aa5579b3ee0cf91aa41ab04ac073592b5d95ad3fab820f5000f6e
+checksum=74bdf97c834b961afb342cae1ea32067af0e05f58239979d0f2d3fab82acae1c
 # No test suite
 make_check=no

From e783f5988a31b7a6c654753026a6387c539ffb2b Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 14 Dec 2021 10:28:45 +0100
Subject: [PATCH 3979/4088] google-chrome: update to 96.0.4664.110

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index d9949d06e371..9c303e4843ec 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=96.0.4664.93
+version=96.0.4664.110
 revision=1
 _channel=stable
 archs="x86_64"
@@ -19,7 +19,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=0b8b50d03cb9a58f8841fc03912e847a54a213745a8b10d8c0c75223a51d4394
+checksum=8bc963fc699c72fde6db576df6a47d85e76729ec2605678437df1dd265909e9d
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From ecee82fdb5aaab140a8fb202f4187980c5a7745c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Nov 2021 22:52:09 +0100
Subject: [PATCH 3980/4088] meson: update to 0.60.2.

---
 srcpkgs/meson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 6cbcd3c9e966..2ac20eb33795 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.59.4
+version=0.60.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
+checksum=64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From a96dbd38943adf13e1b1a12a84c9b71a1be6348a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:27:14 +0100
Subject: [PATCH 3981/4088] bijiben: remove obsolete zeitgeist support

bijiben 40.0 dropped zeitgeist support
---
 srcpkgs/bijiben/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8c3e51c3fc37..604076fdb93c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=1
+revision=2
 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
- zeitgeist-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+ libhandy1-devel"
+depends="desktop-file-utils tracker3"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From b777e17a0fdbcc28cebbcbb6fa298dba4190567f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:41:10 +0100
Subject: [PATCH 3982/4088] colord-gtk: fix building vala bindings

---
 srcpkgs/colord-gtk/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 65463f110590..634a9322dae3 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,10 +1,10 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvala=$(vopt_if vala true false)
+configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
  -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
@@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.freedesktop.org/software/colord"
+homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
 checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
 
@@ -30,5 +30,8 @@ colord-gtk-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }

From caf1816f38a11c9db6ddeb64e9eff4def0998790 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:52:14 +0100
Subject: [PATCH 3983/4088] efl: drop removed configure args

---
 srcpkgs/efl/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 8786d5d94edf..c116523094ea 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -10,8 +10,6 @@ configure_args="
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
  -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
- -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
- -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
  $(vopt_bool elogind systemd)
  $(vopt_bool x11 x11)

From fc03463e243b918a4c1edf9b43b9383e16154115 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:59:16 +0100
Subject: [PATCH 3984/4088] enlightenment: drop a removed configure argument

---
 srcpkgs/enlightenment/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index db9c886dc920..360a0f5368e6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -3,7 +3,7 @@ pkgname=enlightenment
 version=0.24.2
 revision=1
 build_style=meson
-configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
+configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
  $(vopt_bool wayland wl)"
 hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)"
 makedepends="gettext-devel efl-devel pam-devel xkeyboard-config

From e3cc39c61b634b1c39b84cf55f712da6e8e990a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 16:03:04 +0100
Subject: [PATCH 3985/4088] epiphany: drop a removed configure option

---
 srcpkgs/epiphany/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c58e2fa54ef6..0ffa06f547fe 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,7 +4,7 @@ version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
+configure_args="-Dunit_tests=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel

From 387d0ff8ae5e3bcb50a7967bf3ec7d205ec4f480 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:01:58 +0100
Subject: [PATCH 3986/4088] gnome-bluetooth: remove obsolete configure options

---
 srcpkgs/gnome-bluetooth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 83d89c0a8acb..e6861631b08d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -4,8 +4,7 @@ version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dicon-update=false -Dgtk_doc=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"

From 10d2c8c9123b7061b0a13096b5432614a0d5e26c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:06 +0100
Subject: [PATCH 3987/4088] gnome-initial-setup: remove obsolete configure
 options

---
 srcpkgs/gnome-initial-setup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 30a4a6ed4762..075e4b86324f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -3,8 +3,7 @@ pkgname=gnome-initial-setup
 version=40.4
 revision=1
 build_style=meson
-configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
- -Dsystemd=false"
+configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel

From 6907a753f6dec995bed7552a2d61f431bcc396e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:13 +0100
Subject: [PATCH 3988/4088] gedit: remove obsolete configure options

* gir is not optional anymore, so also removing the build option
---
 srcpkgs/gedit/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index b4e862c26ad0..e93ff8905272 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,12 +5,10 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true
- $(vopt_bool gir vapi) $(vopt_bool gir introspection)"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
- $(vopt_if gir vala)"
+configure_args="-Dplugins=true"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel python3-gobject-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 
-build_options="gir"
-build_options_default="gir"
-
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel
 	 libpeas-devel tepl-devel"
@@ -31,9 +26,7 @@ gedit-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gedit/gir-1.0
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gedit/gir-1.0
+		vmove usr/share/vala
 	}
 }

From 60b679567db35992d113d209f2921612ef987957 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:17 +0100
Subject: [PATCH 3989/4088] gnome-builder: remove obsolete configure options

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a3ce20126d78..26cf768c391a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
 revision=3
 build_style=meson
 build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
+configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel

From 905a0308bf7ad81107b2026611ea816d41399e2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:34 +0100
Subject: [PATCH 3990/4088] NetworkManager: remove obsolete configure options

---
 srcpkgs/NetworkManager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e99d04798939..7001b27dc0e3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -4,7 +4,7 @@ version=1.32.12
 revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
+configure_args="-Dsystemd_journal=false
  -Dlibaudit=no -Dovs=false -Dselinux=false
  -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false

From 31e9cdb2094ad2bde268f6d082ca0750e3f3e86d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:21:42 +0100
Subject: [PATCH 3991/4088] graphene: remove obsolete configure options

---
 srcpkgs/graphene/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 79b2ac2e945e..6be39623eeae 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -4,7 +4,7 @@ version=1.10.6
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+configure_args="-Dinstalled_tests=false
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"

From 4d43d9999ae45bb3c8b202889e848fa032238371 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:39 +0100
Subject: [PATCH 3992/4088] grilo: remove obsolete configure options

---
 srcpkgs/grilo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 64bae9bd4e2f..e47ec38542a5 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,7 +4,7 @@ version=0.3.13
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala)
+configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
  -Denable-gtk-doc=false"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
 makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel

From 4e32578c607961a58d38ac0e4ac182928019b635 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:43 +0100
Subject: [PATCH 3993/4088] gnome-passwordsafe: fix build

---
 srcpkgs/gnome-passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index fe91bcd9ed23..8f68cbf329f1 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -2,7 +2,7 @@
 pkgname=gnome-passwordsafe
 version=5.0
 revision=2
-wrksrc="PasswordSafe-${version}"
+wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection
  python3-pykeepass"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983
+checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449

From 94002474b4fc9b6b80abec7115cd51b4fd47af34 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:22 +0100
Subject: [PATCH 3994/4088] libgudev: remove obsolete configure options

---
 srcpkgs/libgudev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 47d1b8fc365d..e7603d00ce2f 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvala=$(vopt_if vala enabled disabled)"
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"

From d2a3d6adb29e47165119a9673fb8abb8d021b4a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:34 +0100
Subject: [PATCH 3995/4088] libfprint: remove obsolete configure options

---
 srcpkgs/libfprint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index 33ac4c2a0571..16e6b2ffa1e0 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=libfprint-v$version
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
  libgusb-devel libglib-devel"

From bb07f190ab4cff33ca96c364c16209b38819e427 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:48 +0100
Subject: [PATCH 3996/4088] gst1-editing-services: remove obsolete configure
 options

---
 srcpkgs/gst1-editing-services/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index f06a4d294879..1613a7ababfd 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled"
 hostmakedepends="flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
 short_desc="GStreamer 1.x Editing Services"

From f055c092d48a7069845346623770739135b63114 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:01:59 +0100
Subject: [PATCH 3997/4088] gst-plugins-base1: remove obsolete configure
 options

---
 srcpkgs/gst-plugins-base1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 3e22f2d1bf48..fc954cc96cf5 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"

From b92e2f4bb7df680b087eed132a0bdb69020d67d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:01 +0100
Subject: [PATCH 3998/4088] gst-plugins-bad1: remove obsolete configure options

---
 srcpkgs/gst-plugins-bad1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 1157ba3e7ded..451f73cb9f55 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -5,9 +5,9 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
- -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
+ -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
  -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled

From 7d9ef0e59fb3135df6281be09f52f6292b9164dc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:12 +0100
Subject: [PATCH 3999/4088] hexchat: remove obsolete configure options

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 97937999bb0d..7b3bc658d5aa 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -3,7 +3,7 @@ pkgname=hexchat
 version=2.16.0
 revision=3
 build_style=meson
-configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"

From 103747341bc5ddabe185f3d3333950a3924b5738 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:20 +0100
Subject: [PATCH 4000/4088] igt-gpu-tools: fix build with meson 0.60

---
 .../patches/meson-fix-underscorify-call.patch | 36 +++++++++++++++++++
 srcpkgs/igt-gpu-tools/template                |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch

diff --git a/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
new file mode 100644
index 000000000000..142e2fa44fb6
--- /dev/null
+++ b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc8..297b0ad2 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+ 
+ lib_intermediates = []
+ foreach f: lib_sources
+-    name = f.underscorify(f)
++    name = f.underscorify()
+     lib = static_library('igt-' + name,
+ 	[ f, lib_version ],
+ 	include_directories: inc,
+-- 
+GitLab
+
diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3b222ecd18d8..3f8b4e2b6166 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -22,7 +22,7 @@ lib32disabled=yes
 archs="i686* x86_64*"
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled"
+	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
 fi
 
 post_install() {

From 8bdbc0afde382229dc8cc2b9c1dc26370c244859 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:54:21 +0100
Subject: [PATCH 4001/4088] libgweather: remove obsolete configure options

---
 srcpkgs/libgweather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 6d9b85a07d04..857006ea8786 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -4,8 +4,7 @@ version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
- -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"

From 431dc1ba98dfdfcf803d946edbf7e2af67a1843e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:04:25 +0100
Subject: [PATCH 4002/4088] light-locker: fix build and license

---
 srcpkgs/light-locker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index e3bb799ba171..d50c71480a33 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,15 +1,15 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel elogind-devel"
+ libXxf86misc-devel libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/the-cavalry/light-locker"
 distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz"
 checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c

From a344d268b92b064ae1e22d2177e3a18e86505292 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:19:07 +0100
Subject: [PATCH 4003/4088] ncmpc: disable html manual

---
 srcpkgs/ncmpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 683ec13e85a3..a7d76aa3ce9e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,9 +1,9 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
 version=0.45
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlirc=disabled"
+configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
 short_desc="Ncurses-based mpd client"

From d394f2d6b4890f30cc32e685d3f656e00a4a4dd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:22:30 +0100
Subject: [PATCH 4004/4088] pixman: remove obsolete configure options

---
 srcpkgs/pixman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 456e9d1628e8..eba3b82c9fa7 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -5,8 +5,8 @@ revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
-configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
- -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
+configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled
+ -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
 makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"

From 7b3985baf20bb7ff46f7101cea0a861ee769c2ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:33:52 +0100
Subject: [PATCH 4005/4088] seatd: fix configure arguments

---
 srcpkgs/seatd/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index c619787ae3eb..178f1b3d8aa9 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,8 @@ pkgname=seatd
 version=0.6.3
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind)
+ -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From b90d9b61a926fef9ccf96675fb3a48166415ad88 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:34:04 +0100
Subject: [PATCH 4006/4088] spice-gtk: remove obsolete configure options

---
 srcpkgs/spice-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 7218e837891f..351923f41e7f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -7,8 +7,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
- -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
- -Dpulse=disabled -Dgtk_doc=disabled"
+ -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel

From 483defa6a1857b105f774996583cf10495e49229 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:37:05 +0100
Subject: [PATCH 4007/4088] switchboard: remove obsolete configure options

---
 srcpkgs/switchboard/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 45031a8d8b76..ebb706e5d9e5 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -3,7 +3,6 @@ pkgname=switchboard
 version=2.3.7
 revision=2
 build_style=meson
-configure_args="-Dlibunity=false"
 hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"

From 3fa66ad750b0ff92fb8095f40ec275637097e286 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:41:37 +0100
Subject: [PATCH 4008/4088] cglm: update to 0.8.4, switch to meson

---
 srcpkgs/cglm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index 5b553c7c0d12..05885c452520 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -2,7 +2,7 @@
 pkgname=cglm
 version=0.8.4
 revision=1
-build_style=cmake
+build_style=meson
 short_desc="Highly Optimized Graphics Math (glm) for C"
 maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"

From 24dfc455bcaad41b311f33eb64727d75f5ca38a6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:56:50 +0100
Subject: [PATCH 4009/4088] totem: remove gir build option

---
 srcpkgs/totem/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8871c546b50a..f80a2620b2f1 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -4,12 +4,9 @@ version=3.38.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-python=no -Denable-nautilus=yes
- -Denable-introspection=$(vopt_if gir yes no)
- -Denable-vala=$(vopt_if gir yes no)"
-hostmakedepends="intltool itstool pkg-config
- $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1
- glib-devel"
+configure_args="-Denable-python=no"
+hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1
+ gst-plugins-good1 glib-devel"
 # XXX missing lirc plugin.
 makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
@@ -31,16 +28,11 @@ do_check() {
 	:
 }
 
-build_options="gir"
-build_options_default="gir"
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -51,8 +43,6 @@ totem-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 	}
 }

From 7603fa7570cabe1f695c8af2b03f55caeb079c1a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:57:22 +0100
Subject: [PATCH 4010/4088] tracker3: remove deprecated networkmanager option

---
 srcpkgs/tracker3/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..a6f8135b77d6 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,16 +1,15 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=3
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled
- -Dstemmer=disabled -Dsystemd_user_services=false"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="tar python3-gobject"
 short_desc="Personal search tool and storage system"
 maintainer="q66 <daniel@octaforge.org>"

From f12a8d43d447f33997d953ba1f5f130c2f6fc17e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:00:29 +0100
Subject: [PATCH 4011/4088] tracker-miners: remove taglib configure option

---
 srcpkgs/tracker-miners/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..9c4762cf56ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
  -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
@@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ libvorbis-devel poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
 short_desc="Data miners for tracker"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -24,8 +24,4 @@ license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
 checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
+make_check=no # relies on unsupported ops in chroot

From 604948a8aebed17dcc897bc39c8d936869daad2a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:18:35 +0100
Subject: [PATCH 4012/4088] tracker3-miners: remove obsolete configure options

---
 srcpkgs/tracker3-miners/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..4c752fe55add 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -5,20 +5,20 @@ revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
  -Dsystemd_user_services=false -Dnetwork_manager=enabled"
 hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
  NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker3"

From 9fbb3a0b92f7fa6a5c38be2bb3bc494bf3519365 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 13:48:40 +0100
Subject: [PATCH 4013/4088] libwacom: remove obsolete configure options

---
 srcpkgs/libwacom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index c4922df7a205..b6003b1c6d3e 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -4,7 +4,7 @@ version=1.12
 revision=1
 build_style=meson
 build_helper="qemu"
-configure_args="-Ddocumentation=disabled -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+configure_args="-Ddocumentation=disabled"
 hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
 checkdepends="python3-pytest python3-libevdev python3-pyudev"

From 6380d804b6aadfb8ac1d5af391a6ad3ba9fdffc6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 14:21:50 +0100
Subject: [PATCH 4014/4088] gnome-settings-daemon: fix build with meson 0.60

---
 .../meson-fix-string-bool-comparison.patch    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
new file mode 100644
index 000000000000..19cb682ca296
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
@@ -0,0 +1,29 @@
+From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 16 Jul 2021 16:02:36 +0200
+Subject: [PATCH] build: Fix str/bool comparison
+
+gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==.
+The result of this is undefined and will become a hard error in a future Meson release.
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fdf71713..ba2a90ca 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release')
+   common_flags += ['-DG_DISABLE_CAST_CHECKS']
+ endif
+ 
+-# Workaround for meson's bug
+-# https://github.com/mesonbuild/meson/pull/1896
+-if get_option('b_ndebug') == true
++if get_option('b_ndebug') == 'true'
+   common_flags += ['-DG_DISABLE_ASSERT']
+ endif
+ 
+-- 
+GitLab
+

From ec57c490d093d1802352016d78f3a9f9d896fef2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 18:57:28 +0100
Subject: [PATCH 4015/4088] vala-panel: fix build with meson 0.60

---
 .../LINGUAS-remove-a-duplicate-entry.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch

diff --git a/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch
new file mode 100644
index 000000000000..36548f5dab6e
--- /dev/null
+++ b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch
@@ -0,0 +1,19 @@
+From 52f40ce779cfa224266dd427cfe57afd83a28362 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 14 Nov 2021 17:15:55 +0100
+Subject: [PATCH] LINGUAS: remove a duplicate entry
+
+---
+ po/LINGUAS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index e66ec1c..3ee3bdd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
+-- 
+2.33.1
+

From a2e809a361194afb5e05d3124cd3a7bf3d759435 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 18:59:05 +0100
Subject: [PATCH 4016/4088] vala-panel-appmenu: fix build with meson 0.60

---
 .../LINGUAS-remove-a-duplicate-entry.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch

diff --git a/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch
new file mode 100644
index 000000000000..3b31ed15b1f5
--- /dev/null
+++ b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch
@@ -0,0 +1,19 @@
+From 442bcebcc00ea3a51057de0d1290593be7f9deb3 Mon Sep 17 00:00:00 2001
+From: Konstantin <ria.freelander@gmail.com>
+Date: Wed, 27 Oct 2021 07:47:37 +0000
+Subject: [PATCH] Update LINGUAS
+
+---
+ po/LINGUAS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index e66ec1c..3ee3bdd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
+-- 
+GitLab
+

From a27864c585878f4cdc225ce6afa0fb73869a49b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:30:31 +0100
Subject: [PATCH 4017/4088] gitg: remove obsolete configure options

---
 srcpkgs/gitg/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index 2f8f671038da..bf10d435baef 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -15,7 +15,3 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gitg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
-fi

From e16b74005546b9a52bc789ffc9b82bef046ca25e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:30:45 +0100
Subject: [PATCH 4018/4088] gedit: remove obsolete configure options

---
 srcpkgs/gedit/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index e93ff8905272..2f8b48a2199d 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,7 +5,6 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true"
 hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
  libpeas-devel tepl-devel python3-gobject-devel"

From c64fec76c11a9b2aa588498899a3306f8621006d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:31:59 +0100
Subject: [PATCH 4019/4088] gtk-vnc: fix build

---
 srcpkgs/gtk-vnc/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 46a535d1e0f3..0186c4f7c00a 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -5,9 +5,10 @@ revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dwith-vala=$(vopt_if gir enabled disabled)"
-hostmakedepends="gettext gettext-devel glib-devel intltool libgcrypt-devel
- pkg-config $(vopt_if gir vala)"
-makedepends="gnutls-devel gtk+3-devel libsasl-devel $(vopt_if gir vala)"
+hostmakedepends="gettext gettext-devel glib-devel intltool pkg-config
+ $(vopt_if gir vala)"
+makedepends="gnutls-devel gtk+3-devel libsasl-devel libgcrypt-devel
+ $(vopt_if gir vala)"
 short_desc="VNC viewer widget for GTK"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From afe7ce654b4da54e8195bb6ac96ecb971fbf7f5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 18:16:46 +0100
Subject: [PATCH 4020/4088] pulseeffects-legacy: fix build

---
 srcpkgs/pulseeffects-legacy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index ec5a16528474..585f25a55c8f 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -4,8 +4,8 @@ version=4.8.5
 revision=3
 wrksrc="easyeffects-${version}"
 build_style=meson
-hostmakedepends="itstool pkg-config gettext"
-makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
+hostmakedepends="itstool pkg-config gettext glib-devel"
+makedepends="boost-devel gsettings-desktop-schemas-devel
  gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
  pulseaudio-devel sratom-devel zita-convolver-devel libbs2b-devel
  libsamplerate-devel libsndfile-devel rnnoise-devel"

From 870a4f1ebedb8cd73e087bf3d0d48d9afabf87b1 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Thu, 16 Dec 2021 19:15:29 -0600
Subject: [PATCH 4021/4088] lego: update to 4.5.3.

---
 srcpkgs/lego/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index 573dbdf943b6..6d46cd6a6e67 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,6 +1,6 @@
 # Template file for 'lego'
 pkgname=lego
-version=4.0.1
+version=4.5.3
 revision=1
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
@@ -11,7 +11,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="https://go-acme.github.io/lego"
 distfiles="https://github.com/go-acme/lego/archive/v${version}.tar.gz"
-checksum=2b30d231189727b8608001e62b70ce3e1513df1a9766e2d43d5f1c5d1cabecdf
+checksum=82778a122e98225b55e1e6c102a06948747263533d88284216f0cce238b897c9
 
 post_install() {
 	vlicense LICENSE

From 998f6f77bfb7d17f80e0d4ebbc164373da074033 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 16 Dec 2021 21:56:13 -0500
Subject: [PATCH 4022/4088] chezmoi: update to 2.9.3.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 1aaf32f386e8..8d0b4216f73f 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.8.0
+version=2.9.3
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=3c7408625639c215926e1401b9acc037a0c2216984a7d063cf647d9ec0798937
+checksum=fa9cf4eb148a51dbe5e08e5290488bac37a378a966cb3e1245864d70623a99aa
 
 export CGO_ENABLED=1
 

From 40ff92f456bcc5b676b4cae59093bb88a3695d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 15 Dec 2021 17:24:39 +0100
Subject: [PATCH 4023/4088] gendesk: update to 1.0.9.

---
 srcpkgs/gendesk/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 7b9eaab6164b..22be43712b03 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,18 +1,16 @@
 # Template file for 'gendesk'
 pkgname=gendesk
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/gendesk
-go_mod_mode=default
-hostmakedepends="git"
 short_desc="Utility to generate .desktop files and download icons"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
-homepage="http://roboticoverlords.org/gendesk/"
+homepage="https://roboticoverlords.org/gendesk/"
 distfiles="https://github.com/xyproto/gendesk/archive/${version}.tar.gz
- http://roboticoverlords.org/images/default.png"
-checksum="548ca9b5bd81174414857ece85d6afd8e021c8ac769584c0f573896b845e8fe1
+ https://roboticoverlords.org/images/default.png"
+checksum="dd0008512eebc893e4b630d07d9bf5e3a4f121b87fe725c32773caa6e391db58
  4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837"
 skip_extraction="default.png"
 

From bb9955c9cd0cb5ee5441881b2e82e13ac7d6f98e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 16 Dec 2021 17:18:54 -0500
Subject: [PATCH 4024/4088] procs: update to 0.11.12

---
 srcpkgs/procs/patches/edition.patch | 13 +++++++++++++
 srcpkgs/procs/template              |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/procs/patches/edition.patch

diff --git a/srcpkgs/procs/patches/edition.patch b/srcpkgs/procs/patches/edition.patch
new file mode 100644
index 000000000000..b650019e43c2
--- /dev/null
+++ b/srcpkgs/procs/patches/edition.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 8291632b86..9c9e1193d4 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -8,7 +8,7 @@ categories = ["command-line-utilities"]
+ license = "MIT"
+ readme = "README.md"
+ description = "A modern replacement for ps"
+-edition = "2021"
++edition = "2018"
+ exclude = ["img/*", "config/*"]
+ 
+ [package.metadata.release]
diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index b82f4ac4e004..cee5b7f47fe9 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,7 +1,7 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.11.10
-revision=2
+version=0.11.12
+revision=1
 build_style=cargo
 build_helper=qemu
 short_desc="Modern replacement for ps written in Rust"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/dalance/procs"
 changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
 distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=e6a869722181f2122a5a223517a2d1f6505d19b8b9d46ffd59c61fb02f472403
+checksum=ff1a293d84cc0160cc92b4530ee93cedf530796e80130df74b0490c3e884efb6
 
 post_build() {
 	PROCS="target/${RUST_TARGET}/release/procs"

From ca35b494f7e97bbab69bf7b652856d1c3ad66719 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 16 Dec 2021 21:02:52 -0500
Subject: [PATCH 4025/4088] tailscale: update to 1.18.2.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 96ebdd1354a8..44055fc87bc2 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.18.1
+version=1.18.2
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=a8630d66ee1d475ba4ec97f389bae87d2777e9a33422726c052be1a6bbd2330c
+checksum=57206181868299027689651b6cd133627acad0c8c38f0151f469ab36d4130012
 
 post_install() {
 	vlicense LICENSE

From 54a87d6f784eca9702e06b335655c9f9896084e6 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Thu, 16 Dec 2021 17:14:32 +0100
Subject: [PATCH 4026/4088] lc0: update to 0.28.2

---
 srcpkgs/lc0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template
index 50863ab6da34..e7433710b1fb 100644
--- a/srcpkgs/lc0/template
+++ b/srcpkgs/lc0/template
@@ -1,6 +1,6 @@
 # Template file for 'lc0'
 pkgname=lc0
-version=0.28.0
+version=0.28.2
 revision=1
 archs="x86_64* i686* aarch64* armv[67]l* ppc64le*"
 build_style=meson
@@ -15,7 +15,7 @@ license="GPL-3.0-only"
 homepage="https://lczero.org"
 distfiles="https://github.com/LeelaChessZero/lc0/archive/v${version}.tar.gz
  https://github.com/LeelaChessZero/lczero-common/archive/${_lczero_commit}.tar.gz"
-checksum="81f857a4c2e45ac161d499957f9fe5060479242f527dacff548d52cd0c573caa
+checksum="5fe8a39c82a9be2b185b57d093417ed290fc36596cb23bc731e05a57fa70f65c
  def7b572df6c3e8f5307afa8abb242d51c0e8d200b12dd56466fff11b9bc4cf8"
 
 build_options="openblas opencl"

From 88419ded44c7f165616f4f7e5177f435ad980c9d Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 15 Dec 2021 22:34:26 -0500
Subject: [PATCH 4027/4088] discord-ptb: update to 0.0.27.

- Added and tested 'update' file based on package 'discord'
---
 srcpkgs/discord-ptb/template | 4 ++--
 srcpkgs/discord-ptb/update   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/discord-ptb/update

diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 87506db908d4..c12cecaed945 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,6 +1,6 @@
 # Template file for 'discord-ptb'
 pkgname=discord-ptb
-version=0.0.26
+version=0.0.27
 revision=1
 archs="x86_64"
 wrksrc="DiscordPTB"
@@ -12,7 +12,7 @@ maintainer="0x5c <dev@0x5c.io>"
 license="custom:Proprietary"
 homepage="https://discord.com/"
 distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=04b33c73a4d55c476c8332bd86e50add6d984c965f0d4b5b759ccb0ebd3992e6
+checksum=0bef5643b57ec9ee42f5d107565e13a0ea83e1b26011e1cd5520fbcb8bd1f07a
 _license_checksum=03580ea1297c38f31c4437555f2dbf9dae25a91c9e61391d7141cf8cc036aeff
 nopie=yes
 restricted=yes
diff --git a/srcpkgs/discord-ptb/update b/srcpkgs/discord-ptb/update
new file mode 100644
index 000000000000..e44771fbb831
--- /dev/null
+++ b/srcpkgs/discord-ptb/update
@@ -0,0 +1,3 @@
+# sample response: {"name": "0.0.11", "pub_date": "2020-08-06T16:59:21"}
+site="https://discordapp.com/api/updates/ptb?platform=linux"
+pattern="\"name\":\s*\"\K[\d.]+(?=\")"

From e021e1d2f166422a266258d0841a71fcd8565994 Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Thu, 16 Dec 2021 14:30:39 -0500
Subject: [PATCH 4028/4088] catatonit: update to 0.1.7.

---
 ...e.ac-call-AM_INIT_AUTOMAKE-only-once.patch | 39 +++++++++++++++++++
 .../use-environ-instead-of-__environ.patch    | 29 --------------
 srcpkgs/catatonit/template                    |  4 +-
 3 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 srcpkgs/catatonit/patches/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch
 delete mode 100644 srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch

diff --git a/srcpkgs/catatonit/patches/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch b/srcpkgs/catatonit/patches/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch
new file mode 100644
index 000000000000..309e37074b4b
--- /dev/null
+++ b/srcpkgs/catatonit/patches/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch
@@ -0,0 +1,39 @@
+From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro@debian.org>
+Date: Thu, 4 Nov 2021 07:37:13 -0300
+Subject: [PATCH] configure.ac: call AM_INIT_AUTOMAKE only once
+
+That second call seems to be there since the beginning, and autoconf
+2.69 was fine with it. autoconf 2.71 doesn't allow it anymore:
+
+    $ ./autogen.sh
+    autoreconf: export WARNINGS=
+    autoreconf: Entering directory '.'
+    autoreconf: configure.ac: not using Gettext
+    autoreconf: running: aclocal --force
+    configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times
+    /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
+    configure.ac:19: the top level
+    /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
+    configure.ac:34: the top level
+    autom4te: error: /usr/bin/m4 failed with exit status: 1
+    aclocal: error: /usr/bin/autom4te failed with exit status: 1
+    autoreconf: error: aclocal failed with exit status: 1
+
+Signed-off-by: Antonio Terceiro <terceiro@debian.org>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 12c9186..94c5c84 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,4 +31,3 @@ AC_FUNC_FORK
+ 
+ AC_CONFIG_FILES([Makefile config.h])
+ AC_OUTPUT
+-AM_INIT_AUTOMAKE
+-- 
+2.34.1
+
diff --git a/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch b/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
deleted file mode 100644
index c32276f9cbc6..000000000000
--- a/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 75014b1c3099245b7d0f44f24d7f6dc4888a45fd Mon Sep 17 00:00:00 2001
-From: Andrey Golovizin <ag@sologoc.com>
-Date: Mon, 1 Mar 2021 18:41:42 +0100
-Subject: [PATCH] Use environ instead of __environ
-
-The `__environ` variable is internal and undocumented. It also breaks
-compilation with musl.
-
-Signed-off-by: Andrey Golovizin <ag@sologoc.com>
----
- catatonit.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/catatonit.c b/catatonit.c
-index a05451e..fd746bb 100644
---- a/catatonit.c
-+++ b/catatonit.c
-@@ -216,7 +216,7 @@ static int spawn_pid1(char *file, char **argv, sigset_t *sigmask)
- 	if (sigprocmask(SIG_SETMASK, sigmask, NULL) < 0)
- 		bail("failed to reset sigmask: %m");
- 
--	execvpe(file, argv, __environ);
-+	execvpe(file, argv, environ);
- 	bail("failed to exec pid1: %m");
- }
- 
--- 
-2.31.1
-
diff --git a/srcpkgs/catatonit/template b/srcpkgs/catatonit/template
index 29cc233b7d51..0935081b094d 100644
--- a/srcpkgs/catatonit/template
+++ b/srcpkgs/catatonit/template
@@ -1,6 +1,6 @@
 # Template file for 'catatonit'
 pkgname=catatonit
-version=0.1.5
+version=0.1.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -9,7 +9,7 @@ maintainer="Justin Bronder <jsbronder@cold-front.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/openSUSE/catatonit"
 distfiles="https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.tar.xz"
-checksum=4c45e2230235751731da3daabe130abce70b3ef37d0b1936cbc90a46b475cf08
+checksum=6ea6cb8c7feeca2cf101e7f794dab6eeb192cde177ecc7714d2939655d3d8997
 
 pre_configure() {
 	autoreconf -fi

From 1e84a1470c59130646ad73d4dcc7a163ba7e5e85 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 15 Dec 2021 11:01:07 +0100
Subject: [PATCH 4029/4088] kotlin-bin: update to 1.6.10.

---
 srcpkgs/kotlin-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index 7d257eca0872..d56a18e26e88 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'kotlin-bin'
 pkgname=kotlin-bin
-version=1.6.0
+version=1.6.10
 revision=1
 archs="x86_64"
 wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="Apache-2.0"
 homepage="https://kotlinlang.org/"
 distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=174c92e12a54c0901fd9f0badacf1514c28b5197a95654e4dab1775293dde1dc
+checksum=432267996d0d6b4b17ca8de0f878e44d4a099b7e9f1587a98edc4d27e76c215a
 nostrip=yes
 replaces="kotlin>=0"
 

From 85485d0cce6625f984ace98deb2f03ab17ed5586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 14 Dec 2021 18:15:26 -0300
Subject: [PATCH 4030/4088] python3-gmpy2: update to 2.1.1.

---
 srcpkgs/python3-gmpy2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gmpy2/template b/srcpkgs/python3-gmpy2/template
index 1be0a070fa5b..a4f8641dd0f5 100644
--- a/srcpkgs/python3-gmpy2/template
+++ b/srcpkgs/python3-gmpy2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gmpy2'
 pkgname=python3-gmpy2
-version=2.1.0rc1
+version=2.1.1
 revision=1
 wrksrc="gmpy2-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/aleaxit/gmpy"
 distfiles="${PYPI_SITE}/g/gmpy2/gmpy2-${version}.tar.gz"
-checksum=86cb6d8e5837560c32c706d48d6ed25676be6b3c79e6aa5d245965b9e99231b9
+checksum=346f442063c8212c347e330519905591626ea6fa31aa6ccd299ecd5654e1086f
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" \

From 6d54453af5d49f28588799e57eee9f806e489ddc Mon Sep 17 00:00:00 2001
From: Simon Persson <simon@flaskpost.me>
Date: Tue, 14 Dec 2021 21:51:39 +0100
Subject: [PATCH 4031/4088] libmpdclient: update to 2.20

---
 srcpkgs/libmpdclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmpdclient/template b/srcpkgs/libmpdclient/template
index 921d4d88f333..c2a822edb031 100644
--- a/srcpkgs/libmpdclient/template
+++ b/srcpkgs/libmpdclient/template
@@ -1,6 +1,6 @@
 # Template file for 'libmpdclient'
 pkgname=libmpdclient
-version=2.19
+version=2.20
 revision=1
 build_style=meson
 short_desc="Asynchronous API library for interfacing MPD"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.musicpd.org/libs/libmpdclient/"
 distfiles="http://www.musicpd.org/download/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189
+checksum=18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d
 
 post_install() {
 	vlicense COPYING

From 56e5a1ff62d687a6d278a73573d1d7fb5842ad10 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 14 Dec 2021 13:48:13 -0500
Subject: [PATCH 4032/4088] boinc: update to 7.16.20.

add log/run to stop service from polluting console/TTY with output
---
 srcpkgs/boinc/files/boinc/log/run | 1 +
 srcpkgs/boinc/template            | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/boinc/files/boinc/log/run

diff --git a/srcpkgs/boinc/files/boinc/log/run b/srcpkgs/boinc/files/boinc/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/boinc/files/boinc/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 1eba13495c2a..4cb973111bbc 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
-version=7.16.16
-revision=2
+version=7.16.20
+revision=1
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
-checksum=0d5656a9f8ed1048936a5764270848b892d63f27bdb863d0ace447f1eaae6002
+checksum=ed2457023ed72a2ba5460494fe016032dd2cf49d9d755e1386d16a4333db7332
 system_accounts="boinc"
 boinc_homedir="/var/lib/boinc"
 boinc_shell="/bin/bash"

From a788f98481b6aa0eb8a62e7cf2f33e9a6722e73c Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Tue, 14 Dec 2021 18:57:13 +0100
Subject: [PATCH 4033/4088] libdrm: update to 2.4.109.

---
 srcpkgs/libdrm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index b867046a56a9..d66295540b17 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
 # Template file for 'libdrm'
 pkgname=libdrm
-version=2.4.107
+version=2.4.109
 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=16b23932a2b7d41d091cf95662a83f56c680a9bb3456931c0b76fde02ae2d53f
+checksum=5ba126403051b2cad0afa4f1d6f78e08d985543db562f164a5fc63c501e07ffd
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*) configure_args+=" -Dvc4=true";;

From bcc1d8331c4f6c14edd7605261ca82b673037d7d Mon Sep 17 00:00:00 2001
From: Foxlet <foxlet@furcode.co>
Date: Tue, 14 Dec 2021 20:04:23 -0500
Subject: [PATCH 4034/4088] element-desktop: update to 1.9.7

---
 srcpkgs/element-desktop/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 9f6a02244ffc..a25edc04f31a 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.9.6
+version=1.9.7
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="420ac62f306a522170aede01b807aa4b406c7f1e1377165f455851b220c32f7b
- 07c5575c79a5ddb2a3750528286cfe90ceeb32d985a88eb2b55452d7902e351e"
+checksum="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
+ b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
 
 patch_args="-Np1 -d ../${pkgname}-${version}"
 
@@ -45,8 +45,8 @@ pre_build() {
 	cd ../element-desktop-${version}
 
 	# Disable auto-updating
-	sed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
-	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	vsed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
+	vsed -i 's/"target": "deb"/"target": "dir"/g' package.json
 	npm_config_arch=$carch yarn install
 }
 

From 690a26fe19506a2e31308174d86d6beb75128288 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 13 Dec 2021 15:39:23 +0100
Subject: [PATCH 4035/4088] dbeaver: update to 21.3.1.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index bca26bae44a7..4cd68d0e2ab4 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.3.0
+version=21.3.1
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=0746eab3ad030d719091281b4cc9db6747b8d627804f5d2e80f594a392a7f3cf
+checksum=11ff4547cf2cf6b0819e623a9b1102b9d5eb8ff0eeb65b1b61a252ec35066602
 nopie=true
 
 do_build() {

From 67ad398021f4a6e281df859a2bec4264b651c7d0 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sat, 11 Dec 2021 14:31:59 +0700
Subject: [PATCH 4036/4088] inkscape: update to 1.1.1

---
 srcpkgs/inkscape/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index f8b76d630bea..e53c0b378e71 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,8 +1,8 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1
-revision=3
-wrksrc="inkscape-${version}_2021-05-24_c4e8f9ed74"
+version=1.1.1
+revision=1
+wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
@@ -21,7 +21,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6
+checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From d4b82ca25acde0a6698937c17e2c201e3f4d3dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 17 Dec 2021 05:42:58 -0300
Subject: [PATCH 4037/4088] olm: update to 3.2.8.

---
 srcpkgs/olm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template
index 0295b2f8af66..8b5c5d64b892 100644
--- a/srcpkgs/olm/template
+++ b/srcpkgs/olm/template
@@ -1,6 +1,6 @@
 # Template file for 'olm'
 pkgname=olm
-version=3.2.4
+version=3.2.8
 revision=1
 build_style=cmake
 short_desc="Implementation of the Double Ratchet cryptographic ratchet"
@@ -8,7 +8,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=fbd233de5ba08b0820c7008a0b83f5c8d40250111ec7acfa0bf7e0110bfa1ec1
+checksum=012e4c358404f273ab2f8502a06a4d80c8df41b17cc8dc1f47d195a71af8dda0
 
 do_check() {
 	cd build/tests

From e80ddc2403db527d8ebd72b8048bb52ecb8e88fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 17 Dec 2021 05:43:02 -0300
Subject: [PATCH 4038/4088] olm-python3: update to 3.2.8.

---
 srcpkgs/olm-python3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/olm-python3/template b/srcpkgs/olm-python3/template
index 1056b8270e9b..48049cb2efd4 100644
--- a/srcpkgs/olm-python3/template
+++ b/srcpkgs/olm-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'olm-python3'
 pkgname=olm-python3
-version=3.2.4
-revision=2
+version=3.2.8
+revision=1
 wrksrc="olm-${version}"
 build_wrksrc=python
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=fbd233de5ba08b0820c7008a0b83f5c8d40250111ec7acfa0bf7e0110bfa1ec1
+checksum=012e4c358404f273ab2f8502a06a4d80c8df41b17cc8dc1f47d195a71af8dda0
 # requires unpackaged pytest-{benchmark,isort}
 make_check=no
 

From 030802600c50dbdc4e274162fa37622fc5d8b18f Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 13 Dec 2021 15:49:10 +0700
Subject: [PATCH 4039/4088] ttf-opensans: update to 3.001

---
 srcpkgs/ttf-opensans/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ttf-opensans/template b/srcpkgs/ttf-opensans/template
index b42ce1f43d6f..864644f67917 100644
--- a/srcpkgs/ttf-opensans/template
+++ b/srcpkgs/ttf-opensans/template
@@ -1,8 +1,8 @@
 # Template file for 'ttf-opensans'
 pkgname=ttf-opensans
-version=3.000
+version=3.001
 revision=1
-_githash=c071e9696751f2d69925d66f3b8c581f2dc041c2
+_githash=ebedbda589fe5bd861b02325aca98c86ad845251
 wrksrc="opensans-${_githash}"
 depends="font-util"
 short_desc="Clean and modern sans-serif typeface"
@@ -10,7 +10,7 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="Apache-2.0"
 homepage="https://fonts.google.com/specimen/Open+Sans"
 distfiles="https://github.com/googlefonts/opensans/archive/${_githash}.tar.gz"
-checksum=fcbeae8c630a9afe2b6722c86a77788e549c353bea8cf7fbbc2e3f2fdacabcb7
+checksum=cdc1ba1f82c7a130a2c6a9def519528ec936baad08e0188bf8dc90a0718ca7f5
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {

From ebb66ce541198fe9396d38d202d542d65b191935 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 15:11:10 +0100
Subject: [PATCH 4040/4088] fwupd: update to 1.7.2 and add (host)makedepends

---
 srcpkgs/fwupd/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 2205b555154b..ca36e9d28617 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,18 +1,18 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.6.4
-revision=2
+version=1.7.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true
  -Dintrospection=true -Dtests=false"
 # tests require unpackaged umockdev
 hostmakedepends="dejavu-fonts-ttf gnutls-tools pkg-config gcab gi-docgen
- vala glib-devel polkit gettext pango python3-gobject python3-Pillow"
+ vala glib-devel polkit gettext pango python3-gobject python3-Pillow protobuf-c-devel"
 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 elogind-devel
- tpm2-tss-devel libjcat-devel libcurl-devel"
+ tpm2-tss-devel libjcat-devel libcurl-devel protobuf-c-devel"
 depends="dbus udisks2"
 conf_files="
  /etc/fwupd/*.conf
@@ -22,7 +22,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/fwupd"
 distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz"
-checksum=4bbbc47a3bdbae197a7071ceba56cdf5cc79da51ad895c2303c652dd41b019fe
+checksum=2536786dba55e7eb068e4a55dd733dbbe6cf69f684398cec76514a879ec37ff9
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 1baa161cf65d972dc2dd5accbe134d27029e29c5 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 14 Dec 2021 10:44:10 +0100
Subject: [PATCH 4041/4088] instaloader: update to 4.8.2.

---
 srcpkgs/instaloader/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index fe0117bb2aff..baf37a595188 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,7 +1,7 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
-revision=2
+version=4.8.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=c86985cacaa1a092ad0237a3c350a05d5a1ee21e13a22fba5f6e4a79a1a43dcd
 
 post_install() {
 	vlicense LICENSE

From 4fad3eed3a52a0ea7bb9fb086649a71e3f60088c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 17 Dec 2021 13:49:46 +0100
Subject: [PATCH 4042/4088] firefox: update to 95.0.1.

---
 srcpkgs/firefox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 2e5dce233bf8..42257de92997 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=95.0
+version=95.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 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=7fa3e43f6ec710b2ebba0e99db713a56d13d85f1f23c4a1399bb594fd74864de
+checksum=552a2bd731921f40694a4db8ad31dce6f4e9f52035d04e7cd1f917613f803efa
 
 lib32disabled=yes
 

From 7dd662f562ebfe3a93474630895687c554bc6ac7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 17 Dec 2021 13:53:06 +0100
Subject: [PATCH 4043/4088] firefox-i18n: update to 95.0.1.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index ad6ab237b77f..bab0462bccb9 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=95.0
+version=95.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cfe7f3362a1fb648edd359fea57845cfe7a7a78d7b1f95fd6248056042d017d1
- 5dd93b8a35a7818d9ecfc82cd85665fa9c20b25f68c8426960d14d95819d6527
- e15b6b403e6ff13cda801d5cf9af3e49a628ec436eab1ac41103fef409742aac
- 6133e8e1558a40f040037629b5f30c92952cbecb7cc59ce170cd5e6999980581
- 4485398bb3031e9d277e82d9bf35f33867a730fc24ebaf120c9e37db77939e40
- 25abd5ec2e5f577c118ea72b985aafe5f4e2929d76745b19c8d55105df87f8fe
- 04d0a3af06c3d0866ff68d7941eb99cd0249c68d27a43e9edbc997924ce2d76a
- 4a225d1c00be54db3b87bfad04222adb7ffe63e0641e103e8d8d4a03d78c7fd0
- 135cfbeb651a408564b18b3e34fcdafcb05910a094ee3ad65927e600d71ba599
- 1b577e75bf51c1c40c670591a3a2f4c0e32a25d23d97fc82741c71fd9d88fe93
- 48a2acbe48b50eeb6fee5e5c45a3750b576bc5e7e1096ab5fec40d878264688f
- d2c52f7289d96d9cd3269a8a8758f774c28c86ccdd0518f82af9487b78462d59
- 6afc282591069ae7fdd0c784d168889822176dd02f8bab1955928541b38a75e2
- 26d3bf0617a331117978d0396c9323d4d4a442807a338ddb4a31b71682cdf9c1
- a8b15ccb48133e80d1a91017a836479f119f8696db5d352b66301e6ebbbbe559
- c86068669b104bce708d3b8c3509c3509f5db58b094276b4c8d08656d35637b4
- c877d7d4a2f11ca6f97262bbcd866d382eab05657dfc91f61514a789bc92b523
- dcbd8bc253390c4c3c1ce16e3417774b3835bc7b83f89a271b2150096d9c9de9
- 7353961a10b508aae3b54b43599094aa2c9c3409ab686a8d5429fb7d653eb947
- ae8e90564862418013cddc30b779f97830f8004dd07bdc6e1836a4594b6ba0a2
- 9d46363758153d9f1c236bbd0c17d3fe7950b7bf039b8ceae6173fc8915a91e9
- 6170c09d02348d15191de90d81517214066bb50aa7fdde4de7d5a21072cce06c
- c5ad2bdb64de5e095cb5703ce37238b83869c3028d8a8fce27d8a791b398d5e0
- fbe76faa48df284065082ca9e62b32635a7654ac8ca484fa5d65b6b6f9f83414
- de5d1eba575e855df21f820251607cd765c48015c4a40cb115fb4da56dbedf3b
- 17740894dcc6d0596a244d7e5544cba47f161cf749781eacd0fb5988cc31d6a8
- 74417da5f2d2897d659ea45da8078aa0bbe007b9e7ce7e1c1bca0af4aeff3ae6
- 084e64083afed72fd333d28447879bab2595e0892ca9255d5394536c8fba810d
- 3ae87ea5ccde4c72d4765742748aa90834d05659520e0c2be881dd2e394cbfc0
- 64ad8cb1b72109a40b106785f7f609ef5793d9cb36a5349edb75152069c4ace0
- f05de5ef6de26bd29f810aeb333019878c2d0bef89287deff864b6eafd109318
- a16cff4ceed1d777dc8a37d8458d41b4b07a4ecfae628f869a46bdcb95517565
- ac2ec4eded44084ca6bcecdecb3a1375b3287afba1748aa83827122d83078b30
- f422fefdda275dce825980b8b52704eb740d6c323b5f3a9a2e1d6eb085c0237e
- 6a829bf16e9387ee4524a5f205677b35c3cc8bd8d3a085dd6038974d51e9403a
- 41f3ee7cd0e4ec2b5ecf74edc09dbbb7295d1992d5e728a90b591a681bcd8344
- 3c4918b715edcefc3232d87df31fc44d437ff4ffe3aea5c468ce01743a10d2a3
- d86394d51cb050773b9019aaae7a214a928baf0929b1280b3a4ed1c1f877e11b
- 1cf69683407cd0fecae1a2d168fbffeba5693b9618777a9ce500d37d24c7bd67
- 142041fb9a0ab8eb7ccc9e95fdf7d3ab22cb810aa3ea2c440f27dfb744c5bcd3
- 3a6b530380591d89d16812371dce9c5e7aa274d40427200d7561e8148318310c
- f9bad43bc7fc1b5ee2822a7a6eeb9c4ec4f0dfac0c110cf6817e0c41135f661f
- 7808cdb157329b8d1fd95a41476d33ced3c3da7a71a11653bc0693156bf4f9ec
- 6f759790d409ea833103c6826c3da24ba0e68cf8ba0c30914c4db12f9e10122a
- 80b58611757a1b5b95d8932e606aaac491cf19b83ebfd8c97b121c8cfff69d56
- 01f74de9828faa7e851042b548282978ace5757c5c80204603fd61829225eafe
- 880901655b2ad565df62b39e2013ee8b3fa821c97ba606181e0820b446b0e5c6
- 41a22ea30907b0417ed5ffdffb8a5884ea0ce810c2d655c148efcfeec478b3e3
- 70b7b32158eb6b5e6da6ef3b02cad6a8b26e3092a78816cf1ebd194f5d3dd85e
- 702e37d4d2979f7230c23814ca7fff5d4434d4b4d21ec9bef80d6c47ad8896ae
- 9addf2d79f8a5d978429bf7bbf3f63f659cc5fb92b354a19429b970f177cb110
- d93afa883c14dcbc6b9a84ab69030d0ee2717801471ad56fdf5574df0629d83d
- c799c8b29e3e597cdbb1b448c5a5770323236f3054e6d2b941ce119773749148
- 743f428b57c413ad72e4dacfbabc8104e26ca371540bb57eb0919b22bca3dee8
- a6e35a6a1940ef15faae9dfdb14f8a24a77139ae47e8d7d9d59305a5164406c7
- be962117642e1887e77f90c6c59baeb1bc459a0a152601fe9afbd35cc5a7cd38
- a2a6ea131606016a328538d9ead4ba74a23c00a0044893abfcd267ca78738f1c
- 35fab44fdf97d098b8b5ce956d8eefab664e88f1e690512c0f0d2e7bba15cd10
- 06676ccf455c56e2cc85ba6b7695e6b0358db03f1b49532ff426e1a2dbc968e4
- 937a72ea4457bc359d9356717944687eaa0f12ddc93955564b8d069df24d54b1
- 78c9491f44a3758df2b118b909b28bc754062859bc08fc7dbb2f712c2b7ce044
- 13a4b6795acb679acd19aaf312abbbc7543a17064a5c984eadaea2fb9dc3a446
- 8351906b8dd9c5b2a91b52a723aa35f4fb36dcc43a2c9ecbe38993e7e3b9f917
- 01ed5eb39445431aa77ff5882b5cdf5e0131f8e643ded1332b28d5c747f51f3a
- 1ab7f3a263fed5ffd0985bdca75d78935088994c2c8fb9293e0545961d21be1f
- eefca6bb67e1479d21b417f619deb9868ec4c36bb03ab5f1a389edc849768dd2
- 3a6328e10c11f427c34e84a06d6f9819d08fce759003f66371d70613e7716880
- f5a9345f6c57eb09254f664a6d85768bc74a9b420e96274f5db4d644f131c2ac
- 2991f022278ca92c538e398cba5e5be6a3dea31e825c7c7c07f33340f777cd44
- 1e278704fefbf85c50ca37a2ebdafa28cac694e82cbaaf410b1f0bd2b0575134
- f1c39fa3736bd6d0ba4ac15eb9bb6b72d50190458413165815ea5db262659837
- 54a03e13b43b0510d4465de61e5d1bdac166218909cfc912ffd89858fc32d1fb
- 34e30654dd6a24f74563f3268520900b7eae0edd2c9f5c84e4166fd060e8d187
- cd16926c10cd99e99c4757904c28cc2a4d49c7e35e6e9c0811b117ebea88fc39
- 655eecd75266d8f73e020e99e80fc858e58c16968d50868c621853ec157f5045
- be5150b27734c1ed74c2b6f2821890bdbfeb01ff7c4db6073119b6bf81b48832
- 98fa9cc1cbf891009242cfb1185f7ba4fad0a0c607ee7930ec6f705e2ca7aa51
- 3678fb42946e788e61a43ec8dff59ce236097fc191f605d481c1e8a0160a9acb
- c3aab42f4f4bc3f2a577a97e02bf5a001831224cbfc061d329df8562996554e5
- c0c277c32c8b91b500f35b905dabb63d7a0f6800d7f90ac431468de14952bac6
- 0150ac70a789ebc64f4fe7edb976360d274dc5b888bcda1871028ad9b4861889
- 22748fe34353085524ea8bc271d8edddebec8bfc41bda5c4890bc872af95a90c
- ca890e61257934bcc64e28e2b1966c93ec16b7a7c79c8f78911ac951105cb556
- 04ae9b37f72ae7b2b8c2df5e9cc2d3731471bc1e579641d5f1fec431a87ecd72
- 766f36eda6380ea34f0d56d42b4bd72519c57aeb79f4b32a26257472a8c3a9d3
- f473c9d48c8299fbce714c6fe829b263835e562fd048a699cb69a3c23ae8a687
- da7eaa5054cffbaa0a757f8a593285660fa9223a3e4b2cecebcca8a667146076
- 25a6b645b8426d21238627f4918d0294840ea22698826e45f4fc46cc0a5029df
- 026759a3278ee086cc9133b7c64782315668203c796cc8f0f9c4436134c21ebb
- 1913dfe5fe2dcb3e4034ca73872afb794161d6306c583ffefefb471335a7d6ee
- 51d5c887a1bd25d7793bb87fbffabbfe1f14343859c4404b0c14d9c076f1aba3
- 944a5fc25185b42ea8390452b6255f0a269bb0706e2cb26542481fd01260c159
- 68c54f13b0cd5688b2f6076032b7eadb2fe4bbab1eba7a361cd5f4cc20559ba7
- df57d1a9f24f728a116009dc8b08609683589bf0b2f87c73c12add7c9c72d8d5
- 1de31c7a7d959f8194b58f9b4574ac797af8dea853126b7be84ff078d5748159
- 141e4c209a48feaa81387469b87753179a479421e30287ecd4b6f89189b2e7af"
+checksum="8abf936c310a8f61178aed10f0a3ba45da0ea1ad695a2927b9a78ec06e04ea65
+ e01675b087f814f816499e0625e08f70ac4546a775f5f13a4572bedc88a31b54
+ b0cd03518bea1c8dd19aa03485cbf49e39a02bc3b515d8298176d2edacf971c5
+ 8f1b81c5f2caa4b0a3f89a5facbbccee63165db2ae1d54bdd7f8717b57fabfa8
+ 6f4f0e306654257f9631b816c17023fc17bd834cf373a8d62a51277b111dca60
+ bb0f9272e394156c78ed747d187af8986d3b1dc28b05d445bb2fa474cae40828
+ 2984949a57e1c62d271521eeffd94b13f8f70ffa52c2ec4ddf5aed728db3e42f
+ 8ebbb09e860dc935cac6c2acd0b84e5f481078705678497e24fbec403c28b901
+ 07428c4033f866a083ae7df24814c2b217f7ac83f95846a671a3ffd1b318c5b7
+ eb2487b259e6b83eda263a0aed8683553567c0f6da9e22c64aabab2988b3c0ac
+ 6be6b63bcd1c379108b7d6471e3b6a50870073756ad600d8b701ff7ad7790e22
+ 22c468f258d3c06fbda914620b460fd82ed6ac3c49ac26c73e1fa4dfda6c90cd
+ e138297c9be5714767ec6e425b2a23e97cdd57dbd93730f026398120e14a92d8
+ 08c938f56fcf7498fe05bd223c52a6c885f244ae2545c1603ee7e6b66bd458fb
+ e7f36610e1bbbd3554d4d1feca8dca3fbe41080f0974933fb9434b55c5dcbd6a
+ 14dd3fbd63a054e4dd2f49fb4b25e2e7ffa22ddcd5c6023c4c0fbea26982a040
+ 3ba77383d390437abf2671f43d32c063bce6885dc2c43310a0e2f1b0dffdc19a
+ 026e5a50c59c8e4f24f98ce24181fb5241b182e83ace6ce8265040de3c78f649
+ a321447497aa4a2069af3abb2cac13a771a85fe5fa8b3d8a86a8598f7c45cefb
+ 869ab861bae53b02b7da6ae90f865685815501ae68380d8c6dac254912ab2743
+ 35ddcb3e0b616c2db9a58f258f24a0b6000be41344c93378c42a889654107519
+ b28850bd73a261ceb3084ba2ebb1a19e64c28aeb3509a8bc5e6fcd1a498bbb1e
+ b6344c735c22f8c4c26074cc7cd0e93b9e8c1f4a5d360216cb8d6da64a8d7cae
+ 2a691626f4bb523fdc5f9d2255afafc513281f2ea50e0612b259c9e3a5e5dd4f
+ a34ae46a380a38d9327239fda4ca1b295dba2b1c05fe02ba36676384e825a0ba
+ e0ecbceb7f26374e3328e1cff789b639d713c819b7461408151533cc54d88b09
+ c0e52e3b63393f30cc12ae121e44e94788ab36b4e2f1f5dbb6373cda4f4825e8
+ 5c7bfa02dfa946eab9bdd3b92126455e3350f70467db242fd7b6e24525aa3cec
+ c00179f26cf93c6c833d694f23e56bec5b9e1e6b0516a330af7b4b3f050d3a83
+ 0d2119c0fe15e0ad0da2c15e3b0a9be83362cc542ee9f7e8671b34273c3be905
+ 490477f865fb7739496246e3950bbed7f24f5d422e4742a8e582f4e4789fa118
+ 171cf6441602466757d6141afdcf3cf0edacf66bad602e6484e0111e51dde65b
+ 42bc70f2b0a5b6c06b0e183c7df00b42abe2cb5451e793b5b99a53779498d78e
+ a815240c0f3f208484d7c3d32330dfd2ef081654ab8c58ae930c6be9698a0e23
+ 71776ea18241a6041d2940e79da4fcf0c5cd40ca9ca7db6da3ad093a5a4bc7d2
+ a4a5fc6d939a3b50938b6b5d59583c27d76fd21123312e6685c586eb5d2d77b9
+ 9745ad1b1b9a92bd7735d2cc73b4679bdd50d64afa66a87610117c109c4dddbd
+ fa770394330ae31cd9accf80dd7bf967868cb37d90515b811ea06d37a3abe896
+ 45d39a7b3cc8a10c5fb815d57040d94beb7c2c9f99ed999da89eacdcc7c01dbe
+ 3c8e08103452ec1c5b857ec6f6afb3b3eaec9eafa803b0834dec261579cbd4e1
+ 2eeae60fcf730518e117091eb37fd5d5c7a92352bdb39ccaeb1f754aeed01b36
+ e46742f379bc88e026281f8ca8a8c805b0d72f974e0a8a88e425009e824f6c6c
+ 79fdfbd1497dce5395dd7062bdfa777b909b7bd1067249de9d015c8792f1b19c
+ 2afe9917408b7454f5aa7fc6a969163e20aa0ba34e835f7fbf543cbd57616839
+ dac6d13cbefba58fd4f5f6fb654dd4ca3f8388cfdbcd1ade75a73e416a4810bf
+ 73de370a450fae1312f2c885ee1a86982c0f9950f9daaf22f4e4a9bb9cead840
+ f997add646b5a6236f7fc779ea4ea21a3aca8f36a0b21adab90fc2014e167702
+ b7bdd59b267f6dba801a055b032f061edc9c0011cfc6ee3fe8107f7a4a9dcac5
+ bada4c9d66d42b24a4c4d1407229273440a3da4a5a92b3d1df6c889e48e7cff8
+ b1b4cd6500badfce561633752c49a293225dbd286f9b1640c555b162aa250d77
+ 363066b01f48aebcc3eb2810acbec59aa9e5a9780c3f0aa4dc6cd9627c321c2b
+ 455f5d057b621d069f726db8ae5efb16481d990ab583417dc3860fd38381d822
+ f96e1cd455dd5c07e52b85295a40f863c527c11bf98e7917845d45aa2587a531
+ ee2f0e91c4c42df9444f9e4d5cb2e8894aaeb179085e140b687d4662a65322c7
+ ea8bbbff597bb4e944b413f4f8753efbcaee0aa66fc5d1df1a18804375b52c7d
+ aaadf2414d9e8d57a143e19b0c0445bf5272fba75ab64ecdd0232a84ca2559de
+ 5bf1ad01bead7bc089a11638477d1ae37fa09c12a51566cf8b5e017041052ce9
+ 574961b10acc73ce034d82134045d0ac9381f946b35865a85259f2427ae3bbd5
+ 2e094a034319647bb8963f5e2ab91e0f5276028089c66d9aa4354ac7381cce14
+ 094c937deb51e4ed40cee0f82dc14db5555fb01a1beab8cf84eea3f621f44b97
+ ad35c5e3f31d8ae4bd92e57f31b795cdbf7fe12f6196b0d9d88f14054f4a4fd7
+ 2e054d2753dc96eed77f277bc6362c0c315b8ab5611cc2776414cb26e86b92a1
+ a36eb8245a8df52785b1f232b78ed02425f0096aef6194d4dcaf29a697de5f53
+ 5f71e20d10c255951b15048253335db18dbf916b3bd6b77c38c4315a9b14b8ef
+ aa52c5fbcd0536b0998b90a5fd9f3edacc0ff35175f929445f5880f64e6204de
+ 81b556ba99e612d477a3512f633072b61dbaf516226e3f460d593d48d0e9fb95
+ 9795f0b99733d0906f6eac49a86a6040bbcf6b0c37c04189c5b0766b90fda2be
+ 554137fd110750eee3a7847f1d5d51a102f679efd296540aa5ecd4c2877f9917
+ 82f851b9b77cc27f2dacac68187a959267a3658d9a59b368bca64008601d731d
+ 1cec4c76d5aa3a60d2b40003b5606082ef0c1fe9d776597e5e119c75f775a80a
+ 62b94ca0826ea2ebffb4e48f7acc32dac59ff04e324a3f4a7d47059a7b33df42
+ aba7ad40a42a60ab341dc8717cb5a1d9558a0216163db01b6e0b172c5cee21aa
+ 7d566c330766b705a7a50c0a309aa737f44090d5ab679314a1fc2f05b8b8ccf4
+ c3ba3baabf0cc9abaa1b695584d6d5e56bc0c4c9bb14c1ee2bf25c6b860c8e9b
+ 9d45dbdeb7ba1ac0523654ca7a5a2ebabfb3166e59112ce8d9331e6b4394c4b2
+ e877da6bb1678fea5aa23f2622538603d2f93b2d7990a264f902db4adc57d41c
+ 74086b002a581e05a4ba732e8069c04d80dacd7c2e01ab706262cdb6392ea836
+ a9b86af907efff93e2af6556d37e990c1130c2da2244565d65b372516f94c6a3
+ 770617f51acf643bdedef43e2fc1477529635c7b8ca0d23e3e49e9f9fed7f15b
+ 086808376186c44c821c28ff838d28da1d6c267abe001329d010ad9a66050909
+ 3220098f3201c685d250877059d972a4b4b4c3de2644a2d648ef3cb74577a2c3
+ 2c4fff85c6c23d898db0349c764a9811540948376355b6ef0ac31f6184b5da75
+ 0122d8ce30775a87d3bdf3ce93976b91440fc49090bd70344a5ab4caa7fbe732
+ b97ad9de5ceee80d0eb9ac692610be14f78d1eed5a84db9f50a6e2f3963064b7
+ 5bea358c6c42e02e8e65a06321618ab859d8c7f4fca4fa62b643f78ec955c558
+ 4710369d6c533a26ccf7ebed2a4456fd5d5fdaf9e90ed6305367924bba05898b
+ 9d740d9aa8cda295de7c33995d204440889dca4879d37aeacebb42f61bec5ddc
+ 1581ddb3915a4714ddf0a8a4e96921d1c3908768a840347828f74f1d9ead9e50
+ 9e2c76d00ecac9c5038bdd76b3b1094a6365241e3507414a9c1319453b61f3d1
+ f8cfa516bb3d69677f5a2c9c53566ccd31cc016a2e30273e18132b4ac47c7583
+ 372240ddeb3389073d649ec12e50c583ed49ef017d0207ab3df2fd85e3a249a6
+ 1e82d9d75999304aa75e7f5939cc3c210bee77e3a9d532bcc6fef81371e7de2c
+ 8098babf1adb466b50af9b6a57f79b0b8013ca27c95b1b29a02fd22b481a718b
+ 4f668997e6867c87469615aebb3e8a7b70bb0ab889532196ba44a6d3397ef0df
+ 4048806b35da1ce2eb7a57013bcab13d73adb4286555d5d9c031075fce49f8ca
+ a9678c824f55e14119255447bcf69a3b484ae9933bca3a555b37daf058046360"

From 4e1b1a59a53f1c92cc674d036a3519b9039ce72d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 13 Dec 2021 03:43:56 +0300
Subject: [PATCH 4044/4088] stlink: update to 1.7.0.

---
 .../01-install-pkgconfig-files-again.patch    | 22 -------
 .../stlink/patches/02-enable-cross-gtk.patch  | 11 ----
 .../patches/03-dont-link-ssp-as-static.patch  | 11 ----
 srcpkgs/stlink/patches/04-fix-paths.patch     | 58 -------------------
 srcpkgs/stlink/patches/enable-cross-gtk.patch | 11 ++++
 .../patches/{05-musl.patch => musl.patch}     |  0
 srcpkgs/stlink/template                       | 18 +++---
 7 files changed, 20 insertions(+), 111 deletions(-)
 delete mode 100644 srcpkgs/stlink/patches/01-install-pkgconfig-files-again.patch
 delete mode 100644 srcpkgs/stlink/patches/02-enable-cross-gtk.patch
 delete mode 100644 srcpkgs/stlink/patches/03-dont-link-ssp-as-static.patch
 delete mode 100644 srcpkgs/stlink/patches/04-fix-paths.patch
 create mode 100644 srcpkgs/stlink/patches/enable-cross-gtk.patch
 rename srcpkgs/stlink/patches/{05-musl.patch => musl.patch} (100%)

diff --git a/srcpkgs/stlink/patches/01-install-pkgconfig-files-again.patch b/srcpkgs/stlink/patches/01-install-pkgconfig-files-again.patch
deleted file mode 100644
index 238387c6e902..000000000000
--- a/srcpkgs/stlink/patches/01-install-pkgconfig-files-again.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e0a029f305f199ad46f35d001931e9b531e1abcd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 1 Jun 2020 00:27:18 +0200
-Subject: [PATCH] CMakeLists.txt: Install pkgconfig files again
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 86282775..60f9087d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ find_package(libusb REQUIRED)
- 
- ## Package configuration (pkg-config) on unix-based systems
- if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
--    #add_subdirectory(cmake/pkgconfig)
-+    add_subdirectory(cmake/pkgconfig)
-     find_package(PkgConfig)
-     pkg_check_modules(GTK3 gtk+-3.0)
- endif ()
diff --git a/srcpkgs/stlink/patches/02-enable-cross-gtk.patch b/srcpkgs/stlink/patches/02-enable-cross-gtk.patch
deleted file mode 100644
index b4f461ee5234..000000000000
--- a/srcpkgs/stlink/patches/02-enable-cross-gtk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,7 @@
- find_package(libusb REQUIRED)
- 
- ## Package configuration (pkg-config) on unix-based systems
--if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
-+if (NOT WIN32)
-     add_subdirectory(cmake/pkgconfig)
-     find_package(PkgConfig)
-     pkg_check_modules(GTK3 gtk+-3.0)
diff --git a/srcpkgs/stlink/patches/03-dont-link-ssp-as-static.patch b/srcpkgs/stlink/patches/03-dont-link-ssp-as-static.patch
deleted file mode 100644
index a5c79c2abd31..000000000000
--- a/srcpkgs/stlink/patches/03-dont-link-ssp-as-static.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,7 +71,7 @@
- 
- CHECK_LIBRARY_EXISTS(ssp __stack_chk_fail "" _stack_chk_fail_exists)
- if (_stack_chk_fail_exists)
--    set(SSP_LIB -static ssp)
-+    set(SSP_LIB ssp)
- else ()
-     set(SSP_LIB "")
- endif ()
diff --git a/srcpkgs/stlink/patches/04-fix-paths.patch b/srcpkgs/stlink/patches/04-fix-paths.patch
deleted file mode 100644
index c6fb69b89089..000000000000
--- a/srcpkgs/stlink/patches/04-fix-paths.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2016590502558caa98c21abad2ce83c5f4804a98 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 1 Jun 2020 00:20:26 +0200
-Subject: [PATCH] doc/man: Fix installation directory
-
-On Unix-like operating systems man pages are commonly installed to
-`/usr/share/man` not `/usr/share/stlink/man`.
----
- doc/man/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
-index 23da9e15..9b3c5076 100644
---- a/doc/man/CMakeLists.txt
-+++ b/doc/man/CMakeLists.txt
-@@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES})
-     endif ()
- 
-     if (f AND NOT WIN32)
--        install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/man/man1)
-+        install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1)
-         unset(f)
-     endif ()
- endforeach ()
-
-From e95b5ffcfe38c917a1f421c2257e58a3d9b2e8cc Mon Sep 17 00:00:00 2001
-From: Vasiliy Glazov <vascom2@gmail.com>
-Date: Mon, 1 Jun 2020 08:44:11 +0300
-Subject: [PATCH] Fix installation path for desktop-file and icons.
-
-This change fixes installation path for desktop-file and icons.
-They should be installed directly to
-```
-/usr/share/applications/
-/usr/share/icons/hicolor/scalable/apps/
-```
----
- src/stlink-gui/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/stlink-gui/CMakeLists.txt b/src/stlink-gui/CMakeLists.txt
-index 8c36e5a1..cc68509f 100644
---- a/src/stlink-gui/CMakeLists.txt
-+++ b/src/stlink-gui/CMakeLists.txt
-@@ -13,11 +13,11 @@ if (NOT WIN32)
- 
-         # Install desktop application entry
-         install(FILES stlink-gui.desktop
--                DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/applications)
-+                DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
- 
-         # Install icons
-         install(FILES icons/stlink-gui.svg
--                DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/icons/hicolor/scalable/apps)
-+                DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
- 
-         set(GUI_SOURCES gui.c gui.h)
- 
diff --git a/srcpkgs/stlink/patches/enable-cross-gtk.patch b/srcpkgs/stlink/patches/enable-cross-gtk.patch
new file mode 100644
index 000000000000..d55e9f9d2724
--- /dev/null
+++ b/srcpkgs/stlink/patches/enable-cross-gtk.patch
@@ -0,0 +1,11 @@
+--- a/src/stlink-gui/CMakeLists.txt
++++ b/src/stlink-gui/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # Build GUI
+ ###
+ 
+-if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
++if (NOT WIN32)
+     find_package(PkgConfig)
+     pkg_check_modules(GTK3 gtk+-3.0)
+ 
diff --git a/srcpkgs/stlink/patches/05-musl.patch b/srcpkgs/stlink/patches/musl.patch
similarity index 100%
rename from srcpkgs/stlink/patches/05-musl.patch
rename to srcpkgs/stlink/patches/musl.patch
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 06f39a7cf256..44788bd15f25 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,19 +1,19 @@
 # Template file for 'stlink'
 pkgname=stlink
-version=1.6.1
+version=1.7.0
 revision=1
 build_style=cmake
-configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d -DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d
- -DSTLINK_LIBRARY_PATH=/usr/lib"
+configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
+ -DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
 hostmakedepends="pkg-config"
 makedepends="libusb-devel gtk+3-devel"
-short_desc="STM32 discovery line Linux programmer"
+short_desc="Firmware programmer for STM32 STLINK v1/v2/v3 protocol"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="BSD-3-Clause"
-homepage="https://github.com/texane/stlink"
-changelog="https://raw.githubusercontent.com/texane/stlink/master/CHANGELOG.md"
+homepage="https://github.com/stlink-org/stlink"
+changelog="https://raw.githubusercontent.com/stlink-org/stlink/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ca9a640f84c3e2c9873bd51759594bc05c00cdf6e1f21b434ae2c0e7985433d8
+checksum=57ec1214905aedf59bee7f70ddff02316f64fa9ba5a9b6a3a64952edc5b65855
 
 post_install() {
 	vlicense LICENSE.md LICENSE
@@ -27,7 +27,6 @@ stlink-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
-		vmove usr/lib/pkgconfig
 	}
 }
 
@@ -35,8 +34,9 @@ stlink-gtk_package() {
 	short_desc+=" - GTK+3 frontend"
 	depends="${sourcepkg}>=${version}_${revision} hicolor-icon-theme desktop-file-utils"
 	pkg_install() {
+		vmove usr/bin/stlink-gui
 		vmove usr/share/applications/stlink-gui.desktop
 		vmove usr/share/icons/hicolor/scalable/apps/stlink-gui.svg
-		vmove "usr/bin/stlink-gui*"
+		vmove usr/share/stlink/stlink-gui.ui
 	}
 }

From 9930dc0f12c1180563c629e7b261314fbf665590 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Fri, 17 Dec 2021 19:29:03 +0700
Subject: [PATCH 4045/4088] vivaldi: update to 5.0.2497.32

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index fae7f11b690b..2bdd3e8b7e7a 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.0.2497.28
+version=5.0.2497.32
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=9beb241951d58a1e4d2596a023c13c1169fba92e3822b01d5cdc5ff0b3ce6d54
+checksum=fffa0a0f1402920239f694098fa8ae501b21139220836b11c8397d01001e63d0
 repository=nonfree
 restricted=yes
 nostrip=yes

From b7604dc169c4fb58a53c232163a4a0da97b0bf5a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 17 May 2021 18:09:50 +0200
Subject: [PATCH 4046/4088] ksh: update to 1.0.0.beta.2.

Revert to the maintained fork "ksh93u+m".
---
 srcpkgs/ksh/template | 48 +++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b02..9d5815f17d4a 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
 # Template file for 'ksh'
 pkgname=ksh
-version=2020.0.0
+reverts="2020.0.0_1"
+version=1.0.0.beta.2
 revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
-short_desc="AT&T's Korn shell (ksh93)"
+wrksrc="ksh-${version/.beta/-beta}"
+short_desc="AT&T's Korn shell (community branch ksh93u+m)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
-homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+homepage="https://github.com/ksh93/ksh"
+distfiles="https://github.com/ksh93/ksh/archive/v${version/.beta/-beta}.tar.gz"
+checksum=d8678d23c3c9633a03e4fc895e604cdd0af2ff006d0268579b3a29beddfb8463
 nocross=yes
 
 register_shell="/bin/ksh"
@@ -24,25 +23,20 @@ if [ "$build_option_static" ]; then
 	LDFLAGS+=" -static"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
-	makedepends+=" musl-fts-devel"
-esac
-
-post_extract() {
-	sed -i -e 's/= library/= static_library/'  \
-		-e 's/install: true/install: false/' src/lib/*/meson.build
-	sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
-	if [ "$build_option_static" ]; then
-		# Drop tests that use .so
-		sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
-		sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
-	fi
+do_build() {
+	bin/package make CCFLAGS="$CFLAGS" NPROC="$XBPS_MAKEJOBS"
+}
+do_check() {
+	# run inside own pty
+	script -qfc bin/shtests /dev/null
 }
-post_install() {
-	mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
-	mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+do_install() {
+	vlicense LICENSE.md LICENSE
+
+	cd arch/*/
+	vbin bin/ksh ksh93
+	vbin bin/shcomp
 	vmkdir usr/share/ksh
-	vcopy src/cmd/ksh93/fun usr/share/ksh/functions
-	vlicense LICENSE
+	vcopy fun usr/share/ksh/functions
+	vman man/man1/sh.1 ksh93.1
 }

From 4d44bfdecf75db16396ebe63bb17fc84b282ff7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 17 Dec 2021 17:28:19 +0100
Subject: [PATCH 4047/4088] xorg-server: update to 1.20.14.

---
 srcpkgs/xorg-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 2127cd7d1a30..e48d679b0360 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.14
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"

From ff3e3a72c51cdb4d27fe5ef8ade3cb49d49d7d5a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 14 Dec 2021 12:04:10 +0100
Subject: [PATCH 4048/4088] tint2: update to 17.0.2.

---
 srcpkgs/tint2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tint2/template b/srcpkgs/tint2/template
index b912618dc219..2b61ce862a43 100644
--- a/srcpkgs/tint2/template
+++ b/srcpkgs/tint2/template
@@ -1,6 +1,6 @@
 # Template file for 'tint2'
 pkgname=tint2
-version=17.0.1
+version=17.0.2
 revision=1
 wrksrc="tint2-v${version}"
 build_style=cmake
@@ -13,9 +13,9 @@ short_desc="Simple panel/taskbar made for modern X window managers"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/o9000/tint2"
-changelog="https://gitlab.com/o9000/tint2/blob/master/ChangeLog"
+changelog="https://gitlab.com/o9000/tint2/-/raw/master/ChangeLog"
 distfiles="https://gitlab.com/o9000/tint2/-/archive/v${version}/tint2-v${version}.tar.bz2"
-checksum=9d4d11708de71d7677330ad5e3938c38fc227c3fbe20a4d3dc57ec8f4e3ae98c
+checksum=329de800a82faa92b3d4c3afb76351e41b22de29fbcdae8a9eb3984a38eba65c
 
 tint2conf_package() {
 	short_desc+=" - configuration tools"

From 92c4122dffac865b5a09d3647c8f16d76cd8e430 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 14 Dec 2021 11:00:46 +0100
Subject: [PATCH 4049/4088] mpg123: update to 1.29.3.

link against SDL2
---
 srcpkgs/mpg123/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 8e376648070e..561ecb5d3a7d 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,19 +1,19 @@
 # Template file for 'mpg123'
 pkgname=mpg123
-version=1.29.2
+version=1.29.3
 revision=1
 build_style=gnu-configure
 # --with-cpu not necessary, upstream detects features correctly
 configure_args="--with-optimization=0 --with-default-audio=alsa
  --enable-ipv6=yes --enable-network=yes"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel SDL-devel"
+makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel SDL2-devel"
 short_desc="Fast console MPEG audio decoder/player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.mpg123.org/"
 distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=9071214ebdfc1b6ed0c0a85d530010bbb8ebc044cfe5ae5930e83f7e6b7937e6
+checksum=963885d8cc77262f28b77187c7d189e32195e64244de2530b798ddf32183e847
 
 case "$XBPS_TARGET_MACHINE" in
 	# No LFS required with musl

From 3ed76a7f5b8702e97a4a7e9c084b6637f6b1c534 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 15 Dec 2021 11:02:22 +0100
Subject: [PATCH 4050/4088] fluidsynth: update to 2.2.4.

---
 srcpkgs/fluidsynth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index da9666cf60d5..3718cedaae2b 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.2.3
+version=2.2.4
 revision=1
 build_style=cmake
 make_check_target=check
@@ -13,7 +13,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=b31807cb0f88e97f3096e2b378c9815a6acfdc20b0b14f97936d905b536965c4
+checksum=83cb1dba04c632ede74f0c0717018b062c0e00b639722203b23f77a961afd390
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 6d1fd9ce72e579d190f88c8878027df52369d920 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 17 Dec 2021 22:53:52 +0100
Subject: [PATCH 4051/4088] jobflow: update to 1.3.1.

---
 srcpkgs/jobflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jobflow/template b/srcpkgs/jobflow/template
index 643a002c04b0..21e8216e4ab5 100644
--- a/srcpkgs/jobflow/template
+++ b/srcpkgs/jobflow/template
@@ -1,6 +1,6 @@
 # Template file for 'jobflow'
 pkgname=jobflow
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-makefile
 short_desc="Like GNU parallel, but much faster and memory-efficient"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/rofl0r/jobflow"
 changelog="https://github.com/rofl0r/jobflow/releases"
 distfiles="http://ftp.barfooze.de/pub/sabotage/tarballs/jobflow-${version}.tar.bz2"
-checksum=1bf124a518383cc6d576aa162704e7a032669a6e91bbe0ee0066a60d49f2d010
+checksum=a8fb51e17bb8483fe591aa3d16ffb22f0a7575b5407bdd0af4e4ee2d899d184b
 
 post_extract() {
 	vsed -e 's;prefix;PREFIX;g' -i Makefile

From 834eb909122a68577c412a34efa92844ce93bba3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 18 Dec 2021 08:36:50 +0100
Subject: [PATCH 4052/4088] linux5.4: update to 5.4.167.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 652dcf4ac953..26fa16fd2f9f 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.166
+version=5.4.167
 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=d6a5fe54495d5c1cd0d1a3d8bfa052ef6cf12a1703cb8207b8aaac69c267f6af
+checksum=b4e43116217ee02009aba7eab3081e64560b81ce42bc6096fcd81257f470a5a7
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 12fa99dc801fac9865ef9ba68575d3a663df5370 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Fri, 17 Dec 2021 22:00:34 -0300
Subject: [PATCH 4053/4088] icewm: update to 2.9.2.

---
 srcpkgs/icewm/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 118071556e15..7d15ec3906f0 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.9.0
+version=2.9.2
 revision=1
 build_style=cmake
 make_cmd=make
@@ -16,8 +16,9 @@ short_desc="Window Manager designed for speed, usability, and consistency"
 maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
+changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=eacf813ee427cf80f46aaf8d104d7d0e79937b38dff362a857ce86a091c9de5b
+checksum=5fc9050508fe1f4a55f47899389a42e7d04be3b202de2c053113775e7b6de867
 # broken tests
 make_check=no
 

From 540acdf7eb6a983662299c5cecc9793cd0824138 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 16 Dec 2021 15:12:37 +0100
Subject: [PATCH 4054/4088] python3-mypy: update to 0.920.

---
 srcpkgs/python3-mypy/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 2464bbe3825c..6883ed6194c9 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=0.910
-revision=2
+version=0.920
+revision=1
 wrksrc="mypy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"
-depends="python3-mypy_extensions python3-typed-ast python3-typing_extensions python3-toml"
+depends="python3-mypy_extensions python3-typed-ast python3-typing_extensions
+ python3-tomli"
 short_desc="Optional static typing for Python3"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/python/mypy"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=704098302473cb31a218f1775a873b376b30b4c18229421e9e9dc8916fd16150
-make_check=no # downloads packages with pip
+checksum=a55438627f5f546192f13255a994d6d1cf2659df48adcf966132b4379fd9c86b
+make_check=no # needs pytest-xdist and many tests fail
 
 post_install() {
 	make -C docs man

From b176a86a323aeff8916a04e44decb785569146ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 3 Dec 2021 00:03:12 +0100
Subject: [PATCH 4055/4088] libinput: update to 1.19.3.

* split debug_gui to a subpackage
---
 srcpkgs/libinput-debug-gui |  1 +
 srcpkgs/libinput/template  | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/libinput-debug-gui

diff --git a/srcpkgs/libinput-debug-gui b/srcpkgs/libinput-debug-gui
new file mode 120000
index 000000000000..b8bfebd1511c
--- /dev/null
+++ b/srcpkgs/libinput-debug-gui
@@ -0,0 +1 @@
+libinput
\ No newline at end of file
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ab2b0db758ef..118f703d9275 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,22 +1,19 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.19.1
+version=1.19.3
 revision=1
 build_style=meson
-configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
-hostmakedepends="pkg-config"
+configure_args="-Dtests=false"
+hostmakedepends="pkg-config wayland-devel"
 makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel
- $(vopt_if debug_gui gtk+3-devel)"
+ gtk+3-devel"
 checkdepends="valgrind check-devel"
 short_desc="Provides handling input devices in Wayland compositors and X"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0bdcf5b1783b737854b7af1ca22df67bc36a6fe7c9cfa71f01e9149f9220446d
-
-build_options="debug_gui"
-desc_option_debug_gui="Build with debug GUI (GTK+3)"
+checksum=3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068
 
 CFLAGS="-UNDEBUG"
 
@@ -37,3 +34,11 @@ libinput-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+libinput-debug-gui_package() {
+	short_desc+=" - debug GUI"
+	pkg_install() {
+		vmove usr/libexec/libinput/libinput-debug-gui
+		vmove usr/share/man/man1/libinput-debug-gui.1
+	}
+}

From 7af29ef47cda651e19cd7e2cdc8f3818cea13fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 30 Sep 2021 22:28:47 +0200
Subject: [PATCH 4056/4088] postgis-postgresql12: remove

---
 srcpkgs/postgis-postgresql12/template | 33 ---------------------------
 srcpkgs/postgis-postgresql12/update   |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 srcpkgs/postgis-postgresql12/template
 delete mode 100644 srcpkgs/postgis-postgresql12/update

diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
deleted file mode 100644
index f801d76f0324..000000000000
--- a/srcpkgs/postgis-postgresql12/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'postgis-postgresql12'
-pkgname=postgis-postgresql12
-version=3.1.4
-revision=1
-wrksrc="postgis-${version}"
-build_style=gnu-configure
-configure_args="
- --with-projdir=${XBPS_CROSS_BASE}/usr
- --with-jsondir=${XBPS_CROSS_BASE}/usr
- --with-protobufdir=${XBPS_CROSS_BASE}/usr
- --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
-hostmakedepends="automake libtool perl pkg-config geos
- libgdal-tools postgresql12-libs-devel which"
-makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
- proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
-short_desc="Spatial database extender for PostgreSQL"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://postgis.net/"
-changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
-distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=dc8e3fe8bc532e422f5d724c5a7c437f6555511716f6410d4d2db9762e1a3796
-nocross="FIXME: Cannot run test program to determine PROJ version"
-
-pre_configure() {
-	./autogen.sh
-}
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql12/update b/srcpkgs/postgis-postgresql12/update
deleted file mode 100644
index dc7538d851a9..000000000000
--- a/srcpkgs/postgis-postgresql12/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=postgis
-ignore="*alpha*"

From aff5b73cd86c23ca46edc6ee6444de734ac492dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 30 Sep 2021 22:28:47 +0200
Subject: [PATCH 4057/4088] postgresql12: remove

---
 srcpkgs/postgresql12-client                   |   1 -
 srcpkgs/postgresql12-contrib                  |   1 -
 srcpkgs/postgresql12-doc                      |   1 -
 srcpkgs/postgresql12-libs                     |   1 -
 srcpkgs/postgresql12-libs-devel               |   1 -
 srcpkgs/postgresql12-plperl                   |   1 -
 srcpkgs/postgresql12-plpython                 |   1 -
 srcpkgs/postgresql12-pltcl                    |   1 -
 srcpkgs/postgresql12/files/pg_config.sh.in    | 143 -----------
 srcpkgs/postgresql12/files/postgresql.confd   |  17 --
 srcpkgs/postgresql12/files/postgresql.pam     |   3 -
 .../postgresql12/files/postgresql12/control/t |   2 -
 .../postgresql12/files/postgresql12/log/run   |   2 -
 srcpkgs/postgresql12/files/postgresql12/run   |  24 --
 srcpkgs/postgresql12/files/profile.sh         |  14 --
 .../patches/pg_config-cross-value.patch       |  46 ----
 srcpkgs/postgresql12/patches/relocate.patch   |  22 --
 srcpkgs/postgresql12/template                 | 227 ------------------
 srcpkgs/postgresql12/update                   |   2 -
 19 files changed, 510 deletions(-)
 delete mode 120000 srcpkgs/postgresql12-client
 delete mode 120000 srcpkgs/postgresql12-contrib
 delete mode 120000 srcpkgs/postgresql12-doc
 delete mode 120000 srcpkgs/postgresql12-libs
 delete mode 120000 srcpkgs/postgresql12-libs-devel
 delete mode 120000 srcpkgs/postgresql12-plperl
 delete mode 120000 srcpkgs/postgresql12-plpython
 delete mode 120000 srcpkgs/postgresql12-pltcl
 delete mode 100644 srcpkgs/postgresql12/files/pg_config.sh.in
 delete mode 100644 srcpkgs/postgresql12/files/postgresql.confd
 delete mode 100644 srcpkgs/postgresql12/files/postgresql.pam
 delete mode 100755 srcpkgs/postgresql12/files/postgresql12/control/t
 delete mode 100755 srcpkgs/postgresql12/files/postgresql12/log/run
 delete mode 100755 srcpkgs/postgresql12/files/postgresql12/run
 delete mode 100644 srcpkgs/postgresql12/files/profile.sh
 delete mode 100644 srcpkgs/postgresql12/patches/pg_config-cross-value.patch
 delete mode 100644 srcpkgs/postgresql12/patches/relocate.patch
 delete mode 100644 srcpkgs/postgresql12/template
 delete mode 100644 srcpkgs/postgresql12/update

diff --git a/srcpkgs/postgresql12-client b/srcpkgs/postgresql12-client
deleted file mode 120000
index 52711bfce654..000000000000
--- a/srcpkgs/postgresql12-client
+++ /dev/null
@@ -1 +0,0 @@
-postgresql12
\ No newline at end of file
diff --git a/srcpkgs/postgresql12-contrib b/srcpkgs/postgresql12-contrib
deleted file mode 120000
index 52711bfce654..000000000000
--- a/srcpkgs/postgresql12-contrib
+++ /dev/null
@@ -1 +0,0 @@
-postgresql12
\ No newline at end of file
diff --git a/srcpkgs/postgresql12-doc b/srcpkgs/postgresql12-doc
deleted file mode 120000
index 52711bfce654..000000000000
--- a/srcpkgs/postgresql12-doc
+++ /dev/null
@@ -1 +0,0 @@
-postgresql12
\ No newline at end of file
diff --git a/srcpkgs/postgresql12-libs b/srcpkgs/postgresql12-libs
deleted file mode 120000
index 52711bfce654..000000000000
--- a/srcpkgs/postgresql12-libs
+++ /dev/null
@@ -1 +0,0 @@
-postgresql12
\ No newline at end of file
diff --git a/srcpkgs/postgresql12-libs-devel b/srcpkgs/postgresql12-libs-devel
deleted file mode 120000
index 52711bfce654..000000000000
--- a/srcpkgs/postgresql12-libs-devel
+++ /dev/null
@@ -1 +0,0 @@
-postgresql12
\ No newline at end of file
diff --git a/srcpkgs/postgresql12-plperl b/srcpkgs/postgresql12-plperl
deleted file mode 120000
index 52711bfce654..000000000000
--- a/srcpkgs/postgresql12-plperl
+++ /dev/null
@@ -1 +0,0 @@
-postgresql12
\ No newline at end of file
diff --git a/srcpkgs/postgresql12-plpython b/srcpkgs/postgresql12-plpython
deleted file mode 120000
index 52711bfce654..000000000000
--- a/srcpkgs/postgresql12-plpython
+++ /dev/null
@@ -1 +0,0 @@
-postgresql12
\ No newline at end of file
diff --git a/srcpkgs/postgresql12-pltcl b/srcpkgs/postgresql12-pltcl
deleted file mode 120000
index 52711bfce654..000000000000
--- a/srcpkgs/postgresql12-pltcl
+++ /dev/null
@@ -1 +0,0 @@
-postgresql12
\ No newline at end of file
diff --git a/srcpkgs/postgresql12/files/pg_config.sh.in b/srcpkgs/postgresql12/files/pg_config.sh.in
deleted file mode 100644
index 3d20d215d0b3..000000000000
--- a/srcpkgs/postgresql12/files/pg_config.sh.in
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-# Released to Public Domain by Doan Tran Cong Danh
-
-print() {
-	printf '%s\n' "$@"
-}
-
-sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
-
-BINDIR="$sysroot/@PREFIX@/bin"
-DOCDIR="$sysroot/@PREFIX@/share/doc/postgresql"
-HTMLDIR="$sysroot/@PREFIX@/share/doc/postgresql"
-INCLUDEDIR="$sysroot/usr/include"
-PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
-INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
-LIBDIR="$sysroot/@PREFIX@/lib"
-PKGLIBDIR="$sysroot/@PREFIX@/lib/postgresql"
-LOCALEDIR="$sysroot/@PREFIX@/share/locale"
-MANDIR="$sysroot/@PREFIX@/share/man"
-SHAREDIR="$sysroot/@PREFIX@/share/postgresql"
-SYSCONFDIR="$sysroot/@PREFIX@/etc/postgresql"
-PGXS="$sysroot/@PREFIX@/lib/postgresql/pgxs/src/makefiles/pgxs.mk"
-
-CONFIGURE="@configure_args@"
-CC="@CC@"
-CPPFLAGS="@CPPFLAGS@"
-CFLAGS="@CFLAGS@"
-CFLAGS_SL="@CFLAGS_SL@"
-LDFLAGS="@LDFLAGS@"
-LDFLAGS_EX="@LDFLAGS_EX@"
-LDFLAGS_SL="@LDFLAGS_SL@"
-LIBS="@LIBS@"
-VERSION="PostgreSQL @FULL_VERSION@"
-
-if [ "$sysroot" != "/" ]; then
-	CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
-	CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
-	LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/@PREFIX@/lib\\),-L$sysroot\\1,g")"
-fi
-
-usage() {
-	cat <<-EOF
-	$0 provides information about the installed version of PostgreSQL.
-
-	Usage:
-	  $0 [OPTION]...
-
-	Options:
-	  --bindir              show location of user executables
-	  --docdir              show location of documentation files
-	  --htmldir             show location of HTML documentation files
-	  --includedir          show location of C header files of the client interfaces
-	  --pkgincludedir       show location of other C header files
-	  --includedir-server   show location of C header files for the server
-	  --libdir              show location of object code libraries
-	  --pkglibdir           show location of dynamically loadable modules
-	  --localedir           show location of locale support files
-	  --mandir              show location of manual pages
-	  --sharedir            show location of architecture-independent support files
-	  --sysconfdir          show location of system-wide configuration files
-	  --pgxs                show location of extension makefile
-	  --configure           show options given to PostgreSQL was built
-	  --cc                  show CC value used when PostgreSQL was built
-	  --cppflags            show CPPFLAGS value used when PostgreSQL was built
-	  --cflags              show CFLAGS value used when PostgreSQL was built
-	  --cflags_sl           show CFLAGS_SL value used when PostgreSQL was built
-	  --ldflags             show LDFLAGS value used when PostgreSQL was built
-	  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was built
-	  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was built
-	  --libs                show LIBS value used when PostgreSQL was built
-	  --version             show the PostgreSQL version
-	  -?, --help            show this help, then exit
-
-	With no arguments, all known items are shown.
-
-	Report bugs to <pgsql-bugs@postgresql.org>.
-	EOF
-}
-
-if test $# -eq 0; then
-	cat <<-EOF
-	BINDIR = $BINDIR
-	DOCDIR = $DOCDIR
-	HTMLDIR = $HTMLDIR
-	INCLUDEDIR = $INCLUDEDIR
-	PKGINCLUDEDIR = $PKGINCLUDEDIR
-	INCLUDEDIR-SERVER = $INCLUDEDIR_SERVER
-	LIBDIR = $LIBDIR
-	PKGLIBDIR = $PKGLIBDIR
-	LOCALEDIR = $LOCALEDIR
-	MANDIR = $MANDIR
-	SHAREDIR = $SHAREDIR
-	SYSCONFDIR = $SYSCONFDIR
-	PGXS = $PGXS
-	CONFIGURE = $CONFIGURE
-	CC = $CC
-	CPPFLAGS = $CPPFLAGS
-	CFLAGS = $CFLAGS
-	CFLAGS_SL = $CFLAGS_SL
-	LDFLAGS = $LDFLAGS
-	LDFLAGS_EX = $LDFLAGS_EX
-	LDFLAGS_SL = $LDFLAGS_SL
-	LIBS = $LIBS
-	VERSION = $VERSION
-	EOF
-fi
-
-for arg
-do
-	if test "x$arg" = "x--help" || test "x$arg" = "x-?"; then
-		usage
-		exit 0
-	fi
-done
-
-for arg
-do
-	case "$arg" in
-	--bindir) print "$BINDIR" ;;
-	--docdir) print "$DOCDIR" ;;
-	--htmldir) print "$HTMLDIR" ;;
-	--includedir) print "$INCLUDEDIR" ;;
-	--pkgincludedir) print "$PKGINCLUDEDIR" ;;
-	--includedir-server) print "$INCLUDEDIR_SERVER" ;;
-	--libdir) print "$LIBDIR" ;;
-	--pkglibdir) print "$PKGLIBDIR" ;;
-	--localedir) print "$LOCALEDIR" ;;
-	--mandir) print "$MANDIR" ;;
-	--sharedir) print "$SHAREDIR" ;;
-	--sysconfdir) print "$SYSCONFDIR" ;;
-	--pgxs) print "$PGXS" ;;
-	--configure) print "$CONFIGURE" ;;
-	--cc) print "$CC" ;;
-	--cppflags) print "$CPPFLAGS" ;;
-	--cflags) print "$CFLAGS" ;;
-	--cflags_sl) print "$CFLAGS_SL" ;;
-	--ldflags) print "$LDFLAGS" ;;
-	--ldflags_ex) print "$LDFLAGS_EX" ;;
-	--ldflags_sl) print "$LDFLAGS_SL" ;;
-	--libs) print "$LIBS" ;;
-	--version) print "$VERSION" ;;
-	esac
-done
diff --git a/srcpkgs/postgresql12/files/postgresql.confd b/srcpkgs/postgresql12/files/postgresql.confd
deleted file mode 100644
index fe7106626fa5..000000000000
--- a/srcpkgs/postgresql12/files/postgresql.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration file for the PostgreSQL server.
-
-# PostgreSQL's database directory
-PGROOT="/var/lib/postgresql@VERSION@"
-
-# PostgreSQL's log file.
-PGLOG="/var/log/postgresql@VERSION@.log"
-
-# Passed to initdb if necessary
-INITOPTS="-A peer --auth-host=md5 --auth-local=peer --locale en_US.UTF-8"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these options
-# can be set directly in the configuration-file.
-#PGOPTS="-N 512 -B 1024"
diff --git a/srcpkgs/postgresql12/files/postgresql.pam b/srcpkgs/postgresql12/files/postgresql.pam
deleted file mode 100644
index 53724d1f86a7..000000000000
--- a/srcpkgs/postgresql12/files/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/srcpkgs/postgresql12/files/postgresql12/control/t b/srcpkgs/postgresql12/files/postgresql12/control/t
deleted file mode 100755
index dcedfaa20180..000000000000
--- a/srcpkgs/postgresql12/files/postgresql12/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/kill -INT `/usr/bin/head -1 /run/runit/supervise.postgresql@VERSION@/pid`
diff --git a/srcpkgs/postgresql12/files/postgresql12/log/run b/srcpkgs/postgresql12/files/postgresql12/log/run
deleted file mode 100755
index 815d9c974079..000000000000
--- a/srcpkgs/postgresql12/files/postgresql12/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/postgresql12/files/postgresql12/run b/srcpkgs/postgresql12/files/postgresql12/run
deleted file mode 100755
index b45c1b4ca8f7..000000000000
--- a/srcpkgs/postgresql12/files/postgresql12/run
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-. /@PREFIX@/etc/default/postgresql
-: ${PGDATA:="$PGROOT/data"}
-
-if [ "$PGROOT" != "/var/lib/postgresql@VERSION@" ]; then
-	echo "Creating symlink /var/lib/postgresql@VERSION@ -> $PGROOT"
-	ln -sf "$PGROOT" /var/lib/postgresql@VERSION@
-fi
-
-
-if [ ! -d "$PGDATA" ]; then
-	echo "Initializing database in $PGDATA"
-
-	mkdir -p "$PGDATA"
-	chown -R postgres:postgres "$PGDATA"
-	chmod 0700 "$PGDATA"
-	su - postgres -m -c "/@PREFIX@/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null
-
-	if [ -f /@PREFIX@/etc/postgresql/postgresql.conf ]; then
-		ln -sf /@PREFIX@/etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
-	fi
-fi
-
-exec chpst -u postgres:postgres /@PREFIX@/bin/postgres -D "$PGDATA" $PGOPTS 2>&1
diff --git a/srcpkgs/postgresql12/files/profile.sh b/srcpkgs/postgresql12/files/profile.sh
deleted file mode 100644
index 54be2ca50a4f..000000000000
--- a/srcpkgs/postgresql12/files/profile.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-appendpath () {
-    case ":$PATH:" in
-        *:"$1":*)
-            ;;
-        *)
-            PATH="${PATH:+$PATH:}$1"
-    esac
-}
-
-appendpath '/@PREFIX@/bin'
-
-unset appendpath
-
-export PATH
diff --git a/srcpkgs/postgresql12/patches/pg_config-cross-value.patch b/srcpkgs/postgresql12/patches/pg_config-cross-value.patch
deleted file mode 100644
index 4a5fea6cc869..000000000000
--- a/srcpkgs/postgresql12/patches/pg_config-cross-value.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Sources: Doan Tran Cong Danh
-Upstream: No
-	- First part needs to be rework in configure script to be usable
-	  upstream
-	- Second part would un-usable for Windows
-diff --git src/common/Makefile src/common/Makefile
-index ec04710..2af845f 100644
---- a/src/common/Makefile
-+++ b/src/common/Makefile
-@@ -30,11 +30,14 @@ include $(top_builddir)/src/Makefile.global
- 
- # don't include subdirectory-path-dependent -I and -L switches
- STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
-+STD_CPPFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_CPPFLAGS))
-+STD_CFLAGS   := $(subst @XBPS_SYSROOT@,,$(CFLAGS))
- STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
-+STD_LDFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_LDFLAGS))
- override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
- override CPPFLAGS += -DVAL_CC="\"$(CC)\""
- override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
--override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
-+override CPPFLAGS += -DVAL_CFLAGS="\"$(STD_CFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
- override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
-@@ -72,7 +75,19 @@ OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
- GEN_KEYWORDLIST = $(PERL) -I $(TOOLSDIR) $(TOOLSDIR)/gen_keywordlist.pl
- GEN_KEYWORDLIST_DEPS = $(TOOLSDIR)/gen_keywordlist.pl $(TOOLSDIR)/PerfectHash.pm
- 
--all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a
-+all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a pg_config.sh
-+
-+pg_config.sh: pg_config.sh.in
-+	sed -e "s/@configure_args@/$(subst /,\\/,$(configure_args))/" \
-+		-e "s/@CC@/$(subst /,\\/,$(CC))/" \
-+		-e "s/@CPPFLAGS@/$(subst /,\\/,$(STD_CPPFLAGS))/" \
-+		-e "s/@CFLAGS@/$(subst /,\\/,$(STD_CFLAGS))/" \
-+		-e "s/@CFLAGS_SL@/$(subst /,\\/,$(CFLAGS_SL))/" \
-+		-e "s/@LDFLAGS@/$(subst /,\\/,$(STD_LDFLAGS))/" \
-+		-e "s/@LDFLAGS_EX@/$(subst /,\\/,$(LDFLAGS_EX))/" \
-+		-e "s/@LDFLAGS_SL@/$(subst /,\\/,$(LDFLAGS_SL))/" \
-+		-e "s/@LIBS@/$(subst /,\\/,$(LIBS))/" \
-+		$< >$@
- 
- distprep: kwlist_d.h
- 
diff --git a/srcpkgs/postgresql12/patches/relocate.patch b/srcpkgs/postgresql12/patches/relocate.patch
deleted file mode 100644
index d2cc14281e3a..000000000000
--- a/srcpkgs/postgresql12/patches/relocate.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bf0601df89f611b33d8dbc27722351bf99e2cc18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Sat, 18 Jan 2020 12:19:45 +0100
-Subject: [PATCH] relocate
-
-
-diff --git src/port/path.c src/port/path.c
-index 710988b..20dc57d 100644
---- a/src/port/path.c
-+++ b/src/port/path.c
-@@ -544,6 +544,8 @@ make_relative_path(char *ret_path, const char *target_path,
- 	int			tail_len;
- 	int			i;
- 
-+	goto no_match; // we relocate only binaries
-+
- 	/*
- 	 * Determine the common prefix --- note we require it to end on a
- 	 * directory separator, consider eg '/usr/lib' and '/usr/libexec'.
--- 
-2.23.0
-
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
deleted file mode 100644
index e9a288a702e2..000000000000
--- a/srcpkgs/postgresql12/template
+++ /dev/null
@@ -1,227 +0,0 @@
-# Template file for 'postgresql12'
-pkgname=postgresql12
-version=12.9
-revision=1
-wrksrc="postgresql-${version}"
-build_style=gnu-configure
-make_build_target=world
-_major="${version%%.*}"
-_prefix="usr/lib/psql${_major}"
-configure_args="--with-openssl --with-python
- --with-pam --enable-thread-safety
- --with-perl --with-tcl --without-ldap --without-gssapi
- --without-bonjour --with-libxml --with-libxslt
- --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
-hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
- python3-devel readline-devel tcl-devel"
-short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="PostgreSQL"
-homepage="https://www.postgresql.org"
-changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
-distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=89fda2de33ed04a98548e43f3ee5f15b882be17505d631fe0dd1a540a2b56dce
-
-conf_files="
- /${_prefix}/etc/default/postgresql
- /${_prefix}/etc/pam.d/postgresql
- /${_prefix}/etc/postgresql/postgresql.conf
-"
-
-# Create 'postgres' user for the server.
-system_accounts="postgres"
-postgres_homedir="/var/lib/postgresql"
-postgres_shell="/bin/sh"
-postgres_descr="PostgreSQL database server user"
-make_dirs="
- /var/lib/postgresql   0750 postgres postgres
- /var/lib/postgresql${_major} 0750 postgres postgres"
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --without-perl --without-python --without-tcl"
-fi
-
-post_patch() {
-	cp "$FILESDIR"/pg_config.sh.in src/common/pg_config.sh.in
-	_substitute src/common/pg_config.sh.in
-	vsed -i -e "s,@XBPS_SYSROOT@,${XBPS_CROSS_BASE%/}," src/common/Makefile
-}
-
-pre_configure() {
-	_style_configure_args="${configure_args}"
-	configure_args=" "
-	for arg in ${_style_configure_args}; do
-		case $arg in
-			--prefix=*|*dir=*) : ;; # skip
-			*) configure_args+=" $arg"
-		esac
-	done
-	configure_args="--prefix=/${_prefix}
-	 --sysconfdir=/${_prefix}/etc
-	 --includedir=/usr/include
-	 ${configure_args}"
-}
-
-post_build() {
-	make -C contrib ${makejobs}
-}
-
-pre_check() {
-	ln -sr tmp_install/${_prefix} /${_prefix%/*}
-}
-
-post_install() {
-	vmkdir usr/share/man
-	cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
-	for i in ${DESTDIR}/usr/share/man/*[^3]/*; do
-		mv $i ${i%.*}-${_major}.${i##*.}
-	done
-	vmkdir ${_prefix}/share/doc
-	cp -r doc/src/sgml/html ${DESTDIR}/${_prefix}/share/doc
-	vsv ${pkgname}
-	find "${DESTDIR}/etc/sv" -type f -exec sed -i -e s:@VERSION@:${_major}: -e s:@PREFIX@:${_prefix}: '{}' ';'
-	vlicense COPYRIGHT
-
-	vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
-	_substitute ${DESTDIR}/etc/profile.d/${pkgname}.sh
-	vinstall ${FILESDIR}/postgresql.confd 644 ${_prefix}/etc/default postgresql
-	_substitute ${DESTDIR}/${_prefix}/etc/default/postgresql
-	vinstall ${FILESDIR}/postgresql.pam 644 ${_prefix}/etc/pam.d postgresql
-	_substitute ${DESTDIR}/${_prefix}/etc/pam.d/postgresql
-	vinstall ${DESTDIR}/${_prefix}/share/postgresql/postgresql.conf.sample \
-		644 ${_prefix}/etc/postgresql postgresql.conf
-	vbin src/common/pg_config.sh
-
-	vsed -i 's/install_bin = .*/install_bin = install/g' \
-		${DESTDIR}/${_prefix}/lib/postgresql/pgxs/src/Makefile.global
-}
-
-_substitute() {
-	sed -i "$1" -e s:@PREFIX@:${_prefix}: -e s:@VERSION@:${_major}: -e s:@FULL_VERSION@:${version}:
-}
-
-postgresql12-doc_package() {
-	short_desc="PostgreSQL documentation"
-	pkg_install() {
-		vmove ${_prefix}/share/doc
-	}
-}
-
-postgresql12-libs_package() {
-	short_desc="PostgreSQL shared libraries"
-	conflicts="postgresql9.6-libs>=0"
-	pkg_install() {
-		vmove "${_prefix}/lib/*.so*"
-		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
-		    -type f -name libpq5\*); do
-			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-		done
-		mv ${PKGDESTDIR}/${_prefix}/lib/* ${PKGDESTDIR}/usr/lib
-	}
-}
-
-postgresql12-libs-devel_package() {
-	depends="postgresql-libs>=${version}_${revision}"
-	short_desc="PostgreSQL shared libraries (development files)"
-	conflicts="postgresql9.6-libs-devel>=0"
-	pkg_install() {
-		vmkdir usr/bin
-		vmkdir usr/lib
-		for f in pg_config ecpg; do
-			vmove ${_prefix}/bin/${f}
-			vmove "usr/share/man/man1/$(basename ${f})*"
-			ln -sr "${PKGDESTDIR}/${_prefix}/bin/${f}" "${PKGDESTDIR}/usr/bin"
-		done
-		vmove usr/bin/pg_config.sh
-		vmove usr/include
-		vmove "${_prefix}/lib/*.a"
-		mv "${DESTDIR}/${_prefix}/lib/pkgconfig" "${PKGDESTDIR}/usr/lib"
-		vmove usr/share/man/man3
-		vmove ${_prefix}/lib/postgresql/pgxs
-		for f in libpq.so libpgtypes.so libecpg_compat.so libecpg.so; do
-			ln -sr "${PKGDESTDIR}/usr/lib/${f}" "${PKGDESTDIR}/${_prefix}/lib"
-		done
-		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
-		   -type f -name pg_config\* -o -name ecpg\*); do
-			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-		done
-	}
-}
-
-# XXX disabled for now in cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-
-postgresql12-plperl_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc="PL/Perl procedural language for PostgreSQL"
-	pkg_install() {
-		vmove "${_prefix}/lib/postgresql/plperl*"
-		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
-		   -type f -name plperl\*); do
-			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-		done
-	}
-}
-
-postgresql12-plpython_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc="PL/Python procedural language for PostgreSQL"
-	pkg_install() {
-		vmove "${_prefix}/lib/postgresql/plpython*"
-		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
-		   -type f -name plpython\*); do
-			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-		done
-	}
-}
-
-postgresql12-pltcl_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc="PL/Tcl procedural language for PostgreSQL"
-	pkg_install() {
-		vmove "${_prefix}/lib/postgresql/pltcl*"
-		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
-		   -type f -name pltcl\*); do
-			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-		done
-	}
-}
-
-fi # !CROSS_BUILD
-
-postgresql12-client_package() {
-	short_desc="Client frontends programs for PostgreSQL"
-	pkg_install() {
-		for f in clusterdb createdb createuser dropdb \
-			dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \
-			vacuumdb; do
-			vmove ${_prefix}/bin/${f}
-			vmove usr/share/man/man1/$(basename ${f})-${_major}.1
-		done
-		vmove usr/share/man/man7
-		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
-		   -type f -name pgscripts\* -o \
-			   -name psql\* -o \
-			   -name pg_dump\*); do
-			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
-		done
-		mv ${DESTDIR}/${_prefix}/share/postgresql/psqlrc.* \
-			${PKGDESTDIR}/${_prefix}/share
-		vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
-		_substitute ${PKGDESTDIR}/etc/profile.d/${pkgname}.sh
-	}
-}
-
-postgresql12-contrib_package() {
-	short_desc="PostgreSQL contributed programs and extensions"
-	pkg_install() {
-		make -C contrib install DESTDIR=${PKGDESTDIR}
-	}
-}
diff --git a/srcpkgs/postgresql12/update b/srcpkgs/postgresql12/update
deleted file mode 100644
index 3f99ada53bea..000000000000
--- a/srcpkgs/postgresql12/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K12[\d.]+(?!\w)"

From b1442afa9984944d77824abbdd147179eb28b4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 30 Sep 2021 22:28:48 +0200
Subject: [PATCH 4058/4088] New package: postgresql14

---
 common/shlibs                                 |   8 +-
 srcpkgs/postgresql-libs                       |   2 +-
 srcpkgs/postgresql-libs-devel                 |   2 +-
 srcpkgs/postgresql14-client                   |   1 +
 srcpkgs/postgresql14-contrib                  |   1 +
 srcpkgs/postgresql14-doc                      |   1 +
 srcpkgs/postgresql14-plperl                   |   1 +
 srcpkgs/postgresql14-plpython                 |   1 +
 srcpkgs/postgresql14-pltcl                    |   1 +
 srcpkgs/postgresql14/files/pg_config.sh.in    | 143 +++++++++++
 srcpkgs/postgresql14/files/postgresql.confd   |  17 ++
 srcpkgs/postgresql14/files/postgresql.pam     |   3 +
 .../postgresql14/files/postgresql14/control/t |   2 +
 .../postgresql14/files/postgresql14/log/run   |   2 +
 srcpkgs/postgresql14/files/postgresql14/run   |  27 +++
 srcpkgs/postgresql14/files/profile.sh         |  14 ++
 .../patches/pg_config-cross-value.patch       |  45 ++++
 srcpkgs/postgresql14/patches/relocate.patch   |  22 ++
 srcpkgs/postgresql14/template                 | 228 ++++++++++++++++++
 srcpkgs/postgresql14/update                   |   2 +
 20 files changed, 517 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/postgresql14-client
 create mode 120000 srcpkgs/postgresql14-contrib
 create mode 120000 srcpkgs/postgresql14-doc
 create mode 120000 srcpkgs/postgresql14-plperl
 create mode 120000 srcpkgs/postgresql14-plpython
 create mode 120000 srcpkgs/postgresql14-pltcl
 create mode 100644 srcpkgs/postgresql14/files/pg_config.sh.in
 create mode 100644 srcpkgs/postgresql14/files/postgresql.confd
 create mode 100644 srcpkgs/postgresql14/files/postgresql.pam
 create mode 100755 srcpkgs/postgresql14/files/postgresql14/control/t
 create mode 100755 srcpkgs/postgresql14/files/postgresql14/log/run
 create mode 100755 srcpkgs/postgresql14/files/postgresql14/run
 create mode 100644 srcpkgs/postgresql14/files/profile.sh
 create mode 100644 srcpkgs/postgresql14/patches/pg_config-cross-value.patch
 create mode 100644 srcpkgs/postgresql14/patches/relocate.patch
 create mode 100644 srcpkgs/postgresql14/template
 create mode 100644 srcpkgs/postgresql14/update

diff --git a/common/shlibs b/common/shlibs
index a634e46b4717..b7e6f298a247 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,10 +558,10 @@ libKF5PurposeWidgets.so.5 purpose-5.48.0_1
 libKF5Purpose.so.5 purpose-5.48.0_1
 libKF5PulseAudioQt.so.3 pulseaudio-qt-1.3_1
 libReviewboardHelpers.so.5 purpose-5.48.0_1
-libecpg_compat.so.3 postgresql-libs-13.2_2
-libecpg.so.6 postgresql-libs-13.2_2
-libpgtypes.so.3 postgresql-libs-13.2_2
-libpq.so.5 postgresql-libs-13.2_2
+libecpg_compat.so.3 postgresql-libs-14.0_1
+libecpg.so.6 postgresql-libs-14.0_1
+libpgtypes.so.3 postgresql-libs-14.0_1
+libpq.so.5 postgresql-libs-14.0_1
 libmypaint.so.0 libmypaint-1.6.1_1
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/postgresql-libs b/srcpkgs/postgresql-libs
index f6f48b1ff3a2..13d0224a054b 120000
--- a/srcpkgs/postgresql-libs
+++ b/srcpkgs/postgresql-libs
@@ -1 +1 @@
-postgresql13
\ No newline at end of file
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql-libs-devel b/srcpkgs/postgresql-libs-devel
index f6f48b1ff3a2..13d0224a054b 120000
--- a/srcpkgs/postgresql-libs-devel
+++ b/srcpkgs/postgresql-libs-devel
@@ -1 +1 @@
-postgresql13
\ No newline at end of file
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14-client b/srcpkgs/postgresql14-client
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-client
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14-contrib b/srcpkgs/postgresql14-contrib
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-contrib
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14-doc b/srcpkgs/postgresql14-doc
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-doc
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14-plperl b/srcpkgs/postgresql14-plperl
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-plperl
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14-plpython b/srcpkgs/postgresql14-plpython
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-plpython
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14-pltcl b/srcpkgs/postgresql14-pltcl
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-pltcl
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14/files/pg_config.sh.in b/srcpkgs/postgresql14/files/pg_config.sh.in
new file mode 100644
index 000000000000..68068a82e01e
--- /dev/null
+++ b/srcpkgs/postgresql14/files/pg_config.sh.in
@@ -0,0 +1,143 @@
+#!/bin/sh
+# Released to Public Domain by Doan Tran Cong Danh
+
+print() {
+	printf '%s\n' "$@"
+}
+
+sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
+
+BINDIR="$sysroot/@PREFIX@/bin"
+DOCDIR="$sysroot/@PREFIX@/share/doc/postgresql"
+HTMLDIR="$sysroot/@PREFIX@/share/doc/postgresql"
+INCLUDEDIR="$sysroot/usr/include"
+PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
+INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
+LIBDIR="$sysroot/@PREFIX@/lib"
+PKGLIBDIR="$sysroot/@PREFIX@/lib/postgresql"
+LOCALEDIR="$sysroot/@PREFIX@/share/locale"
+MANDIR="$sysroot/@PREFIX@/share/man"
+SHAREDIR="$sysroot/@PREFIX@/share/postgresql"
+SYSCONFDIR="$sysroot/etc/psql@VERSION@/postgresql"
+PGXS="$sysroot/@PREFIX@/lib/postgresql/pgxs/src/makefiles/pgxs.mk"
+
+CONFIGURE="@configure_args@"
+CC="@CC@"
+CPPFLAGS="@CPPFLAGS@"
+CFLAGS="@CFLAGS@"
+CFLAGS_SL="@CFLAGS_SL@"
+LDFLAGS="@LDFLAGS@"
+LDFLAGS_EX="@LDFLAGS_EX@"
+LDFLAGS_SL="@LDFLAGS_SL@"
+LIBS="@LIBS@"
+VERSION="PostgreSQL @FULL_VERSION@"
+
+if [ "$sysroot" != "/" ]; then
+	CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
+	CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
+	LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/@PREFIX@/lib\\),-L$sysroot\\1,g")"
+fi
+
+usage() {
+	cat <<-EOF
+	$0 provides information about the installed version of PostgreSQL.
+
+	Usage:
+	  $0 [OPTION]...
+
+	Options:
+	  --bindir              show location of user executables
+	  --docdir              show location of documentation files
+	  --htmldir             show location of HTML documentation files
+	  --includedir          show location of C header files of the client interfaces
+	  --pkgincludedir       show location of other C header files
+	  --includedir-server   show location of C header files for the server
+	  --libdir              show location of object code libraries
+	  --pkglibdir           show location of dynamically loadable modules
+	  --localedir           show location of locale support files
+	  --mandir              show location of manual pages
+	  --sharedir            show location of architecture-independent support files
+	  --sysconfdir          show location of system-wide configuration files
+	  --pgxs                show location of extension makefile
+	  --configure           show options given to PostgreSQL was built
+	  --cc                  show CC value used when PostgreSQL was built
+	  --cppflags            show CPPFLAGS value used when PostgreSQL was built
+	  --cflags              show CFLAGS value used when PostgreSQL was built
+	  --cflags_sl           show CFLAGS_SL value used when PostgreSQL was built
+	  --ldflags             show LDFLAGS value used when PostgreSQL was built
+	  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was built
+	  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was built
+	  --libs                show LIBS value used when PostgreSQL was built
+	  --version             show the PostgreSQL version
+	  -?, --help            show this help, then exit
+
+	With no arguments, all known items are shown.
+
+	Report bugs to <pgsql-bugs@postgresql.org>.
+	EOF
+}
+
+if test $# -eq 0; then
+	cat <<-EOF
+	BINDIR = $BINDIR
+	DOCDIR = $DOCDIR
+	HTMLDIR = $HTMLDIR
+	INCLUDEDIR = $INCLUDEDIR
+	PKGINCLUDEDIR = $PKGINCLUDEDIR
+	INCLUDEDIR-SERVER = $INCLUDEDIR_SERVER
+	LIBDIR = $LIBDIR
+	PKGLIBDIR = $PKGLIBDIR
+	LOCALEDIR = $LOCALEDIR
+	MANDIR = $MANDIR
+	SHAREDIR = $SHAREDIR
+	SYSCONFDIR = $SYSCONFDIR
+	PGXS = $PGXS
+	CONFIGURE = $CONFIGURE
+	CC = $CC
+	CPPFLAGS = $CPPFLAGS
+	CFLAGS = $CFLAGS
+	CFLAGS_SL = $CFLAGS_SL
+	LDFLAGS = $LDFLAGS
+	LDFLAGS_EX = $LDFLAGS_EX
+	LDFLAGS_SL = $LDFLAGS_SL
+	LIBS = $LIBS
+	VERSION = $VERSION
+	EOF
+fi
+
+for arg
+do
+	if test "x$arg" = "x--help" || test "x$arg" = "x-?"; then
+		usage
+		exit 0
+	fi
+done
+
+for arg
+do
+	case "$arg" in
+	--bindir) print "$BINDIR" ;;
+	--docdir) print "$DOCDIR" ;;
+	--htmldir) print "$HTMLDIR" ;;
+	--includedir) print "$INCLUDEDIR" ;;
+	--pkgincludedir) print "$PKGINCLUDEDIR" ;;
+	--includedir-server) print "$INCLUDEDIR_SERVER" ;;
+	--libdir) print "$LIBDIR" ;;
+	--pkglibdir) print "$PKGLIBDIR" ;;
+	--localedir) print "$LOCALEDIR" ;;
+	--mandir) print "$MANDIR" ;;
+	--sharedir) print "$SHAREDIR" ;;
+	--sysconfdir) print "$SYSCONFDIR" ;;
+	--pgxs) print "$PGXS" ;;
+	--configure) print "$CONFIGURE" ;;
+	--cc) print "$CC" ;;
+	--cppflags) print "$CPPFLAGS" ;;
+	--cflags) print "$CFLAGS" ;;
+	--cflags_sl) print "$CFLAGS_SL" ;;
+	--ldflags) print "$LDFLAGS" ;;
+	--ldflags_ex) print "$LDFLAGS_EX" ;;
+	--ldflags_sl) print "$LDFLAGS_SL" ;;
+	--libs) print "$LIBS" ;;
+	--version) print "$VERSION" ;;
+	esac
+done
diff --git a/srcpkgs/postgresql14/files/postgresql.confd b/srcpkgs/postgresql14/files/postgresql.confd
new file mode 100644
index 000000000000..fe7106626fa5
--- /dev/null
+++ b/srcpkgs/postgresql14/files/postgresql.confd
@@ -0,0 +1,17 @@
+# Configuration file for the PostgreSQL server.
+
+# PostgreSQL's database directory
+PGROOT="/var/lib/postgresql@VERSION@"
+
+# PostgreSQL's log file.
+PGLOG="/var/log/postgresql@VERSION@.log"
+
+# Passed to initdb if necessary
+INITOPTS="-A peer --auth-host=md5 --auth-local=peer --locale en_US.UTF-8"
+
+# Extra options to run postmaster with, e.g.:
+# -N is the maximal number of client connections
+# -B is the number of shared buffers and has to be at least 2x the value for -N
+# Please read the man-page to postmaster for more options. Many of these options
+# can be set directly in the configuration-file.
+#PGOPTS="-N 512 -B 1024"
diff --git a/srcpkgs/postgresql14/files/postgresql.pam b/srcpkgs/postgresql14/files/postgresql.pam
new file mode 100644
index 000000000000..53724d1f86a7
--- /dev/null
+++ b/srcpkgs/postgresql14/files/postgresql.pam
@@ -0,0 +1,3 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
diff --git a/srcpkgs/postgresql14/files/postgresql14/control/t b/srcpkgs/postgresql14/files/postgresql14/control/t
new file mode 100755
index 000000000000..dcedfaa20180
--- /dev/null
+++ b/srcpkgs/postgresql14/files/postgresql14/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/kill -INT `/usr/bin/head -1 /run/runit/supervise.postgresql@VERSION@/pid`
diff --git a/srcpkgs/postgresql14/files/postgresql14/log/run b/srcpkgs/postgresql14/files/postgresql14/log/run
new file mode 100755
index 000000000000..815d9c974079
--- /dev/null
+++ b/srcpkgs/postgresql14/files/postgresql14/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/postgresql14/files/postgresql14/run b/srcpkgs/postgresql14/files/postgresql14/run
new file mode 100755
index 000000000000..3aee9440e847
--- /dev/null
+++ b/srcpkgs/postgresql14/files/postgresql14/run
@@ -0,0 +1,27 @@
+#!/bin/sh
+. /etc/psql@VERSION@/default/postgresql
+: ${PGDATA:="$PGROOT/data"}
+
+if [ "$PGROOT" != "/var/lib/postgresql@VERSION@" ]; then
+	echo "Creating symlink /var/lib/postgresql@VERSION@ -> $PGROOT"
+	ln -sf "$PGROOT" /var/lib/postgresql@VERSION@
+fi
+
+
+if [ ! -d "$PGDATA" ]; then
+	echo "Initializing database in $PGDATA"
+
+	mkdir -p "$PGDATA" || exit 1
+	chown -R postgres:postgres "$PGDATA"
+	chmod 0700 "$PGDATA"
+	su - postgres -c "/@PREFIX@/bin/initdb $INITOPTS -D '$PGDATA'" 2>&1 || {
+		rm -fr "$PGDATA"
+		exit 1
+	}
+
+	if [ -f /etc/psql@VERSION@/postgresql/postgresql.conf ]; then
+		ln -sf /etc/psql@VERSION@/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
+	fi
+fi
+
+exec chpst -u postgres:postgres /@PREFIX@/bin/postgres -D "$PGDATA" $PGOPTS 2>&1
diff --git a/srcpkgs/postgresql14/files/profile.sh b/srcpkgs/postgresql14/files/profile.sh
new file mode 100644
index 000000000000..54be2ca50a4f
--- /dev/null
+++ b/srcpkgs/postgresql14/files/profile.sh
@@ -0,0 +1,14 @@
+appendpath () {
+    case ":$PATH:" in
+        *:"$1":*)
+            ;;
+        *)
+            PATH="${PATH:+$PATH:}$1"
+    esac
+}
+
+appendpath '/@PREFIX@/bin'
+
+unset appendpath
+
+export PATH
diff --git a/srcpkgs/postgresql14/patches/pg_config-cross-value.patch b/srcpkgs/postgresql14/patches/pg_config-cross-value.patch
new file mode 100644
index 000000000000..cc0a9fc19133
--- /dev/null
+++ b/srcpkgs/postgresql14/patches/pg_config-cross-value.patch
@@ -0,0 +1,45 @@
+Sources: Doan Tran Cong Danh
+Upstream: No
+	- First part needs to be rework in configure script to be usable
+	  upstream
+	- Second part would un-usable for Windows
+diff --git src/common/Makefile src/common/Makefile
+index ec04710..2af845f 100644
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -30,10 +30,13 @@ include $(top_builddir)/src/Makefile.global
+ 
+ # don't include subdirectory-path-dependent -I and -L switches
+ STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
++STD_CPPFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_CPPFLAGS))
++STD_CFLAGS   := $(subst @XBPS_SYSROOT@,,$(CFLAGS))
+ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
++STD_LDFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_LDFLAGS))
+ override CPPFLAGS += -DVAL_CC="\"$(CC)\""
+ override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
+-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
++override CPPFLAGS += -DVAL_CFLAGS="\"$(STD_CFLAGS)\""
+ override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
+ override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
+ override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
+@@ -72,7 +75,19 @@ OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
+ GEN_KEYWORDLIST = $(PERL) -I $(TOOLSDIR) $(TOOLSDIR)/gen_keywordlist.pl
+ GEN_KEYWORDLIST_DEPS = $(TOOLSDIR)/gen_keywordlist.pl $(TOOLSDIR)/PerfectHash.pm
+ 
+-all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a
++all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a pg_config.sh
++
++pg_config.sh: pg_config.sh.in
++	sed -e "s/@configure_args@/$(subst /,\\/,$(configure_args))/" \
++		-e "s/@CC@/$(subst /,\\/,$(CC))/" \
++		-e "s/@CPPFLAGS@/$(subst /,\\/,$(STD_CPPFLAGS))/" \
++		-e "s/@CFLAGS@/$(subst /,\\/,$(STD_CFLAGS))/" \
++		-e "s/@CFLAGS_SL@/$(subst /,\\/,$(CFLAGS_SL))/" \
++		-e "s/@LDFLAGS@/$(subst /,\\/,$(STD_LDFLAGS))/" \
++		-e "s/@LDFLAGS_EX@/$(subst /,\\/,$(LDFLAGS_EX))/" \
++		-e "s/@LDFLAGS_SL@/$(subst /,\\/,$(LDFLAGS_SL))/" \
++		-e "s/@LIBS@/$(subst /,\\/,$(LIBS))/" \
++		$< >$@
+ 
+ distprep: kwlist_d.h
+ 
diff --git a/srcpkgs/postgresql14/patches/relocate.patch b/srcpkgs/postgresql14/patches/relocate.patch
new file mode 100644
index 000000000000..d2cc14281e3a
--- /dev/null
+++ b/srcpkgs/postgresql14/patches/relocate.patch
@@ -0,0 +1,22 @@
+From bf0601df89f611b33d8dbc27722351bf99e2cc18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Sat, 18 Jan 2020 12:19:45 +0100
+Subject: [PATCH] relocate
+
+
+diff --git src/port/path.c src/port/path.c
+index 710988b..20dc57d 100644
+--- a/src/port/path.c
++++ b/src/port/path.c
+@@ -544,6 +544,8 @@ make_relative_path(char *ret_path, const char *target_path,
+ 	int			tail_len;
+ 	int			i;
+ 
++	goto no_match; // we relocate only binaries
++
+ 	/*
+ 	 * Determine the common prefix --- note we require it to end on a
+ 	 * directory separator, consider eg '/usr/lib' and '/usr/libexec'.
+-- 
+2.23.0
+
diff --git a/srcpkgs/postgresql14/template b/srcpkgs/postgresql14/template
new file mode 100644
index 000000000000..94ba16bffbc6
--- /dev/null
+++ b/srcpkgs/postgresql14/template
@@ -0,0 +1,228 @@
+# Template file for 'postgresql14'
+pkgname=postgresql14
+version=14.1
+revision=1
+wrksrc="postgresql-${version}"
+build_style=gnu-configure
+make_build_target=world
+_major="${version%%.*}"
+_prefix="usr/lib/psql${_major}"
+_sysconfdir="etc/psql${_major}"
+configure_args="--with-openssl --with-python
+ --with-pam --enable-thread-safety
+ --with-perl --with-tcl --without-ldap --without-gssapi
+ --without-bonjour --with-libxml --with-libxslt
+ --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
+hostmakedepends="docbook2x gettext flex openjade"
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
+ python3-devel readline-devel tcl-devel"
+short_desc="Sophisticated open-source Object-Relational DBMS"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="PostgreSQL"
+homepage="https://www.postgresql.org"
+changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
+distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
+checksum=4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f
+
+conf_files="
+ /${_sysconfdir}/default/postgresql
+ /${_sysconfdir}/pam.d/postgresql
+ /${_sysconfdir}/postgresql/postgresql.conf
+"
+
+# Create 'postgres' user for the server.
+system_accounts="postgres"
+postgres_homedir="/var/lib/postgresql"
+postgres_shell="/bin/sh"
+postgres_descr="PostgreSQL database server user"
+make_dirs="
+ /var/lib/postgresql   0750 postgres postgres
+ /var/lib/postgresql${_major} 0750 postgres postgres"
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --without-perl --without-python --without-tcl"
+fi
+
+post_patch() {
+	cp "$FILESDIR"/pg_config.sh.in src/common/pg_config.sh.in
+	_substitute src/common/pg_config.sh.in
+	vsed -i -e "s,@XBPS_SYSROOT@,${XBPS_CROSS_BASE%/}," src/common/Makefile
+}
+
+pre_configure() {
+	_style_configure_args="${configure_args}"
+	configure_args=" "
+	for arg in ${_style_configure_args}; do
+		case $arg in
+			--prefix=*|*dir=*) : ;; # skip
+			*) configure_args+=" $arg"
+		esac
+	done
+	configure_args="--prefix=/${_prefix}
+	 --sysconfdir=/${_sysconfdir}
+	 --includedir=/usr/include
+	 ${configure_args}"
+}
+
+post_build() {
+	make -C contrib ${makejobs}
+}
+
+pre_check() {
+	ln -sr tmp_install/${_prefix} /${_prefix%/*}
+}
+
+post_install() {
+	vmkdir usr/share/man
+	cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
+	for i in ${DESTDIR}/usr/share/man/*[^3]/*; do
+		mv $i ${i%.*}-${_major}.${i##*.}
+	done
+	vmkdir ${_prefix}/share/doc
+	cp -r doc/src/sgml/html ${DESTDIR}/${_prefix}/share/doc
+	vsv ${pkgname}
+	find "${DESTDIR}/etc/sv" -type f -exec sed -i -e s:@VERSION@:${_major}: -e s:@PREFIX@:${_prefix}: '{}' ';'
+	vlicense COPYRIGHT
+
+	vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
+	_substitute ${DESTDIR}/etc/profile.d/${pkgname}.sh
+	vinstall ${FILESDIR}/postgresql.confd 644 ${_sysconfdir}/default postgresql
+	_substitute ${DESTDIR}/${_sysconfdir}/default/postgresql
+	vinstall ${FILESDIR}/postgresql.pam 644 ${_sysconfdir}/pam.d postgresql
+	_substitute ${DESTDIR}/${_sysconfdir}/pam.d/postgresql
+	vinstall ${DESTDIR}/${_prefix}/share/postgresql/postgresql.conf.sample \
+		644 ${_sysconfdir}/postgresql postgresql.conf
+	vbin src/common/pg_config.sh
+
+	vsed -i 's/install_bin = .*/install_bin = install/g' \
+		${DESTDIR}/${_prefix}/lib/postgresql/pgxs/src/Makefile.global
+}
+
+_substitute() {
+	sed -i "$1" -e s:@PREFIX@:${_prefix}: -e s:@VERSION@:${_major}: -e s:@FULL_VERSION@:${version}:
+}
+
+postgresql14-doc_package() {
+	short_desc="PostgreSQL documentation"
+	pkg_install() {
+		vmove ${_prefix}/share/doc
+	}
+}
+
+postgresql-libs_package() {
+	short_desc="PostgreSQL shared libraries"
+	conflicts="postgresql9.6-libs>=0 postgresql12-libs>=0 postgresql13-libs>=0"
+	pkg_install() {
+		vmove "${_prefix}/lib/*.so*"
+		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+		    -type f -name libpq5\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+		mv ${PKGDESTDIR}/${_prefix}/lib/* ${PKGDESTDIR}/usr/lib
+	}
+}
+
+postgresql-libs-devel_package() {
+	depends="postgresql-libs>=${version}_${revision}"
+	short_desc="PostgreSQL shared libraries (development files)"
+	conflicts="postgresql9.6-libs-devel>=0 postgresql12-libs-devel>=0 postgresql13-libs-devel>=0"
+	pkg_install() {
+		vmkdir usr/bin
+		vmkdir usr/lib
+		for f in pg_config ecpg; do
+			vmove ${_prefix}/bin/${f}
+			vmove "usr/share/man/man1/$(basename ${f})*"
+			ln -sr "${PKGDESTDIR}/${_prefix}/bin/${f}" "${PKGDESTDIR}/usr/bin"
+		done
+		vmove usr/bin/pg_config.sh
+		vmove usr/include
+		vmove "${_prefix}/lib/*.a"
+		mv "${DESTDIR}/${_prefix}/lib/pkgconfig" "${PKGDESTDIR}/usr/lib"
+		vmove usr/share/man/man3
+		vmove ${_prefix}/lib/postgresql/pgxs
+		for f in libpq.so libpgtypes.so libecpg_compat.so libecpg.so; do
+			ln -sr "${PKGDESTDIR}/usr/lib/${f}" "${PKGDESTDIR}/${_prefix}/lib"
+		done
+		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+		   -type f -name pg_config\* -o -name ecpg\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+	}
+}
+
+# XXX disabled for now in cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+
+postgresql14-plperl_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc="PL/Perl procedural language for PostgreSQL"
+	pkg_install() {
+		vmove "${_prefix}/lib/postgresql/plperl*"
+		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+		   -type f -name plperl\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+	}
+}
+
+postgresql14-plpython_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc="PL/Python procedural language for PostgreSQL"
+	pkg_install() {
+		vmove "${_prefix}/lib/postgresql/plpython*"
+		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+		   -type f -name plpython\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+	}
+}
+
+postgresql14-pltcl_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc="PL/Tcl procedural language for PostgreSQL"
+	pkg_install() {
+		vmove "${_prefix}/lib/postgresql/pltcl*"
+		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+		   -type f -name pltcl\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+	}
+}
+
+fi # !CROSS_BUILD
+
+postgresql14-client_package() {
+	short_desc="Client frontends programs for PostgreSQL"
+	pkg_install() {
+		for f in clusterdb createdb createuser dropdb \
+			dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \
+			vacuumdb; do
+			vmove ${_prefix}/bin/${f}
+			vmove usr/share/man/man1/$(basename ${f})-${_major}.1
+		done
+		vmove usr/share/man/man7
+		for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+		   -type f -name pgscripts\* -o \
+			   -name psql\* -o \
+			   -name pg_dump\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+		mv ${DESTDIR}/${_prefix}/share/postgresql/psqlrc.* \
+			${PKGDESTDIR}/${_prefix}/share
+		vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
+		_substitute ${PKGDESTDIR}/etc/profile.d/${pkgname}.sh
+	}
+}
+
+postgresql14-contrib_package() {
+	short_desc="PostgreSQL contributed programs and extensions"
+	pkg_install() {
+		make -C contrib install DESTDIR=${PKGDESTDIR}
+	}
+}
diff --git a/srcpkgs/postgresql14/update b/srcpkgs/postgresql14/update
new file mode 100644
index 000000000000..160ccf143338
--- /dev/null
+++ b/srcpkgs/postgresql14/update
@@ -0,0 +1,2 @@
+site="https://ftp.postgresql.org/pub/source/"
+pattern="v\K${version%%.*}[\d.]+(?!\w)"

From eda95d1c1464948949efd7412f1ed5fd6e70cb42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 30 Sep 2021 22:28:48 +0200
Subject: [PATCH 4059/4088] New package: postgresql13-libs-13.4

---
 srcpkgs/postgresql13-libs       | 1 +
 srcpkgs/postgresql13-libs-devel | 1 +
 srcpkgs/postgresql13/template   | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/postgresql13-libs
 create mode 120000 srcpkgs/postgresql13-libs-devel

diff --git a/srcpkgs/postgresql13-libs b/srcpkgs/postgresql13-libs
new file mode 120000
index 000000000000..f6f48b1ff3a2
--- /dev/null
+++ b/srcpkgs/postgresql13-libs
@@ -0,0 +1 @@
+postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-libs-devel b/srcpkgs/postgresql13-libs-devel
new file mode 120000
index 000000000000..f6f48b1ff3a2
--- /dev/null
+++ b/srcpkgs/postgresql13-libs-devel
@@ -0,0 +1 @@
+postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 7d91058244c3..0f7b79fd6710 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.5
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -108,7 +108,7 @@ postgresql13-doc_package() {
 	}
 }
 
-postgresql-libs_package() {
+postgresql13-libs_package() {
 	short_desc="PostgreSQL shared libraries"
 	conflicts="postgresql9.6-libs>=0 postgresql12-libs>=0"
 	pkg_install() {
@@ -122,7 +122,7 @@ postgresql-libs_package() {
 	}
 }
 
-postgresql-libs-devel_package() {
+postgresql13-libs-devel_package() {
 	depends="postgresql-libs>=${version}_${revision}"
 	short_desc="PostgreSQL shared libraries (development files)"
 	conflicts="postgresql9.6-libs-devel>=0 postgresql12-libs-devel>=0"

From 594eeab8d55c27b5d70b7825feaa25ce8a0b6307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 30 Sep 2021 22:28:48 +0200
Subject: [PATCH 4060/4088] postgis-postgresql13: build with postgresql13-libs

---
 srcpkgs/postgis-postgresql13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index afa6432adb7e..706c8fb96810 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
 version=3.1.4
-revision=1
+revision=2
 wrksrc="postgis-${version}"
 build_style=gnu-configure
 configure_args="
@@ -10,8 +10,8 @@ configure_args="
  --with-protobufdir=${XBPS_CROSS_BASE}/usr
  --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
 hostmakedepends="automake libtool perl pkg-config geos
- libgdal-tools postgresql-libs-devel which"
-makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
+ libgdal-tools postgresql13-libs-devel which"
+makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql13-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
 checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"

From 4cc1c20b140001d83f67841b6361113498467488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 30 Sep 2021 22:28:48 +0200
Subject: [PATCH 4061/4088] New package: postgis-postgresql14-3.1.4

---
 srcpkgs/postgis-postgresql14/template | 33 +++++++++++++++++++++++++++
 srcpkgs/postgis-postgresql14/update   |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 srcpkgs/postgis-postgresql14/template
 create mode 100644 srcpkgs/postgis-postgresql14/update

diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
new file mode 100644
index 000000000000..6ce4231b1726
--- /dev/null
+++ b/srcpkgs/postgis-postgresql14/template
@@ -0,0 +1,33 @@
+# Template file for 'postgis-postgresql14'
+pkgname=postgis-postgresql14
+version=3.1.4
+revision=1
+wrksrc="postgis-${version}"
+build_style=gnu-configure
+configure_args="
+ --with-projdir=${XBPS_CROSS_BASE}/usr
+ --with-jsondir=${XBPS_CROSS_BASE}/usr
+ --with-protobufdir=${XBPS_CROSS_BASE}/usr
+ --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
+hostmakedepends="automake libtool perl pkg-config geos
+ libgdal-tools postgresql-libs-devel which"
+makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
+ proj-devel protobuf-c-devel pcre-devel json-c-devel"
+checkdepends="libxslt CUnit-devel"
+short_desc="Spatial database extender for PostgreSQL"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="GPL-2.0-or-later"
+homepage="https://postgis.net/"
+changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
+distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
+checksum=dc8e3fe8bc532e422f5d724c5a7c437f6555511716f6410d4d2db9762e1a3796
+nocross="FIXME: Cannot run test program to determine PROJ version"
+
+pre_configure() {
+	./autogen.sh
+}
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql14/update b/srcpkgs/postgis-postgresql14/update
new file mode 100644
index 000000000000..dc7538d851a9
--- /dev/null
+++ b/srcpkgs/postgis-postgresql14/update
@@ -0,0 +1,2 @@
+pkgname=postgis
+ignore="*alpha*"

From 3ac00251adb8b515e73397d460a40a1923f284f2 Mon Sep 17 00:00:00 2001
From: uhohspaghetios <rich@servermonkeys.com>
Date: Fri, 10 Dec 2021 01:04:00 -0500
Subject: [PATCH 4062/4088] haproxy: update to 2.4.9

---
 srcpkgs/haproxy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index ffa473d66df3..f5f65453c8a4 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,19 +1,19 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.8
+version=2.4.9
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
 makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
-checkdepends="varnish"
+checkdepends="curl varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 changelog="https://www.haproxy.org/download/2.4/src/CHANGELOG"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5
+checksum=d56c7fe3c5afedd1b9a19e1b7f8f954feaf50a9c2f205f99891043858b72a763
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From 12819ff560f28c7fd402fd1a559f90f087ba1dcb Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 29 Nov 2021 00:50:13 +1100
Subject: [PATCH 4063/4088] New package: codec2-1.0.1

---
 common/shlibs                      |  1 +
 srcpkgs/codec2-devel               |  1 +
 srcpkgs/codec2/patches/cross.patch | 15 ++++++++
 srcpkgs/codec2/template            | 62 ++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+)
 create mode 120000 srcpkgs/codec2-devel
 create mode 100644 srcpkgs/codec2/patches/cross.patch
 create mode 100644 srcpkgs/codec2/template

diff --git a/common/shlibs b/common/shlibs
index b7e6f298a247..4edfe7d909d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4090,3 +4090,4 @@ libkmaillanguagetool.so.5 kdepim-addons-21.08.3_1
 libkaddressbookmergelibprivate.so.5 kdepim-addons-21.08.3_1
 libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1
 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
+libcodec2.so.1.0 codec2-1.0.1_1
diff --git a/srcpkgs/codec2-devel b/srcpkgs/codec2-devel
new file mode 120000
index 000000000000..d95961287843
--- /dev/null
+++ b/srcpkgs/codec2-devel
@@ -0,0 +1 @@
+codec2
\ No newline at end of file
diff --git a/srcpkgs/codec2/patches/cross.patch b/srcpkgs/codec2/patches/cross.patch
new file mode 100644
index 000000000000..46b52c0b805c
--- /dev/null
+++ b/srcpkgs/codec2/patches/cross.patch
@@ -0,0 +1,15 @@
+# reason:
+#   [110/327] Generating codebookjvm.c
+#   FAILED: src/codebookjvm.c /builddir/codec2-1.0.1/build/src/codebookjvm.c
+#   /bin/sh: line 1: /builddir/codec2-1.0.1/build/src/generate_codebook: cannot execute binary file: Exec format error
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -68,6 +68,7 @@
+     ExternalProject_Add(codec2_native
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..
+        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/codec2_native
++       CMAKE_ARGS -DCMAKE_C_COMPILER=$ENV{CC_FOR_BUILD} -DCMAKE_C_FLAGS=$ENV{CFLAGS_FOR_BUILD}
+        BUILD_COMMAND ${CMAKE_COMMAND} --build . --target generate_codebook
+        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/codec2_native/src/generate_codebook ${CMAKE_CURRENT_BINARY_DIR}
+        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/generate_codebook
diff --git a/srcpkgs/codec2/template b/srcpkgs/codec2/template
new file mode 100644
index 000000000000..10521d98c05d
--- /dev/null
+++ b/srcpkgs/codec2/template
@@ -0,0 +1,62 @@
+# Template file for 'codec2'
+pkgname=codec2
+version=1.0.1
+revision=1
+build_style=cmake
+checkdepends="gnuplot octave python3-numpy sox valgrind"
+short_desc="Low bit rate speech codec"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="LGPL-2.1-only"
+homepage="https://www.rowetel.com/codec2.html"
+distfiles="https://github.com/drowe67/codec2/archive/v${version}.tar.gz"
+checksum=14227963940d79e0ec5af810f37101b30e1c7e8555abd96c56b3c0473abac8ef
+
+do_check() {
+	cd build
+	ctest -E "test_CML_ldpcut|\
+test_COHPSK_modem_octave_port|\
+test_OFDM_modem_burst_acq_port|\
+test_OFDM_modem_datac0_octave_burst|\
+test_OFDM_modem_datac1_octave|\
+test_OFDM_modem_datac3_octave|\
+test_OFDM_modem_esno_est_c|\
+test_OFDM_modem_esno_est_octave|\
+test_OFDM_modem_fading_BER|\
+test_OFDM_modem_fading_DPSK_BER|\
+test_OFDM_modem_octaeve_datac0_mpp|\
+test_OFDM_modem_octave_burst_acq|\
+test_OFDM_modem_octave_datac0_mpp|\
+test_OFDM_modem_octave_datac0_mpp_coded|\
+test_OFDM_modem_octave_datac0_postamble|\
+test_OFDM_modem_octave_port|\
+test_OFDM_modem_octave_port_Nc_31|\
+test_OFDM_modem_octave_qam16_uncoded|\
+test_OFDM_modem_phase_est_bw|\
+test_OFDM_modem_time_sync_700D|\
+test_codec2_700c_octave_port|\
+test_demo_700d|\
+test_demo_700d_python|\
+test_freedv_api_700D_backwards_compatability|\
+test_freedv_api_700D_burble|\
+test_freedv_data_raw_fsk_ldpc_100|\
+test_freedv_reliable_text_awgn_700D|\
+test_freedv_reliable_text_fade_1600|\
+test_freedv_reliable_text_fade_700D|\
+test_freedv_reliable_text_fade_700E|\
+test_fsk_lib_4fsk_ldpc|\
+test_fsk_modem_octave_port|\
+test_ldpc_enc_dec_HRA_56_56|\
+test_ldpc_enc_dec_H_16200_9720|\
+test_ldpc_enc_dec_H_2064_516_sparse"
+}
+
+codec2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 2eda3fd27967da78bcca7f1e275e7100ee9f01aa Mon Sep 17 00:00:00 2001
From: hamlolum <hamlolum@tilde.club>
Date: Sun, 5 Dec 2021 17:59:28 +0530
Subject: [PATCH 4064/4088] New package: mkp224o-1.5.0

---
 srcpkgs/mkp224o/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/mkp224o/template

diff --git a/srcpkgs/mkp224o/template b/srcpkgs/mkp224o/template
new file mode 100644
index 000000000000..08b34d424330
--- /dev/null
+++ b/srcpkgs/mkp224o/template
@@ -0,0 +1,23 @@
+# Template file for 'mkp224o'
+pkgname=mkp224o
+version=1.5.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="autoconf automake"
+makedepends="libsodium-devel"
+short_desc="Vanity address generator for ed25519 onion services"
+maintainer="hamlolum <hamlolum@tilde.club>"
+license="CC0-1.0"
+homepage="https://github.com/cathugger/mkp224o"
+distfiles="https://github.com/cathugger/mkp224o/archive/refs/tags/v${version}.tar.gz"
+checksum=1bdc2b838ed53d62f62652e0b46d2632fad7ed703c65a00a96ad1b4547d74173
+nostrip=yes
+
+pre_configure() {
+	autoreconf
+}
+
+do_install() {
+	vdoc README.txt
+	vbin mkp224o
+}

From e761b4a6a15a4a2d56098727a45ab2c4c8cad6d3 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 18 Dec 2021 14:26:35 +0100
Subject: [PATCH 4065/4088] calibre: update to 5.34.0.

---
 srcpkgs/calibre/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 55adad369532..eb10fb20d143 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.33.2
+version=5.34.0
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,8 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=c2db77b9c09a16af702e4efd09e0b3db4b4c33a01b2ed6782e7e93c4ec7476f2
+checksum=d4d401eefadc534851df4f3ff247949ffac785dbc993901bd2938c3f2894d7e3
+python_version=3
 lib32disabled=yes
 nocross=yes
 

From dfd390765683d1bccf4c862df74a210c02d127db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 18 Dec 2021 19:57:58 +0100
Subject: [PATCH 4066/4088] dq: update to 0.0.20211217.

---
 srcpkgs/dq/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dq/template b/srcpkgs/dq/template
index 632384197cf6..30e1b912651d 100644
--- a/srcpkgs/dq/template
+++ b/srcpkgs/dq/template
@@ -1,6 +1,6 @@
 # Template file for 'dq'
 pkgname=dq
-version=0.0.20181021
+version=0.0.20211217
 revision=1
 wrksrc="${pkgname}-${version##*.}"
 build_style=gnu-makefile
@@ -16,8 +16,11 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Public Domain"
 homepage="https://mojzis.com/software/dq/"
 distfiles="https://github.com/janmojzis/dq/archive/${version##*.}.tar.gz"
-checksum=b1797538dd7dfe8e6d9c2964eee0b569589b448c8a2e636bbee4cf2a19bc7ea4
-nocross="build run target"
+checksum=bfe5b0ab164ef26884626d582ac1bbc28de2cad9cbb1fa84aecd2c79bceeb1c5
+
+if [ "$CROSS_BUILD" ]; then
+	make_build_target="cross-compile"
+fi
 
 system_accounts="_dqcache"
 

From f537dcc7a1fbe4d29feccb9fcf4674be90dfa538 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 18 Dec 2021 21:18:15 +0100
Subject: [PATCH 4067/4088] gemserv: drop openssl makedepends, restrict archs
 (rustls)

---
 srcpkgs/gemserv/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index 2383d9f7683f..190966d63f10 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -2,10 +2,11 @@
 pkgname=gemserv
 version=0.6.0
 revision=1
+# uses rustls/ring
+archs="x86_64* aarch64* i686* armv[67]*"
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 299cc3931192a9ab698d47003de93d09e842ae26 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 18 Dec 2021 23:56:45 +0100
Subject: [PATCH 4068/4088] python3-pyinfra: enable unit tests.

---
 srcpkgs/python3-pyinfra/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index a1b34afe347c..519e53441897 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -8,6 +8,7 @@ hostmakedepends="python3-setuptools"
 depends="python3 python3-Jinja2 python3-click python3-colorama python3-dateutil
  python3-distro python3-docopt python3-gevent python3-paramiko python3-pywinrm
  python3-six python3-yaml"
+checkdepends="${depends} python3-pytest python3-mock openssh"
 short_desc="Automate infrastructure super fast at massive scale"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
@@ -23,3 +24,7 @@ post_install() {
 	rm -r ${DESTDIR}/${py3_sitelib}/tests
 	vlicense LICENSE.md
 }
+
+do_check() {
+	pytest --disable-warnings
+}

From df7d23c2cdb0add312837adac346aa770e0864ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 19 Dec 2021 00:16:05 +0100
Subject: [PATCH 4069/4088] bmake: update to 20211212.

Adopt.
---
 srcpkgs/bmake/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index d01ec195ba89..c8cac35c76c0 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20211024
+version=20211212
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=b5a3305bdb328b1383982125e90785baa30bc2ff024a1b0fda3d5d5beca82ac9
+checksum=ad75925b3d123f5d107f58b8137569f6d58259df6b7bcf371aa57877f4e49e9e
 python_version=3
 
 do_configure() {

From 4089b5561b0a66508c395b072fbdc57a921bb7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 18 Dec 2021 11:00:21 +0000
Subject: [PATCH 4070/4088] pipewire: update to 0.3.42.

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 62d392db1b6c..668b4989bbec 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.41
+version=0.3.42
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="665dd941c37f96b2709871ac594d21850b39038eb69a99ae77a7954ad3c35f4e
+checksum="726d1f2faed6f1e93c1499cd20ff0d6461bc698166bea3b98d46c291794e6e1c
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From e76963b5b803cd34d30f5ef80b6e303a5c8d445f Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Thu, 16 Dec 2021 13:30:46 +0100
Subject: [PATCH 4071/4088] clamav: update to 0.103.4

Changelog for our LTS version
https://blog.clamav.net/2021/11/clamav-01034-and-01041-patch-releases.html
---
 srcpkgs/clamav/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..d898bc215263 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
-version=0.103.3
-revision=2
+version=0.103.4
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
@@ -19,10 +19,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.clamav.net/"
 distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz"
-checksum=9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9
+checksum=def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85
 _clamav_homedir="/var/lib/_${pkgname}"
 _clamav_descr="ClamAV user"
 system_accounts="_clamav"
+make_check=ci-skip
 
 CPPFLAGS="-Wno-unused-local-typedefs"
 if [ "$CROSS_BUILD" ]; then

From b569810a34015fbcfda4e5eb6deeec0ebc3953ed Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 17 Dec 2021 09:58:48 +0100
Subject: [PATCH 4072/4088] kubernetes-kind: update to 0.11.1.

---
 srcpkgs/kubernetes-kind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index cda9579b2cca..810e9935e3dd 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
-version=0.11.0
+version=0.11.1
 revision=1
 wrksrc="kind-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
 license="Apache-2.0"
 homepage="https://kind.sigs.k8s.io/"
 distfiles="https://github.com/kubernetes-sigs/kind/archive/v${version}.tar.gz"
-checksum=@351400f93c90595bebda767affdc3ede7902b7d9f0ef9b4bfb328c9005f52fa2
+checksum=95ce0e7b01c00be149e5bd777936cef3f79ba7f1f3e5872e7ed60595858a2491
 _completions="bash zsh fish"
 
 post_build() {

From 338ddc9af5dfb1c68e07797f134564a8715f9ca5 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Fri, 17 Dec 2021 18:46:58 +0530
Subject: [PATCH 4073/4088] nsxiv: update to 28

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 -------------------
 srcpkgs/nsxiv/template                        | 12 +++----
 2 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch

diff --git a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
deleted file mode 100644
index 83f09fe2d0f5..000000000000
--- a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Makefile	2021-09-22 17:00:05.123980000 +0530
-+++ b/Makefile	2021-09-22 16:59:53.050646000 +0530
-@@ -86,7 +86,7 @@
- 		>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
- 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
- 	@echo "INSTALL share/nsxiv/"
--	install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/*
-+	install -Dt $(DESTDIR)$(PREFIX)/share/doc/nsxiv/examples exec/*
- 
- uninstall:
- 	@echo "REMOVE bin/nsxiv"
---- a/nsxiv.1	2021-09-22 16:55:16.433967000 +0530
-+++ b/nsxiv.1	2021-09-22 17:03:11.870655000 +0530
-@@ -428,7 +428,7 @@
- 3) image height.
- .P
- There is also an example script installed together with nsxiv as
--.IR PREFIX/share/nsxiv/exec/image-info .
-+.IR PREFIX/share/doc/nsxiv/examples/image-info .
- .SH EXTERNAL KEY HANDLER
- Additional external keyboard commands can be defined using a handler program
- located in
-@@ -446,7 +446,7 @@
- keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
- 
- There is also an example script installed together with nsxiv as
--.IR PREFIX/share/nsxiv/exec/key-handler .
-+.IR PREFIX/share/doc/nsxiv/examples/key-handler .
- .SH THUMBNAIL CACHING
- nsxiv stores all thumbnails under
- .IR $XDG_CACHE_HOME/nsxiv/ .
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 65954bc98288..6ef4a1e207d2 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,21 +1,19 @@
 # Template file for 'nsxiv'
 pkgname=nsxiv
-version=27.1
+version=28
 revision=1
 build_style=gnu-makefile
-makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+make_install_target=install-all
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
+ libwebp-devel"
 short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
 maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/nsxiv/nsxiv"
 distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
-checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+checksum=38047f60e51854363dd98fb7b3bc9f1cfa9b7d6f9e8788508b6f1e317328dd75
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
 
 pre_build() {
 	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
 }
-
-post_install() {
-	vinstall nsxiv.desktop 644 usr/share/applications
-}

From 2cf07c36641f57784d4908ff825fc107ac7889ac Mon Sep 17 00:00:00 2001
From: Kye Shi <shi.kye@gmail.com>
Date: Mon, 6 Dec 2021 22:30:22 -0800
Subject: [PATCH 4074/4088] python3-poetry-core: update to 1.0.7

---
 srcpkgs/python3-poetry-core/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-poetry-core/template b/srcpkgs/python3-poetry-core/template
index 9de34cbab254..a657d7130146 100644
--- a/srcpkgs/python3-poetry-core/template
+++ b/srcpkgs/python3-poetry-core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-poetry-core'
 pkgname=python3-poetry-core
-version=1.0.3
-revision=2
+version=1.0.7
+revision=1
 wrksrc="poetry-core-${version}"
 build_style="python3-module"
 make_install_target="poetry_core-${version}-*-*-*.whl"
@@ -12,7 +12,7 @@ maintainer="Kye Shi <shi.kye@gmail.com>"
 license="MIT"
 homepage="https://github.com/python-poetry/poetry-core"
 distfiles="${PYPI_SITE}/p/poetry-core/poetry-core-${version}.tar.gz"
-checksum="2315c928249fc3207801a81868b64c66273077b26c8d8da465dccf8f488c90c5"
+checksum="98c11c755a16ef6c5673c22ca94a3802a7df4746a0853a70b6fae8b9f5cac206"
 
 post_install() {
 	vlicense LICENSE

From 6efb9f2d6ec577a058e6f416500557bb79354a56 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Wed, 15 Dec 2021 11:37:15 +1000
Subject: [PATCH 4075/4088] k9s: update to 0.25.15

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 3d1fe84f8387..b680c7949e69 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.25.8
+version=0.25.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ 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=56a4939b18a1059b55823e3a34b27fef8863473dca6c901659506a79219dba8e
+checksum=76615939e083942c3681e70cbdd8b689571f2b9f3810c6b4e6ec9b65134e6e09
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From 817597cdad857b1ab60b3f26626ce8a5109b894d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 19 Dec 2021 09:50:59 +0100
Subject: [PATCH 4076/4088] wine: update to 7.0rc2.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 21d4e4fe4e1c..a48cca0611c6 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.0-rc1/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.0-rc1/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.0-rc2/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.0-rc2/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 963c731e94cb..f803d1a7f2e5 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.0-rc1/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-7.0-rc1/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-7.0-rc2/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-7.0-rc2/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 916141ce3775..844db2ad5476 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.0rc1
+version=7.0rc2
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="2e9362c07c264c13baeac61c188175e977965b3778d6f00368040e8155d72061
- 0d4447688e31fced16adbe4b3d15502f1e11422dcb18b66e133e5265d5f86f5d"
+checksum="0fdd8e39af5f15d05dd3065bb512f3f683a1849dc0b4771264fd04696c96ed7d
+ e6976e0d8c1f49a41dd3432f2b2f421e0f7861cf6660742d2d7fad16a8dff6ba"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 6ad6805d4500e637f7e9d6d3e8e276936a5fd89e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 19 Dec 2021 09:52:52 +0100
Subject: [PATCH 4077/4088] vhba-module-dkms: update to 20211218.

---
 srcpkgs/vhba-module-dkms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vhba-module-dkms/template b/srcpkgs/vhba-module-dkms/template
index 5a5c1fbef6c8..8d15e99fab2e 100644
--- a/srcpkgs/vhba-module-dkms/template
+++ b/srcpkgs/vhba-module-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'vhba-module-dkms'
 pkgname=vhba-module-dkms
-version=20211023
+version=20211218
 revision=1
 wrksrc=vhba-module-${version}
 conf_files="/usr/lib/udev/rules.d/40-vhba.rules"
@@ -9,7 +9,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.xz"
-checksum=60087baaa928cefa06d5684706fef3d48712acfef92cb32afc507ab19adebf10
+checksum=72c5a8c1c452805e4cef8cafefcecc2d25ce197ae4c67383082802e5adcd77b6
 
 dkms_modules="vhba-module ${version}"
 depends="dkms"

From ec0ef0bf8e11d5e7c910ce615e9dbec869649f97 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 19 Dec 2021 09:56:51 +0100
Subject: [PATCH 4078/4088] libmirage: update to 3.2.6.

---
 srcpkgs/libmirage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmirage/template b/srcpkgs/libmirage/template
index 283a27e223ca..b3fd597a6701 100644
--- a/srcpkgs/libmirage/template
+++ b/srcpkgs/libmirage/template
@@ -1,6 +1,6 @@
 # Template file for 'libmirage'
 pkgname=libmirage
-version=3.2.5
+version=3.2.6
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/libmirage-${version}.tar.xz"
-checksum=d50d97e15f180f99fddcdf388b0d9fec073fb8fe080ba6c69cd3674214141139
+checksum=257f4690c9195749ea936c4b44ada3e449b352dadaa107f31a1ed10f7b6df2a6
 
 build_options="gir"
 build_options_default="gir"

From b346d071be640a3f89e2780ed928915e8f443ce8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 19 Dec 2021 09:58:44 +0100
Subject: [PATCH 4079/4088] cdemu-daemon: update to 3.2.6.

---
 srcpkgs/cdemu-daemon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdemu-daemon/template b/srcpkgs/cdemu-daemon/template
index 72e148a2db3b..b51b8710cc0d 100644
--- a/srcpkgs/cdemu-daemon/template
+++ b/srcpkgs/cdemu-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'cdemu-daemon'
 pkgname=cdemu-daemon
-version=3.2.5
+version=3.2.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config intltool"
@@ -11,6 +11,6 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-daemon-${version}.tar.xz"
-checksum=8d1053b195e8f9040c5628340740aa9bbfdd4891bac06fbc5eb5cd4ec376e699
+checksum=a6e404e3ef75c6146e36354f65880dfd63b4b8ef1f54039dc5058e190f857d8f
 
 CFLAGS="-fcommon"

From d3b1a76b2ece3916f6ce2dbd6635a2b3ba3fd377 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 19 Dec 2021 13:31:32 +0100
Subject: [PATCH 4080/4088] xorg-server-xwayland: update to 21.1.4.

---
 srcpkgs/xorg-server-xwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index a6a62e8acc84..906d7bf18d63 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=21.1.3
+version=21.1.4
 revision=1
 wrksrc="xserver-xwayland-$version"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=fe9636403a54f76a23b7d5ea41242b080fd5ef37c6bf04eb1f413e76070bb48c
+checksum=4ab75ed551d5eb66beabe91c29e9a6b75dc828ac20c205983cd0dcbce0fd6348
 make_check=no # needs xtest repository
 
 post_install() {

From 5c365a5291ef391541b091aa90c5df578a74e5ea Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 19 Dec 2021 13:36:07 +0100
Subject: [PATCH 4081/4088] libhandy1: update to 1.5.0.

---
 srcpkgs/libhandy1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 5188a452a010..95803645bb70 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.4.0
+version=1.5.0
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=2676d51fa1fa40fdee7497d3e763fefa18b0338bffcd2ee32e7f7e633c885446
+checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"

From 6b72b218bc0cb07d845ed823b6ba7fbf01e266f7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 19 Dec 2021 13:53:04 +0100
Subject: [PATCH 4082/4088] libadwaita: update to 1.0.0alpha4.

---
 .../patches/disable-broken-tests.patch           | 16 ++++++++--------
 srcpkgs/libadwaita/template                      |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
index f7a101abbdc3..dba1ca021140 100644
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -1,10 +1,10 @@
 --- a/tests/meson.build
 +++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
+@@ -36,7 +36,6 @@
+   'test-preferences-group',
+   'test-preferences-page',
+   'test-preferences-row',
+-  'test-preferences-window',
+   'test-split-button',
+   'test-squeezer',
+   'test-status-page',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 94379f7d8a9a..ecd0d06959a2 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,8 +1,8 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.0alpha3
+version=1.0.0alpha4
 revision=1
-_ver=1.0.0.alpha.3
+_ver=1.0.0.alpha.4
 wrksrc="$pkgname-${_ver}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=dfb7397b9d04580707b57431e9d0991d9216b5aca472f108b21a09bbd29910cd
+checksum=f9a18952ec96fc5dc4d0827a4873c776a56c4dc236f7924aecb83f6f961a48d1
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 15268be5a0345441975dde9ae09b1a1088caa277 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 19 Dec 2021 16:42:09 +0100
Subject: [PATCH 4083/4088] apk-tools: update to 2.12.9.

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 79bbfd1dad91..9ef09c8fbdb9 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.8
+version=2.12.9
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=d976d625d5ede5ccdd1bae4a56627c26a11f323475f85d7bc5cb29b04781f7b5
+checksum=f4ead0a3722bc7c6760634b6c8abfe139b5359c934b7fca8661704828f5f6dd9
 CFLAGS="-Wno-error"
 
 do_install() {

From 4f1c0aa2bf49a4ce25497bf4cc50568a17061e64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 19 Dec 2021 16:42:56 +0100
Subject: [PATCH 4084/4088] fio: update to 3.29.

---
 srcpkgs/fio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index 9650902440f9..e5b15d2b6908 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.28
+version=3.29
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=135a3455ab6e9251430bb1b12e97151daf4ff5d2d22e8472562c9998a753a04f
+checksum=3ad22ee9c545afae914f399886e9637a43d1b3aa5dfcf6966ed83e633759acb7
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in

From c7419118322afa9417f1342eddfc4fa05f359395 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 19 Dec 2021 16:43:48 +0100
Subject: [PATCH 4085/4088] perl-LWP: update to 6.60.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index f03930a8e0db..2429675c6247 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.59
+version=6.60
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=179a284f10d8ba17632c68f94546bee0bb4ac03badb2cb51266e48d21c039e5c
+checksum=cdd28b9237b9c6791725b9099695c7c3c720b33881606fd6cc7635a5495bb07c

From 1f707a481133ddbfe2191518b4fcb3d473fa41a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 19 Dec 2021 16:45:45 +0100
Subject: [PATCH 4086/4088] weechat: update to 3.4.

---
 srcpkgs/weechat/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index ff04a2e4aa16..9395e73319cf 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.3
-revision=2
+version=3.4
+revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=cafeab8af8be4582ccfd3e74fd40e5086a1efa158231f2c26b8b05c3950fcbdf
+checksum=7cd3dcc7029e888de49e13ebbcc3749586ff59c9d97f89f5eeb611067c7bb94c
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"
@@ -32,10 +32,6 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPERL_LFLAGS=-L$_perlpath"
 fi
 
-post_extract() {
-	vsed -i '/pkg_search_module/s/ruby-2.7/ruby-3.0 &/' cmake/FindRuby.cmake
-}
-
 weechat-aspell_package() {
 	lib32disabled=yes
 	depends="${sourcepkg}>=${version}_${revision}"

From b657b5af9903ed504e4986053885a4bcec270702 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 19 Dec 2021 12:04:40 -0500
Subject: [PATCH 4087/4088] podman-compose: update to 1.0.2.

---
 srcpkgs/podman-compose/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index d716fa148396..4e1722d64ea6 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -1,13 +1,15 @@
 # Template file for 'podman-compose'
 pkgname=podman-compose
-version=0.1.5
-revision=3
+version=1.0.2
+revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-yaml"
-depends="${hostmakedepends} podman"
+hostmakedepends="python3-setuptools"
+depends="podman python3-yaml python3-dotenv"
 short_desc="Script to run docker-compose.yml using podman"
 maintainer="juan <juan@horlux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/containers/podman-compose"
 distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz"
-checksum="5f9557d3b2617a6d10905286ff41f0e722703ffca985755b035084b2db68066a"
+checksum=8eae5f2d89a423c66c26377c29955e077e7c90532e1a63989e8f04d973181c76
+# Source distribution does not script unit tests
+make_check=no

From 4329ec72f58567bd58a6f615f793fe495cec0be2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sun, 19 Dec 2021 22:23:06 +0100
Subject: [PATCH 4088/4088] bubblewrap: update to 0.5.0.

---
 srcpkgs/musl/patches/readlink.patch |  39 ++++++
 srcpkgs/musl/patches/realpath.patch | 182 ++++++++++++++++++++++++++++
 2 files changed, 221 insertions(+)
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..4c25c9df3643
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,39 @@
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..aa2e5b068018
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,182 @@
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 11889 bytes --]

From b42ee11eac19e8c3f91af825e66d48aeadfc93c3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 6 Oct 2021 09:12:05 +0200
Subject: [PATCH] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 18493 bytes --]

From c4742c68ea703bd793e0533a0fe2704eb9db354c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sun, 19 Dec 2021 22:53:15 +0100
Subject: [PATCH] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 srcpkgs/musl/patches/readlink.patch           |  41 +++
 srcpkgs/musl/patches/realpath.patch           | 184 +++++++++++++
 5 files changed, 228 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818
diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..06f359168a2d
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,41 @@
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d524..32f4537f 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..3d4bc9ae079d
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,184 @@
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59..db8b74dc 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 19167 bytes --]

From c5423e857ee5152214cd796080f7dea576f42997 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sun, 19 Dec 2021 22:56:44 +0100
Subject: [PATCH 1/2] musl: add readlink and realpath patches

Needed to update bubblewrap to 0.5.0.
---
 srcpkgs/musl/patches/readlink.patch |  41 +++++++
 srcpkgs/musl/patches/realpath.patch | 184 ++++++++++++++++++++++++++++
 srcpkgs/musl/template               |   2 +-
 3 files changed, 226 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..06f359168a2d
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,41 @@
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d524..32f4537f 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..3d4bc9ae079d
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,184 @@
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59..db8b74dc 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..5bdc5c48e623 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=10
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

From bbd62a706e0a93c349cbfaeb84c1dbca6032780d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sun, 19 Dec 2021 22:57:15 +0100
Subject: [PATCH 2/2] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

Re: bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-997460601

Comment:
@ericonr ping

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 19167 bytes --]

From 7d6c282b93b7f90d3c1bc22e06702ba1a1f4d08e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sun, 19 Dec 2021 22:56:44 +0100
Subject: [PATCH 1/2] musl: add readlink and realpath patches

Needed to update bubblewrap to 0.5.0.
---
 srcpkgs/musl/patches/readlink.patch |  41 +++++++
 srcpkgs/musl/patches/realpath.patch | 184 ++++++++++++++++++++++++++++
 srcpkgs/musl/template               |   2 +-
 3 files changed, 226 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..06f359168a2d
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,41 @@
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d524..32f4537f 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..3d4bc9ae079d
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,184 @@
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59..db8b74dc 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..5bdc5c48e623 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=10
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

From 82705b62827e0d98b5cdf5bb0331edd6e5eda57e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sun, 19 Dec 2021 22:57:15 +0100
Subject: [PATCH 2/2] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 19167 bytes --]

From 7ad9d16e32f8fb056c9c215c92f63bf251341f6f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sun, 19 Dec 2021 22:56:44 +0100
Subject: [PATCH 1/2] musl: add readlink and realpath patches

Needed to update bubblewrap to 0.5.0.
---
 srcpkgs/musl/patches/readlink.patch |  41 +++++++
 srcpkgs/musl/patches/realpath.patch | 184 ++++++++++++++++++++++++++++
 srcpkgs/musl/template               |   2 +-
 3 files changed, 226 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..06f359168a2d
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,41 @@
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d524..32f4537f 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..3d4bc9ae079d
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,184 @@
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59..db8b74dc 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..5bdc5c48e623 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=10
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

From b519874607865ad72922e2b78506cc9b4890b07d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sun, 19 Dec 2021 22:57:15 +0100
Subject: [PATCH 2/2] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

Re: bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-1030643532

Comment:
No idea what that builder is trying to do.

Re: bubblewrap: update to 0.5.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-1030651192

Comment:
> No idea what that builder is trying to do.

on x86_64-musl, it's trying to check if all packages depending on musl can still be installed.

Could you change the homepage of musl to https://musl.libc.org/?

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 19629 bytes --]

From 8476b4496a3c0b113a1d0347baf9d4fdd3ea207f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Feb 2022 17:46:45 +0100
Subject: [PATCH 1/2] musl: add readlink and realpath patches, update homepage

---
 srcpkgs/musl/patches/readlink.patch |  41 +++++++
 srcpkgs/musl/patches/realpath.patch | 184 ++++++++++++++++++++++++++++
 srcpkgs/musl/template               |   6 +-
 3 files changed, 228 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..06f359168a2d
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,41 @@
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d524..32f4537f 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..3d4bc9ae079d
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,184 @@
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59..db8b74dc 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..d4339f7748c4 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=10
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
@@ -10,8 +10,8 @@ configure_args="--prefix=/usr --disable-gcc-wrapper"
 short_desc="Musl C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
-homepage="http://www.musl-libc.org/"
-distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
+homepage="https://www.musl.libc.org/"
+distfiles="https://www.musl.libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 
 nostrip_files="libc.so"

From 2590ededb90d9cc41dcd1845a1cf7412803b2991 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Feb 2022 17:47:29 +0100
Subject: [PATCH 2/2] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 19621 bytes --]

From 74849c0c6f1e4dfebad66aac23cc83db3f448174 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Feb 2022 17:50:21 +0100
Subject: [PATCH 1/2] musl: add readlink and realpath patches, update homepage

---
 srcpkgs/musl/patches/readlink.patch |  41 +++++++
 srcpkgs/musl/patches/realpath.patch | 184 ++++++++++++++++++++++++++++
 srcpkgs/musl/template               |   6 +-
 3 files changed, 228 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..06f359168a2d
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,41 @@
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d524..32f4537f 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..3d4bc9ae079d
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,184 @@
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59..db8b74dc 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a7379450902c 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=10
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
@@ -10,8 +10,8 @@ configure_args="--prefix=/usr --disable-gcc-wrapper"
 short_desc="Musl C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
-homepage="http://www.musl-libc.org/"
-distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
+homepage="https://musl.libc.org/"
+distfiles="https://musl.libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 
 nostrip_files="libc.so"

From cfc6526526f95dc5d7bdd5f73cf5538b07dffdf9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Feb 2022 17:50:28 +0100
Subject: [PATCH 2/2] bubblewrap: update to 0.5.0.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

Re: bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-1030657958

Comment:
Done, is it okay for it to be in the same commit as musl patches or should I split?

Re: bubblewrap: update to 0.5.0.

[q66]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33372#issuecomment-1030683414

Comment:
same commit as the other musl change please

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 19621 bytes --]

From 7029caf09849bb83183e9b68dd1dce78db494c3f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Feb 2022 17:50:21 +0100
Subject: [PATCH 1/2] musl: add readlink and realpath patches, update homepage

---
 srcpkgs/musl/patches/readlink.patch |  41 +++++++
 srcpkgs/musl/patches/realpath.patch | 184 ++++++++++++++++++++++++++++
 srcpkgs/musl/template               |   6 +-
 3 files changed, 228 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..06f359168a2d
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,41 @@
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d524..32f4537f 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..3d4bc9ae079d
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,184 @@
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59..db8b74dc 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a7379450902c 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=10
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
@@ -10,8 +10,8 @@ configure_args="--prefix=/usr --disable-gcc-wrapper"
 short_desc="Musl C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
-homepage="http://www.musl-libc.org/"
-distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
+homepage="https://musl.libc.org/"
+distfiles="https://musl.libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 
 nostrip_files="libc.so"

From b076553753dc01c395f246184f7d922fcbf4ef75 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Feb 2022 17:50:28 +0100
Subject: [PATCH 2/2] bubblewrap: update to 0.6.1.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..32a7aad50457 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818

Re: [PR PATCH] [Updated] bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository

https://github.com/UsernameRandomlyGenerated/void-packages bwrap050
https://github.com/void-linux/void-packages/pull/33372

bubblewrap: update to 0.5.0.
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/33372.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bwrap050-33372.patch --]
[-- Type: text/x-diff, Size: 19621 bytes --]

From 7029caf09849bb83183e9b68dd1dce78db494c3f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Feb 2022 17:50:21 +0100
Subject: [PATCH 1/2] musl: add readlink and realpath patches, update homepage

---
 srcpkgs/musl/patches/readlink.patch |  41 +++++++
 srcpkgs/musl/patches/realpath.patch | 184 ++++++++++++++++++++++++++++
 srcpkgs/musl/template               |   6 +-
 3 files changed, 228 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musl/patches/readlink.patch
 create mode 100644 srcpkgs/musl/patches/realpath.patch

diff --git a/srcpkgs/musl/patches/readlink.patch b/srcpkgs/musl/patches/readlink.patch
new file mode 100644
index 000000000000..06f359168a2d
--- /dev/null
+++ b/srcpkgs/musl/patches/readlink.patch
@@ -0,0 +1,41 @@
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d524..32f4537f 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+ 
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
+ #ifdef SYS_readlink
+-	return syscall(SYS_readlink, path, buf, bufsize);
++	int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+-	return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++	int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5..f79d3d14 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+ 
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+-	return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	char dummy[1];
++	if (!bufsize) {
++		buf = dummy;
++		bufsize = 1;
++	}
++	int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++	if (buf == dummy && r > 0) r = 0;
++	return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/patches/realpath.patch b/srcpkgs/musl/patches/realpath.patch
new file mode 100644
index 000000000000..3d4bc9ae079d
--- /dev/null
+++ b/srcpkgs/musl/patches/realpath.patch
@@ -0,0 +1,184 @@
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59..db8b74dc 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++	const char *s0 = s;
++	while (*s == '/') s++;
++	return s-s0;
++}
+ 
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+-	int fd;
+-	ssize_t r;
+-	struct stat st1, st2;
+-	char buf[15+3*sizeof(int)];
+-	char tmp[PATH_MAX];
++	char stack[PATH_MAX+1];
++	char output[PATH_MAX];
++	size_t p, q, l, l0, cnt=0, nup=0;
++	int check_dir=0;
+ 
+ 	if (!filename) {
+ 		errno = EINVAL;
+ 		return 0;
+ 	}
++	l = strnlen(filename, sizeof stack);
++	if (!l) {
++		errno = ENOENT;
++		return 0;
++	}
++	if (l >= PATH_MAX) goto toolong;
++	p = sizeof stack - l - 1;
++	q = 0;
++	memcpy(stack+p, filename, l+1);
++
++	/* Main loop. Each iteration pops the next part from stack of
++	 * remaining path components and consumes any slashes that follow.
++	 * If not a link, it's moved to output; if a link, contents are
++	 * pushed to the stack. */
++restart:
++	for (; ; p+=slash_len(stack+p)) {
++		/* If stack starts with /, the whole component is / or //
++		 * and the output state must be reset. */
++		if (stack[p] == '/') {
++			check_dir=0;
++			nup=0;
++			q=0;
++			output[q++] = '/';
++			p++;
++			/* Initial // is special. */
++			if (stack[p] == '/' && stack[p+1] != '/')
++				output[q++] = '/';
++			continue;
++		}
++
++		char *z = __strchrnul(stack+p, '/');
++		l0 = l = z-(stack+p);
+ 
+-	fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+-	if (fd < 0) return 0;
+-	__procfdname(buf, fd);
++		if (!l && !check_dir) break;
+ 
+-	r = readlink(buf, tmp, sizeof tmp - 1);
+-	if (r < 0) goto err;
+-	tmp[r] = 0;
++		/* Skip any . component but preserve check_dir status. */
++		if (l==1 && stack[p]=='.') {
++			p += l;
++			continue;
++		}
+ 
+-	fstat(fd, &st1);
+-	r = stat(tmp, &st2);
+-	if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+-		if (!r) errno = ELOOP;
+-		goto err;
++		/* Copy next component onto output at least temporarily, to
++		 * call readlink, but wait to advance output position until
++		 * determining it's not a link. */
++		if (q && output[q-1] != '/') {
++			if (!p) goto toolong;
++			stack[--p] = '/';
++			l++;
++		}
++		if (q+l >= PATH_MAX) goto toolong;
++		memcpy(output+q, stack+p, l);
++		output[q+l] = 0;
++		p += l;
++
++		int up = 0;
++		if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++			up = 1;
++			/* Any non-.. path components we could cancel start
++			 * after nup repetitions of the 3-byte string "../";
++			 * if there are none, accumulate .. components to
++			 * later apply to cwd, if needed. */
++			if (q <= 3*nup) {
++				nup++;
++				q += l;
++				continue;
++			}
++			/* When previous components are already known to be
++			 * directories, processing .. can skip readlink. */
++			if (!check_dir) goto skip_readlink;
++		}
++		ssize_t k = readlink(output, stack, p);
++		if (k==p) goto toolong;
++		if (!k) {
++			errno = ENOENT;
++			return 0;
++		}
++		if (k<0) {
++			if (errno != EINVAL) return 0;
++skip_readlink:
++			check_dir = 0;
++			if (up) {
++				while(q && output[q-1]!='/') q--;
++				if (q>1 && (q>2 || output[0]!='/')) q--;
++				continue;
++			}
++			if (l0) q += l;
++			check_dir = stack[p];
++			continue;
++		}
++		if (++cnt == SYMLOOP_MAX) {
++			errno = ELOOP;
++			return 0;
++		}
++
++		/* If link contents end in /, strip any slashes already on
++		 * stack to avoid /->// or //->/// or spurious toolong. */
++		if (stack[k-1]=='/') while (stack[p]=='/') p++;
++		p -= k;
++		memmove(stack+p, stack, k);
++
++		/* Skip the stack advancement in case we have a new
++		 * absolute base path. */
++		goto restart;
+ 	}
+ 
+-	__syscall(SYS_close, fd);
+-	return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+-	__syscall(SYS_close, fd);
++ 	output[q] = 0;
++
++	if (output[0] != '/') {
++		if (!getcwd(stack, sizeof stack)) return 0;
++		l = strlen(stack);
++		/* Cancel any initial .. components. */
++		p = 0;
++		while (nup--) {
++			while(l>1 && stack[l-1]!='/') l--;
++			if (l>1) l--;
++			p += 2;
++			if (p<q) p++;
++		}
++		if (q-p && stack[l-1]!='/') stack[l++] = '/';
++		if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++		memmove(output + l, output + p, q - p + 1);
++		memcpy(output, stack, l);
++		q = l + q-p;
++	}
++
++	if (resolved) return memcpy(resolved, output, q+1);
++	else return strdup(output);
++
++toolong:
++	errno = ENAMETOOLONG;
+ 	return 0;
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a7379450902c 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=10
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
@@ -10,8 +10,8 @@ configure_args="--prefix=/usr --disable-gcc-wrapper"
 short_desc="Musl C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
-homepage="http://www.musl-libc.org/"
-distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
+homepage="https://musl.libc.org/"
+distfiles="https://musl.libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 
 nostrip_files="libc.so"

From 6bf39ead62cb40a4403640196bf5bd4807e4eb0e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Feb 2022 17:50:28 +0100
Subject: [PATCH 2/2] bubblewrap: update to 0.6.1.

---
 .../fix-TEMP_FAILTURE_RETRY-musl.patch        |  19 --
 .../patches/realpath-workaround.patch         | 249 ------------------
 srcpkgs/bubblewrap/template                   |  12 +-
 3 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
 delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch

diff --git a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch b/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
deleted file mode 100644
index 1afa9e4f9832..000000000000
--- a/srcpkgs/bubblewrap/patches/fix-TEMP_FAILTURE_RETRY-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/bubblewrap.c
-+++ b/bubblewrap.c
-@@ -42,6 +42,16 @@
- #define CLONE_NEWCGROUP 0x02000000 /* New cgroup namespace */
- #endif
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Globals to avoid having to use getuid(), since the uid/gid changes during runtime */
- static uid_t real_uid;
- static gid_t real_gid;
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath	2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+     The Regents of the University of California.  All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ *      The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+        struct stat sb;
-+        int idx = 0, nlnk = 0;
-+        const char *q;
-+        char *p, wbuf[2][MAXPATHLEN], *fres;
-+        size_t len;
-+        ssize_t n;
-+
-+        /* POSIX sez we must test for this */
-+        if (path == NULL) {
-+                errno = EINVAL;
-+                return NULL;
-+        }
-+
-+        if (resolved == NULL) {
-+                fres = resolved = malloc(MAXPATHLEN);
-+                if (resolved == NULL)
-+                        return NULL;
-+        } else
-+                fres = NULL;
-+
-+
-+        /*
-+         * Build real path one by one with paying an attention to .,
-+         * .. and symbolic link.
-+         */
-+
-+        /*
-+         * `p' is where we'll put a new component with prepending
-+         * a delimiter.
-+         */
-+        p = resolved;
-+
-+        if (*path == '\0') {
-+                *p = '\0';
-+                errno = ENOENT;
-+                goto out;
-+        }
-+
-+        /* If relative path, start from current working directory. */
-+        if (*path != '/') {
-+                /* check for resolved pointer to appease coverity */
-+                if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+                        p[0] = '.';
-+                        p[1] = '\0';
-+                        goto out;
-+                }
-+                len = strlen(resolved);
-+                if (len > 1)
-+                        p += len;
-+        }
-+
-+loop:
-+        /* Skip any slash. */
-+        while (*path == '/')
-+                path++;
-+
-+        if (*path == '\0') {
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                return resolved;
-+        }
-+
-+        /* Find the end of this component. */
-+        q = path;
-+        do
-+                q++;
-+        while (*q != '/' && *q != '\0');
-+
-+        /* Test . or .. */
-+        if (path[0] == '.') {
-+                if (q - path == 1) {
-+                        path = q;
-+                        goto loop;
-+                }
-+                if (path[1] == '.' && q - path == 2) {
-+                        /* Trim the last component. */
-+                        if (p != resolved)
-+                                while (*--p != '/')
-+                                        continue;
-+                        path = q;
-+                        goto loop;
-+                }
-+        }
-+
-+        /* Append this component. */
-+        if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+                errno = ENAMETOOLONG;
-+                if (p == resolved)
-+                        *p++ = '/';
-+                *p = '\0';
-+                goto out;
-+        }
-+        p[0] = '/';
-+        memcpy(&p[1], path,
-+            /* LINTED We know q > path. */
-+            q - path);
-+        p[1 + q - path] = '\0';
-+
-+        /*
-+         * If this component is a symlink, toss it and prepend link
-+         * target to unresolved path.
-+         */
-+        if (lstat(resolved, &sb) == -1)
-+                goto out;
-+
-+        if (S_ISLNK(sb.st_mode)) {
-+                if (nlnk++ >= MAXSYMLINKS) {
-+                        errno = ELOOP;
-+                        goto out;
-+                }
-+                n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+                if (n < 0)
-+                        goto out;
-+                if (n == 0) {
-+                        errno = ENOENT;
-+                        goto out;
-+                }
-+
-+                /* Append unresolved path to link target and switch to it. */
-+                if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+                        errno = ENAMETOOLONG;
-+                        goto out;
-+                }
-+                memcpy(&wbuf[idx][n], q, len + 1);
-+                path = wbuf[idx];
-+                idx ^= 1;
-+
-+                /* If absolute symlink, start from root. */
-+                if (*path == '/')
-+                        p = resolved;
-+                goto loop;
-+        }
-+        if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+                errno = ENOTDIR;
-+                goto out;
-+        }
-+
-+        /* Advance both resolved and unresolved path. */
-+        p += 1 + q - path;
-+        path = q;
-+        goto loop;
-+out:
-+        free(fres);
-+        return NULL;
-+}
-+#endif
- 
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
-   /* The mount operation will resolve any symlinks in the destination
-      path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
-   resolved_dest = realpath (dest, NULL);
--  if (resolved_dest == NULL)
-+#else
-+  resolved_dest = realpath_int (dest, NULL);
-+#endif
-+  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..eaede3a7178c 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.6.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vlicense LICENSE.realpath
-	fi
-}
+checksum=9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282

Re: [PR PATCH] [Closed]: bubblewrap: update to 0.5.0.

[UsernameRandomlyGenerated]

[-- Attachment #1: Type: text/plain, Size: 1514 bytes --]

There's a closed pull request on the void-packages repository

bubblewrap: update to 0.5.0.
https://github.com/void-linux/void-packages/pull/33372

Description:
Musl problem seems to be resolved, tested flatpak steam, runs fine.


<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->