Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [New Package] asar
@ 2021-05-29 12:12 ReneganRonin
  2021-05-29 14:29 ` [PR PATCH] [Updated] " ReneganRonin
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: ReneganRonin @ 2021-05-29 12:12 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

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

#### General
- [x] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 9208add2585c688ec7aab3e38c0bb1808ddf8f3a Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH 1/3] Adding asar

---
 srcpkgs/asar/template | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/asar/template

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..d9204ea81430
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,32 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+archs="x86_64"
+#wrksrc=
+#create_wrksrc=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="nodejs"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_build() {
+	npm install --no-optional
+}
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/lib/node_modules/asar/
+	vcopy * usr/lib/node_modules/asar/
+	ln -s /usr/lib/node_modules/asar/bin/asar.js "${DESTDIR}"/usr/bin/asar
+	vlicense LICENSE.md
+}

From ea146fb989a7868b527b4ad8d1a76f4661df86f0 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:59:33 +0800
Subject: [PATCH 2/3] Removing unnecessary lines

---
 srcpkgs/asar/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index d9204ea81430..70c5a7827607 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -3,13 +3,6 @@ pkgname=asar
 version=3.0.3
 revision=1
 archs="x86_64"
-#wrksrc=
-#create_wrksrc=yes
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="nodejs"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"

From ea7cd931c0ac7e04c1f9b287f8041661cbc082c4 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 20:04:56 +0800
Subject: [PATCH 3/3] Add 'depends=nodejs'

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

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index 70c5a7827607..ca9838ca7ca0 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -4,6 +4,7 @@ version=3.0.3
 revision=1
 archs="x86_64"
 hostmakedepends="nodejs"
+depends="nodejs"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
 license="MIT"

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

* Re: [PR PATCH] [Updated] [New Package] asar
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
@ 2021-05-29 14:29 ` ReneganRonin
  2021-05-31  2:01 ` ReneganRonin
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-05-29 14:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

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

#### General
- [x] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 9208add2585c688ec7aab3e38c0bb1808ddf8f3a Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH 1/4] Adding asar

---
 srcpkgs/asar/template | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/asar/template

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..d9204ea81430
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,32 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+archs="x86_64"
+#wrksrc=
+#create_wrksrc=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="nodejs"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_build() {
+	npm install --no-optional
+}
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/lib/node_modules/asar/
+	vcopy * usr/lib/node_modules/asar/
+	ln -s /usr/lib/node_modules/asar/bin/asar.js "${DESTDIR}"/usr/bin/asar
+	vlicense LICENSE.md
+}

From ea146fb989a7868b527b4ad8d1a76f4661df86f0 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:59:33 +0800
Subject: [PATCH 2/4] Removing unnecessary lines

---
 srcpkgs/asar/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index d9204ea81430..70c5a7827607 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -3,13 +3,6 @@ pkgname=asar
 version=3.0.3
 revision=1
 archs="x86_64"
-#wrksrc=
-#create_wrksrc=yes
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="nodejs"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"

From ea7cd931c0ac7e04c1f9b287f8041661cbc082c4 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 20:04:56 +0800
Subject: [PATCH 3/4] Add 'depends=nodejs'

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

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index 70c5a7827607..ca9838ca7ca0 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -4,6 +4,7 @@ version=3.0.3
 revision=1
 archs="x86_64"
 hostmakedepends="nodejs"
+depends="nodejs"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
 license="MIT"

From 82da1ade54fa5d55a82c63566b81a015f3845c8e Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 22:29:11 +0800
Subject: [PATCH 4/4] Add obsidian

---
 srcpkgs/obsidian/files/obsidian         |  2 ++
 srcpkgs/obsidian/files/obsidian.desktop | 11 ++++++++++
 srcpkgs/obsidian/template               | 29 +++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 srcpkgs/obsidian/files/obsidian
 create mode 100644 srcpkgs/obsidian/files/obsidian.desktop
 create mode 100644 srcpkgs/obsidian/template

diff --git a/srcpkgs/obsidian/files/obsidian b/srcpkgs/obsidian/files/obsidian
new file mode 100644
index 000000000000..a1e2352262fc
--- /dev/null
+++ b/srcpkgs/obsidian/files/obsidian
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/electron12 /usr/lib/obsidian/app.asar --no-sandbox "$@"
diff --git a/srcpkgs/obsidian/files/obsidian.desktop b/srcpkgs/obsidian/files/obsidian.desktop
new file mode 100644
index 000000000000..8014114a866b
--- /dev/null
+++ b/srcpkgs/obsidian/files/obsidian.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Obsidian
+Exec=obsidian %U
+Terminal=false
+Type=Application
+Icon=obsidian
+StartupWMClass=obsidian
+X-AppImage-Version=0.11.9
+Comment=Obsidian
+MimeType=x-scheme-handler/obsidian;
+Categories=Office;
diff --git a/srcpkgs/obsidian/template b/srcpkgs/obsidian/template
new file mode 100644
index 000000000000..c7fe53253823
--- /dev/null
+++ b/srcpkgs/obsidian/template
@@ -0,0 +1,29 @@
+# Template file for 'obsidian'
+pkgname=obsidian
+version=0.12.3
+revision=1
+archs="x86_64"
+makedepends="asar nodejs"
+depends="zlib hicolor-icon-theme fuse electron12"
+short_desc="Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="custom:Commercial"
+homepage="https://obsidian.md/"
+distfiles="https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"
+checksum=9f0b50a7b064319c0ccdf9c0e7075c30085f7b333ffcb9bd71fd296ef9ce5591
+
+pre_install() {
+	asar ef resources/obsidian.asar icon.png
+}
+
+do_install() {
+	ls
+	vmkdir usr/bin
+	vmkdir usr/lib/obsidian
+	vbin ${FILESDIR}/obsidian obsidian
+	vinstall ${FILESDIR}/obsidian.desktop 644 usr/share/applications
+	vinstall icon.png 644 usr/share/pixmaps/obsidian.png
+	vcopy resources/* usr/lib/obsidian/
+	vlicense LICENSE.electron.txt
+	vlicense LICENSES.chromium.html
+}

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

* Re: [New Package] asar
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
  2021-05-29 14:29 ` [PR PATCH] [Updated] " ReneganRonin
@ 2021-05-31  2:01 ` ReneganRonin
  2021-05-31  2:08 ` [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3 ReneganRonin
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-05-31  2:01 UTC (permalink / raw)
  To: ml

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

New comment by ReneganRonin on void-packages repository

https://github.com/void-linux/void-packages/pull/31205#issuecomment-851116182

Comment:
Turns out I messed up with what branch i am using (I have fever). I will mark this as WIP since the package needs modclean. It is huge once you install this unless modclean exists.

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

* Re: [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
  2021-05-29 14:29 ` [PR PATCH] [Updated] " ReneganRonin
  2021-05-31  2:01 ` ReneganRonin
@ 2021-05-31  2:08 ` ReneganRonin
  2021-05-31  2:34 ` [PR REVIEW] " ericonr
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-05-31  2:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

[WIP] New Package: asar 3.0.3
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 9208add2585c688ec7aab3e38c0bb1808ddf8f3a Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH 1/2] Adding asar

---
 srcpkgs/asar/template | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/asar/template

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..d9204ea81430
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,32 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+archs="x86_64"
+#wrksrc=
+#create_wrksrc=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="nodejs"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_build() {
+	npm install --no-optional
+}
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/lib/node_modules/asar/
+	vcopy * usr/lib/node_modules/asar/
+	ln -s /usr/lib/node_modules/asar/bin/asar.js "${DESTDIR}"/usr/bin/asar
+	vlicense LICENSE.md
+}

From ea146fb989a7868b527b4ad8d1a76f4661df86f0 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:59:33 +0800
Subject: [PATCH 2/2] Removing unnecessary lines

---
 srcpkgs/asar/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index d9204ea81430..70c5a7827607 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -3,13 +3,6 @@ pkgname=asar
 version=3.0.3
 revision=1
 archs="x86_64"
-#wrksrc=
-#create_wrksrc=yes
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="nodejs"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"

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

* Re: [PR REVIEW] [WIP] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (2 preceding siblings ...)
  2021-05-31  2:08 ` [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3 ReneganRonin
@ 2021-05-31  2:34 ` ericonr
  2021-05-31 12:54 ` [PR PATCH] [Updated] " ReneganRonin
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-05-31  2:34 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31205#discussion_r642175880

Comment:
Why is this being restricted?

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

* Re: [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (3 preceding siblings ...)
  2021-05-31  2:34 ` [PR REVIEW] " ericonr
@ 2021-05-31 12:54 ` ReneganRonin
  2021-05-31 21:24 ` ericonr
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-05-31 12:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

[WIP] New Package: asar 3.0.3
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 9208add2585c688ec7aab3e38c0bb1808ddf8f3a Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH 1/3] Adding asar

---
 srcpkgs/asar/template | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/asar/template

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..d9204ea81430
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,32 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+archs="x86_64"
+#wrksrc=
+#create_wrksrc=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="nodejs"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_build() {
+	npm install --no-optional
+}
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/lib/node_modules/asar/
+	vcopy * usr/lib/node_modules/asar/
+	ln -s /usr/lib/node_modules/asar/bin/asar.js "${DESTDIR}"/usr/bin/asar
+	vlicense LICENSE.md
+}

From ea146fb989a7868b527b4ad8d1a76f4661df86f0 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:59:33 +0800
Subject: [PATCH 2/3] Removing unnecessary lines

---
 srcpkgs/asar/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index d9204ea81430..70c5a7827607 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -3,13 +3,6 @@ pkgname=asar
 version=3.0.3
 revision=1
 archs="x86_64"
-#wrksrc=
-#create_wrksrc=yes
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="nodejs"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"

From dd3ba4b7915489495deeba3a299af884ccca1c2b Mon Sep 17 00:00:00 2001
From: "Soc V. E" <66054069+ReneganRonin@users.noreply.github.com>
Date: Mon, 31 May 2021 20:54:53 +0800
Subject: [PATCH 3/3] Update template

---
 srcpkgs/asar/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index 70c5a7827607..b268d7a7c443 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -2,7 +2,6 @@
 pkgname=asar
 version=3.0.3
 revision=1
-archs="x86_64"
 hostmakedepends="nodejs"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"

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

* Re: [WIP] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (4 preceding siblings ...)
  2021-05-31 12:54 ` [PR PATCH] [Updated] " ReneganRonin
@ 2021-05-31 21:24 ` ericonr
  2021-06-02  2:34 ` [PR PATCH] [Updated] " ReneganRonin
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-05-31 21:24 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31205#issuecomment-851689413

Comment:
Also, any new electron package should be using system electron, IMO.

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

* Re: [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (5 preceding siblings ...)
  2021-05-31 21:24 ` ericonr
@ 2021-06-02  2:34 ` ReneganRonin
  2021-06-04  5:22 ` ReneganRonin
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-06-02  2:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

[WIP] New Package: asar 3.0.3
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 9208add2585c688ec7aab3e38c0bb1808ddf8f3a Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH 1/5] Adding asar

---
 srcpkgs/asar/template | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/asar/template

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..d9204ea81430
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,32 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+archs="x86_64"
+#wrksrc=
+#create_wrksrc=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="nodejs"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_build() {
+	npm install --no-optional
+}
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/lib/node_modules/asar/
+	vcopy * usr/lib/node_modules/asar/
+	ln -s /usr/lib/node_modules/asar/bin/asar.js "${DESTDIR}"/usr/bin/asar
+	vlicense LICENSE.md
+}

From feb968767343cec2e8aa41a583691c21ac148451 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:59:33 +0800
Subject: [PATCH 2/5] Removing unnecessary lines

---
 srcpkgs/asar/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index d9204ea81430..70c5a7827607 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -3,13 +3,6 @@ pkgname=asar
 version=3.0.3
 revision=1
 archs="x86_64"
-#wrksrc=
-#create_wrksrc=yes
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="nodejs"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"

From e05522a85f83a31468e737a6f2a51ec22097715c Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Tue, 1 Jun 2021 10:20:38 +0800
Subject: [PATCH 3/5] Update template

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

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index 70c5a7827607..5a4af7e7949c 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -2,8 +2,9 @@
 pkgname=asar
 version=3.0.3
 revision=1
-archs="x86_64"
 hostmakedepends="nodejs"
+makedepends="nodejs modclean"
+depends="nodejs electron"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
 license="MIT"

From 0dba7001fa2bb219ba374d532ff68085d68d1f12 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Tue, 1 Jun 2021 10:26:30 +0800
Subject: [PATCH 4/5] Add modclean

---
 srcpkgs/modclean/template | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/modclean/template

