Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libcgroup: update to 2.0.
@ 2021-07-28 15:54 wibed
  2021-07-28 15:59 ` [PR REVIEW] " paper42
                   ` (62 more replies)
  0 siblings, 63 replies; 64+ messages in thread
From: wibed @ 2021-07-28 15:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From ff00b759e5c5773eb6239e2e426ae1a545d5f356 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  2 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 12 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..3fcd6a4ea1b8 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -18,5 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
+
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..6089977f8bdc 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,18 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-
+homepage="https://github.com/${pkgname}/${pkgname}"
+distfiles="${homepage}/releases/download/v2.0/${pkgname}-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
@ 2021-07-28 15:59 ` paper42
  2021-07-28 15:59 ` paper42
                   ` (61 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 15:59 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678440960

Comment:
why?

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
  2021-07-28 15:59 ` [PR REVIEW] " paper42
@ 2021-07-28 15:59 ` paper42
  2021-07-28 15:59 ` paper42
                   ` (60 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 15:59 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678442933

Comment:
I wouldn't use $homepage and $pkgname. 2.0 should be replaced with $version. tar.gz is prefered over bz2.

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
  2021-07-28 15:59 ` [PR REVIEW] " paper42
  2021-07-28 15:59 ` paper42
@ 2021-07-28 15:59 ` paper42
  2021-07-28 15:59 ` paper42
                   ` (59 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 15:59 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678442250

Comment:
don't use $pkgname in homepage

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (2 preceding siblings ...)
  2021-07-28 15:59 ` paper42
@ 2021-07-28 15:59 ` paper42
  2021-07-28 16:01 ` paper42
                   ` (58 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 15:59 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678440778

Comment:
why?

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (3 preceding siblings ...)
  2021-07-28 15:59 ` paper42
@ 2021-07-28 16:01 ` paper42
  2021-07-28 16:15 ` [PR PATCH] [Updated] " wibed
                   ` (57 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 16:01 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888429401

Comment:
pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (4 preceding siblings ...)
  2021-07-28 16:01 ` paper42
@ 2021-07-28 16:15 ` wibed
  2021-07-28 16:16 ` [PR REVIEW] " wibed
                   ` (56 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From fd00a10bc8dfaed7a8b5f67ec126493f9fab7348 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  5 +--
 srcpkgs/libcgroup/template                    | 12 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (95%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 95%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..3a571281ee93 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -3,8 +3,7 @@ GNU libc's if _GNU_SOURCE is defined.
 
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
-@@ -3332,8 +3332,16 @@
- 
+@@ -3332,4 +3332,12 @@
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +16,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..7284d8191462 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,18 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (5 preceding siblings ...)
  2021-07-28 16:15 ` [PR PATCH] [Updated] " wibed
@ 2021-07-28 16:16 ` wibed
  2021-07-28 16:17 ` wibed
                   ` (55 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:16 UTC (permalink / raw)
  To: ml

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

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678457466

Comment:
cp paste creep


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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (6 preceding siblings ...)
  2021-07-28 16:16 ` [PR REVIEW] " wibed
@ 2021-07-28 16:17 ` wibed
  2021-07-28 16:17 ` paper42
                   ` (54 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:17 UTC (permalink / raw)
  To: ml

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

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678457584

Comment:
cp paste creep

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (7 preceding siblings ...)
  2021-07-28 16:17 ` wibed
@ 2021-07-28 16:17 ` paper42
  2021-07-28 16:17 ` paper42
                   ` (53 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 16:17 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678440778

Comment:
why?

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (8 preceding siblings ...)
  2021-07-28 16:17 ` paper42
@ 2021-07-28 16:17 ` paper42
  2021-07-28 16:17 ` wibed
                   ` (52 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 16:17 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678440960

Comment:
why?

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (9 preceding siblings ...)
  2021-07-28 16:17 ` paper42
@ 2021-07-28 16:17 ` wibed
  2021-07-28 16:17 ` wibed
                   ` (51 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:17 UTC (permalink / raw)
  To: ml

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

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678457791

Comment:
pgkname removed from var

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (10 preceding siblings ...)
  2021-07-28 16:17 ` wibed
@ 2021-07-28 16:17 ` wibed
  2021-07-28 16:33 ` paper42
                   ` (50 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:17 UTC (permalink / raw)
  To: ml

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

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678458184

Comment:
i kept $homepage and $pkgname because it shortens the url quite a bit

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (11 preceding siblings ...)
  2021-07-28 16:17 ` wibed
@ 2021-07-28 16:33 ` paper42
  2021-07-28 16:37 ` wibed
                   ` (49 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 16:33 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678469976

Comment:
I don't think we have a shortage of bytes.

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (12 preceding siblings ...)
  2021-07-28 16:33 ` paper42
@ 2021-07-28 16:37 ` wibed
  2021-07-28 16:39 ` paper42
                   ` (48 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:37 UTC (permalink / raw)
  To: ml

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

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678473337

Comment:
it would be nice to keep the 80 column mark as close as possible.

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (13 preceding siblings ...)
  2021-07-28 16:37 ` wibed
@ 2021-07-28 16:39 ` paper42
  2021-07-28 16:40 ` paper42
                   ` (47 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 16:39 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678474806

Comment:
please revert the changes on patches

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (14 preceding siblings ...)
  2021-07-28 16:39 ` paper42
@ 2021-07-28 16:40 ` paper42
  2021-07-28 16:41 ` paper42
                   ` (46 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 16:40 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678475784

Comment:
distfiles often go over that mark and that's fine.

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (15 preceding siblings ...)
  2021-07-28 16:40 ` paper42
@ 2021-07-28 16:41 ` paper42
  2021-07-28 16:44 ` [PR PATCH] [Updated] " wibed
                   ` (45 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 16:41 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678476681

Comment:
add an empty line between checksum= and case.

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (16 preceding siblings ...)
  2021-07-28 16:41 ` paper42
@ 2021-07-28 16:44 ` wibed
  2021-07-28 16:45 ` [PR REVIEW] " wibed
                   ` (44 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From edbed4e3148844b3708c19a88dd9aa8223a6d2f5 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 12 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..7284d8191462 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,18 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (17 preceding siblings ...)
  2021-07-28 16:44 ` [PR PATCH] [Updated] " wibed
@ 2021-07-28 16:45 ` wibed
  2021-07-28 16:46 ` [PR PATCH] [Updated] " wibed
                   ` (43 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:45 UTC (permalink / raw)
  To: ml

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

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678479050

Comment:
the file has been reverted as in the original

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (18 preceding siblings ...)
  2021-07-28 16:45 ` [PR REVIEW] " wibed
@ 2021-07-28 16:46 ` wibed
  2021-07-28 16:47 ` [PR REVIEW] " wibed
                   ` (42 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From 332be86cdf8f0143a5b6f56ae44ab492fd9c6490 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 12 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..7a89ab4b174c 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,18 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (19 preceding siblings ...)
  2021-07-28 16:46 ` [PR PATCH] [Updated] " wibed
@ 2021-07-28 16:47 ` wibed
  2021-07-28 16:47 ` [PR PATCH] [Updated] " wibed
                   ` (41 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:47 UTC (permalink / raw)
  To: ml

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

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678480623

Comment:
distfile now contains full url

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (20 preceding siblings ...)
  2021-07-28 16:47 ` [PR REVIEW] " wibed
@ 2021-07-28 16:47 ` wibed
  2021-07-28 16:48 ` [PR REVIEW] " wibed
                   ` (40 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:47 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From 581dd8976ed98a521d3f9a69a50a1b9989af2bca Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 11 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..88e8acc4045b 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (21 preceding siblings ...)
  2021-07-28 16:47 ` [PR PATCH] [Updated] " wibed
@ 2021-07-28 16:48 ` wibed
  2021-07-28 16:49 ` wibed
                   ` (39 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:48 UTC (permalink / raw)
  To: ml

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

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678481398

Comment:
added

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (22 preceding siblings ...)
  2021-07-28 16:48 ` [PR REVIEW] " wibed
@ 2021-07-28 16:49 ` wibed
  2021-07-28 16:59 ` paper42
                   ` (38 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 16:49 UTC (permalink / raw)
  To: ml

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

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888463058

Comment:
> pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.

do you mean the block? 
```
pre_configure() {
  autoreconf -if
}
```

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (23 preceding siblings ...)
  2021-07-28 16:49 ` wibed
@ 2021-07-28 16:59 ` paper42
  2021-07-28 17:03 ` wibed
                   ` (37 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 16:59 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888469500

Comment:
> > pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.
> 
> do you mean the block?
> 
> ```
> pre_configure() {
>   autoreconf -if
> }
> ```

yes and you might be able to remove the hostmakedepends variable then

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (24 preceding siblings ...)
  2021-07-28 16:59 ` paper42
@ 2021-07-28 17:03 ` wibed
  2021-07-28 17:14 ` [PR PATCH] [Updated] " wibed
                   ` (36 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 17:03 UTC (permalink / raw)
  To: ml

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

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888472285

Comment:
> > > pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.
> > 
> > 
> > do you mean the block?
> > ```
> > pre_configure() {
> >   autoreconf -if
> > }
> > ```
> 
> yes and you might be able to remove the hostmakedepends variable then

without the pre_configure block it builds fine
but it depends on the hostmakedepends variable

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (25 preceding siblings ...)
  2021-07-28 17:03 ` wibed
@ 2021-07-28 17:14 ` wibed
  2021-07-28 20:29 ` paper42
                   ` (35 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-07-28 17:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (26 preceding siblings ...)
  2021-07-28 17:14 ` [PR PATCH] [Updated] " wibed
@ 2021-07-28 20:29 ` paper42
  2021-07-28 20:36 ` [PR REVIEW] " paper42
                   ` (34 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 20:29 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888600324

Comment:
> > > pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.
> > 
> > yes and you might be able to remove the hostmakedepends variable then
> 
> without the pre_configure block it builds fine
> but it depends on the hostmakedepends variable

sorry, I forgot about flex, we can drop automake and libtool, but have to leave flex there

```
hostmakedepends="flex"
```

Can you also fix the lint issue from CI?

> srcpkgs/libcgroup/template:10: use SPDX id for 'LGPL-2.1' license or see Manual.md

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (27 preceding siblings ...)
  2021-07-28 20:29 ` paper42
@ 2021-07-28 20:36 ` paper42
  2021-08-04 20:26 ` paper42
                   ` (33 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-07-28 20:36 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678633855

Comment:
Something is wrong, GitHub still shows the change. Are you sure you reverted the changes?

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (28 preceding siblings ...)
  2021-07-28 20:36 ` [PR REVIEW] " paper42
@ 2021-08-04 20:26 ` paper42
  2021-08-12 17:11 ` paper42
                   ` (32 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-08-04 20:26 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r682875073

Comment:
don't use $pkgname please

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (29 preceding siblings ...)
  2021-08-04 20:26 ` paper42
@ 2021-08-12 17:11 ` paper42
  2021-08-13  7:36 ` wibed
                   ` (31 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-08-12 17:11 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-897814476

Comment:
@wibed are you still interested in continuing to work on this PR?

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (30 preceding siblings ...)
  2021-08-12 17:11 ` paper42
@ 2021-08-13  7:36 ` wibed
  2021-08-18  3:22 ` [PR PATCH] [Updated] " wibed
                   ` (30 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-08-13  7:36 UTC (permalink / raw)
  To: ml

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

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-898254086

Comment:
> @wibed are you still interested in continuing to work on this PR?

@paper42 i do, please be patient.

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (31 preceding siblings ...)
  2021-08-13  7:36 ` wibed
@ 2021-08-18  3:22 ` wibed
  2021-08-18  3:31 ` wibed
                   ` (29 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-08-18  3:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (32 preceding siblings ...)
  2021-08-18  3:22 ` [PR PATCH] [Updated] " wibed
@ 2021-08-18  3:31 ` wibed
  2021-08-18  3:40 ` wibed
                   ` (28 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-08-18  3:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/2] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/2] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (33 preceding siblings ...)
  2021-08-18  3:31 ` wibed
@ 2021-08-18  3:40 ` wibed
  2021-08-18  8:45 ` wibed
                   ` (27 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-08-18  3:40 UTC (permalink / raw)
  To: ml

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

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-900788438

Comment:
@mt3 you just comitted literally when i was to to push my changes upstream

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (34 preceding siblings ...)
  2021-08-18  3:40 ` wibed
@ 2021-08-18  8:45 ` wibed
  2021-08-18 16:11 ` [PR REVIEW] " paper42
                   ` (26 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-08-18  8:45 UTC (permalink / raw)
  To: ml

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

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-900935335

Comment:
@mt3 it seems the checksum should be updated

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (35 preceding siblings ...)
  2021-08-18  8:45 ` wibed
@ 2021-08-18 16:11 ` paper42
  2021-08-18 16:11 ` paper42
                   ` (25 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-08-18 16:11 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r691403647

Comment:
this was not solved

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (36 preceding siblings ...)
  2021-08-18 16:11 ` [PR REVIEW] " paper42
@ 2021-08-18 16:11 ` paper42
  2021-08-18 16:12 ` paper42
                   ` (24 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-08-18 16:11 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r691403647

Comment:
this was not solved

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (37 preceding siblings ...)
  2021-08-18 16:11 ` paper42
@ 2021-08-18 16:12 ` paper42
  2021-08-18 16:13 ` paper42
                   ` (23 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-08-18 16:12 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r691405318

Comment:
this was not solved

sorry for the double comment

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

* Re: libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (38 preceding siblings ...)
  2021-08-18 16:12 ` paper42
@ 2021-08-18 16:13 ` paper42
  2021-08-19 12:56 ` [PR PATCH] [Updated] " wibed
                   ` (22 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-08-18 16:13 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-901244882

Comment:
> @mt3 it seems the checksum should be updated

yes, that should fix the CI

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (39 preceding siblings ...)
  2021-08-18 16:13 ` paper42
@ 2021-08-19 12:56 ` wibed
  2021-08-19 21:18 ` [PR REVIEW] " paper42
                   ` (21 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-08-19 12:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/3] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/3] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 2a257f4e8f5f2b42be8114c9f8d6739f9bd6b128 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 3/3] checksum bz2 corrected

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

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 935e9d96b222..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

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

* Re: [PR REVIEW] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (40 preceding siblings ...)
  2021-08-19 12:56 ` [PR PATCH] [Updated] " wibed
@ 2021-08-19 21:18 ` paper42
  2021-08-20  0:13 ` [PR PATCH] [Updated] " wibed
                   ` (20 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: paper42 @ 2021-08-19 21:18 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r692493505

Comment:
let's use tar.gz

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

* Re: [PR PATCH] [Updated] libcgroup: update to 2.0.
  2021-07-28 15:54 [PR PATCH] libcgroup: update to 2.0 wibed
                   ` (41 preceding siblings ...)
  2021-08-19 21:18 ` [PR REVIEW] " paper42
@ 2021-08-20  0:13 ` wibed
  2021-08-20  0:56 ` wibed
                   ` (19 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: wibed @ 2021-08-20  0:13 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

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

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

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] 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/32231.patch is attached

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

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 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.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_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
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+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
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_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
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,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
 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
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ 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
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * 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.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+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
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -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=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ 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"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_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"
-hostmakedepends="automake libtool pkg-config"
-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"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-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
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 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.04.3
+version=21.08.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=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -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=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 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.04.3
+version=21.08.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=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 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.04.3
+version=21.08.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=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 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.04.3
+version=21.08.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=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 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.04.3
+version=21.08.0
 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=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.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=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 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.6
+version=2.12.7
 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=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.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=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.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=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 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=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 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="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 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.04.3
+version=21.08.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=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.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=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 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"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 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=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.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=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 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.84.0
+version=5.85.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=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 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.3
+version=5.22.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=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 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.84.0
+version=5.85.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=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.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=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 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=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.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=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 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/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.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=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 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=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# 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.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# 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.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -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=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 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, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 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=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 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=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 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=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,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=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 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=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 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.04.3
+version=21.08.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=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.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=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 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.15
+version=0.5.16
 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=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 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.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -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=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 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.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.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=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.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=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 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=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 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.84.0
+version=5.85.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=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 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=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 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=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+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"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 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=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 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.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ 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=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+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=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 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=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.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
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.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=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 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=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+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=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 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=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 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=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.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=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 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=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 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=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 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=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 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=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 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="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,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=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 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=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.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=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -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=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.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=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+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"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 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
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 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=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -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=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 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=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 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=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -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=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.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=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 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.04.3
+version=21.08.0
 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=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 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.04.3
+version=21.08.0
 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=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 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.84.0
+version=5.85.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=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.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=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.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=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.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=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.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=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.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=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.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=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.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=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.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=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.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=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 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=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 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.84.0
+version=5.85.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=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.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=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.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=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.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=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.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=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.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=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.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=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 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.84.0
+version=5.85.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=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.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=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.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=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 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=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 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.84.0
+version=5.85.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=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.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=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 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.3
+version=5.22.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=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 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.3
+version=5.22.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=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 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.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.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=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+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"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,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=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.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=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.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=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 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.04.3
+version=21.08.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=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.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=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+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"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 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.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 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.3
+version=5.22.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=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.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=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.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=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.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=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 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=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.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=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.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=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 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=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.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=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.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=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 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=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 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=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.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=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.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=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.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=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 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.84.0
+version=5.85.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=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.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=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.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=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.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=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.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=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.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=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.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=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,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=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.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=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.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=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.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=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 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.04.3
+version=21.08.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=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 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.04.3
+version=21.08.0
 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=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.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=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.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=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.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=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.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=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.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=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.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=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.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=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.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=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.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=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 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=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 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.04.3
+version=21.08.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=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -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=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.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=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.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=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.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=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.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=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.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=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 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=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 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=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 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=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 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=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 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=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.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=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.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=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 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=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 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=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.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=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 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
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.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=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+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=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.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=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.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=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 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=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.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=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.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=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.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=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.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=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.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=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.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=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 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=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.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=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 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=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.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=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.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=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.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=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.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=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.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=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.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=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.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=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 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=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
<