diff --git a/srcpkgs/modclean/template b/srcpkgs/modclean/template
new file mode 100644
index 000000000000..356b2d2175f3
--- /dev/null
+++ b/srcpkgs/modclean/template
@@ -0,0 +1,35 @@
+# Template file for 'modclean'
+pkgname=modclean
+version=3.0.0beta.1
+revision=1
+wrksrc="modclean-3.0.0-beta.1"
+create_wrksrc="yes"
+hostmakedepends="nodejs"
+makedepends="nodejs"
+depends="nodejs"
+short_desc="Remove unwanted files and directories from your node_modules folder"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/ModClean/modclean"
+distfiles="${homepage}/archive/3.0.0-beta.1.tar.gz"
+checksum=58a39e8b4eed1da8131facfb21a455659144aacd250a73a6efaba31500b901f0
+
+do_build() {
+	cd modclean-3.0.0-beta.1/
+	npm install --no-optional --save
+	./bin/modclean.js -r -a '.bin,bin.js' --ignore='license'
+	vlicense LICENSE
+}
+
+
+do_install() {
+	mv modclean-3.0.0-beta.1/* .
+	rm -rf modclean-3.0.0-beta.1
+	vmkdir usr/bin/
+	vmkdir usr/lib/node_modules/modclean/
+	vcopy "*" usr/lib/node_modules/modclean/
+}
+
+post_install() {
+	ln -sf /usr/lib/node_modules/modclean/bin/modclean.js "$DESTDIR"/usr/bin/modclean
+}

From 91e6bea5800b943702325ad6650e6f3f12601c8f Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Tue, 1 Jun 2021 14:33:02 +0800
Subject: [PATCH 5/5] Add asar

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

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
index 5a4af7e7949c..69ae3b20b1d7 100644
--- a/srcpkgs/asar/template
+++ b/srcpkgs/asar/template
@@ -4,7 +4,7 @@ version=3.0.3
 revision=1
 hostmakedepends="nodejs"
 makedepends="nodejs modclean"
-depends="nodejs electron"
+depends="nodejs electron12"
 short_desc="Creating Electron app packages"
 maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
 license="MIT"
@@ -15,6 +15,7 @@ python_version=3
 
 do_build() {
 	npm install --no-optional
+	modclean -r -a "*.ts,.bin,.vscode,bin.js" --ignore='license'
 }
 
 do_install() {

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

* Re: [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (6 preceding siblings ...)
  2021-06-02  2:34 ` [PR PATCH] [Updated] " ReneganRonin
@ 2021-06-04  5:22 ` ReneganRonin
  2021-06-04  5:24 ` ReneganRonin
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-06-04  5:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

[WIP] New Package: asar 3.0.3
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 449a4f05064002d73b558fce2131c84adf77dd40 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH] Adding asar package

---
 srcpkgs/asar/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/asar/template

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..3d5c2d334256
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,24 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+archs="x86_64"
+hostmakedepends="nodejs"
+makedepends="nodejs modclean"
+depends="nodejs electron12"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_install() {
+	npm install -g --user root --engine-strict --prefix "$DESTDIR"/usr "${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${version}.tar.gz"
+	local _npmdir="${DESTDIR}/usr/lib/node_modules/${pkgname}"
+	cd "$_npmdir"
+	modclean -r -a "*.ts,.bin,.vscode,bin.js" --ignore='license'
+	vlicense "$_npmdir/LICENSE.md"
+	vdoc "$_npmdir/README.md"
+}

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

* Re: [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (7 preceding siblings ...)
  2021-06-04  5:22 ` ReneganRonin
@ 2021-06-04  5:24 ` ReneganRonin
  2021-06-04  5:26 ` ReneganRonin
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-06-04  5:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

[WIP] New Package: asar 3.0.3
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From ad68db05e82fd158e110099c9c87ce528273285e Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH] Adding asar package

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

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..94bab29a5ef3
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,23 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+hostmakedepends="nodejs"
+makedepends="nodejs modclean"
+depends="nodejs electron12"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_install() {
+	npm install -g --user root --engine-strict --prefix "$DESTDIR"/usr "${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${version}.tar.gz"
+	local _npmdir="${DESTDIR}/usr/lib/node_modules/${pkgname}"
+	cd "$_npmdir"
+	modclean -r -a "*.ts,.bin,.vscode,bin.js" --ignore='license'
+	vlicense "$_npmdir/LICENSE.md"
+	vdoc "$_npmdir/README.md"
+}

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

* Re: [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (8 preceding siblings ...)
  2021-06-04  5:24 ` ReneganRonin
@ 2021-06-04  5:26 ` ReneganRonin
  2021-06-04  5:35 ` [PR PATCH] [Updated] " ReneganRonin
  2021-06-04  5:37 ` [PR PATCH] [Closed]: " ReneganRonin
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-06-04  5:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

[WIP] New Package: asar 3.0.3
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 0dba7001fa2bb219ba374d532ff68085d68d1f12 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Tue, 1 Jun 2021 10:26:30 +0800
Subject: [PATCH 01/39] Add modclean

---
 srcpkgs/modclean/template | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/modclean/template

diff --git a/srcpkgs/modclean/template b/srcpkgs/modclean/template
new file mode 100644
index 000000000000..356b2d2175f3
--- /dev/null
+++ b/srcpkgs/modclean/template
@@ -0,0 +1,35 @@
+# Template file for 'modclean'
+pkgname=modclean
+version=3.0.0beta.1
+revision=1
+wrksrc="modclean-3.0.0-beta.1"
+create_wrksrc="yes"
+hostmakedepends="nodejs"
+makedepends="nodejs"
+depends="nodejs"
+short_desc="Remove unwanted files and directories from your node_modules folder"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/ModClean/modclean"
+distfiles="${homepage}/archive/3.0.0-beta.1.tar.gz"
+checksum=58a39e8b4eed1da8131facfb21a455659144aacd250a73a6efaba31500b901f0
+
+do_build() {
+	cd modclean-3.0.0-beta.1/
+	npm install --no-optional --save
+	./bin/modclean.js -r -a '.bin,bin.js' --ignore='license'
+	vlicense LICENSE
+}
+
+
+do_install() {
+	mv modclean-3.0.0-beta.1/* .
+	rm -rf modclean-3.0.0-beta.1
+	vmkdir usr/bin/
+	vmkdir usr/lib/node_modules/modclean/
+	vcopy "*" usr/lib/node_modules/modclean/
+}
+
+post_install() {
+	ln -sf /usr/lib/node_modules/modclean/bin/modclean.js "$DESTDIR"/usr/bin/modclean
+}

From 7b091021e2fe2204be2b769e6e37dc643007bd82 Mon Sep 17 00:00:00 2001
From: BlueChrystal <84290062+BlueChrystal@users.noreply.github.com>
Date: Wed, 2 Jun 2021 01:31:20 +0300
Subject: [PATCH 02/39] syncthing: update to 1.17.0.

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

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 6ffaaf269c7e..0fdbbcef87f6 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.16.1
+version=1.17.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=9994380a94b298e8266fdd40238bcff3ade2c21752b9cff98ec4218fe84731ad
+checksum=497365c08a11cdc1c80ff55316d3c3842dfaa3aaaf063bb10118ab93706a37b1
 
 pre_build() {
 	GOARCH= go generate \

From ddcf407183982f9c8be273424895bc72c2c5033d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 2 Jun 2021 00:43:58 +0200
Subject: [PATCH 03/39] elixir: update to 1.12.1.

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

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index a02cf881b7ab..6660412e9ce1 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.11.4
+version=1.12.1
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,4 +13,4 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=85c7118a0db6007507313db5bddf370216d9394ed7911fe80f21e2fbf7f54d29
+checksum=96167d614b9c483efc54bd7898c3eea4768569a77dd8892ada85d7800d5e3ea4

From 128c3128b65bace00f5392e16b0f5551f2e3dfcf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 26 May 2021 14:49:16 -0500
Subject: [PATCH 04/39] tcpreplay: update to 4.3.4.

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

diff --git a/srcpkgs/tcpreplay/template b/srcpkgs/tcpreplay/template
index 0d7168e96378..90f7de684c0d 100644
--- a/srcpkgs/tcpreplay/template
+++ b/srcpkgs/tcpreplay/template
@@ -1,6 +1,6 @@
 # Template file for 'tcpreplay'
 pkgname=tcpreplay
-version=4.3.3
+version=4.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="libpcap-devel"
@@ -10,4 +10,4 @@ maintainer="misuchiru03 <misuchiru03+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/appneta/tcpreplay"
 distfiles="${homepage}/releases/download/v${version}/tcpreplay-${version}.tar.gz"
-checksum=ed2402caa9434ff5c74b2e7b31178c73e7c7c5c4ea1e1d0e2e39a7dc46958fde
+checksum=ee065310806c22e2fd36f014e1ebb331b98a7ec4db958e91c3d9cbda0640d92c

From 472f7ba2c1d63a896de9f9077c9745b8276a5e10 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 08:59:59 -0500
Subject: [PATCH 05/39] Amass: update to 3.13.0.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 9494f04abf32..16970f3a08af 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.12.3
+version=3.13.0
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=92045ab82afe9a3bf15741c49d8df8d37f3fcb1e5fad7fa1c6f770cfd334bd8d
+checksum=7799ab0a41182518a7b631e3499afa87d75160e83b0db9616627360b4a338e80

From 69bb92187fd17ab73e950876ed37ec53e762c079 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 09:00:02 -0500
Subject: [PATCH 06/39] bpytop: update to 1.0.66.

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

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

From 3ff139b7a4fe2b802536dd3d082689deb85788ea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 09:00:04 -0500
Subject: [PATCH 07/39] delta: update to 0.8.0.

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

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 250d68bccdbb..e2524884cece 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.7.1
+version=0.8.0
 revision=1
 build_style=cargo
 short_desc="Syntax-highlighting pager for git"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f432335361088c37f8aa4bb747ba12e1f8eddbbc3ed5c51fdd52d9b96eb22227
+checksum=706b55667de221b651b0d938dfbb468112b322ed41a634d3ca5c8bd861b19e8a
 
 post_install() {
 	vlicense LICENSE

From fe0ba400887b56d773c28dec39977e416b920137 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 09:00:07 -0500
Subject: [PATCH 08/39] fvwm3: update to 1.0.3.

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

diff --git a/srcpkgs/fvwm3/template b/srcpkgs/fvwm3/template
index a3e94af42bce..f2704bed37dd 100644
--- a/srcpkgs/fvwm3/template
+++ b/srcpkgs/fvwm3/template
@@ -1,6 +1,6 @@
 # Template file for 'fvwm3'
 pkgname=fvwm3
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.fvwm.org/"
 distfiles="https://github.com/fvwmorg/fvwm3/releases/download/${version}/fvwm3-${version}.tar.gz"
-checksum=aa5597fe98fcfadebf936b491497d96e81b07a39a9fa93b590592bf2bf9b8a2f
+checksum=09c6af875534326cfbb908762fe55d9674c7a94aaeb402fc3a0d33918a9e2411
 nocross=yes
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 1ac40806e1e841b7e4e68ad9631025dfc55333ec Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 09:00:11 -0500
Subject: [PATCH 09/39] libxlsxwriter: update to 1.0.6.

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

diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index d66783dc2f2f..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.5
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=953e4cc6d5b7a76e913575c743d186416e739b73cf5a035235c93fb6cdd15641
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From 95e6ceae3cb752d7b61dd20e191f61ad00615edd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH 10/39] btrfs-progs: update to 5.12.1

- Add build options for btrfs-convert.
- Temporarily disable all tests, since most of them fail without
`mount` or `fallocate` commands.
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2485880dfe80..ba589537b1f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1452,6 +1452,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..931abeb7fffc 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.12.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+# Most of the tests depend on `mount` and `fallocate` commands, which are not
+# presented in chroot-util-linux
+make_check=no
+
+build_options="reiserfs e2fs"
+build_options_default="e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then
@@ -23,13 +32,6 @@ pre_build() {
 	fi
 }
 
-pre_check() {
-	# Requires losetup which is part of util-linux, but even with it installed it fails
-	rm -rf -- tests/mkfs-tests/017-small-backing-size-thin-provision-device
-	# Requires fallocate from util-linux
-	rm -rf -- tests/fsck-tests/025-file-extents
-}
-
 post_install() {
 	vinstall btrfs-completion 644 /usr/share/bash-completion/completions btrfs
 }

From 34029178a31c12d5e5ad8d8921bd24cb4a578aec Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 01:40:59 +0300
Subject: [PATCH 11/39] pipe-viewer: update to 0.1.0

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

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 0ef7f35c9db0..8d5b183979aa 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.0.9
+version=0.1.0
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/pipe-viewer"
 changelog="https://github.com/trizen/pipe-viewer/releases"
 distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz"
-checksum=598ec7c39be0a42900ed1f4c5c68c26a728dd09b774e9dd38a873aa2def76e27
+checksum=215d2de4b547ff810e6d6759b8ac8190da845661b9101b99ba679225384cd0bb
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 7faa033313511386e323c3679a2a5702e076a30b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 01:06:18 +0300
Subject: [PATCH 12/39] mpDris2: update to 0.9.1

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

diff --git a/srcpkgs/mpDris2/template b/srcpkgs/mpDris2/template
index bd2a266cd517..bb1cc605979d 100644
--- a/srcpkgs/mpDris2/template
+++ b/srcpkgs/mpDris2/template
@@ -1,16 +1,16 @@
 # Template file for 'mpDris2'
 pkgname=mpDris2
-version=0.8
+version=0.9.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake intltool gettext-devel"
-depends="python3 python3-dbus python3-gobject python3-mpd2 python3-mutagen"
+depends="python3-dbus python3-gobject python3-mpd2 python3-mutagen"
 short_desc="Provides MPRIS 2 support to mpd (Music Player Daemon)"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="GPL-3.0-only"
 homepage="https://github.com/eonpatapon/mpDris2"
 distfiles="https://github.com/eonpatapon/mpDris2/archive/${version}.tar.gz"
-checksum=b6b15c1fdddf16a6d74485ad09f56ed353a317e149c37475c00a279186da4391
+checksum=d0f0467841e7866310cff44a1063334a9c776a64fd594815d926670b765fbee6
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
@@ -20,6 +20,5 @@ post_install() {
 	rm -f ${DESTDIR}/usr/lib/systemd/user/mpDris2.service
 	vsv mpDris2
 	vdoc README.md
-	vlicense COPYING
 	vsconf src/mpDris2.conf
 }

From cf7dd2bc583e9332cab9dd2579ea9cddfd88e7f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 31 May 2021 00:05:27 +0200
Subject: [PATCH 13/39] catgirl: update to 1.8.

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

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 7c3199015c5c..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,15 +1,15 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.7
+version=1.8
 revision=1
 build_style=configure
-configure_args="--prefix=/usr"
+configure_args="--prefix=/usr --mandir=/usr/share/man"
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libtls-devel ncurses-devel openssl-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
-maintainer="Paper <paper@tilde.institute>"
+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=dec85275eab897a6390c4259115307027829eaf8e790f8f3a4ba5ca78d3b5ffd
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b

From d56418b8906164e144e2a4536db017c9506798ca Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 1 Jun 2021 19:54:37 +0200
Subject: [PATCH 14/39] python3-serpent: update to 1.40.

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

diff --git a/srcpkgs/python3-serpent/template b/srcpkgs/python3-serpent/template
index 4b950974494b..d156563a2259 100644
--- a/srcpkgs/python3-serpent/template
+++ b/srcpkgs/python3-serpent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-serpent'
 pkgname=python3-serpent
-version=1.30.2
-revision=2
+version=1.40
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="pulux <pulux@pf4sh.de>"
 license="MIT"
 homepage="https://pypi.org/project/serpent/"
 distfiles="${PYPI_SITE}/s/serpent/serpent-${version}.tar.gz"
-checksum=72753820246a7d8486e8b385353e3bbf769abfceec2e850fa527a288b084ff7a
+checksum=10b34e7f8e3207ee6fb70dcdc9bce473851ee3daf0b47c58aec1b48032ac11ce
 
 post_install() {
 	vlicense LICENSE

From 9eae1622da3b8eba4008a520c442701533609a55 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 1 Jun 2021 11:42:24 +0200
Subject: [PATCH 15/39] git-team: update to 1.7.0.

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

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 3a86c11a80f5..6501dfe4c212 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,6 +1,6 @@
 # Template file for 'git-team'
 pkgname=git-team
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=go
 go_import_path=github.com/hekmekk/git-team
@@ -9,7 +9,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/hekmekk/git-team"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d474d759b81a458519c47059990d12808df28d4b313a69234aaa9574a70da723
+checksum=c52d800ea3b5f45896d4f21ab4944d1f45dd8d90cdf1a634a445d22b93a31f49
 
 post_install() {
 	vlicense LICENSE

From c6cc866c3d48a026e77837b88e12abc2d88eb94b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 1 Jun 2021 07:48:58 +0400
Subject: [PATCH 16/39] osinfo-db: update to 20210531.

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

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

From 60c1d6a7c49834512b31392a85051401048bc61f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 1 Jun 2021 23:45:00 +0300
Subject: [PATCH 17/39] qutebrowser: update to 2.2.3

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

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index d289bf4f1cc7..fa2fbc0bdfc7 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.2.2
+version=2.2.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=7855ea9d9b187b8d3d0ac69b331780316e93d5b1bff3b31290b2d5ff80b87287
+checksum=0683f5ebc8f18fde27be4adc802f377cfc3f4cf46c2363db0a8a2acd6345eb62
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From a63a933142b8b43661faac220349f2faa3e3d112 Mon Sep 17 00:00:00 2001
From: Andrea D'Amore <a@d-amo.re>
Date: Tue, 25 May 2021 01:03:34 +0200
Subject: [PATCH 18/39] groff: obtain devpdf fonts from ghostscript

cfr. https://lists.gnu.org/archive/html/groff/2019-02/msg00080.html
---
 srcpkgs/groff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index e58613b4c638..88923c6874b5 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -1,10 +1,10 @@
 # Template file for 'groff'
 pkgname=groff
 version=1.22.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-x --disable-rpath"
-hostmakedepends="texinfo perl bison"
+hostmakedepends="texinfo perl bison ghostscript"
 makedepends="zlib-devel"
 short_desc="GNU troff text-formatting system"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 617f5613697fb09d07e1590f1af33f6668204d15 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <void@qwertyuiop.de>
Date: Tue, 25 May 2021 20:14:39 +0000
Subject: [PATCH 19/39] touchegg: update to 2.0.9

By ericonr:
- fix libudev-devel package, it was picking up eudev-libudev-devel's
  provides=

Closes: #31123 [via git-merge-pr]
---
 srcpkgs/touchegg/files/touchegg/run       |  2 ++
 srcpkgs/touchegg/patches/musl.patch       | 24 +++++++++++++++
 srcpkgs/touchegg/patches/no-systemd.patch | 28 +++++++++++++++++
 srcpkgs/touchegg/patches/qt5.patch        | 37 -----------------------
 srcpkgs/touchegg/template                 | 22 +++++++++-----
 5 files changed, 69 insertions(+), 44 deletions(-)
 create mode 100755 srcpkgs/touchegg/files/touchegg/run
 create mode 100644 srcpkgs/touchegg/patches/musl.patch
 create mode 100644 srcpkgs/touchegg/patches/no-systemd.patch
 delete mode 100644 srcpkgs/touchegg/patches/qt5.patch

diff --git a/srcpkgs/touchegg/files/touchegg/run b/srcpkgs/touchegg/files/touchegg/run
new file mode 100755
index 000000000000..abe9b2319e3b
--- /dev/null
+++ b/srcpkgs/touchegg/files/touchegg/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u _touchegg:input touchegg --daemon
diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch
new file mode 100644
index 000000000000..62e9e0fbbbb9
--- /dev/null
+++ b/srcpkgs/touchegg/patches/musl.patch
@@ -0,0 +1,24 @@
+From da9a3a95cfe9965ff6e15e3a0e1a98f8840a34d7 Mon Sep 17 00:00:00 2001
+From: Alexander Gehrke <void@qwertyuiop.de>
+Date: Tue, 25 May 2021 23:47:51 +0000
+Subject: [PATCH] Fix missing header for musl
+
+---
+ src/utils/client-lock.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils/client-lock.cpp b/src/utils/client-lock.cpp
+index fb1e67b..27c6c6a 100644
+--- src/utils/client-lock.cpp
++++ src/utils/client-lock.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <sys/file.h>
+ #include <unistd.h>
++#include <fcntl.h>
+ 
+ #include <exception>
+ #include <stdexcept>
+-- 
+2.31.1
+
diff --git a/srcpkgs/touchegg/patches/no-systemd.patch b/srcpkgs/touchegg/patches/no-systemd.patch
new file mode 100644
index 000000000000..7b194cca886d
--- /dev/null
+++ b/srcpkgs/touchegg/patches/no-systemd.patch
@@ -0,0 +1,28 @@
+From 938167799926ad70849d8088bdef023b5e8a0700 Mon Sep 17 00:00:00 2001
+From: Alexander Gehrke <void@qwertyuiop.de>
+Date: Tue, 25 May 2021 20:11:29 +0000
+Subject: [PATCH] Fix CMake failing because of missing Systemd service dir
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dee220d..13b773f 100755
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -76,11 +76,6 @@ include(GNUInstallDirs)
+ set(SYSTEM_CONFIG_FILE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/touchegg/touchegg.conf")
+ target_compile_definitions(touchegg PUBLIC SYSTEM_CONFIG_FILE_PATH=\"${SYSTEM_CONFIG_FILE_PATH}\")
+ 
+-# configure systemd service unit to use the right path, e.g. @CMAKE_INSTALL_BINDIR@/touchegg
+-configure_file(${PROJECT_SOURCE_DIR}/installation/touchegg.service.in ${PROJECT_SOURCE_DIR}/installation/touchegg.service @ONLY)
+-pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemdsystemunitdir)
+-
+ install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/touchegg) # /usr/share/touchegg/touchegg.conf
+-install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.service DESTINATION ${SYSTEMD_SERVICE_DIR})
+ install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.desktop DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart)
+ install(PROGRAMS ${PROJECT_BINARY_DIR}/touchegg DESTINATION ${CMAKE_INSTALL_BINDIR}) # /usr/bin/touchegg
+-- 
+2.31.1
+
diff --git a/srcpkgs/touchegg/patches/qt5.patch b/srcpkgs/touchegg/patches/qt5.patch
deleted file mode 100644
index cd5a0fff5126..000000000000
--- a/srcpkgs/touchegg/patches/qt5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e60ff96afe5ffb893803e26c598e7bc11d1e0c33 Mon Sep 17 00:00:00 2001
-From: chrmod <krzysztof.modras@gmail.com>
-Date: Sun, 31 Jan 2016 14:20:41 +0100
-Subject: [PATCH] Updating dependencies for QT 5.1 to compile on Ubuntu 15.10
-
----
- src/touchegg/util/Include.h | 3 ++-
- touchegg.pro                | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/touchegg/util/Include.h b/src/touchegg/util/Include.h
-index 4fb27d5..c0de1d5 100644
---- touchegg/src/touchegg/util/Include.h
-+++ touchegg/src/touchegg/util/Include.h
-@@ -23,7 +23,8 @@
-     // Qt
-     #include <QtCore>
-     #include <QtGui>
--    #include <QtGui/QX11Info>
-+    #include <QtWidgets>
-+    #include <QX11Info>
-     #include <QtXml>
- 
-     // Xlib
-diff --git a/touchegg.pro b/touchegg.pro
-index 696ea1a..4565083 100644
---- touchegg/touchegg.pro
-+++ touchegg/touchegg.pro
-@@ -1,6 +1,6 @@
- TEMPLATE     = app
- TARGET       = touchegg
--QT          += gui core xml
-+QT          += gui core xml widgets x11extras
- LIBS        += -lgeis -lX11 -lXtst -lXext
- //DEFINES      = QT_NO_DEBUG_OUTPUT
- 
-
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index e245c3fb1959..538277a2c683 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,14 +1,22 @@
 # Template file for 'touchegg'
 pkgname=touchegg
-version=1.1.1
-revision=5
-build_wrksrc=touchegg
-build_style=qmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="libXtst-devel geis-devel qt5-devel qt5-x11extras-devel"
+version=2.0.9
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
+ libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
 short_desc="Multitouch gesture recognizer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JoseExposito/touchegg"
 distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8
+checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e
+system_accounts="_touchegg"
+
+post_install() {
+	# we don't want the package being installed to mean it should be autostarted
+	rm -r ${DESTDIR}/etc/xdg/autostart
+
+	vsv touchegg
+}

From ee8512d8375fee27aaf55c5389edc0b27318823f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 31 May 2021 18:57:09 +0700
Subject: [PATCH 20/39] nss: update to 3.66.

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

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 46c77eda081f..24da85cec752 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.30
 
 pkgname=nss
-version=3.65
+version=3.66
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=32170f6c188212a78bf9fdacffa2eeed0d564ef8faae63fd8ae971b208e8c637
+checksum=89a79e3a756cf0ac9ba645f4d4c0fc58d4133134401fb0b6c8a74c420bb4cdc9
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From f1c099af0afa172759abdbe0165fbbfcd3439cb5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 31 May 2021 21:37:18 -0400
Subject: [PATCH 21/39] python3-virtualenv: update to 20.4.7.

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

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 18c3a95d9b1e..2c575aef0b27 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.4.6
+version=20.4.7
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=72cf267afc04bf9c86ec932329b7e94db6a0331ae9847576daaa7ca3c86b29a4
+checksum=14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From 9db1f23b44c2c6edd41f8df62b6301e11b4a8d6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 31 May 2021 21:37:34 -0400
Subject: [PATCH 22/39] python3-setuptools: update to 57.0.0.

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

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

From 4da7ce7e3afeb8f4b6c948eb252ada8b8d55759a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 31 May 2021 21:37:55 -0400
Subject: [PATCH 23/39] python-urllib3: update to 1.26.5.

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

diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 430c93c8e557..2b2310ad8077 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,6 +1,6 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
-version=1.26.4
+version=1.26.5
 revision=1
 wrksrc="urllib3-${version}"
 build_style=python-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://urllib3.readthedocs.io/"
 distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
-checksum=e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937
+checksum=a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098
 # Checks depend on unpackaged "trustme"
 make_check=no
 

From 63263bead810708913c248bd75f3e8452190c746 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 1 Jun 2021 17:08:51 +0200
Subject: [PATCH 24/39] bdf2psf: update to 1.203.

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

diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index 314d83e905ee..bacab7932b2c 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -1,6 +1,6 @@
 # Template file for 'bdf2psf'
 pkgname=bdf2psf
-version=1.202
+version=1.203
 revision=1
 wrksrc="console-setup-${version}"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/bdf2psf"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=c9b38d548337b26ffdc2bf555072e328bef8b7c1b2ac88cb4e24b898796cca20
+checksum=0d6ac1faa2b26d692e794be5b179866feea5a68821da97eea09802ea0c93e4a2
 
 post_extract() {
 	sed -i '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf

From 2a18f925b828f080ee8766cc30b831cb79d92c3b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 2 Jun 2021 16:44:02 +0200
Subject: [PATCH 25/39] fzf: update to 0.27.2.

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

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index d4ef0a34ebf5..5bacbb59790d 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.27.1
+version=0.27.2
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/junegunn/fzf"
 changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
 distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=d86d879e01dee330d2fd3ef522a5bc5c2eafd31990e6869142fd300a06e4c13e
+checksum=7798a9e22fc363801131456dc21026ccb0f037aed026d17df60b1178b3f24111
 
 post_install() {
 	cd ${wrksrc}

From 8916cd3a81b0487a04e5f2f23a9e00b32d24a94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 29 May 2021 11:49:19 +0700
Subject: [PATCH 26/39] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6

See: /usr/lib/qt6/mkspecs/modules/qt_lib_core_private.pri

It should say "-latomic" instead of "atomic".
---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 ++++++++++++++
 srcpkgs/qt6-base/template                |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
new file mode 100644
index 000000000000..edbe5e609d5a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/libatomic.patch
@@ -0,0 +1,14 @@
+Index: cmake/FindWrapAtomic.cmake
+===================================================================
+--- cmake/FindWrapAtomic.cmake.orig
++++ cmake/FindWrapAtomic.cmake
+@@ -38,7 +38,8 @@ endif()
+ 
+ add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
+ if(HAVE_STDATOMIC_WITH_LIB)
+-    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
++    find_library(LIBATOMIC atomic REQUIRED)
++    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
+ endif()
+ 
+ set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index c720e7f51671..d03dfe7a2129 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.0
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -25,7 +25,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
  sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
 short_desc="Cross-platform application and UI framework (QT6)"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
 checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4

From 99dc4338865e1315830cd62b1177d5ecee715cf2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 1 Jun 2021 04:32:34 +0200
Subject: [PATCH 27/39] linux5.4: fix up ppc-dotconfig

---
 srcpkgs/linux5.4/files/ppc-dotconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index f16d80306325..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.110 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -522,8 +522,9 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC=""
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y

From a8e63d5e3e6d981de8385d354288bf72ddbfc718 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Tue, 1 Jun 2021 20:50:14 +0200
Subject: [PATCH 28/39] cbindgen: update to version 0.19.0.

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

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3c9d15bbce0d..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
 # Template file for 'cbindgen'
 pkgname=cbindgen
-version=0.18.0
+version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
@@ -8,7 +8,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
-checksum=956fb1ca77daabf89451a1ea42658b74ad35477fed24ad859d8612708f9c4336
+checksum=5a068b3d4cd0319b12844c83816d63e2e9ce8176bd2d78ca0ac03d4833bcbab7
 
 do_check() {
 	: # test are only expected to work with rust nightly

From ca26097d7aa59885bd41456ce3246f01619551a3 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Tue, 1 Jun 2021 20:50:41 +0200
Subject: [PATCH 29/39] firefox: update to version 89.0.

---
 .../firefox/patches/disable-minidump.patch    | 34 -------------------
 srcpkgs/firefox/template                      |  4 +--
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/disable-minidump.patch

diff --git a/srcpkgs/firefox/patches/disable-minidump.patch b/srcpkgs/firefox/patches/disable-minidump.patch
deleted file mode 100644
index 5c440076474b..000000000000
--- a/srcpkgs/firefox/patches/disable-minidump.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Enables itself even when --disable-backtrace is set,
-and doesn't build on musl or ppc* (not tested).
-
-diff --git Cargo.toml Cargo.toml
-index 4076a60577..945f26f638 100644
---- Cargo.toml
-+++ Cargo.toml
-@@ -13,7 +13,6 @@ members = [
-   "netwerk/test/http3server",
-   "security/manager/ssl/osclientcerts",
-   "testing/geckodriver",
--  "toolkit/crashreporter/rust_minidump_writer_linux",
-   "toolkit/library/gtest/rust",
-   "toolkit/library/rust/",
-   "toolkit/mozapps/defaultagent/rust",
-@@ -79,7 +78,6 @@ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
--minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "01c7a0da8d34059f7dae8ab9e7512529ff16347a" }
- 
- [patch.crates-io.cranelift-codegen]
- git = "https://github.com/mozilla-spidermonkey/wasmtime"
-diff --git toolkit/moz.configure toolkit/moz.configure
-index 806576b1ef..43ef8309f1 100644
---- toolkit/moz.configure
-+++ toolkit/moz.configure
-@@ -2487,8 +2487,6 @@ set_define("MOZ_USE_NATIVE_POPUP_WINDOWS", True, when="MOZ_USE_NATIVE_POPUP_WIND
- # ==============================================================
- @depends(target)
- def oxidized_breakpad(target):
--    if target.kernel == "Linux" and target.os != "Android":
--        return target.cpu in ("x86", "x86_64")
-     return False
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0a54a0d352c8..3ce8a92ecbb0 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=88.0.1
+version=89.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=83df1eae0e28fe99661fd5d39d705cdab2e108b4a24ce12c2db6183c632804cc
+checksum=db43d7d5796455051a5b847f6daa3423393803c9288c8b6d7f1186f5e2e0a90a
 
 lib32disabled=yes
 

From a84f89f1262c05df62a444c744b9f438c9176145 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Wed, 2 Jun 2021 00:07:55 +0200
Subject: [PATCH 30/39] firefox-i18n: updated to version 89.0.

Closes: #31248 [via git-merge-pr]
---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 582142758b24..9e057874b4a2 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=88.0.1
+version=89.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="80d01a3af48f86e2f99d48b81933c813a6add751cbc3c17617cd9ac59aaa45d1
- b0462a102fa42c5e20dffa371b47ca79112f9c0860f7ae222c1d1f4711c4f1f4
- ad1bf82b2a6598f080f168ae00b878c524a326dbb80f2502d16a85e20f9084ed
- 8834060393326650c97dfff017fc3a5cd701aaa7e1ad10e364db1fc58b6058c9
- 0331fe783f787492229c31322bec6227d493a396efe40c629f259037e260a8bd
- 10f5b5791a17bfe2765a7af427622cebc462e52e6780c948aafdd4f511e53127
- 86713d2fe5b3071195db13c8ce4f7d69e88b4ad5897ec862ee9cde6a06f40654
- dab99398f4a93110b9caf90b9f401919777de8ed942063110bfc57b2935a4bb8
- 65514a6ca8b2709a8a7fe530bc781075645fad548a91c760875016e59d6bedfd
- eace7d76e3dd6d3a9cf61a2639342f8f9c6d16e5d9aa1e84a1897ea600662826
- 4b5ce0682e3292e1893a362998222bd8bd755a78be5135bccaee234e0d27be20
- 076dc03cda273eb92fb9b0efb18f1a7ec7ef1cc8e9a99629d3a1d258e1e08b3e
- dc9b1a177df4d8a07bc3777b82273b7f52b927221a7c3ab30d81582343de8f23
- 58ef43f7f6a40d76013b9179a6b60a1d7be79083060c50dc775d0f934779dabb
- f97091e3b7284388171a2d344aab7f022087c255d649ab49ce19bc702a7e5c6a
- f4acefa54dc91d2ce335b82969db6632913c3fc899ece59110a0051b20f79c4b
- 8e07fbf79e539061fd3cfa8a7a19d5b7f1a8f30740e200451dac248b5d8ce36d
- 7cfe8a32374e862cf7de4cb9fc28077b625bea7be39e17aff08605036de4c64e
- 0a892932cbb536177457d081f56ca3c6e29b7f08bace67b858a2b3f392f64731
- c0f0c3c079da499adb40815e6cda38a68c3d36c8e19d3d1eae705354d9b217a4
- 218afbcd896be8ab58d772e993c946fa6ba2310a688b97d25625c16ce207d9e9
- dd5089f902c502954580e8cf4e9bdc3a08f8b9e7c6835b65a6e27eb6c6061ec1
- d1246f60808b37e8fa51c19d62d8996953306a1f7ed83f151f7ac25380e999ca
- a19d5f4d6c5d1d0b0f66b0ba9a16f11c22df4ae4d738eb942381e9d471c5ffd3
- c074e370c6d95bfe6b1d5cbe93c5a868207e4a1b7587618060708ae95f5dc187
- 2e15a9d0066bc0d7bea7fb712a0195e3f15b488ed06d0dd8fb893527d4aa4107
- 8a505ee4bce3fa9d26ded1c09b401987aff02997dd2abf4cd220a4c10069c126
- 69d5a146ef8dd0581af03b034b495a695a9768c68fb9e3d68a2144db8b36be27
- 4be5b1cc3682961212f10a5c72e69e22ad818aacd35df5cda62001315ba9a169
- 157cf8160f537857dd6d617a096836e510b13aa58deba19867072409371547ca
- 890e4af479db68015dbf1f4761ce44ee6a659c3b667fabaf0b51ddab3930542b
- 7e182154ee64bf0926ac8549dd4d9c97a5e396262d4422fde5591b043e146195
- 708bf3f9f35d1caf5cebb76052bfca05dbb0279ea60e9562d22255fda755e0e7
- 7f1e28ac36aedaf889fe65123960dd076a6d2c800cf5c09f9d734e68a0c175bf
- 9694b7099a0e4b543992d431045beb421aab2931ba806bb5efc997c77e11c6a7
- 199599e9e9fe5feae34047d0ca761ccd2847c8475a38ab5685c4f1487cdf3c23
- ec2f6edd10a39a8ac96e38bbf72f7dc2aae06d9e68b00316979b2a51e8fe8e3d
- 94c964b8526f64d4dd7fccc972eca6e33a5b9db7daef3b6dfcc9cd4911cb94a5
- 48ab4a86a1abdc9838102324b3bf5f4b406b68ad630bae215f0dd9b7b99cabe3
- 142b8f92096bd812da58aedc86111d76cd7a10fafa03aaaa4052f480235e6661
- 089a0533ccec66d0a451967521b7a3eff0db0b0f75589fe2b9045016702aee26
- ef09d30d8d1e5714d04fc6dcb8b4348e46901f961d4ef65443bf124fd7cfb93d
- 629c16da6d5467c83fbbeb4511484629cb20babb3e067454c571830631768e8c
- 5bdfa6cb2d6032a112f076f098746bb08ed9d0b1a1bcfca515af39d17533170d
- ccc164411ab79a0fca4f1968067d2c008acb3ee00f339f017e6c39aadef9334d
- f99be63e67b9fcbd59a6e1fd8b8cbfddf9d9a4d1b412a701dd466f7eda9c00f2
- aded4763b7a2cafa37d9a405ce40a4649f3967e36ace410c687cee975861f549
- 8ca5fbec8187088a600398b652c4491df75b7159a0371ec16c72a21ac6816cc8
- c8c5c7e3cbb8da143218c1bfed836cf3d62e8a7ffa96af886251abe760066baa
- 5df0960a12955cd9acbd67eae0b1a111aa8d0c5c601bb14539c7aced81e59aae
- 5582003eb846eacfa350955a706f84b7133e3b5294270c809ffebe9035bcf8dd
- b1daa0ccc0056e23556413b1fa3f92727df8a75bfed928c6d6d7835170727e07
- 818262c84ccc247ccd566980bd563f85b2f6f88d0cc38c9ffe5bd7d82127fb2e
- 9578eeb909233fdce99d0426bd4d2d5972b46fe63af62d8957ff6170fb9618a2
- a5b21393bfab188c6f3ba647a376a0ad63a3ca33175f7d3b0e88a204be457f70
- 09916f7223ebe012deee3b503a690697db566c60a84366f117ed43b95ddb4873
- 61181ec9e6f4c2af894c58fd9c432f3fc56945f6a2c7a5cdf0b7a6d3e2098f15
- 645e40060948871010ca1b3f2b62dd9d72d50bdb3c0df52ab3300dbe11f0c267
- 911803ed44b73bf232b3a95e4bc636249df68dc3c6c5685b22d8e9a900ae873c
- c05dd396d67b4c47e34dfa6afc8b7fc06a880001589fea1f46b5b1b660d1c5c9
- a4f1b51752fc377146d4b5489f45380557bbf956f5075daa2a0ca337d7fa462a
- 33cfcf70fd3a20222648d89f8f1dfa101bd54dda1777bcd8adb77873c413af0b
- 0ed711860a7da0893ae6e9c93f6a01137b9f607dd2e41bdc1d4f7602a790a6d7
- 06a10157e2bc454947e8bc35f4d7add624528ee556114d9da7fb56ff7ca0628f
- 3d099078e99a658c194fefe063abb63a2dc1ef70ad10685509a0ed1213383e85
- dc6cdaaf8f1a06645312a5127a1f533fb0bd289f41de2c559bd9a83db3cafba5
- 76c78c8d1246467f8680c9f8d2f108f0ca3a8eddf1cde2150b8ff5cefa4388aa
- f791a1d8da8a1b4dec937660c9664679a04176a83fbbda63fda61d29d6752148
- 7ddf2d351962efd9fd2d13e53378a877dca2be8b610053fd9b13dafd74fe0280
- c977cf8fbb47aaeb573f0fed95e67a9614115440fc4ce89736e9f83fba9e0dea
- 153e408653e06449bb4de584df31722ffefa30fca259074b879ef28bc6188ea5
- 5b25bfedb0a2986777960fdbf6553ff5da77f95d52ff3e7a8273fb59703e4229
- b802a1bf47a83dc773de1f2b31fb04141838fefddf98a1f7980bb64e2ff487a9
- aea7155b62595eb92438c5d6a59231eb19264c249427b913971bbac3746fa01e
- b852a49e72182b513db59f6355b651c1f42b67ae2f8cbb0c5aefd9d2b605dc45
- 46e6caba0551b360a6e5cceb2f34e10265c7a2acd209b9f6423559cfa7162d2a
- 343b5eded13a9faf73071ab1a14f2d166cf086cb3d3ebd8b964a370e5fcd47cc
- 9ecf36f0398c8f58e46f96d943435e01ca64ff54860947968d6fb4047ee4f53a
- a682cb0c8cc42a1ed0311a4c6695a11b5d8e9bfabaf819107527b642c05eab23
- 798f0bb6281dd56d5e0bf21f98a8a09dad386755ff7c3b1facb7b3f871233753
- bd3e8383475e93da36683afb1a3cd81056d8ea8a76d95e35f048add52e8b76fc
- 6abf4ffbc9b945702a5acc95a3bc4f981401a38e1dfcc1bf49e3323008e48b4a
- 327f10df38fcff9e796db163e49a2aeab7ebfa1969a0201d985086526a8da07a
- d5d2630d3068eba3a9842fa7d94ff5ddf5ce247ec1cfe0671186ef56b50704f6
- db6dd5560e5d868f4b79a227305a270059adf4980086440df031703c8b3d4536
- a3ffd854799a85fd1ef5e882c9d8d38dc892509f42b656ea52ed0bd53e85a490
- e82e73e7f8b16b182bc0aa64648e02177093b65aa175e4388fd46f6727ef1038
- 35a8d5c2d2e576ec2f66faf137a1ee53daaa4ef8ff6bc0b13f5f77d0269c782a
- 1401f6935ee94a4487e8d64cb58f2ce0074e91297b18083877ff6e85bc32b2f1
- 76ab00d25a3131d90ba3a30927dab6e98d7c8ccd9c27b68e39228e62e3f53eb0
- 0de92fd6614bafcf3a8a8f88367537f40ca3fd4963c73046d237ef857ae265bf
- 3f47f20d655de331ee281d2f2e71f68a730e730be2eddcb6811ee2b3db9759e9
- acc767c992a616c72306496611e1aa67cbd946dac8fba753c025788e8bf84947
- 986526dec3da5a96f218d53b398e8e45358b66ab03f0e4a76adc0179fb39aace
- ae2e0644fa1f620418e1cce9561b0816575721326aaf13e232f47afa323f0686
- 6ee4c16de0a36febf3ca0f2d80ed3d3afab3d90d12cbbd8c7f531ff50f93025e"
+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"

From ab93453cb106b6542e72aa8e82db787fffb5589b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 3 Jun 2021 16:34:33 +0200
Subject: [PATCH 31/39] libvirt: update to 7.4.0.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 28824ed7f713..aadf2b4a2356 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.3.0
+version=7.4.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=27bdbb85c0301475ab1f2ecd185c629ea0bfd5512bef3f6f1817b6c55d1dc1be
+checksum=b366d73dee6ce77a226bedef592e0620ceb8e22e5998f60768017f79fc4ead26
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From cb36d47e8a26e2e8221a7d675ebeeb9af69aa8db Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 3 Jun 2021 16:37:49 +0200
Subject: [PATCH 32/39] libvirt-python3: update to 7.4.0.

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

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 316e02e83df8..0331c79c35c6 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.3.0
+version=7.4.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=676c260ddb365120404e611a38c514045ef1af1a7fede15c1fc02d0f8241f696
+checksum=384a5273c06013ea4fbaa98069e364c209af390d000f0e206d803634711d0b9a

From 860e82075e9b5c0237f9222feb9bc00092222fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 2 Jun 2021 21:47:23 +0200
Subject: [PATCH 33/39] bfs: update to 2.2.1.

---
 ...pabilities-when-run-as-root-on-Linux.patch | 90 -------------------
 ...ing-forever-when-failing-to-drop-cap.patch | 41 ---------
 ...emove-capabilities-after-dropping-th.patch | 47 ----------
 srcpkgs/bfs/template                          |  4 +-
 4 files changed, 2 insertions(+), 180 deletions(-)
 delete mode 100644 srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
 delete mode 100644 srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
 delete mode 100644 srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch

diff --git a/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch b/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
deleted file mode 100644
index a2e54c397f8b..000000000000
--- a/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From f2e6186ed0ce9b68362ad25d897f1e3c697728ec Mon Sep 17 00:00:00 2001
-From: Tavian Barnes <tavianator@tavianator.com>
-Date: Sun, 21 Mar 2021 13:18:43 -0400
-Subject: [PATCH] tests: Drop capabilities when run as root on Linux
-
-bfs's tests rely on file permissions being enforced, which leads them to
-work incorrectly when run as root.  This is probably the most common
-packaging issue for bfs, most recently seen with Void Linux's update to
-bfs 2.2.
-
-Make it easier on packagers by using capsh, if it's available, to drop
-the DAC privileges for the tests.
-
-Link: https://github.com/void-linux/void-packages/pull/29437#issuecomment-798670288
-Link: https://salsa.debian.org/lamby/pkg-bfs/-/commit/b173efb35da126adb39b0984219d6a2fd9ff428f
----
- tests.sh | 35 +++++++++++++++++++++++++++++------
- 1 file changed, 29 insertions(+), 6 deletions(-)
-
-diff --git tests.sh tests.sh
-index b039eea..0bdd1d4 100755
---- tests.sh
-+++ tests.sh
-@@ -34,10 +34,25 @@ if [ -t 1 ]; then
-     RST="$(printf '\033[0m')"
- fi
- 
--if [ "$EUID" -eq 0 ]; then
-+if command -v capsh &>/dev/null; then
-+    if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
-+        cat >&2 <<EOF
-+${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
-+${BLD}CAP_DAC_READ_SEARCH${RST}.
-+
-+EOF
-+
-+        exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
-+    fi
-+elif [ "$EUID" -eq 0 ]; then
-+    UNLESS=
-+    if [ "$(uname)" = "Linux" ]; then
-+	UNLESS=" unless ${GRN}capsh${RST} is installed"
-+    fi
-+
-     cat >&2 <<EOF
- ${RED}error:${RST} These tests expect filesystem permissions to be enforced, and therefore
--will not work when run as ${BLD}$(id -un)${RST}.
-+will not work when run as ${BLD}$(id -un)${RST}${UNLESS}.
- EOF
-     exit 1
- fi
-@@ -1209,11 +1224,15 @@ function test_gid() {
- }
- 
- function test_gid_plus() {
--    bfs_diff basic -gid +0
-+    if [ "$(id -g)" -ne 0 ]; then
-+	bfs_diff basic -gid +0
-+    fi
- }
- 
- function test_gid_plus_plus() {
--    bfs_diff basic -gid +0
-+    if [ "$(id -g)" -ne 0 ]; then
-+	bfs_diff basic -gid ++0
-+    fi
- }
- 
- function test_gid_minus() {
-@@ -1229,11 +1248,15 @@ function test_uid() {
- }
- 
- function test_uid_plus() {
--    bfs_diff basic -uid +0
-+    if [ "$(id -u)" -ne 0 ]; then
-+	bfs_diff basic -uid +0
-+    fi
- }
- 
- function test_uid_plus_plus() {
--    bfs_diff basic -uid ++0
-+    if [ "$(id -u)" -ne 0 ]; then
-+	bfs_diff basic -uid ++0
-+    fi
- }
- 
- function test_uid_minus() {
--- 
-2.31.0
-
diff --git a/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch b/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
deleted file mode 100644
index 5e951faea29c..000000000000
--- a/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From dbc77fd3b6e48a17eb79f9ff3a5f810b7554bf6f Mon Sep 17 00:00:00 2001
-From: Tavian Barnes <tavianator@tavianator.com>
-Date: Mon, 22 Mar 2021 17:19:31 -0400
-Subject: [PATCH] tests: Avoid looping forever when failing to drop
- capabilities
-
-Link: https://github.com/void-linux/void-packages/pull/29437/checks?check_run_id=2169825021
----
- tests.sh | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git tests.sh tests.sh
-index 0bdd1d4..ad71894 100755
---- tests.sh
-+++ tests.sh
-@@ -36,13 +36,21 @@ fi
- 
- if command -v capsh &>/dev/null; then
-     if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
-+	if [ -n "$BFS_TRIED_DROP" ]; then
-+            cat >&2 <<EOF
-+${RED}error: ${RST} Failed to drop capabilities.
-+EOF
-+
-+	    exit 1
-+	fi
-+
-         cat >&2 <<EOF
- ${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
- ${BLD}CAP_DAC_READ_SEARCH${RST}.
- 
- EOF
- 
--        exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
-+        BFS_TRIED_DROP=y exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
-     fi
- elif [ "$EUID" -eq 0 ]; then
-     UNLESS=
--- 
-2.31.0
-
diff --git a/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch b/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch
deleted file mode 100644
index acf3d32f9113..000000000000
--- a/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From d36ece2ca7498b7ba5485d5010439b57f006c9c8 Mon Sep 17 00:00:00 2001
-From: Tavian Barnes <tavianator@tavianator.com>
-Date: Tue, 23 Mar 2021 11:46:26 -0400
-Subject: [PATCH] tests: Actually remove capabilities after dropping them
-
----
- tests.sh | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git tests.sh tests.sh
-index ad71894..8eb4dc0 100755
---- tests.sh
-+++ tests.sh
-@@ -35,22 +35,25 @@ if [ -t 1 ]; then
- fi
- 
- if command -v capsh &>/dev/null; then
--    if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
-+    if capsh --has-p=cap_dac_override &>/dev/null || capsh --has-p=cap_dac_read_search &>/dev/null; then
- 	if [ -n "$BFS_TRIED_DROP" ]; then
-             cat >&2 <<EOF
--${RED}error: ${RST} Failed to drop capabilities.
-+${RED}error:${RST} Failed to drop capabilities.
- EOF
- 
- 	    exit 1
- 	fi
- 
-         cat >&2 <<EOF
--${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
--${BLD}CAP_DAC_READ_SEARCH${RST}.
-+${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}cap_dac_override${RST} and
-+${BLD}cap_dac_read_search${RST}.
- 
- EOF
- 
--        BFS_TRIED_DROP=y exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
-+        BFS_TRIED_DROP=y exec capsh \
-+            --drop=cap_dac_override,cap_dac_read_search \
-+            --caps=cap_dac_override,cap_dac_read_search-eip \
-+            -- "$0" "$@"
-     fi
- elif [ "$EUID" -eq 0 ]; then
-     UNLESS=
--- 
-2.31.1
-
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index ebc526cec78f..c0a36ae67f52 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.2
+version=2.2.1
 revision=1
 build_style=gnu-makefile
 makedepends="acl-devel libcap-devel"
@@ -11,7 +11,7 @@ license="0BSD"
 homepage="https://github.com/tavianator/bfs"
 changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md"
 distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=09cff2033544cbaa31af2ad7d59347056a53c04ff7c469bb5904e575d3641053
+checksum=94a9c9a03d82c2d8e81ff373021d8188925a1a5e525937ddda2523483629e390
 
 post_install() {
 	vlicense LICENSE

From 8935eab1c0e33f449b66b25987a119a9cee14236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 3 Jun 2021 06:42:00 +0200
Subject: [PATCH 34/39] you-get: update to 0.4.1527.

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

diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index bb10fcae99f4..51436a4a2160 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,6 +1,6 @@
 # Template file for 'you-get'
 pkgname=you-get
-version=0.4.1525
+version=0.4.1527
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://you-get.org/"
 distfiles="${PYPI_SITE}/y/you-get/you-get-${version}.tar.gz"
-checksum=905eae25a7d2aef2262cb6a2cabd036381a6c6c6cc8746e13c4a8fde4602911c
+checksum=470b2f76ccad5dbe37bc4a8779056cf6da67f4322fe723e2b9227e825da595c9
 
 post_install() {
 	vlicense LICENSE.txt

From 43f939279893b278ceff49a047abf2f4cba528cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 3 Jun 2021 07:14:16 +0200
Subject: [PATCH 35/39] monolith: update to 2.5.0.

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

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 8aedb83c561d..d4f05f3d2946 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,6 +1,6 @@
 # Template file for 'monolith'
 pkgname=monolith
-version=2.4.1
+version=2.5.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/Y2Z/monolith"
 distfiles="https://github.com/Y2Z/monolith/archive/v${version}.tar.gz"
-checksum=d68980bd5ade841f41e0d35447f9c299c82118eef2d291c2c07063086a18de0d
+checksum=0280d811c6b74fb84066a059db058d0008ff24ce128d4042659681d3aedf99cc
 
 post_install() {
 	vlicense LICENSE

From 3f807fbb8bee1811bda02127bac82eb38cafe686 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 3 Jun 2021 11:23:15 +0200
Subject: [PATCH 36/39] libmbim: update to 1.24.8.

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

diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index f12d888da43f..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.6
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=760465caaa1ccd699c14290e9791da456d5300dd11ebf4c1486151033e875dfd
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"

From 4e404504f0dce63b442e3a690624f2eb54084ba2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 3 Jun 2021 13:58:25 +0300
Subject: [PATCH 37/39] notcurses: update to 2.3.2.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index d54d7fb3e25a..82e0742eb118 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=5d8e53e308e8406834cf05008a7c738833991bc0f1e5f964d195c837c9951df1
+checksum=d936c931e137a3d67b4485ba543e3d99ecef0b6c3b181746b595e1ed09c1deee
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 400af943e4ea7c39e2061de424166f8fc2d2255b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 2 Jun 2021 13:21:42 +0200
Subject: [PATCH 38/39] intellij-idea-ultimate-edition: update to 2021.1.2.

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

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 20b2c7cbd226..90d702943d6e 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.1
+version=2021.1.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7142.45"
+wrksrc="idea-IU-211.7442.40"
 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=31ce6b0173bc8e046b263d7ab5601e3e1d1535a8e14f54487ce8a7f3a525f1a7
+checksum=a59f601182b3b457daeb3f545812ffa85fe4501cfaf185dfc973851915538457
 repository=nonfree
 restricted=yes
 nopie=yes

From ccdbb2f1baeffdcf1b5876696a6efa1d70c69e9b Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH 39/39] Adding asar package

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

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..94bab29a5ef3
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,23 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+hostmakedepends="nodejs"
+makedepends="nodejs modclean"
+depends="nodejs electron12"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_install() {
+	npm install -g --user root --engine-strict --prefix "$DESTDIR"/usr "${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${version}.tar.gz"
+	local _npmdir="${DESTDIR}/usr/lib/node_modules/${pkgname}"
+	cd "$_npmdir"
+	modclean -r -a "*.ts,.bin,.vscode,bin.js" --ignore='license'
+	vlicense "$_npmdir/LICENSE.md"
+	vdoc "$_npmdir/README.md"
+}

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

* Re: [PR PATCH] [Updated] New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (9 preceding siblings ...)
  2021-06-04  5:26 ` ReneganRonin
@ 2021-06-04  5:35 ` ReneganRonin
  2021-06-04  5:37 ` [PR PATCH] [Closed]: " ReneganRonin
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-06-04  5:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ReneganRonin/void-packages master
https://github.com/void-linux/void-packages/pull/31205

New Package: asar 3.0.3
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 0dba7001fa2bb219ba374d532ff68085d68d1f12 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Tue, 1 Jun 2021 10:26:30 +0800
Subject: [PATCH 01/39] Add modclean

---
 srcpkgs/modclean/template | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/modclean/template

diff --git a/srcpkgs/modclean/template b/srcpkgs/modclean/template
new file mode 100644
index 000000000000..356b2d2175f3
--- /dev/null
+++ b/srcpkgs/modclean/template
@@ -0,0 +1,35 @@
+# Template file for 'modclean'
+pkgname=modclean
+version=3.0.0beta.1
+revision=1
+wrksrc="modclean-3.0.0-beta.1"
+create_wrksrc="yes"
+hostmakedepends="nodejs"
+makedepends="nodejs"
+depends="nodejs"
+short_desc="Remove unwanted files and directories from your node_modules folder"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/ModClean/modclean"
+distfiles="${homepage}/archive/3.0.0-beta.1.tar.gz"
+checksum=58a39e8b4eed1da8131facfb21a455659144aacd250a73a6efaba31500b901f0
+
+do_build() {
+	cd modclean-3.0.0-beta.1/
+	npm install --no-optional --save
+	./bin/modclean.js -r -a '.bin,bin.js' --ignore='license'
+	vlicense LICENSE
+}
+
+
+do_install() {
+	mv modclean-3.0.0-beta.1/* .
+	rm -rf modclean-3.0.0-beta.1
+	vmkdir usr/bin/
+	vmkdir usr/lib/node_modules/modclean/
+	vcopy "*" usr/lib/node_modules/modclean/
+}
+
+post_install() {
+	ln -sf /usr/lib/node_modules/modclean/bin/modclean.js "$DESTDIR"/usr/bin/modclean
+}

From 7b091021e2fe2204be2b769e6e37dc643007bd82 Mon Sep 17 00:00:00 2001
From: BlueChrystal <84290062+BlueChrystal@users.noreply.github.com>
Date: Wed, 2 Jun 2021 01:31:20 +0300
Subject: [PATCH 02/39] syncthing: update to 1.17.0.

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

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 6ffaaf269c7e..0fdbbcef87f6 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.16.1
+version=1.17.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=9994380a94b298e8266fdd40238bcff3ade2c21752b9cff98ec4218fe84731ad
+checksum=497365c08a11cdc1c80ff55316d3c3842dfaa3aaaf063bb10118ab93706a37b1
 
 pre_build() {
 	GOARCH= go generate \

From ddcf407183982f9c8be273424895bc72c2c5033d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 2 Jun 2021 00:43:58 +0200
Subject: [PATCH 03/39] elixir: update to 1.12.1.

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

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index a02cf881b7ab..6660412e9ce1 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.11.4
+version=1.12.1
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,4 +13,4 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=85c7118a0db6007507313db5bddf370216d9394ed7911fe80f21e2fbf7f54d29
+checksum=96167d614b9c483efc54bd7898c3eea4768569a77dd8892ada85d7800d5e3ea4

From 128c3128b65bace00f5392e16b0f5551f2e3dfcf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 26 May 2021 14:49:16 -0500
Subject: [PATCH 04/39] tcpreplay: update to 4.3.4.

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

diff --git a/srcpkgs/tcpreplay/template b/srcpkgs/tcpreplay/template
index 0d7168e96378..90f7de684c0d 100644
--- a/srcpkgs/tcpreplay/template
+++ b/srcpkgs/tcpreplay/template
@@ -1,6 +1,6 @@
 # Template file for 'tcpreplay'
 pkgname=tcpreplay
-version=4.3.3
+version=4.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="libpcap-devel"
@@ -10,4 +10,4 @@ maintainer="misuchiru03 <misuchiru03+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/appneta/tcpreplay"
 distfiles="${homepage}/releases/download/v${version}/tcpreplay-${version}.tar.gz"
-checksum=ed2402caa9434ff5c74b2e7b31178c73e7c7c5c4ea1e1d0e2e39a7dc46958fde
+checksum=ee065310806c22e2fd36f014e1ebb331b98a7ec4db958e91c3d9cbda0640d92c

From 472f7ba2c1d63a896de9f9077c9745b8276a5e10 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 08:59:59 -0500
Subject: [PATCH 05/39] Amass: update to 3.13.0.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 9494f04abf32..16970f3a08af 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.12.3
+version=3.13.0
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=92045ab82afe9a3bf15741c49d8df8d37f3fcb1e5fad7fa1c6f770cfd334bd8d
+checksum=7799ab0a41182518a7b631e3499afa87d75160e83b0db9616627360b4a338e80

From 69bb92187fd17ab73e950876ed37ec53e762c079 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 09:00:02 -0500
Subject: [PATCH 06/39] bpytop: update to 1.0.66.

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

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

From 3ff139b7a4fe2b802536dd3d082689deb85788ea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 09:00:04 -0500
Subject: [PATCH 07/39] delta: update to 0.8.0.

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

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 250d68bccdbb..e2524884cece 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.7.1
+version=0.8.0
 revision=1
 build_style=cargo
 short_desc="Syntax-highlighting pager for git"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f432335361088c37f8aa4bb747ba12e1f8eddbbc3ed5c51fdd52d9b96eb22227
+checksum=706b55667de221b651b0d938dfbb468112b322ed41a634d3ca5c8bd861b19e8a
 
 post_install() {
 	vlicense LICENSE

From fe0ba400887b56d773c28dec39977e416b920137 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 09:00:07 -0500
Subject: [PATCH 08/39] fvwm3: update to 1.0.3.

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

diff --git a/srcpkgs/fvwm3/template b/srcpkgs/fvwm3/template
index a3e94af42bce..f2704bed37dd 100644
--- a/srcpkgs/fvwm3/template
+++ b/srcpkgs/fvwm3/template
@@ -1,6 +1,6 @@
 # Template file for 'fvwm3'
 pkgname=fvwm3
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.fvwm.org/"
 distfiles="https://github.com/fvwmorg/fvwm3/releases/download/${version}/fvwm3-${version}.tar.gz"
-checksum=aa5597fe98fcfadebf936b491497d96e81b07a39a9fa93b590592bf2bf9b8a2f
+checksum=09c6af875534326cfbb908762fe55d9674c7a94aaeb402fc3a0d33918a9e2411
 nocross=yes
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 1ac40806e1e841b7e4e68ad9631025dfc55333ec Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 1 Jun 2021 09:00:11 -0500
Subject: [PATCH 09/39] libxlsxwriter: update to 1.0.6.

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

diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index d66783dc2f2f..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.5
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=953e4cc6d5b7a76e913575c743d186416e739b73cf5a035235c93fb6cdd15641
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From 95e6ceae3cb752d7b61dd20e191f61ad00615edd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH 10/39] btrfs-progs: update to 5.12.1

- Add build options for btrfs-convert.
- Temporarily disable all tests, since most of them fail without
`mount` or `fallocate` commands.
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2485880dfe80..ba589537b1f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1452,6 +1452,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..931abeb7fffc 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.12.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+# Most of the tests depend on `mount` and `fallocate` commands, which are not
+# presented in chroot-util-linux
+make_check=no
+
+build_options="reiserfs e2fs"
+build_options_default="e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then
@@ -23,13 +32,6 @@ pre_build() {
 	fi
 }
 
-pre_check() {
-	# Requires losetup which is part of util-linux, but even with it installed it fails
-	rm -rf -- tests/mkfs-tests/017-small-backing-size-thin-provision-device
-	# Requires fallocate from util-linux
-	rm -rf -- tests/fsck-tests/025-file-extents
-}
-
 post_install() {
 	vinstall btrfs-completion 644 /usr/share/bash-completion/completions btrfs
 }

From 34029178a31c12d5e5ad8d8921bd24cb4a578aec Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 01:40:59 +0300
Subject: [PATCH 11/39] pipe-viewer: update to 0.1.0

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

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 0ef7f35c9db0..8d5b183979aa 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.0.9
+version=0.1.0
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/pipe-viewer"
 changelog="https://github.com/trizen/pipe-viewer/releases"
 distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz"
-checksum=598ec7c39be0a42900ed1f4c5c68c26a728dd09b774e9dd38a873aa2def76e27
+checksum=215d2de4b547ff810e6d6759b8ac8190da845661b9101b99ba679225384cd0bb
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 7faa033313511386e323c3679a2a5702e076a30b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 2 Jun 2021 01:06:18 +0300
Subject: [PATCH 12/39] mpDris2: update to 0.9.1

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

diff --git a/srcpkgs/mpDris2/template b/srcpkgs/mpDris2/template
index bd2a266cd517..bb1cc605979d 100644
--- a/srcpkgs/mpDris2/template
+++ b/srcpkgs/mpDris2/template
@@ -1,16 +1,16 @@
 # Template file for 'mpDris2'
 pkgname=mpDris2
-version=0.8
+version=0.9.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake intltool gettext-devel"
-depends="python3 python3-dbus python3-gobject python3-mpd2 python3-mutagen"
+depends="python3-dbus python3-gobject python3-mpd2 python3-mutagen"
 short_desc="Provides MPRIS 2 support to mpd (Music Player Daemon)"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="GPL-3.0-only"
 homepage="https://github.com/eonpatapon/mpDris2"
 distfiles="https://github.com/eonpatapon/mpDris2/archive/${version}.tar.gz"
-checksum=b6b15c1fdddf16a6d74485ad09f56ed353a317e149c37475c00a279186da4391
+checksum=d0f0467841e7866310cff44a1063334a9c776a64fd594815d926670b765fbee6
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
@@ -20,6 +20,5 @@ post_install() {
 	rm -f ${DESTDIR}/usr/lib/systemd/user/mpDris2.service
 	vsv mpDris2
 	vdoc README.md
-	vlicense COPYING
 	vsconf src/mpDris2.conf
 }

From cf7dd2bc583e9332cab9dd2579ea9cddfd88e7f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 31 May 2021 00:05:27 +0200
Subject: [PATCH 13/39] catgirl: update to 1.8.

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

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 7c3199015c5c..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,15 +1,15 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.7
+version=1.8
 revision=1
 build_style=configure
-configure_args="--prefix=/usr"
+configure_args="--prefix=/usr --mandir=/usr/share/man"
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libtls-devel ncurses-devel openssl-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
-maintainer="Paper <paper@tilde.institute>"
+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=dec85275eab897a6390c4259115307027829eaf8e790f8f3a4ba5ca78d3b5ffd
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b

From d56418b8906164e144e2a4536db017c9506798ca Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 1 Jun 2021 19:54:37 +0200
Subject: [PATCH 14/39] python3-serpent: update to 1.40.

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

diff --git a/srcpkgs/python3-serpent/template b/srcpkgs/python3-serpent/template
index 4b950974494b..d156563a2259 100644
--- a/srcpkgs/python3-serpent/template
+++ b/srcpkgs/python3-serpent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-serpent'
 pkgname=python3-serpent
-version=1.30.2
-revision=2
+version=1.40
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="pulux <pulux@pf4sh.de>"
 license="MIT"
 homepage="https://pypi.org/project/serpent/"
 distfiles="${PYPI_SITE}/s/serpent/serpent-${version}.tar.gz"
-checksum=72753820246a7d8486e8b385353e3bbf769abfceec2e850fa527a288b084ff7a
+checksum=10b34e7f8e3207ee6fb70dcdc9bce473851ee3daf0b47c58aec1b48032ac11ce
 
 post_install() {
 	vlicense LICENSE

From 9eae1622da3b8eba4008a520c442701533609a55 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 1 Jun 2021 11:42:24 +0200
Subject: [PATCH 15/39] git-team: update to 1.7.0.

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

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 3a86c11a80f5..6501dfe4c212 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,6 +1,6 @@
 # Template file for 'git-team'
 pkgname=git-team
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=go
 go_import_path=github.com/hekmekk/git-team
@@ -9,7 +9,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/hekmekk/git-team"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d474d759b81a458519c47059990d12808df28d4b313a69234aaa9574a70da723
+checksum=c52d800ea3b5f45896d4f21ab4944d1f45dd8d90cdf1a634a445d22b93a31f49
 
 post_install() {
 	vlicense LICENSE

From c6cc866c3d48a026e77837b88e12abc2d88eb94b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 1 Jun 2021 07:48:58 +0400
Subject: [PATCH 16/39] osinfo-db: update to 20210531.

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

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

From 60c1d6a7c49834512b31392a85051401048bc61f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 1 Jun 2021 23:45:00 +0300
Subject: [PATCH 17/39] qutebrowser: update to 2.2.3

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

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index d289bf4f1cc7..fa2fbc0bdfc7 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.2.2
+version=2.2.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=7855ea9d9b187b8d3d0ac69b331780316e93d5b1bff3b31290b2d5ff80b87287
+checksum=0683f5ebc8f18fde27be4adc802f377cfc3f4cf46c2363db0a8a2acd6345eb62
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From a63a933142b8b43661faac220349f2faa3e3d112 Mon Sep 17 00:00:00 2001
From: Andrea D'Amore <a@d-amo.re>
Date: Tue, 25 May 2021 01:03:34 +0200
Subject: [PATCH 18/39] groff: obtain devpdf fonts from ghostscript

cfr. https://lists.gnu.org/archive/html/groff/2019-02/msg00080.html
---
 srcpkgs/groff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index e58613b4c638..88923c6874b5 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -1,10 +1,10 @@
 # Template file for 'groff'
 pkgname=groff
 version=1.22.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-x --disable-rpath"
-hostmakedepends="texinfo perl bison"
+hostmakedepends="texinfo perl bison ghostscript"
 makedepends="zlib-devel"
 short_desc="GNU troff text-formatting system"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 617f5613697fb09d07e1590f1af33f6668204d15 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <void@qwertyuiop.de>
Date: Tue, 25 May 2021 20:14:39 +0000
Subject: [PATCH 19/39] touchegg: update to 2.0.9

By ericonr:
- fix libudev-devel package, it was picking up eudev-libudev-devel's
  provides=

Closes: #31123 [via git-merge-pr]
---
 srcpkgs/touchegg/files/touchegg/run       |  2 ++
 srcpkgs/touchegg/patches/musl.patch       | 24 +++++++++++++++
 srcpkgs/touchegg/patches/no-systemd.patch | 28 +++++++++++++++++
 srcpkgs/touchegg/patches/qt5.patch        | 37 -----------------------
 srcpkgs/touchegg/template                 | 22 +++++++++-----
 5 files changed, 69 insertions(+), 44 deletions(-)
 create mode 100755 srcpkgs/touchegg/files/touchegg/run
 create mode 100644 srcpkgs/touchegg/patches/musl.patch
 create mode 100644 srcpkgs/touchegg/patches/no-systemd.patch
 delete mode 100644 srcpkgs/touchegg/patches/qt5.patch

diff --git a/srcpkgs/touchegg/files/touchegg/run b/srcpkgs/touchegg/files/touchegg/run
new file mode 100755
index 000000000000..abe9b2319e3b
--- /dev/null
+++ b/srcpkgs/touchegg/files/touchegg/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u _touchegg:input touchegg --daemon
diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch
new file mode 100644
index 000000000000..62e9e0fbbbb9
--- /dev/null
+++ b/srcpkgs/touchegg/patches/musl.patch
@@ -0,0 +1,24 @@
+From da9a3a95cfe9965ff6e15e3a0e1a98f8840a34d7 Mon Sep 17 00:00:00 2001
+From: Alexander Gehrke <void@qwertyuiop.de>
+Date: Tue, 25 May 2021 23:47:51 +0000
+Subject: [PATCH] Fix missing header for musl
+
+---
+ src/utils/client-lock.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils/client-lock.cpp b/src/utils/client-lock.cpp
+index fb1e67b..27c6c6a 100644
+--- src/utils/client-lock.cpp
++++ src/utils/client-lock.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <sys/file.h>
+ #include <unistd.h>
++#include <fcntl.h>
+ 
+ #include <exception>
+ #include <stdexcept>
+-- 
+2.31.1
+
diff --git a/srcpkgs/touchegg/patches/no-systemd.patch b/srcpkgs/touchegg/patches/no-systemd.patch
new file mode 100644
index 000000000000..7b194cca886d
--- /dev/null
+++ b/srcpkgs/touchegg/patches/no-systemd.patch
@@ -0,0 +1,28 @@
+From 938167799926ad70849d8088bdef023b5e8a0700 Mon Sep 17 00:00:00 2001
+From: Alexander Gehrke <void@qwertyuiop.de>
+Date: Tue, 25 May 2021 20:11:29 +0000
+Subject: [PATCH] Fix CMake failing because of missing Systemd service dir
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dee220d..13b773f 100755
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -76,11 +76,6 @@ include(GNUInstallDirs)
+ set(SYSTEM_CONFIG_FILE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/touchegg/touchegg.conf")
+ target_compile_definitions(touchegg PUBLIC SYSTEM_CONFIG_FILE_PATH=\"${SYSTEM_CONFIG_FILE_PATH}\")
+ 
+-# configure systemd service unit to use the right path, e.g. @CMAKE_INSTALL_BINDIR@/touchegg
+-configure_file(${PROJECT_SOURCE_DIR}/installation/touchegg.service.in ${PROJECT_SOURCE_DIR}/installation/touchegg.service @ONLY)
+-pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemdsystemunitdir)
+-
+ install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/touchegg) # /usr/share/touchegg/touchegg.conf
+-install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.service DESTINATION ${SYSTEMD_SERVICE_DIR})
+ install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.desktop DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart)
+ install(PROGRAMS ${PROJECT_BINARY_DIR}/touchegg DESTINATION ${CMAKE_INSTALL_BINDIR}) # /usr/bin/touchegg
+-- 
+2.31.1
+
diff --git a/srcpkgs/touchegg/patches/qt5.patch b/srcpkgs/touchegg/patches/qt5.patch
deleted file mode 100644
index cd5a0fff5126..000000000000
--- a/srcpkgs/touchegg/patches/qt5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e60ff96afe5ffb893803e26c598e7bc11d1e0c33 Mon Sep 17 00:00:00 2001
-From: chrmod <krzysztof.modras@gmail.com>
-Date: Sun, 31 Jan 2016 14:20:41 +0100
-Subject: [PATCH] Updating dependencies for QT 5.1 to compile on Ubuntu 15.10
-
----
- src/touchegg/util/Include.h | 3 ++-
- touchegg.pro                | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/touchegg/util/Include.h b/src/touchegg/util/Include.h
-index 4fb27d5..c0de1d5 100644
---- touchegg/src/touchegg/util/Include.h
-+++ touchegg/src/touchegg/util/Include.h
-@@ -23,7 +23,8 @@
-     // Qt
-     #include <QtCore>
-     #include <QtGui>
--    #include <QtGui/QX11Info>
-+    #include <QtWidgets>
-+    #include <QX11Info>
-     #include <QtXml>
- 
-     // Xlib
-diff --git a/touchegg.pro b/touchegg.pro
-index 696ea1a..4565083 100644
---- touchegg/touchegg.pro
-+++ touchegg/touchegg.pro
-@@ -1,6 +1,6 @@
- TEMPLATE     = app
- TARGET       = touchegg
--QT          += gui core xml
-+QT          += gui core xml widgets x11extras
- LIBS        += -lgeis -lX11 -lXtst -lXext
- //DEFINES      = QT_NO_DEBUG_OUTPUT
- 
-
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index e245c3fb1959..538277a2c683 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,14 +1,22 @@
 # Template file for 'touchegg'
 pkgname=touchegg
-version=1.1.1
-revision=5
-build_wrksrc=touchegg
-build_style=qmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="libXtst-devel geis-devel qt5-devel qt5-x11extras-devel"
+version=2.0.9
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
+ libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
 short_desc="Multitouch gesture recognizer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JoseExposito/touchegg"
 distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8
+checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e
+system_accounts="_touchegg"
+
+post_install() {
+	# we don't want the package being installed to mean it should be autostarted
+	rm -r ${DESTDIR}/etc/xdg/autostart
+
+	vsv touchegg
+}

From ee8512d8375fee27aaf55c5389edc0b27318823f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 31 May 2021 18:57:09 +0700
Subject: [PATCH 20/39] nss: update to 3.66.

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

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 46c77eda081f..24da85cec752 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.30
 
 pkgname=nss
-version=3.65
+version=3.66
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=32170f6c188212a78bf9fdacffa2eeed0d564ef8faae63fd8ae971b208e8c637
+checksum=89a79e3a756cf0ac9ba645f4d4c0fc58d4133134401fb0b6c8a74c420bb4cdc9
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From f1c099af0afa172759abdbe0165fbbfcd3439cb5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 31 May 2021 21:37:18 -0400
Subject: [PATCH 21/39] python3-virtualenv: update to 20.4.7.

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

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 18c3a95d9b1e..2c575aef0b27 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.4.6
+version=20.4.7
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=72cf267afc04bf9c86ec932329b7e94db6a0331ae9847576daaa7ca3c86b29a4
+checksum=14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From 9db1f23b44c2c6edd41f8df62b6301e11b4a8d6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 31 May 2021 21:37:34 -0400
Subject: [PATCH 22/39] python3-setuptools: update to 57.0.0.

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

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

From 4da7ce7e3afeb8f4b6c948eb252ada8b8d55759a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 31 May 2021 21:37:55 -0400
Subject: [PATCH 23/39] python-urllib3: update to 1.26.5.

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

diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 430c93c8e557..2b2310ad8077 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,6 +1,6 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
-version=1.26.4
+version=1.26.5
 revision=1
 wrksrc="urllib3-${version}"
 build_style=python-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://urllib3.readthedocs.io/"
 distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
-checksum=e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937
+checksum=a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098
 # Checks depend on unpackaged "trustme"
 make_check=no
 

From 63263bead810708913c248bd75f3e8452190c746 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 1 Jun 2021 17:08:51 +0200
Subject: [PATCH 24/39] bdf2psf: update to 1.203.

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

diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index 314d83e905ee..bacab7932b2c 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -1,6 +1,6 @@
 # Template file for 'bdf2psf'
 pkgname=bdf2psf
-version=1.202
+version=1.203
 revision=1
 wrksrc="console-setup-${version}"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/bdf2psf"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=c9b38d548337b26ffdc2bf555072e328bef8b7c1b2ac88cb4e24b898796cca20
+checksum=0d6ac1faa2b26d692e794be5b179866feea5a68821da97eea09802ea0c93e4a2
 
 post_extract() {
 	sed -i '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf

From 2a18f925b828f080ee8766cc30b831cb79d92c3b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 2 Jun 2021 16:44:02 +0200
Subject: [PATCH 25/39] fzf: update to 0.27.2.

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

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index d4ef0a34ebf5..5bacbb59790d 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.27.1
+version=0.27.2
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/junegunn/fzf"
 changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
 distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=d86d879e01dee330d2fd3ef522a5bc5c2eafd31990e6869142fd300a06e4c13e
+checksum=7798a9e22fc363801131456dc21026ccb0f037aed026d17df60b1178b3f24111
 
 post_install() {
 	cd ${wrksrc}

From 8916cd3a81b0487a04e5f2f23a9e00b32d24a94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 29 May 2021 11:49:19 +0700
Subject: [PATCH 26/39] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6

See: /usr/lib/qt6/mkspecs/modules/qt_lib_core_private.pri

It should say "-latomic" instead of "atomic".
---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 ++++++++++++++
 srcpkgs/qt6-base/template                |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
new file mode 100644
index 000000000000..edbe5e609d5a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/libatomic.patch
@@ -0,0 +1,14 @@
+Index: cmake/FindWrapAtomic.cmake
+===================================================================
+--- cmake/FindWrapAtomic.cmake.orig
++++ cmake/FindWrapAtomic.cmake
+@@ -38,7 +38,8 @@ endif()
+ 
+ add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
+ if(HAVE_STDATOMIC_WITH_LIB)
+-    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
++    find_library(LIBATOMIC atomic REQUIRED)
++    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
+ endif()
+ 
+ set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index c720e7f51671..d03dfe7a2129 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.0
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -25,7 +25,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
  sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
 short_desc="Cross-platform application and UI framework (QT6)"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
 checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4

From 99dc4338865e1315830cd62b1177d5ecee715cf2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 1 Jun 2021 04:32:34 +0200
Subject: [PATCH 27/39] linux5.4: fix up ppc-dotconfig

---
 srcpkgs/linux5.4/files/ppc-dotconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index f16d80306325..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.110 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -522,8 +522,9 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC=""
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y

From a8e63d5e3e6d981de8385d354288bf72ddbfc718 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Tue, 1 Jun 2021 20:50:14 +0200
Subject: [PATCH 28/39] cbindgen: update to version 0.19.0.

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

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3c9d15bbce0d..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
 # Template file for 'cbindgen'
 pkgname=cbindgen
-version=0.18.0
+version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
@@ -8,7 +8,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
-checksum=956fb1ca77daabf89451a1ea42658b74ad35477fed24ad859d8612708f9c4336
+checksum=5a068b3d4cd0319b12844c83816d63e2e9ce8176bd2d78ca0ac03d4833bcbab7
 
 do_check() {
 	: # test are only expected to work with rust nightly

From ca26097d7aa59885bd41456ce3246f01619551a3 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Tue, 1 Jun 2021 20:50:41 +0200
Subject: [PATCH 29/39] firefox: update to version 89.0.

---
 .../firefox/patches/disable-minidump.patch    | 34 -------------------
 srcpkgs/firefox/template                      |  4 +--
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/disable-minidump.patch

diff --git a/srcpkgs/firefox/patches/disable-minidump.patch b/srcpkgs/firefox/patches/disable-minidump.patch
deleted file mode 100644
index 5c440076474b..000000000000
--- a/srcpkgs/firefox/patches/disable-minidump.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Enables itself even when --disable-backtrace is set,
-and doesn't build on musl or ppc* (not tested).
-
-diff --git Cargo.toml Cargo.toml
-index 4076a60577..945f26f638 100644
---- Cargo.toml
-+++ Cargo.toml
-@@ -13,7 +13,6 @@ members = [
-   "netwerk/test/http3server",
-   "security/manager/ssl/osclientcerts",
-   "testing/geckodriver",
--  "toolkit/crashreporter/rust_minidump_writer_linux",
-   "toolkit/library/gtest/rust",
-   "toolkit/library/rust/",
-   "toolkit/mozapps/defaultagent/rust",
-@@ -79,7 +78,6 @@ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
--minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "01c7a0da8d34059f7dae8ab9e7512529ff16347a" }
- 
- [patch.crates-io.cranelift-codegen]
- git = "https://github.com/mozilla-spidermonkey/wasmtime"
-diff --git toolkit/moz.configure toolkit/moz.configure
-index 806576b1ef..43ef8309f1 100644
---- toolkit/moz.configure
-+++ toolkit/moz.configure
-@@ -2487,8 +2487,6 @@ set_define("MOZ_USE_NATIVE_POPUP_WINDOWS", True, when="MOZ_USE_NATIVE_POPUP_WIND
- # ==============================================================
- @depends(target)
- def oxidized_breakpad(target):
--    if target.kernel == "Linux" and target.os != "Android":
--        return target.cpu in ("x86", "x86_64")
-     return False
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0a54a0d352c8..3ce8a92ecbb0 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=88.0.1
+version=89.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=83df1eae0e28fe99661fd5d39d705cdab2e108b4a24ce12c2db6183c632804cc
+checksum=db43d7d5796455051a5b847f6daa3423393803c9288c8b6d7f1186f5e2e0a90a
 
 lib32disabled=yes
 

From a84f89f1262c05df62a444c744b9f438c9176145 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Wed, 2 Jun 2021 00:07:55 +0200
Subject: [PATCH 30/39] firefox-i18n: updated to version 89.0.

Closes: #31248 [via git-merge-pr]
---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 582142758b24..9e057874b4a2 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=88.0.1
+version=89.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="80d01a3af48f86e2f99d48b81933c813a6add751cbc3c17617cd9ac59aaa45d1
- b0462a102fa42c5e20dffa371b47ca79112f9c0860f7ae222c1d1f4711c4f1f4
- ad1bf82b2a6598f080f168ae00b878c524a326dbb80f2502d16a85e20f9084ed
- 8834060393326650c97dfff017fc3a5cd701aaa7e1ad10e364db1fc58b6058c9
- 0331fe783f787492229c31322bec6227d493a396efe40c629f259037e260a8bd
- 10f5b5791a17bfe2765a7af427622cebc462e52e6780c948aafdd4f511e53127
- 86713d2fe5b3071195db13c8ce4f7d69e88b4ad5897ec862ee9cde6a06f40654
- dab99398f4a93110b9caf90b9f401919777de8ed942063110bfc57b2935a4bb8
- 65514a6ca8b2709a8a7fe530bc781075645fad548a91c760875016e59d6bedfd
- eace7d76e3dd6d3a9cf61a2639342f8f9c6d16e5d9aa1e84a1897ea600662826
- 4b5ce0682e3292e1893a362998222bd8bd755a78be5135bccaee234e0d27be20
- 076dc03cda273eb92fb9b0efb18f1a7ec7ef1cc8e9a99629d3a1d258e1e08b3e
- dc9b1a177df4d8a07bc3777b82273b7f52b927221a7c3ab30d81582343de8f23
- 58ef43f7f6a40d76013b9179a6b60a1d7be79083060c50dc775d0f934779dabb
- f97091e3b7284388171a2d344aab7f022087c255d649ab49ce19bc702a7e5c6a
- f4acefa54dc91d2ce335b82969db6632913c3fc899ece59110a0051b20f79c4b
- 8e07fbf79e539061fd3cfa8a7a19d5b7f1a8f30740e200451dac248b5d8ce36d
- 7cfe8a32374e862cf7de4cb9fc28077b625bea7be39e17aff08605036de4c64e
- 0a892932cbb536177457d081f56ca3c6e29b7f08bace67b858a2b3f392f64731
- c0f0c3c079da499adb40815e6cda38a68c3d36c8e19d3d1eae705354d9b217a4
- 218afbcd896be8ab58d772e993c946fa6ba2310a688b97d25625c16ce207d9e9
- dd5089f902c502954580e8cf4e9bdc3a08f8b9e7c6835b65a6e27eb6c6061ec1
- d1246f60808b37e8fa51c19d62d8996953306a1f7ed83f151f7ac25380e999ca
- a19d5f4d6c5d1d0b0f66b0ba9a16f11c22df4ae4d738eb942381e9d471c5ffd3
- c074e370c6d95bfe6b1d5cbe93c5a868207e4a1b7587618060708ae95f5dc187
- 2e15a9d0066bc0d7bea7fb712a0195e3f15b488ed06d0dd8fb893527d4aa4107
- 8a505ee4bce3fa9d26ded1c09b401987aff02997dd2abf4cd220a4c10069c126
- 69d5a146ef8dd0581af03b034b495a695a9768c68fb9e3d68a2144db8b36be27
- 4be5b1cc3682961212f10a5c72e69e22ad818aacd35df5cda62001315ba9a169
- 157cf8160f537857dd6d617a096836e510b13aa58deba19867072409371547ca
- 890e4af479db68015dbf1f4761ce44ee6a659c3b667fabaf0b51ddab3930542b
- 7e182154ee64bf0926ac8549dd4d9c97a5e396262d4422fde5591b043e146195
- 708bf3f9f35d1caf5cebb76052bfca05dbb0279ea60e9562d22255fda755e0e7
- 7f1e28ac36aedaf889fe65123960dd076a6d2c800cf5c09f9d734e68a0c175bf
- 9694b7099a0e4b543992d431045beb421aab2931ba806bb5efc997c77e11c6a7
- 199599e9e9fe5feae34047d0ca761ccd2847c8475a38ab5685c4f1487cdf3c23
- ec2f6edd10a39a8ac96e38bbf72f7dc2aae06d9e68b00316979b2a51e8fe8e3d
- 94c964b8526f64d4dd7fccc972eca6e33a5b9db7daef3b6dfcc9cd4911cb94a5
- 48ab4a86a1abdc9838102324b3bf5f4b406b68ad630bae215f0dd9b7b99cabe3
- 142b8f92096bd812da58aedc86111d76cd7a10fafa03aaaa4052f480235e6661
- 089a0533ccec66d0a451967521b7a3eff0db0b0f75589fe2b9045016702aee26
- ef09d30d8d1e5714d04fc6dcb8b4348e46901f961d4ef65443bf124fd7cfb93d
- 629c16da6d5467c83fbbeb4511484629cb20babb3e067454c571830631768e8c
- 5bdfa6cb2d6032a112f076f098746bb08ed9d0b1a1bcfca515af39d17533170d
- ccc164411ab79a0fca4f1968067d2c008acb3ee00f339f017e6c39aadef9334d
- f99be63e67b9fcbd59a6e1fd8b8cbfddf9d9a4d1b412a701dd466f7eda9c00f2
- aded4763b7a2cafa37d9a405ce40a4649f3967e36ace410c687cee975861f549
- 8ca5fbec8187088a600398b652c4491df75b7159a0371ec16c72a21ac6816cc8
- c8c5c7e3cbb8da143218c1bfed836cf3d62e8a7ffa96af886251abe760066baa
- 5df0960a12955cd9acbd67eae0b1a111aa8d0c5c601bb14539c7aced81e59aae
- 5582003eb846eacfa350955a706f84b7133e3b5294270c809ffebe9035bcf8dd
- b1daa0ccc0056e23556413b1fa3f92727df8a75bfed928c6d6d7835170727e07
- 818262c84ccc247ccd566980bd563f85b2f6f88d0cc38c9ffe5bd7d82127fb2e
- 9578eeb909233fdce99d0426bd4d2d5972b46fe63af62d8957ff6170fb9618a2
- a5b21393bfab188c6f3ba647a376a0ad63a3ca33175f7d3b0e88a204be457f70
- 09916f7223ebe012deee3b503a690697db566c60a84366f117ed43b95ddb4873
- 61181ec9e6f4c2af894c58fd9c432f3fc56945f6a2c7a5cdf0b7a6d3e2098f15
- 645e40060948871010ca1b3f2b62dd9d72d50bdb3c0df52ab3300dbe11f0c267
- 911803ed44b73bf232b3a95e4bc636249df68dc3c6c5685b22d8e9a900ae873c
- c05dd396d67b4c47e34dfa6afc8b7fc06a880001589fea1f46b5b1b660d1c5c9
- a4f1b51752fc377146d4b5489f45380557bbf956f5075daa2a0ca337d7fa462a
- 33cfcf70fd3a20222648d89f8f1dfa101bd54dda1777bcd8adb77873c413af0b
- 0ed711860a7da0893ae6e9c93f6a01137b9f607dd2e41bdc1d4f7602a790a6d7
- 06a10157e2bc454947e8bc35f4d7add624528ee556114d9da7fb56ff7ca0628f
- 3d099078e99a658c194fefe063abb63a2dc1ef70ad10685509a0ed1213383e85
- dc6cdaaf8f1a06645312a5127a1f533fb0bd289f41de2c559bd9a83db3cafba5
- 76c78c8d1246467f8680c9f8d2f108f0ca3a8eddf1cde2150b8ff5cefa4388aa
- f791a1d8da8a1b4dec937660c9664679a04176a83fbbda63fda61d29d6752148
- 7ddf2d351962efd9fd2d13e53378a877dca2be8b610053fd9b13dafd74fe0280
- c977cf8fbb47aaeb573f0fed95e67a9614115440fc4ce89736e9f83fba9e0dea
- 153e408653e06449bb4de584df31722ffefa30fca259074b879ef28bc6188ea5
- 5b25bfedb0a2986777960fdbf6553ff5da77f95d52ff3e7a8273fb59703e4229
- b802a1bf47a83dc773de1f2b31fb04141838fefddf98a1f7980bb64e2ff487a9
- aea7155b62595eb92438c5d6a59231eb19264c249427b913971bbac3746fa01e
- b852a49e72182b513db59f6355b651c1f42b67ae2f8cbb0c5aefd9d2b605dc45
- 46e6caba0551b360a6e5cceb2f34e10265c7a2acd209b9f6423559cfa7162d2a
- 343b5eded13a9faf73071ab1a14f2d166cf086cb3d3ebd8b964a370e5fcd47cc
- 9ecf36f0398c8f58e46f96d943435e01ca64ff54860947968d6fb4047ee4f53a
- a682cb0c8cc42a1ed0311a4c6695a11b5d8e9bfabaf819107527b642c05eab23
- 798f0bb6281dd56d5e0bf21f98a8a09dad386755ff7c3b1facb7b3f871233753
- bd3e8383475e93da36683afb1a3cd81056d8ea8a76d95e35f048add52e8b76fc
- 6abf4ffbc9b945702a5acc95a3bc4f981401a38e1dfcc1bf49e3323008e48b4a
- 327f10df38fcff9e796db163e49a2aeab7ebfa1969a0201d985086526a8da07a
- d5d2630d3068eba3a9842fa7d94ff5ddf5ce247ec1cfe0671186ef56b50704f6
- db6dd5560e5d868f4b79a227305a270059adf4980086440df031703c8b3d4536
- a3ffd854799a85fd1ef5e882c9d8d38dc892509f42b656ea52ed0bd53e85a490
- e82e73e7f8b16b182bc0aa64648e02177093b65aa175e4388fd46f6727ef1038
- 35a8d5c2d2e576ec2f66faf137a1ee53daaa4ef8ff6bc0b13f5f77d0269c782a
- 1401f6935ee94a4487e8d64cb58f2ce0074e91297b18083877ff6e85bc32b2f1
- 76ab00d25a3131d90ba3a30927dab6e98d7c8ccd9c27b68e39228e62e3f53eb0
- 0de92fd6614bafcf3a8a8f88367537f40ca3fd4963c73046d237ef857ae265bf
- 3f47f20d655de331ee281d2f2e71f68a730e730be2eddcb6811ee2b3db9759e9
- acc767c992a616c72306496611e1aa67cbd946dac8fba753c025788e8bf84947
- 986526dec3da5a96f218d53b398e8e45358b66ab03f0e4a76adc0179fb39aace
- ae2e0644fa1f620418e1cce9561b0816575721326aaf13e232f47afa323f0686
- 6ee4c16de0a36febf3ca0f2d80ed3d3afab3d90d12cbbd8c7f531ff50f93025e"
+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"

From ab93453cb106b6542e72aa8e82db787fffb5589b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 3 Jun 2021 16:34:33 +0200
Subject: [PATCH 31/39] libvirt: update to 7.4.0.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 28824ed7f713..aadf2b4a2356 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.3.0
+version=7.4.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=27bdbb85c0301475ab1f2ecd185c629ea0bfd5512bef3f6f1817b6c55d1dc1be
+checksum=b366d73dee6ce77a226bedef592e0620ceb8e22e5998f60768017f79fc4ead26
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From cb36d47e8a26e2e8221a7d675ebeeb9af69aa8db Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 3 Jun 2021 16:37:49 +0200
Subject: [PATCH 32/39] libvirt-python3: update to 7.4.0.

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

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 316e02e83df8..0331c79c35c6 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.3.0
+version=7.4.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=676c260ddb365120404e611a38c514045ef1af1a7fede15c1fc02d0f8241f696
+checksum=384a5273c06013ea4fbaa98069e364c209af390d000f0e206d803634711d0b9a

From 860e82075e9b5c0237f9222feb9bc00092222fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 2 Jun 2021 21:47:23 +0200
Subject: [PATCH 33/39] bfs: update to 2.2.1.

---
 ...pabilities-when-run-as-root-on-Linux.patch | 90 -------------------
 ...ing-forever-when-failing-to-drop-cap.patch | 41 ---------
 ...emove-capabilities-after-dropping-th.patch | 47 ----------
 srcpkgs/bfs/template                          |  4 +-
 4 files changed, 2 insertions(+), 180 deletions(-)
 delete mode 100644 srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
 delete mode 100644 srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
 delete mode 100644 srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch

diff --git a/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch b/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
deleted file mode 100644
index a2e54c397f8b..000000000000
--- a/srcpkgs/bfs/patches/0001-tests-Drop-capabilities-when-run-as-root-on-Linux.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From f2e6186ed0ce9b68362ad25d897f1e3c697728ec Mon Sep 17 00:00:00 2001
-From: Tavian Barnes <tavianator@tavianator.com>
-Date: Sun, 21 Mar 2021 13:18:43 -0400
-Subject: [PATCH] tests: Drop capabilities when run as root on Linux
-
-bfs's tests rely on file permissions being enforced, which leads them to
-work incorrectly when run as root.  This is probably the most common
-packaging issue for bfs, most recently seen with Void Linux's update to
-bfs 2.2.
-
-Make it easier on packagers by using capsh, if it's available, to drop
-the DAC privileges for the tests.
-
-Link: https://github.com/void-linux/void-packages/pull/29437#issuecomment-798670288
-Link: https://salsa.debian.org/lamby/pkg-bfs/-/commit/b173efb35da126adb39b0984219d6a2fd9ff428f
----
- tests.sh | 35 +++++++++++++++++++++++++++++------
- 1 file changed, 29 insertions(+), 6 deletions(-)
-
-diff --git tests.sh tests.sh
-index b039eea..0bdd1d4 100755
---- tests.sh
-+++ tests.sh
-@@ -34,10 +34,25 @@ if [ -t 1 ]; then
-     RST="$(printf '\033[0m')"
- fi
- 
--if [ "$EUID" -eq 0 ]; then
-+if command -v capsh &>/dev/null; then
-+    if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
-+        cat >&2 <<EOF
-+${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
-+${BLD}CAP_DAC_READ_SEARCH${RST}.
-+
-+EOF
-+
-+        exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
-+    fi
-+elif [ "$EUID" -eq 0 ]; then
-+    UNLESS=
-+    if [ "$(uname)" = "Linux" ]; then
-+	UNLESS=" unless ${GRN}capsh${RST} is installed"
-+    fi
-+
-     cat >&2 <<EOF
- ${RED}error:${RST} These tests expect filesystem permissions to be enforced, and therefore
--will not work when run as ${BLD}$(id -un)${RST}.
-+will not work when run as ${BLD}$(id -un)${RST}${UNLESS}.
- EOF
-     exit 1
- fi
-@@ -1209,11 +1224,15 @@ function test_gid() {
- }
- 
- function test_gid_plus() {
--    bfs_diff basic -gid +0
-+    if [ "$(id -g)" -ne 0 ]; then
-+	bfs_diff basic -gid +0
-+    fi
- }
- 
- function test_gid_plus_plus() {
--    bfs_diff basic -gid +0
-+    if [ "$(id -g)" -ne 0 ]; then
-+	bfs_diff basic -gid ++0
-+    fi
- }
- 
- function test_gid_minus() {
-@@ -1229,11 +1248,15 @@ function test_uid() {
- }
- 
- function test_uid_plus() {
--    bfs_diff basic -uid +0
-+    if [ "$(id -u)" -ne 0 ]; then
-+	bfs_diff basic -uid +0
-+    fi
- }
- 
- function test_uid_plus_plus() {
--    bfs_diff basic -uid ++0
-+    if [ "$(id -u)" -ne 0 ]; then
-+	bfs_diff basic -uid ++0
-+    fi
- }
- 
- function test_uid_minus() {
--- 
-2.31.0
-
diff --git a/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch b/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
deleted file mode 100644
index 5e951faea29c..000000000000
--- a/srcpkgs/bfs/patches/0002-tests-Avoid-looping-forever-when-failing-to-drop-cap.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From dbc77fd3b6e48a17eb79f9ff3a5f810b7554bf6f Mon Sep 17 00:00:00 2001
-From: Tavian Barnes <tavianator@tavianator.com>
-Date: Mon, 22 Mar 2021 17:19:31 -0400
-Subject: [PATCH] tests: Avoid looping forever when failing to drop
- capabilities
-
-Link: https://github.com/void-linux/void-packages/pull/29437/checks?check_run_id=2169825021
----
- tests.sh | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git tests.sh tests.sh
-index 0bdd1d4..ad71894 100755
---- tests.sh
-+++ tests.sh
-@@ -36,13 +36,21 @@ fi
- 
- if command -v capsh &>/dev/null; then
-     if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
-+	if [ -n "$BFS_TRIED_DROP" ]; then
-+            cat >&2 <<EOF
-+${RED}error: ${RST} Failed to drop capabilities.
-+EOF
-+
-+	    exit 1
-+	fi
-+
-         cat >&2 <<EOF
- ${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
- ${BLD}CAP_DAC_READ_SEARCH${RST}.
- 
- EOF
- 
--        exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
-+        BFS_TRIED_DROP=y exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
-     fi
- elif [ "$EUID" -eq 0 ]; then
-     UNLESS=
--- 
-2.31.0
-
diff --git a/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch b/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch
deleted file mode 100644
index acf3d32f9113..000000000000
--- a/srcpkgs/bfs/patches/0003-tests-Actually-remove-capabilities-after-dropping-th.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From d36ece2ca7498b7ba5485d5010439b57f006c9c8 Mon Sep 17 00:00:00 2001
-From: Tavian Barnes <tavianator@tavianator.com>
-Date: Tue, 23 Mar 2021 11:46:26 -0400
-Subject: [PATCH] tests: Actually remove capabilities after dropping them
-
----
- tests.sh | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git tests.sh tests.sh
-index ad71894..8eb4dc0 100755
---- tests.sh
-+++ tests.sh
-@@ -35,22 +35,25 @@ if [ -t 1 ]; then
- fi
- 
- if command -v capsh &>/dev/null; then
--    if capsh --has-p=CAP_DAC_OVERRIDE &>/dev/null || capsh --has-p=CAP_DAC_READ_SEARCH &>/dev/null; then
-+    if capsh --has-p=cap_dac_override &>/dev/null || capsh --has-p=cap_dac_read_search &>/dev/null; then
- 	if [ -n "$BFS_TRIED_DROP" ]; then
-             cat >&2 <<EOF
--${RED}error: ${RST} Failed to drop capabilities.
-+${RED}error:${RST} Failed to drop capabilities.
- EOF
- 
- 	    exit 1
- 	fi
- 
-         cat >&2 <<EOF
--${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}CAP_DAC_OVERRIDE${RST} and
--${BLD}CAP_DAC_READ_SEARCH${RST}.
-+${YLW}warning:${RST} Running as ${BLD}$(id -un)${RST} is not recommended.  Dropping ${BLD}cap_dac_override${RST} and
-+${BLD}cap_dac_read_search${RST}.
- 
- EOF
- 
--        BFS_TRIED_DROP=y exec capsh --drop=CAP_DAC_OVERRIDE,CAP_DAC_READ_SEARCH -- "$0" "$@"
-+        BFS_TRIED_DROP=y exec capsh \
-+            --drop=cap_dac_override,cap_dac_read_search \
-+            --caps=cap_dac_override,cap_dac_read_search-eip \
-+            -- "$0" "$@"
-     fi
- elif [ "$EUID" -eq 0 ]; then
-     UNLESS=
--- 
-2.31.1
-
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index ebc526cec78f..c0a36ae67f52 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.2
+version=2.2.1
 revision=1
 build_style=gnu-makefile
 makedepends="acl-devel libcap-devel"
@@ -11,7 +11,7 @@ license="0BSD"
 homepage="https://github.com/tavianator/bfs"
 changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md"
 distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=09cff2033544cbaa31af2ad7d59347056a53c04ff7c469bb5904e575d3641053
+checksum=94a9c9a03d82c2d8e81ff373021d8188925a1a5e525937ddda2523483629e390
 
 post_install() {
 	vlicense LICENSE

From 8935eab1c0e33f449b66b25987a119a9cee14236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 3 Jun 2021 06:42:00 +0200
Subject: [PATCH 34/39] you-get: update to 0.4.1527.

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

diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index bb10fcae99f4..51436a4a2160 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,6 +1,6 @@
 # Template file for 'you-get'
 pkgname=you-get
-version=0.4.1525
+version=0.4.1527
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://you-get.org/"
 distfiles="${PYPI_SITE}/y/you-get/you-get-${version}.tar.gz"
-checksum=905eae25a7d2aef2262cb6a2cabd036381a6c6c6cc8746e13c4a8fde4602911c
+checksum=470b2f76ccad5dbe37bc4a8779056cf6da67f4322fe723e2b9227e825da595c9
 
 post_install() {
 	vlicense LICENSE.txt

From 43f939279893b278ceff49a047abf2f4cba528cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 3 Jun 2021 07:14:16 +0200
Subject: [PATCH 35/39] monolith: update to 2.5.0.

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

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 8aedb83c561d..d4f05f3d2946 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,6 +1,6 @@
 # Template file for 'monolith'
 pkgname=monolith
-version=2.4.1
+version=2.5.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/Y2Z/monolith"
 distfiles="https://github.com/Y2Z/monolith/archive/v${version}.tar.gz"
-checksum=d68980bd5ade841f41e0d35447f9c299c82118eef2d291c2c07063086a18de0d
+checksum=0280d811c6b74fb84066a059db058d0008ff24ce128d4042659681d3aedf99cc
 
 post_install() {
 	vlicense LICENSE

From 3f807fbb8bee1811bda02127bac82eb38cafe686 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 3 Jun 2021 11:23:15 +0200
Subject: [PATCH 36/39] libmbim: update to 1.24.8.

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

diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index f12d888da43f..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.6
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=760465caaa1ccd699c14290e9791da456d5300dd11ebf4c1486151033e875dfd
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"

From 4e404504f0dce63b442e3a690624f2eb54084ba2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 3 Jun 2021 13:58:25 +0300
Subject: [PATCH 37/39] notcurses: update to 2.3.2.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index d54d7fb3e25a..82e0742eb118 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=5d8e53e308e8406834cf05008a7c738833991bc0f1e5f964d195c837c9951df1
+checksum=d936c931e137a3d67b4485ba543e3d99ecef0b6c3b181746b595e1ed09c1deee
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 400af943e4ea7c39e2061de424166f8fc2d2255b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 2 Jun 2021 13:21:42 +0200
Subject: [PATCH 38/39] intellij-idea-ultimate-edition: update to 2021.1.2.

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

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 20b2c7cbd226..90d702943d6e 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.1
+version=2021.1.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7142.45"
+wrksrc="idea-IU-211.7442.40"
 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=31ce6b0173bc8e046b263d7ab5601e3e1d1535a8e14f54487ce8a7f3a525f1a7
+checksum=a59f601182b3b457daeb3f545812ffa85fe4501cfaf185dfc973851915538457
 repository=nonfree
 restricted=yes
 nopie=yes

From ccdbb2f1baeffdcf1b5876696a6efa1d70c69e9b Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Sat, 29 May 2021 19:34:03 +0800
Subject: [PATCH 39/39] Adding asar package

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

diff --git a/srcpkgs/asar/template b/srcpkgs/asar/template
new file mode 100644
index 000000000000..94bab29a5ef3
--- /dev/null
+++ b/srcpkgs/asar/template
@@ -0,0 +1,23 @@
+# Template file for 'asar'
+pkgname=asar
+version=3.0.3
+revision=1
+hostmakedepends="nodejs"
+makedepends="nodejs modclean"
+depends="nodejs electron12"
+short_desc="Creating Electron app packages"
+maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+license="MIT"
+homepage="https://github.com/electron/asar"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=0a5ded75457fd95d87ec17586d7db7bea32db2df2f52961170064ab0b0ff8b5a
+python_version=3
+
+do_install() {
+	npm install -g --user root --engine-strict --prefix "$DESTDIR"/usr "${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${version}.tar.gz"
+	local _npmdir="${DESTDIR}/usr/lib/node_modules/${pkgname}"
+	cd "$_npmdir"
+	modclean -r -a "*.ts,.bin,.vscode,bin.js" --ignore='license'
+	vlicense "$_npmdir/LICENSE.md"
+	vdoc "$_npmdir/README.md"
+}

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

* Re: [PR PATCH] [Closed]: New Package: asar 3.0.3
  2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
                   ` (10 preceding siblings ...)
  2021-06-04  5:35 ` [PR PATCH] [Updated] " ReneganRonin
@ 2021-06-04  5:37 ` ReneganRonin
  11 siblings, 0 replies; 13+ messages in thread
From: ReneganRonin @ 2021-06-04  5:37 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

New Package: asar 3.0.3
https://github.com/void-linux/void-packages/pull/31205

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

#### General
- [x] 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

end of thread, other threads:[~2021-06-04  5:37 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-29 12:12 [PR PATCH] [New Package] asar ReneganRonin
2021-05-29 14:29 ` [PR PATCH] [Updated] " ReneganRonin
2021-05-31  2:01 ` ReneganRonin
2021-05-31  2:08 ` [PR PATCH] [Updated] [WIP] New Package: asar 3.0.3 ReneganRonin
2021-05-31  2:34 ` [PR REVIEW] " ericonr
2021-05-31 12:54 ` [PR PATCH] [Updated] " ReneganRonin
2021-05-31 21:24 ` ericonr
2021-06-02  2:34 ` [PR PATCH] [Updated] " ReneganRonin
2021-06-04  5:22 ` ReneganRonin
2021-06-04  5:24 ` ReneganRonin
2021-06-04  5:26 ` ReneganRonin
2021-06-04  5:35 ` [PR PATCH] [Updated] " ReneganRonin
2021-06-04  5:37 ` [PR PATCH] [Closed]: " ReneganRonin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).